diff --git a/STM32/Core/Src/lcd.c b/STM32/Core/Src/lcd.c index 9e25e3c..037d09a 100644 --- a/STM32/Core/Src/lcd.c +++ b/STM32/Core/Src/lcd.c @@ -672,7 +672,10 @@ static void LCD_displayStatusInfoBar(bool redraw) //VOLTAGE sprintf(buff, "% 0.1f V ", TRX_InVoltage); if(TRX_InVoltage < 10.0f) - LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_VLT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, COLOR_RED, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT); + { + LCDDriver_Fill_RectWH(LAY_STATUS_LABEL_VLT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, 75, 15, COLOR_BLACK); + LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_VLT_X_OFFSET + 9, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, COLOR_RED, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT); + } else LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_VLT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, COLOR->STATUS_LABEL_VLT, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT); //IN/OUT diff --git a/STM32/Core/Src/screen_layout.h b/STM32/Core/Src/screen_layout.h index 84cbea8..f898ad3 100644 --- a/STM32/Core/Src/screen_layout.h +++ b/STM32/Core/Src/screen_layout.h @@ -62,7 +62,7 @@ #define LAY_FREQ_SMALL_FONT_7S &DS_DIGIT32pt7b #define LAY_FREQ_DELIMITER_Y_OFFSET 0 -#define LAY_FREQ_DELIMITER_X1_OFFSET 151 +#define LAY_FREQ_DELIMITER_X1_OFFSET 148 #define LAY_FREQ_DELIMITER_X2_OFFSET 285 //Display statuses under frequency #define LAY_STATUS_Y_OFFSET (uint16_t)(LAY_FREQ_Y_TOP + LAY_FREQ_BLOCK_HEIGHT + 1) diff --git a/STM32/MDK-ARM/WOLF-Lite.uvoptx b/STM32/MDK-ARM/WOLF-Lite.uvoptx index 2ba6b4b..5acbd4f 100644 --- a/STM32/MDK-ARM/WOLF-Lite.uvoptx +++ b/STM32/MDK-ARM/WOLF-Lite.uvoptx @@ -2010,6 +2010,150 @@ + + 116 + 0 + 814 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 117 + 0 + 815 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 118 + 0 + 816 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 119 + 0 + 848 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 120 + 0 + 849 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 121 + 0 + 850 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 122 + 0 + 855 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 123 + 0 + 856 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 124 + 0 + 857 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + 0 diff --git a/STM32/MDK-ARM/WOLF-Lite_ALEX_61_440.bin b/STM32/MDK-ARM/WOLF-Lite_ALEX_61_440.bin deleted file mode 100644 index ce0e768..0000000 Binary files a/STM32/MDK-ARM/WOLF-Lite_ALEX_61_440.bin and /dev/null differ diff --git a/STM32/MDK-ARM/WOLF-Lite_ALEX_64_320.bin b/STM32/MDK-ARM/WOLF-Lite_ALEX_64_320.bin deleted file mode 100644 index ce0e768..0000000 Binary files a/STM32/MDK-ARM/WOLF-Lite_ALEX_64_320.bin and /dev/null differ diff --git a/STM32/MDK-ARM/WOLF-Lite_R7KBI_61_440.bin b/STM32/MDK-ARM/WOLF-Lite_R7KBI_61_440.bin index ce0e768..003e396 100644 Binary files a/STM32/MDK-ARM/WOLF-Lite_R7KBI_61_440.bin and b/STM32/MDK-ARM/WOLF-Lite_R7KBI_61_440.bin differ diff --git a/STM32/MDK-ARM/WOLF-Lite_R7KBI_64_320.bin b/STM32/MDK-ARM/WOLF-Lite_R7KBI_64_320.bin deleted file mode 100644 index ce0e768..0000000 Binary files a/STM32/MDK-ARM/WOLF-Lite_R7KBI_64_320.bin and /dev/null differ