Skip to content

Commit

Permalink
SUKU vsnr renamed to vsn1r
Browse files Browse the repository at this point in the history
  • Loading branch information
@SukuWc
SukuWc committed Sep 2, 2024
1 parent c3a35e2 commit 62f9030
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion grid_common/grid_protocol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions grid_esp/components/grid_esp32_module_tek1/grid_esp32_module_tek1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}

Expand Down Expand Up @@ -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);
}
}
Expand Down
8 changes: 4 additions & 4 deletions grid_esp/main/grid_fw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 62f9030

Please sign in to comment.