Bootloader for 9XE

radio/src/bootloader/Makefile

@@ -124,6 +124,10 @@ else
     CPPDEFS += -DREV4a
   else ifeq ($(PCBREV), REVPLUS)
     CPPDEFS += -DREVPLUS
+    HAPTIC = YES
+  else ifeq ($(PCBREV), REV9E)
+    CPPDEFS += -DREVPLUS -DREV9E
+    HAPTIC = YES
   else
     CPPDEFS += -DREV4
   endif
@@ -178,6 +182,10 @@ CPPSRC = ../targets/taranis/lcd_driver.cpp \
 	../strhelpers.cpp \
 	boot.cpp
 
+ifeq ($(PCBREV), REV9E)
+  CPPSRC += ../targets/taranis/rotenc_driver.cpp
+endif
+
 # List ASM source files here
 ASRC = ../targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc_ride7/startup_stm32f2xx.s
 

radio/src/targets/taranis/board_taranis.h

@@ -174,9 +174,9 @@ uint32_t readTrims(void);
 
 #if defined(REV9E)
 // Rotary Encoder driver
-void rotencInit();
-void rotencEnd();
-void checkRotaryEncoder();
+void rotencInit(void);
+void rotencEnd(void);
+void checkRotaryEncoder(void);
 #endif
 
 // WDT driver

radio/src/targets/taranis/keys_driver.cpp

@@ -145,7 +145,7 @@ void readKeysAndTrims()
 
 #if defined(REV9E)
   static rotenc_t rePreviousValue;
-  rotenc_t reNewValue = (x9de_rotenc / ROTARY_ENCODER_GRANULARITY);
+  rotenc_t reNewValue = (x9de_rotenc / 2);
   int8_t scrollRE = reNewValue - rePreviousValue;
   if (scrollRE) {
     rePreviousValue = reNewValue;

radio/src/targets/taranis/lcd_driver.cpp

@@ -44,7 +44,6 @@ static void Delay(uint32_t ms)
 }
 
 #if defined(REVPLUS)
-static void LCD_Hardware_Init() ;
 
 // New hardware SPI driver for LCD
 void initLcdSpi()