diff --git a/bitmaps.c b/bitmaps.c index 6276553..f706f73 100644 --- a/bitmaps.c +++ b/bitmaps.c @@ -28,7 +28,7 @@ const uint8_t BITMAP_POWERSAVE[8] = __extension__ 0b00110001 #endif }; - +/* const uint8_t BITMAP_TX[8] = { // "TX" __extension__ 0b00000000, @@ -46,13 +46,13 @@ const uint8_t BITMAP_RX[8] = __extension__ 0b00000000, __extension__ 0b01111111, __extension__ 0b00001001, + __extension__ 0b00001001, __extension__ 0b00011001, __extension__ 0b01100110, __extension__ 0b00000000, - __extension__ 0b00000000, __extension__ 0b00000000 }; - +*/ #ifndef ENABLE_REVERSE_BAT_SYMBOL // Quansheng way (+ pole to the left) const uint8_t BITMAP_BATTERY_LEVEL[17] = diff --git a/bitmaps.h b/bitmaps.h index d4e2537..168b428 100644 --- a/bitmaps.h +++ b/bitmaps.h @@ -5,8 +5,8 @@ #include extern const uint8_t BITMAP_POWERSAVE[8]; -extern const uint8_t BITMAP_TX[8]; -extern const uint8_t BITMAP_RX[8]; +//extern const uint8_t BITMAP_TX[8]; +//extern const uint8_t BITMAP_RX[8]; extern const uint8_t BITMAP_BATTERY_LEVEL[17]; diff --git a/firmware.bin b/firmware.bin index 31f6a2d..e1d0935 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 3b91ba3..b1dfb61 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/ui/status.c b/ui/status.c index bfa5ccf..66bc3b8 100644 --- a/ui/status.c +++ b/ui/status.c @@ -31,15 +31,7 @@ #include "ui/helper.h" #include "ui/ui.h" #include "ui/status.h" -/* -void invert_pixels(void *p, const unsigned int size) -{ - unsigned int i; - uint8_t *p8 = (uint8_t *)p; - for (i = 0; i < size; i++) - *p8++ ^= 0xff; -} -*/ + void UI_DisplayStatus(const bool test_display) { uint8_t *line = g_status_line; @@ -49,26 +41,17 @@ void UI_DisplayStatus(const bool test_display) memset(g_status_line, 0, sizeof(g_status_line)); - // ************** - // POWER-SAVE indicator - if (g_current_function == FUNCTION_TRANSMIT) - { - memcpy(line + x, BITMAP_TX, sizeof(BITMAP_TX)); -// invert_pixels(line + x, sizeof(BITMAP_TX)); - } - else - if (g_current_function == FUNCTION_RECEIVE || - g_current_function == FUNCTION_NEW_RECEIVE || - g_monitor_enabled) - { - memcpy(line + x, BITMAP_RX, sizeof(BITMAP_RX)); - } - else if (g_current_function == FUNCTION_POWER_SAVE || test_display) - { memcpy(line + x, BITMAP_POWERSAVE, sizeof(BITMAP_POWERSAVE)); - } + else +#if 0 + if (g_current_function == FUNCTION_TRANSMIT) + memcpy(line + x, BITMAP_TX, sizeof(BITMAP_TX)); + else + if (g_current_function == FUNCTION_RECEIVE || g_current_function == FUNCTION_NEW_RECEIVE || g_monitor_enabled) + memcpy(line + x, BITMAP_RX, sizeof(BITMAP_RX)); +#endif x += sizeof(BITMAP_POWERSAVE) + 1; #ifdef ENABLE_NOAA @@ -155,14 +138,9 @@ void UI_DisplayStatus(const bool test_display) } if (dw_running) - { memcpy(line + x, BITMAP_TDR_RUNNING, sizeof(BITMAP_TDR_RUNNING)); -// invert_pixels(line + x, sizeof(BITMAP_TDR_RUNNING)); - } else - { memcpy(line + x, BITMAP_TDR_HOLDING, sizeof(BITMAP_TDR_HOLDING)); - } x += sizeof(BITMAP_TDR_RUNNING) + 1; } @@ -196,7 +174,6 @@ void UI_DisplayStatus(const bool test_display) if (g_eeprom.config.setting.key_lock || test_display) { memcpy(line + x, BITMAP_KEYLOCK, sizeof(BITMAP_KEYLOCK)); -// invert_pixels(line + x, sizeof(BITMAP_KEYLOCK)); x += sizeof(BITMAP_KEYLOCK) + 1; } else @@ -204,7 +181,6 @@ void UI_DisplayStatus(const bool test_display) if (g_fkey_pressed) { memcpy(line + x, BITMAP_F_KEY, sizeof(BITMAP_F_KEY)); -// invert_pixels(line + x, sizeof(BITMAP_F_KEY)); x += sizeof(BITMAP_F_KEY); } x++; @@ -256,7 +232,5 @@ void UI_DisplayStatus(const bool test_display) // BATTERY LEVEL indicator UI_DrawBattery(line + x, g_battery_display_level, g_low_battery_blink); - // ************** - ST7565_BlitStatusLine(); }