Merge fixes

radio/src/gui/128x64/model_setup.cpp

@@ -409,7 +409,7 @@ void menuModelSetup(event_t event)
   MENU_TAB({
     HEADER_LINE_COLUMNS
     0,
-    TIMERS_ROWS,
+    TIMER_ROWS,
     0, // Extended limits
     1, // Extended trims
     0, // Show trims
@@ -1767,18 +1767,19 @@ void menuModelSetup(event_t event)
         getModuleStatusString(EXTERNAL_MODULE, reusableBuffer.moduleSetup.msg);
         lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg);
         break;
-
+      }
 #if defined(HARDWARE_INTERNAL_MODULE)
       case ITEM_MODEL_SETUP_INTERNAL_MODULE_SYNCSTATUS:
 #endif
 #if defined(HARDWARE_EXTERNAL_MODULE)
       case ITEM_MODEL_SETUP_EXTERNAL_MODULE_SYNCSTATUS:
 #endif
-      {
-        lcdDrawTextAlignedLeft(y, STR_MODULE_SYNC);
-        getModuleSyncStatusString(moduleIdx, reusableBuffer.moduleSetup.msg);
-        lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg);
-        break;
+        {
+          lcdDrawTextAlignedLeft(y, STR_MODULE_SYNC);
+          getModuleSyncStatusString(moduleIdx, reusableBuffer.moduleSetup.msg);
+          lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg);
+          break;
+        }
 #endif
 
 #if defined(AFHDS3)

radio/src/gui/gui_common.cpp

@@ -1096,15 +1096,6 @@ const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol)
 }
 #endif
 
-void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags)
-{
-  lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, idx+1, 0);
-  if (ZEXIST(g_eeGeneral.anaNames[idx]) || (flags && s_editMode > 0))
-    editName(x, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, event, flags);
-  else
-    lcdDrawMMM(x, y, flags);
-}
-
 #if defined(MULTIMODULE)
 const char * getMultiOptionTitle(uint8_t moduleIdx)
 {

radio/src/lua/interface.cpp

@@ -756,7 +756,7 @@ void displayLuaError(const char * title)
         lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + 2 * FH, split + 2, 20, SMLSIZE);
         lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + 3 * FH, split + 22, strlen(split + 22), SMLSIZE);
       }
-#else
+#elif LCD_W == 64
       lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + FH + 3, lua_warning_info, split - lua_warning_info, SMLSIZE);
       lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + 2 * FH + 2, split + 2, lua_warning_info + LUA_WARNING_INFO_LEN - split, SMLSIZE);
 #endif

radio/src/pulses/afhds3.h

@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef PULSES_AFHDS3_H_
-#define PULSES_AFHDS3_H_
+#pragma once
 
 #include "libopenui/src/bitfield.h"
 #include "definitions.h"
@@ -95,7 +94,6 @@ struct Data
   void reset()
   {
     pulsesSize = 0;
-#endif
   }
 
 #if defined(EXTMODULE_USART) && defined(EXTMODULE_TX_INVERT_GPIO)
@@ -591,4 +589,4 @@ class PulsesData: public Data, CommandFifo
     ModuleVersion version;
 };
 } /* Namespace ahfds3 */
-#endif /* PULSES_AFHDS3_H_ */
+

radio/src/targets/horus/CMakeLists.txt

@@ -23,7 +23,7 @@ set(RTC_BACKUP_RAM YES)
 set(PPM_LIMITS_SYMETRICAL YES)
 set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)")
 set(ROTARY_ENCODER YES)
-set(EXTERNAL_MODULE YES)
+set(HARDWARE_EXTERNAL_MODULE YES)
 
 if(BOOTLOADER)
   set(LINKER_SCRIPT targets/horus/stm32f4_flash_bootloader.ld)
@@ -177,6 +177,10 @@ if(HARDWARE_EXTERNAL_ACCESS_MOD)
   add_definitions(-DHARDWARE_EXTERNAL_ACCESS_MOD)
 endif()
 
+if(HARDWARE_EXTERNAL_MODULE)
+  add_definitions(-DHARDWARE_EXTERNAL_MODULE)
+endif()
+
 if(INTERNAL_MODULE_PXX1)
   add_definitions(-DHARDWARE_INTERNAL_MODULE)
   add_definitions(-DINTERNAL_MODULE_PXX1)
@@ -217,7 +221,6 @@ set(TARGET_SRC
   extmodule_driver.cpp
   trainer_driver.cpp
   ../common/arm/stm32/mixer_scheduler_driver.cpp
-  ../common/arm/stm32/heartbeat_driver.cpp
   ../common/arm/stm32/timers_driver.cpp
   ../common/arm/stm32/intmodule_serial_driver.cpp
   ../common/arm/stm32/rotary_encoder_driver.cpp

radio/src/targets/horus/lcd_driver.cpp

@@ -151,7 +151,7 @@ static void LCD_NRSTConfig(void)
   GPIO_Init(LCD_GPIO_NRST, &GPIO_InitStructure);
 }
 
-static void lcd_reset(void)
+static void lcdReset(void)
 {
 #if defined(RADIO_T18)     // T18 screen has issues if NRST is ever brought low
   NRST_HIGH();

radio/src/telemetry/crossfire.h

@@ -104,7 +104,7 @@ const uint8_t CROSSFIRE_FRAME_PERIODS[] = {
 };
 #if SPORT_MAX_BAUDRATE < 400000 || defined(DEBUG)
 #define CROSSFIRE_BAUDRATE    CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate]
-#define CROSSFIRE_PERIOD      (CROSSFIRE_PERIODS[g_eeGeneral.telemetryBaudrate] * 1000)
+#define CROSSFIRE_PERIOD      (CROSSFIRE_FRAME_PERIODS[g_eeGeneral.telemetryBaudrate] * 1000)
 #else
 #define CROSSFIRE_BAUDRATE       400000
 #define CROSSFIRE_PERIOD         4000 /* us; 250 Hz */

radio/src/translations/cn.h.txt

@@ -571,6 +571,7 @@
 #define TR_MULTI_CUSTOM                "自定义"
 #define TR_MULTI_RFTUNE                TR("Freq tune", "频率微调")
 #define TR_MULTI_RFPOWER               "发射功率"
+#define TR_MULTI_WBUS                  "Output"
 #define TR_MULTI_TELEMETRY             "回传"
 #define TR_MULTI_VIDFREQ               TR("Vid. freq.", "Video frequency")
 #define TR_RF_POWER                    "发射功率"
@@ -599,6 +600,7 @@
 #define TR_BINDING_CH1_8_TELEM_OFF     "Ch1-8 关闭回传"
 #define TR_BINDING_CH9_16_TELEM_ON     "Ch9-16 开启回传"
 #define TR_BINDING_CH9_16_TELEM_OFF    "Ch9-16 关闭回传"
+#define TR_PROTOCOL                    "Protocol"
 #define TR_PROTOCOL_INVALID            TR("Prot. invalid", "无效协议")
 #define TR_MODULE_STATUS               TR(INDENT "Status", INDENT "多协议状态")
 #define TR_MODULE_SYNC                 TR(INDENT "Sync", INDENT "协议同步状态")
@@ -1309,3 +1311,6 @@
 #define ZSTR_SERVO_VOLTAGE             "SrvV"
 #define ZSTR_SERVO_TEMPERATURE         "SrvT"
 #define ZSTR_SERVO_STATUS              "SrvS"
+#define ZSTR_LOSS                      "Loss"
+#define ZSTR_SPEED                     "Spd "
+#define ZSTR_FLOW                      "Flow"

radio/src/translations/tw.h.txt

@@ -571,6 +571,7 @@
 #define TR_MULTI_CUSTOM                "自定義"
 #define TR_MULTI_RFTUNE                 TR("Freq tune", "頻率微調")
 #define TR_MULTI_RFPOWER                "發射功率"
+#define TR_MULTI_WBUS                   "Output"
 #define TR_MULTI_TELEMETRY              "回傳"
 #define TR_MULTI_VIDFREQ                TR("Vid. freq.", "Video frequency")
 #define TR_RF_POWER                     "發射功率"
@@ -599,6 +600,7 @@
 #define TR_BINDING_CH1_8_TELEM_OFF      "Ch1-8 關閉回傳"
 #define TR_BINDING_CH9_16_TELEM_ON      "Ch9-16 開啟回傳"
 #define TR_BINDING_CH9_16_TELEM_OFF     "Ch9-16 關閉回傳"
+#define TR_PROTOCOL                     "Protocol"
 #define TR_PROTOCOL_INVALID             TR("Prot. invalid", "無效協議")
 #define TR_MODULE_STATUS                TR(INDENT "Status", INDENT "多協議狀態")
 #define TR_MODULE_SYNC                  TR(INDENT "Sync", INDENT "協議同步狀態")
@@ -1316,4 +1318,7 @@
 #define ZSTR_SERVO_CURRENT             "SrvA"
 #define ZSTR_SERVO_VOLTAGE             "SrvV"
 #define ZSTR_SERVO_TEMPERATURE         "SrvT"
-#define ZSTR_SERVO_STATUS              "SrvS"
+#define ZSTR_SERVO_STATUS              "SrvS"
+#define ZSTR_LOSS                      "Loss"
+#define ZSTR_SPEED                     "Spd "
+#define ZSTR_FLOW                      "Flow"