[stock] Issue 86 fixed (tx voltage calibration issue)

This commit is contained in:
bsongis@gmail.com
2013-08-04 21:56:24 +00:00
parent 07c786d19c
commit 79e152e1bf
+2 -5
View File
@@ -3822,20 +3822,17 @@ void perMain()
}
if (counter-- == 0) {
counter = 10;
#if defined(PCBTARANIS)
int32_t instant_vbat = anaIn(TX_VOLTAGE);
#if defined(PCBTARANIS)
instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.vBatCalib)/128) * BATT_SCALE;
instant_vbat >>= 11;
instant_vbat += 2; // because of the diode
#elif defined(PCBSKY9X)
int32_t instant_vbat = anaIn(TX_VOLTAGE);
instant_vbat = (instant_vbat + instant_vbat*(g_eeGeneral.vBatCalib)/128) * 4191;
instant_vbat /= 55296;
#elif defined(PCBGRUVIN9X)
uint16_t instant_vbat = anaIn(TX_VOLTAGE);
instant_vbat = ((uint32_t)instant_vbat*1112 + (int32_t)instant_vbat*g_eeGeneral.vBatCalib + (BandGap<<2)) / (BandGap<<3);
instant_vbat = (instant_vbat*1112 + instant_vbat*g_eeGeneral.vBatCalib + (BandGap<<2)) / (BandGap<<3);
#else
uint16_t instant_vbat = anaIn(TX_VOLTAGE);
instant_vbat = (instant_vbat*16 + instant_vbat*g_eeGeneral.vBatCalib/8) / BandGap;
#endif