diff --git a/companion/src/firmwares/generalsettings.cpp b/companion/src/firmwares/generalsettings.cpp index ec3c0bf97..48ea45672 100644 --- a/companion/src/firmwares/generalsettings.cpp +++ b/companion/src/firmwares/generalsettings.cpp @@ -86,13 +86,7 @@ GeneralSettings::GeneralSettings() vBatMin = -5; //8,5V vBatMax = -5; //11,5V } - else if (IS_HORUS_X10(board)) { - // Lipo 2S - vBatWarn = 66; - vBatMin = -28; // 6.2V - vBatMax = -38; // 8.2V - } - else if (IS_TARANIS_XLITE(board)) { + else if (IS_TARANIS_XLITE(board) || IS_HORUS_X10(board)) { vBatWarn = 66; vBatMin = -23; // 6.7V vBatMax = -37; // 8.3V diff --git a/companion/src/simulation/simulatorwidget.cpp b/companion/src/simulation/simulatorwidget.cpp index 50b99cb4b..610206ae1 100644 --- a/companion/src/simulation/simulatorwidget.cpp +++ b/companion/src/simulation/simulatorwidget.cpp @@ -687,9 +687,7 @@ void SimulatorWidget::restoreRadioWidgetsState() emit stickModeChange(radioSettings.stickMode); // TODO : custom voltages - qint16 volts = radioSettings.vBatWarn + 2; - if (firmware->getCapability(Capability::HasBatMeterRange)) - volts = (radioSettings.vBatMin + 90) + ((radioSettings.vBatMax + 30) - radioSettings.vBatMin) / 2; + qint16 volts = radioSettings.vBatWarn + 20; // 1V above min emit inputValueChange(SimulatorInterface::INPUT_SRC_TXVIN, 0, volts); } diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h index 8e9ab3d38..0466d9451 100644 --- a/radio/src/targets/horus/board.h +++ b/radio/src/targets/horus/board.h @@ -420,8 +420,8 @@ extern volatile uint32_t pwm_interrupt_count; #if defined(PCBX10) // Lipo 2S #define BATTERY_WARN 66 // 6.6V - #define BATTERY_MIN 62 // 6.2V - #define BATTERY_MAX 82 // 8.2V + #define BATTERY_MIN 67 // 6.7V + #define BATTERY_MAX 83 // 8.3V #else // NI-MH 9.6V #define BATTERY_WARN 87 // 8.7V