From 0ff6c0e5aeb0d09b2fac4122ea019676b14f36bb Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Wed, 24 Jun 2020 12:35:28 +0200
Subject: [PATCH] Fix nightlies (#7765)

---
 radio/src/datastructs.h                | 4 ----
 radio/src/pulses/afhds3.cpp            | 2 +-
 radio/src/pulses/afhds3.h              | 6 +++---
 radio/src/targets/horus/lcd_driver.cpp | 8 ++++----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 876ae9875..9f114c5f8 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -744,12 +744,8 @@ PACK(struct RadioData {
   uint8_t backlightMode:3;
   int8_t antennaMode:2;
   uint8_t disableRtcWarning:1;
-#if defined(KEYS_BACKLIGHT_GPIO)
   uint8_t keysBacklight:1;
   int8_t spare1:1;
-#else
-  int8_t spare1:2;
-#endif
   NOBACKUP(TrainerData trainer);
   NOBACKUP(uint8_t view);            // index of view in main screen
   NOBACKUP(BUZZER_FIELD); /* 2bits */
diff --git a/radio/src/pulses/afhds3.cpp b/radio/src/pulses/afhds3.cpp
index bd3f577a3..bcfe8d3cf 100644
--- a/radio/src/pulses/afhds3.cpp
+++ b/radio/src/pulses/afhds3.cpp
@@ -341,7 +341,7 @@ void PulsesData::putFrame(COMMAND command, FRAME_TYPE frame, uint8_t* data, uint
   if (frameIndex == nullptr) {
     frameIndex = &this->frame_index;
   }
-  uint8_t buffer[] = { FrameAddress, *frameIndex, frame, command };
+  uint8_t buffer[] = {FrameAddress, *frameIndex, frame, command};
   putBytes(buffer, 4);
 
   //payload
diff --git a/radio/src/pulses/afhds3.h b/radio/src/pulses/afhds3.h
index 774293b65..fab057854 100644
--- a/radio/src/pulses/afhds3.h
+++ b/radio/src/pulses/afhds3.h
@@ -43,7 +43,7 @@
 // 1s = 1 000 000 us
 // 1000000/115200 = 8,68 us
 // actual timer is ticking in 0,5 us  = 8,68*2 = 17,36 because it must be integer take 17
-// difference 1000000 / x = 8.5 -->  x = 117 647 = difference = 1.2 %
+// difference 1000000 / x = 8.5 -->  x = 117 647 = difference = 1.2 %
 // allowed half a bit difference on the last bit -- should be fine
 #define AFHDS3_BAUDRATE        115200
 //Because timer is ticking with 0.5us
@@ -176,7 +176,7 @@ enum DeviceAddress
   MODULE = 0x03,
 };
 
-enum FRAME_TYPE
+enum FRAME_TYPE: uint8_t
 {
   REQUEST_GET_DATA = 0x01,  //Get data response: ACK + DATA
   REQUEST_SET_EXPECT_DATA = 0x02,  //Set data response: ACK + DATA
@@ -187,7 +187,7 @@ enum FRAME_TYPE
   NOT_USED = 0xff
 };
 
-enum COMMAND
+enum COMMAND: uint8_t
 {
   MODULE_READY = 0x01,
   MODULE_STATE = 0x02,
diff --git a/radio/src/targets/horus/lcd_driver.cpp b/radio/src/targets/horus/lcd_driver.cpp
index 42d2c3837..751aa88cd 100644
--- a/radio/src/targets/horus/lcd_driver.cpp
+++ b/radio/src/targets/horus/lcd_driver.cpp
@@ -153,6 +153,9 @@ static void delay3(uint32_t nCount)
 
 static void lcd_reset(void)
 {
+#if defined(RADIO_T18)     // T18 screen has issues if NRST is ever brought low
+  NRST_HIGH();
+#else
   NRST_HIGH();
   delay3(1);
 
@@ -161,6 +164,7 @@ static void lcd_reset(void)
 
   NRST_HIGH();
   delay3(30);
+#endif
 }
 
 void LCD_Init_LTDC(void)
@@ -326,11 +330,7 @@ void LCD_Init(void)
 {
   /* Reset the LCD --------------------------------------------------------*/
   LCD_NRSTConfig();
-#if defined(RADIO_T18)  // T18 seems to have eractic display issue if NRST is ever driven low
-  NRST_HIGH();
-#else
   lcd_reset();
-#endif
 
   /* Configure the LCD Control pins */
   LCD_AF_GPIOConfig();