1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 16:55:36 +03:00

Only enable VBat ADC when VBat feature is enabled.

Fixes #612
This commit is contained in:
Dominic Clifton 2015-03-13 22:26:04 +01:00
parent 8fcffa1454
commit 3b77626dd8
5 changed files with 21 additions and 17 deletions

View file

@ -882,7 +882,7 @@ static bool processOutCommand(uint8_t cmdMSP)
case MSP_ANALOG:
headSerialReply(7);
serialize8((uint8_t)constrain(vbat, 0, 255));
serialize16((uint16_t)constrain(mAhDrawn, 0, 0xFFFF)); // milliamphours drawn from battery
serialize16((uint16_t)constrain(mAhDrawn, 0, 0xFFFF)); // milliamp hours drawn from battery
serialize16(rssi);
if(masterConfig.batteryConfig.multiwiiCurrentMeterOutput) {
serialize16((uint16_t)constrain(amperage * 10, 0, 0xFFFF)); // send amperage in 0.001 A steps. Negative range is truncated to zero
@ -890,7 +890,7 @@ static bool processOutCommand(uint8_t cmdMSP)
serialize16((int16_t)constrain(amperage, -0x8000, 0x7FFF)); // send amperage in 0.01 A steps, range is -320A to 320A
break;
case MSP_RC_TUNING:
headSerialReply(8 + 2);//allow for returning tpa_breakpoint
headSerialReply(10);
serialize8(currentControlRateProfile->rcRate8);
serialize8(currentControlRateProfile->rcExpo8);
for (i = 0 ; i < 3; i++) {
@ -899,7 +899,6 @@ static bool processOutCommand(uint8_t cmdMSP)
serialize8(currentControlRateProfile->dynThrPID);
serialize8(currentControlRateProfile->thrMid8);
serialize8(currentControlRateProfile->thrExpo8);
//Configurator pid-tuning can allow tpa_breakpoint update, agnostic if older Configurator versions are used
serialize16(currentControlRateProfile->tpa_breakpoint);
break;
case MSP_PID: