[stock] Issue 86 fixed (tx voltage calibration issue)
This commit is contained in:
+2
-5
@@ -3822,20 +3822,17 @@ void perMain()
|
|||||||
}
|
}
|
||||||
if (counter-- == 0) {
|
if (counter-- == 0) {
|
||||||
counter = 10;
|
counter = 10;
|
||||||
#if defined(PCBTARANIS)
|
|
||||||
int32_t instant_vbat = anaIn(TX_VOLTAGE);
|
int32_t instant_vbat = anaIn(TX_VOLTAGE);
|
||||||
|
#if defined(PCBTARANIS)
|
||||||
instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.vBatCalib)/128) * BATT_SCALE;
|
instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.vBatCalib)/128) * BATT_SCALE;
|
||||||
instant_vbat >>= 11;
|
instant_vbat >>= 11;
|
||||||
instant_vbat += 2; // because of the diode
|
instant_vbat += 2; // because of the diode
|
||||||
#elif defined(PCBSKY9X)
|
#elif defined(PCBSKY9X)
|
||||||
int32_t instant_vbat = anaIn(TX_VOLTAGE);
|
|
||||||
instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.vBatCalib)/128) * 4191;
|
instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.vBatCalib)/128) * 4191;
|
||||||
instant_vbat /= 55296;
|
instant_vbat /= 55296;
|
||||||
#elif defined(PCBGRUVIN9X)
|
#elif defined(PCBGRUVIN9X)
|
||||||
uint16_t instant_vbat = anaIn(TX_VOLTAGE);
|
instant_vbat = (instant_vbat*1112 + instant_vbat*g_eeGeneral.vBatCalib + (BandGap<<2)) / (BandGap<<3);
|
||||||
instant_vbat = ((uint32_t)instant_vbat*1112 + (int32_t)instant_vbat*g_eeGeneral.vBatCalib + (BandGap<<2)) / (BandGap<<3);
|
|
||||||
#else
|
#else
|
||||||
uint16_t instant_vbat = anaIn(TX_VOLTAGE);
|
|
||||||
instant_vbat = (instant_vbat*16 + instant_vbat*g_eeGeneral.vBatCalib/8) / BandGap;
|
instant_vbat = (instant_vbat*16 + instant_vbat*g_eeGeneral.vBatCalib/8) / BandGap;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user