Антон 2021-02-05 23:05:12 +03:00
rodzic 4a8d181363
commit 046b6d25c9
4 zmienionych plików z 13 dodań i 5 usunięć

Wyświetl plik

@ -28,6 +28,7 @@ typedef const struct
const uint16_t STATUS_LABEL_RIT;
const uint16_t STATUS_LABEL_VLT;
const uint16_t STATUS_LABEL_CPU;
const uint16_t STATUS_LABEL_PWM;
const uint16_t STATUS_LABEL_THERM;
const uint16_t STATUS_LABEL_NOTCH;
const uint16_t STATUS_SMETER;
@ -85,6 +86,7 @@ static const STRUCT_COLOR_THEME COLOR_THEMES[2] = {
.STATUS_LABEL_RIT = COLOR_WHITE,
.STATUS_LABEL_VLT = rgb888torgb565(249, 205, 46),
.STATUS_LABEL_CPU = rgb888torgb565(255, 0, 0),
.STATUS_LABEL_PWM = rgb888torgb565(255, 0, 0),
.STATUS_LABEL_THERM = rgb888torgb565(249, 205, 46),
.STATUS_LABEL_NOTCH = rgb888torgb565(0, 200, 255),
.STATUS_SMETER = rgb888torgb565(249, 205, 46),

Wyświetl plik

@ -607,6 +607,10 @@ static void LCD_displayStatusInfoBar(bool redraw)
sprintf(buff, "VLT:%.1f ", TRX_InVoltage);
LCDDriver_printText(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_LABELS_FONT_SIZE);
//PWM
sprintf(buff, "PWM:%d\%%\n", TRX.RF_Power);
LCDDriver_printText(buff, LAY_STATUS_LABEL_PWM_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_PWM_Y_OFFSET, COLOR->STATUS_LABEL_VLT, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
//CPU-DSP
sprintf(buff, "CPU:%.1f ", CPU_LOAD.Load);
LCDDriver_printText(buff, LAY_STATUS_LABEL_CPU_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_CPU_Y_OFFSET, COLOR->STATUS_LABEL_CPU, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);

Wyświetl plik

@ -1287,14 +1287,14 @@ static void MX_FSMC_Init(void)
//LCD timings
#if defined(LCD_HX8357B)
Timing.AddressSetupTime = 3;
Timing.DataSetupTime = 3;
Timing.BusTurnAroundDuration = 2;
Timing.AddressSetupTime = 4;
Timing.DataSetupTime = 4;
Timing.BusTurnAroundDuration = 0;
Timing.AccessMode = FSMC_ACCESS_MODE_A;
#endif
#if defined(LCD_ILI9481)
Timing.AddressSetupTime = 3;
Timing.DataSetupTime = 2;
Timing.DataSetupTime = 4;
Timing.BusTurnAroundDuration = 3;
Timing.AccessMode = FSMC_ACCESS_MODE_A;
#endif

Wyświetl plik

@ -90,7 +90,9 @@
#define LAY_STATUS_LABEL_RIT_Y_OFFSET 36
#define LAY_STATUS_LABEL_VLT_X_OFFSET 200
#define LAY_STATUS_LABEL_VLT_Y_OFFSET 36
#define LAY_STATUS_LABEL_CPU_X_OFFSET 280
#define LAY_STATUS_LABEL_PWM_X_OFFSET 65
#define LAY_STATUS_LABEL_PWM_Y_OFFSET 36
#define LAY_STATUS_LABEL_CPU_X_OFFSET 270
#define LAY_STATUS_LABEL_CPU_Y_OFFSET 36
#define LAY_STATUS_LABEL_NOTCH_X_OFFSET 335
#define LAY_STATUS_LABEL_NOTCH_Y_OFFSET 36