From 046b6d25c9cb98f41638e5def533612fd2998d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD?=
 <43981173+UU5JPP@users.noreply.github.com>
Date: Fri, 5 Feb 2021 23:05:12 +0300
Subject: [PATCH] PWM

---
 STM32/Core/Src/color_themes.h  | 2 ++
 STM32/Core/Src/lcd.c           | 4 ++++
 STM32/Core/Src/main.c          | 8 ++++----
 STM32/Core/Src/screen_layout.h | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/STM32/Core/Src/color_themes.h b/STM32/Core/Src/color_themes.h
index 44d0b28..6e951de 100644
--- a/STM32/Core/Src/color_themes.h
+++ b/STM32/Core/Src/color_themes.h
@@ -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),
diff --git a/STM32/Core/Src/lcd.c b/STM32/Core/Src/lcd.c
index 9c4c577..8149876 100644
--- a/STM32/Core/Src/lcd.c
+++ b/STM32/Core/Src/lcd.c
@@ -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);
diff --git a/STM32/Core/Src/main.c b/STM32/Core/Src/main.c
index fd466a4..6c22f9b 100644
--- a/STM32/Core/Src/main.c
+++ b/STM32/Core/Src/main.c
@@ -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
diff --git a/STM32/Core/Src/screen_layout.h b/STM32/Core/Src/screen_layout.h
index dc5919a..fc5e8e0 100644
--- a/STM32/Core/Src/screen_layout.h
+++ b/STM32/Core/Src/screen_layout.h
@@ -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