feat(v16): add voltage and current for battery, modules and charging HUD

radio/src/gui/colorlcd/module/module_setup.cpp

@@ -72,6 +72,10 @@
 #include "dsmp_settings.h"
 #endif
 
+#if defined(CSD203_SENSOR)
+#include "csd203_sensor.h"
+#endif
+
 #define SET_DIRTY() storageDirty(EE_MODEL)
 
 #define ETX_STATE_UNIQUE_ID_WARN LV_STATE_USER_1
@@ -766,6 +770,47 @@ ModulePage::ModulePage(uint8_t moduleIdx) : Page(ICON_MODEL_SETUP)
   });
 
   auto subTypeChoice = new ModuleSubTypeChoice(box, moduleIdx);
+
+#if defined(CSD203_SENSOR)
+  FormLine* sensorVoltLine = nullptr;
+  FormLine* sensorCurrLine = nullptr;
+  if (moduleIdx == INTERNAL_MODULE) {
+    sensorCurrLine = body->newLine(grid);
+    new StaticText(sensorCurrLine, rect_t{}, STR_MODULE_SENSOR_CURRENT);
+    new DynamicNumber<int16_t>(
+        sensorCurrLine, rect_t{},
+        []() { return getIntModuleCurrent(); },
+        COLOR_THEME_PRIMARY1_INDEX, 0, "", "mA");
+  } else if (moduleIdx == EXTERNAL_MODULE) {
+    sensorVoltLine = body->newLine(grid);
+    new StaticText(sensorVoltLine, rect_t{}, STR_MODULE_SENSOR_VOLTAGE);
+    new DynamicNumber<uint16_t>(
+        sensorVoltLine, rect_t{},
+        []() { return getExtModuleVoltage(); },
+        COLOR_THEME_PRIMARY1_INDEX, PREC2, "", "V");
+
+    sensorCurrLine = body->newLine(grid);
+    new StaticText(sensorCurrLine, rect_t{}, STR_MODULE_SENSOR_CURRENT);
+    new DynamicNumber<int16_t>(
+        sensorCurrLine, rect_t{},
+        []() { return getExtModuleCurrent(); },
+        COLOR_THEME_PRIMARY1_INDEX, 0, "", "mA");
+  }
+
+  auto updateSensorVisibility = [=]() {
+    const bool on = g_model.moduleData[moduleIdx].type != MODULE_TYPE_NONE;
+    if (sensorVoltLine) {
+      if (on) sensorVoltLine->show();
+      else sensorVoltLine->hide();
+    }
+    if (sensorCurrLine) {
+      if (on) sensorCurrLine->show();
+      else sensorCurrLine->hide();
+    }
+  };
+  updateSensorVisibility();
+#endif
+
   auto moduleWindow = new ModuleWindow(body, moduleIdx);
 
   // This needs to be after moduleWindow has been created
@@ -775,6 +820,10 @@ ModulePage::ModulePage(uint8_t moduleIdx) : Page(ICON_MODEL_SETUP)
     moduleWindow->updateModule();
     subTypeChoice->updateLayout();
 
+#if defined(CSD203_SENSOR)
+    updateSensorVisibility();
+#endif
+
     SET_DIRTY();
   });
 

radio/src/targets/common/arm/stm32/csd203_sensor.cpp

@@ -21,6 +21,7 @@
 
 #include "csd203_sensor.h"
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -188,7 +189,58 @@ bool CSD203ExtInitFlag = false;
 
 bool IICReadStatusFlag = false;
 
-static uint16_t csd203extvbus = 0;
+/** The three CSD203 sensor configs polled in round-robin by readCSD203(). */
+enum CsdChannel { CSD_CH_MAIN, CSD_CH_IN, CSD_CH_EXT, CSD_CH_COUNT };
+
+static uint16_t csd203VoltMv[CSD_CH_COUNT] = {0, 0, 0};
+static int16_t csd203CurrMa[CSD_CH_COUNT] = {0, 0, 0};
+
+/** EMA low-pass: new += (sample - new) / 2^shift */
+constexpr uint8_t CSD203_VOLT_EMA_SHIFT = 4;
+constexpr uint8_t CSD203_CURR_EMA_SHIFT = 3;
+
+struct EmaState {
+  int32_t value = 0;
+  bool inited = false;
+};
+
+static EmaState csd203VoltFilt[CSD_CH_COUNT];
+static EmaState csd203CurrFilt[CSD_CH_COUNT];
+
+static int32_t csd203EmaI32(EmaState& filt, int32_t sample, uint8_t shift)
+{
+  if (!filt.inited) {
+    filt.value = sample;
+    filt.inited = true;
+    return sample;
+  }
+  filt.value += (sample - filt.value) >> shift;
+  return filt.value;
+}
+
+static void csd203ResetFilters()
+{
+  for (int ch = 0; ch < CSD_CH_COUNT; ch++) {
+    csd203VoltFilt[ch] = EmaState();
+    csd203CurrFilt[ch] = EmaState();
+    csd203VoltMv[ch] = 0;
+    csd203CurrMa[ch] = 0;
+  }
+}
+
+static int16_t csd203ClampI16(int32_t value)
+{
+  if (value > INT16_MAX) return INT16_MAX;
+  if (value < INT16_MIN) return INT16_MIN;
+  return (int16_t)value;
+}
+
+static uint16_t csd203ClampU16(int32_t value)
+{
+  if (value < 0) return 0;
+  if (value > UINT16_MAX) return UINT16_MAX;
+  return (uint16_t)value;
+}
 
 static CSD_CONFIG CSD203_MainSensorCFG;
 static CSD_CONFIG CSD203_InSensorCFG;
@@ -338,6 +390,7 @@ void initCSD203(void)
   CSD203MainInitFlag = false;
   CSD203InInitFlag = false;
   CSD203ExtInitFlag = false;
+  csd203ResetFilters();
 
   // TRACE("202 test ...");		//A0=CLK A1=SDA  RadioSky
 
@@ -398,14 +451,44 @@ void initCSD203(void)
   }
 }
 
-static uint16_t getCSD203BatteryVoltage(void)
-{  // 1000=1000mV
-  return csd203extvbus;
+static uint16_t csd203RawToMillivolts(uint16_t raw)
+{
+  return (uint16_t)((raw * 5) / 4);  // 1.25 mV/LSB
+}
+
+static int16_t csd203RawToMilliamps(uint16_t raw, const CSD_CONFIG* cfg)
+{
+  return (int16_t)((int16_t)raw * cfg->CurrentLSB / CSD_CONFIG_CurrentLsb1mA);
 }
 
 uint16_t getBatteryVoltage()
 {
-  return getCSD203BatteryVoltage() / 10;
+  return csd203VoltMv[CSD_CH_EXT] / 10;  // 10mV steps for EdgeTX API
+}
+
+uint16_t getBatteryMidVoltage()
+{
+  return csd203VoltMv[CSD_CH_MAIN] / 10;
+}
+
+uint16_t getExtModuleVoltage()
+{
+  return csd203VoltMv[CSD_CH_IN] / 10;
+}
+
+int16_t getExtModuleCurrent()
+{
+  return csd203CurrMa[CSD_CH_EXT];
+}
+
+int16_t getSystemCurrent()
+{
+  return csd203CurrMa[CSD_CH_MAIN];
+}
+
+int16_t getIntModuleCurrent()
+{
+  return csd203CurrMa[CSD_CH_IN];
 }
 
 void readCSD203(void)
@@ -418,16 +501,50 @@ void readCSD203(void)
 
   IICReadStatusFlag = true;
   if (GetSenSorStep == 0 && CSD203MainInitFlag == true) {
-    CSD203_ReadCurrent(&CSD203_MainSensorCFG);
-    CSD203_ReadVbus(&CSD203_MainSensorCFG);
+    const int32_t rawCurr =
+        csd203RawToMilliamps(CSD203_ReadCurrent(&CSD203_MainSensorCFG),
+                             &CSD203_MainSensorCFG);
+    csd203CurrMa[CSD_CH_MAIN] = csd203ClampI16(csd203EmaI32(
+        csd203CurrFilt[CSD_CH_MAIN], rawCurr, CSD203_CURR_EMA_SHIFT));
+
+    const uint32_t rawVolt = csd203RawToMillivolts(
+        CSD203_ReadVbus(&CSD203_MainSensorCFG));
+    csd203VoltMv[CSD_CH_MAIN] = csd203ClampU16(csd203EmaI32(
+        csd203VoltFilt[CSD_CH_MAIN], (int32_t)rawVolt, CSD203_VOLT_EMA_SHIFT));
   } else if (GetSenSorStep == 1 && CSD203InInitFlag == true) {
-    CSD203_ReadCurrent(&CSD203_InSensorCFG);
-    CSD203_ReadVbus(&CSD203_InSensorCFG);
+    const int32_t rawCurr =
+        csd203RawToMilliamps(CSD203_ReadCurrent(&CSD203_InSensorCFG),
+                             &CSD203_InSensorCFG);
+    csd203CurrMa[CSD_CH_IN] = csd203ClampI16(csd203EmaI32(
+        csd203CurrFilt[CSD_CH_IN], rawCurr, CSD203_CURR_EMA_SHIFT));
+
+    const uint32_t rawVolt =
+        csd203RawToMillivolts(CSD203_ReadVbus(&CSD203_InSensorCFG));
+    csd203VoltMv[CSD_CH_IN] = csd203ClampU16(csd203EmaI32(
+        csd203VoltFilt[CSD_CH_IN], (int32_t)rawVolt, CSD203_VOLT_EMA_SHIFT));
   } else if (GetSenSorStep == 2 && CSD203ExtInitFlag == true) {
-    CSD203_ReadCurrent(&CSD203_ExtSensorCFG);
-    csd203extvbus = (CSD203_ReadVbus(&CSD203_ExtSensorCFG) * 1.25);
-    // TRACE("Vbat=%d\r",csd203extvbus);
+    const int32_t rawCurr =
+        csd203RawToMilliamps(CSD203_ReadCurrent(&CSD203_ExtSensorCFG),
+                             &CSD203_ExtSensorCFG);
+    csd203CurrMa[CSD_CH_EXT] = csd203ClampI16(csd203EmaI32(
+        csd203CurrFilt[CSD_CH_EXT], rawCurr, CSD203_CURR_EMA_SHIFT));
+
+    const uint32_t rawVolt = csd203RawToMillivolts(
+        CSD203_ReadVbus(&CSD203_ExtSensorCFG));
+    csd203VoltMv[CSD_CH_EXT] = csd203ClampU16(csd203EmaI32(
+        csd203VoltFilt[CSD_CH_EXT], (int32_t)rawVolt, CSD203_VOLT_EMA_SHIFT));
   }
   IICReadStatusFlag = false;
-  if (++GetSenSorStep >= 3) GetSenSorStep = 0;
+  if (++GetSenSorStep >= 3) {
+    GetSenSorStep = 0;
+
+#if defined(DEBUG_CSD203)
+    TRACE("csd203BatteryVoltage: %d", csd203VoltMv[CSD_CH_EXT]);
+    TRACE("csd203SystemCurrent: %d", csd203CurrMa[CSD_CH_MAIN]);
+    TRACE("csd203ExtModuleVoltage: %d", csd203VoltMv[CSD_CH_IN]);
+    TRACE("csd203ExtModuleCurrent: %d", csd203CurrMa[CSD_CH_EXT]);
+    TRACE("csd203IntModuleCurrent: %d", csd203CurrMa[CSD_CH_IN]);
+    TRACE("csd203BatteryMidVoltage: %d", csd203VoltMv[CSD_CH_MAIN]);
+#endif
+  }
 }

radio/src/targets/common/arm/stm32/csd203_sensor.h

@@ -21,6 +21,20 @@
 
 #pragma once
 
+#include <stdint.h>
+
 void IICcsd203init(void);
 void initCSD203(void);
 void readCSD203(void);
+
+// CSD203_ExtSensorCFG: device supply battery
+uint16_t getBatteryVoltage();           // 10mV steps
+int16_t getExtModuleCurrent();          // mA
+
+// CSD203_MainSensorCFG: 2S pack mid-cell tap / system consumption
+uint16_t getBatteryMidVoltage();        // 10mV steps
+int16_t getSystemCurrent();             // mA
+
+// CSD203_InSensorCFG: external RF module supply / internal RF module
+uint16_t getExtModuleVoltage();         // 10mV steps
+int16_t getIntModuleCurrent();          // mA

radio/src/targets/horus/CMakeLists.txt

@@ -111,6 +111,8 @@ if (PCB STREQUAL X10)
     set(AUX2_SERIAL OFF)
     set(CSD203_SENSOR ON)
     set(CI1302_SENSOR ON)
+    set(USB_CHARGER YES)
+    set(V16_CHARGE_UI ON)
     set(FLYSKY_GIMBAL ON)
     add_definitions(-DIMU_ICM42627)
     add_definitions(-DIMU_SC7U22)
@@ -350,6 +352,11 @@ if(CI1302_SENSOR)
   add_definitions(-DVOICE_CONTROL_SENSOR)
 endif()
 
+if(V16_CHARGE_UI)
+  add_definitions(-DV16_CHARGE_UI)
+  set(SRC ${SRC} ${TARGET_SRC_DIR}/charge_ui.cpp)
+endif()
+
 set(SRC ${SRC}
   io/frsky_firmware_update.cpp
   io/multi_firmware_update.cpp