From 2aa2b41f3ada8b2554442888d064152384958a18 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 25 Oct 2015 11:10:17 +0100 Subject: [PATCH] Fixes #2989 --- companion/src/firmwares/opentx/opentxinterface.cpp | 2 +- radio/src/opentx.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index d338d0ac4..3009b37a6 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -799,7 +799,7 @@ int OpenTxFirmware::getCapability(const Capability capability) case MixersMonitor: return id.contains("mixersmon") ? 1 : 0; case HasBatMeterRange: - return (IS_TARANIS(board) ? true : false); + return (IS_TARANIS(board) ? true : id.contains("battgraph")); case DangerousFunctions: return id.contains("danger") ? 1 : 0; default: diff --git a/radio/src/opentx.h b/radio/src/opentx.h index bcee11321..c9ad9cc39 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1133,10 +1133,10 @@ extern const char vers_stamp[]; #endif extern uint8_t g_vbat100mV; -#if defined(CPUARM) - #define GET_TXBATT_BARS() (min(10, 10 * (g_vbat100mV - g_eeGeneral.vBatMin - 90) / (30 + g_eeGeneral.vBatMax - g_eeGeneral.vBatMin))) +#if defined(PCBTARANIS) + #define GET_TXBATT_BARS() (limit(0, 10 * (g_vbat100mV - g_eeGeneral.vBatMin - 90) / (30 + g_eeGeneral.vBatMax - g_eeGeneral.vBatMin), 10)) #else - #define GET_TXBATT_BARS() (limit(2, 20 * (g_vbat100mV - g_eeGeneral.vBatMin - 90) / (30 + g_eeGeneral.vBatMax - g_eeGeneral.vBatMin), 20)) + #define GET_TXBATT_BARS() (limit(2, 20 * (g_vbat100mV - g_eeGeneral.vBatMin - 90) / (30 + g_eeGeneral.vBatMax - g_eeGeneral.vBatMin), 20)) #endif #define IS_TXBATT_WARNING() (g_vbat100mV <= g_eeGeneral.vBatWarn)