From 62f9030bca96c6d3343efe9af55d33ce369d79fc Mon Sep 17 00:00:00 2001 From: suku Date: Mon, 2 Sep 2024 17:38:20 +0200 Subject: [PATCH] SUKU vsnr renamed to vsn1r --- grid_common/grid_protocol.h | 2 +- .../grid_esp32_module_tek1/grid_esp32_module_tek1.c | 6 +++--- grid_esp/main/grid_fw.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/grid_common/grid_protocol.h b/grid_common/grid_protocol.h index dded9239..ed0736a4 100644 --- a/grid_common/grid_protocol.h +++ b/grid_common/grid_protocol.h @@ -69,7 +69,7 @@ #define GRID_MODULE_TEK2_RevA 17 #define GRID_MODULE_VSN1_RevA 49 -#define GRID_MODULE_VSNR_RevA 81 +#define GRID_MODULE_VSN1R_RevA 81 #define GRID_MODULE_VSN2_RevA 113 #define GRID_MODULE_PB44_RevA 145 diff --git a/grid_esp/components/grid_esp32_module_tek1/grid_esp32_module_tek1.c b/grid_esp/components/grid_esp32_module_tek1/grid_esp32_module_tek1.c index 2130082c..f4353ca3 100644 --- a/grid_esp/components/grid_esp32_module_tek1/grid_esp32_module_tek1.c +++ b/grid_esp/components/grid_esp32_module_tek1/grid_esp32_module_tek1.c @@ -191,7 +191,7 @@ void grid_esp32_module_tek1_task(void* arg) { if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_TEK1_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1_RevA) { vsn1_process_analog(); - } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSNR_RevA) { + } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1R_RevA) { vsn1r_process_analog(); } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN2_RevA) { @@ -206,7 +206,7 @@ void grid_esp32_module_tek1_task(void* arg) { grid_esp32_lcd_hardware_init(&grid_esp32_lcd_state, 0); } - if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSNR_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN2_RevA) { + if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1R_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN2_RevA) { grid_esp32_lcd_hardware_init(&grid_esp32_lcd_state, 1); } @@ -303,7 +303,7 @@ void grid_esp32_module_tek1_task(void* arg) { grid_esp32_lcd_draw_bitmap_blocking(&grid_esp32_lcd_state, 0, 0, i, SCREEN_WIDTH, TRANSFERBUFFER_LINES, hw_framebuffer); } - if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSNR_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN2_RevA) { + if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1R_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN2_RevA) { grid_esp32_lcd_draw_bitmap_blocking(&grid_esp32_lcd_state, 1, 0, i, SCREEN_WIDTH, TRANSFERBUFFER_LINES, hw_framebuffer); } } diff --git a/grid_esp/main/grid_fw.c b/grid_esp/main/grid_fw.c index dbce505b..ca6e82c2 100644 --- a/grid_esp/main/grid_fw.c +++ b/grid_esp/main/grid_fw.c @@ -227,7 +227,7 @@ void grid_module_tek1_ui_init(struct grid_ain_model* ain, struct grid_led_model* uint8_t led_lookup[18] = {10, 11, 12, 13, 14, 15, 16, 17, 5, 0, 6, 1, 7, 2, 8, 3, 9, 4}; // set unused to -1 grid_led_lookup_init(led, led_lookup); - } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSNR_RevA) { + } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1R_RevA) { uint8_t led_lookup[18] = {10, 11, 12, 13, 14, 15, 16, 17, 0, 5, 1, 6, 2, 7, 3, 8, 4, 9}; // set unused to -1 grid_led_lookup_init(led, led_lookup); @@ -239,7 +239,7 @@ void grid_module_tek1_ui_init(struct grid_ain_model* ain, struct grid_led_model* grid_led_lookup_init(led, led_lookup); } - if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_TEK1_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSNR_RevA) { + if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_TEK1_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1R_RevA) { grid_ui_model_init(ui, 14 + 1); @@ -363,7 +363,7 @@ void app_main(void) { } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_TEK2_RevA) { grid_module_tek2_ui_init(&grid_ain_state, &grid_led_state, &grid_ui_state); } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_TEK1_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1_RevA || - grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSNR_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN2_RevA) { + grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1R_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN2_RevA) { grid_module_tek1_ui_init(&grid_ain_state, &grid_led_state, &grid_ui_state, grid_sys_get_hwcfg(&grid_sys_state)); } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_PB44_RevA) { grid_module_pb44_ui_init(&grid_ain_state, &grid_led_state, &grid_ui_state); @@ -496,7 +496,7 @@ void app_main(void) { } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_TEK2_RevA) { xTaskCreatePinnedToCore(grid_esp32_module_tek2_task, "tek2", 1024 * 4, NULL, MODULE_TASK_PRIORITY, &module_task_hdl, 0); } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_TEK1_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1_RevA || - grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSNR_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN2_RevA) { + grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN1R_RevA || grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_VSN2_RevA) { xTaskCreatePinnedToCore(grid_esp32_module_tek1_task, "tek1", 1024 * 4, NULL, MODULE_TASK_PRIORITY, &module_task_hdl, 0); } else if (grid_sys_get_hwcfg(&grid_sys_state) == GRID_MODULE_PB44_RevA) { xTaskCreatePinnedToCore(grid_esp32_module_pb44_task, "pb44", 1024 * 3, NULL, MODULE_TASK_PRIORITY, &module_task_hdl, 0);