Minor types change to match current OpenTX/EdgeTX

OpenI6X · Dec 3, 2024 · 8a0e6f5 · 8a0e6f5
1 parent 2b4a6ac
commit 8a0e6f5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp
@@ -838,7 +838,7 @@ void putsRotaryEncoderMode(coord_t x, coord_t y, uint8_t phase, uint8_t idx, Lcd
 }
 #endif
 
-void drawValueWithUnit(coord_t x, coord_t y, int val, uint8_t unit, LcdFlags att)
+void drawValueWithUnit(coord_t x, coord_t y, int32_t val, uint8_t unit, LcdFlags att)
 {
   // convertUnit(val, unit);
   lcdDrawNumber(x, y, val, att & (~NO_UNIT));

diff --git a/radio/src/gui/128x64/lcd.h b/radio/src/gui/128x64/lcd.h
@@ -44,7 +44,7 @@ typedef uint8_t display_t;
 #define BLINK                          0x01
 #define INVERS                         0x02
 #if defined(BOLD_FONT)
-  #define BOLD                         0x40
+  #define BOLD                         0x40u
 #else
   #define BOLD                         0x00
 #endif
@@ -53,10 +53,9 @@ typedef uint8_t display_t;
 #define CENTERED                       0x20
 #define CONDENSED                      0x08
 #define FIXEDWIDTH                     0x10
-/* lcd puts flags */
 /* no 0x80 here because of "GV"1 which is aligned LEFT */
 /* no 0x10 here because of "MODEL"01 which uses LEADING0 */
-#define ZCHAR                          0x80
+#define ZCHAR                          0x80u
 
 /* lcdDrawNumber additional flags */
 #define LEADING0                       0x10

diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h
@@ -90,7 +90,7 @@ void drawFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
 swsrc_t checkIncDecMovedSwitch(swsrc_t val);
 
 #include "telemetry/telemetry_sensors.h"
-void drawValueWithUnit(coord_t x, coord_t y, int val, uint8_t unit, LcdFlags flags);
+void drawValueWithUnit(coord_t x, coord_t y, int32_t val, uint8_t unit, LcdFlags flags);
 void drawCurveRef(coord_t x, coord_t y, CurveRef & curve, LcdFlags flags=0);
 void drawDate(coord_t x, coord_t y, TelemetryItem & telemetryItem, LcdFlags flags=0);
 void drawTelemScreenDate(coord_t x, coord_t y, source_t sensor, LcdFlags flags=0);

diff --git a/radio/src/targets/common/arm/stm32/delays.cpp b/radio/src/targets/common/arm/stm32/delays.cpp
@@ -33,7 +33,7 @@
 //     RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM6, ENABLE);
 // }
 
-void delay_01us(uint16_t nb)
+void delay_01us(uint32_t nb)
 {
     TIM6->SR = 0;
     TIM6->PSC = 0;
@@ -42,7 +42,7 @@ void delay_01us(uint16_t nb)
     TIM6->CR1 |= TIM_CR1_CEN;
     while (!(TIM6->SR & TIM_SR_UIF));
 }
-void delay_us(uint16_t nb)
+void delay_us(uint32_t nb)
 {
     TIM6->SR = 0;
     TIM6->PSC = 0;
@@ -57,14 +57,14 @@ void delaysInit(void)
   DWT->CYCCNT = 0;
   DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
 }
-void delay_01us(uint16_t nb)
+void delay_01us(uint32_t nb)
 {
   volatile uint32_t dwtStart = DWT->CYCCNT;
   volatile uint32_t dwtTotal = (SYSTEM_TICKS_01US * nb) - 10;
   while ((DWT->CYCCNT - dwtStart) < dwtTotal);
 
 }
-void delay_us(uint16_t nb)
+void delay_us(uint32_t nb)
 {
   volatile uint32_t dwtStart = DWT->CYCCNT;
   volatile uint32_t dwtTotal = (SYSTEM_TICKS_1US * nb) - 10;

diff --git a/radio/src/targets/flysky/board.h b/radio/src/targets/flysky/board.h
@@ -115,8 +115,8 @@ void init5msTimer();
 extern "C" {
 #endif
 // void delaysInit(void);
-void delay_01us(uint16_t nb);
-void delay_us(uint16_t nb);
+void delay_01us(uint32_t nb);
+void delay_us(uint32_t nb);
 void delay_ms(uint32_t ms);
 #ifdef __cplusplus
 }

diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h
@@ -114,8 +114,8 @@ void boardOff(void);
 extern "C" {
 #endif
 void delaysInit(void);
-void delay_01us(uint16_t nb);
-void delay_us(uint16_t nb);
+void delay_01us(uint32_t nb);
+void delay_us(uint32_t nb);
 void delay_ms(uint32_t ms);
 #ifdef __cplusplus
 }

diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
@@ -121,8 +121,8 @@ void init5msTimer();
 extern "C" {
 #endif
 void delaysInit(void);
-void delay_01us(uint16_t nb);
-void delay_us(uint16_t nb);
+void delay_01us(uint32_t nb);
+void delay_us(uint32_t nb);
 void delay_ms(uint32_t ms);
 #ifdef __cplusplus
 }