Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

add new msp messages for voltage meter and enhance messages for current meter

Browse source
This commit is contained in:
Marc Egli 2015-01-25 16:45:41 +01:00
parent 0db1807fec
commit 99089b9e70
1 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/io/serial_msp.c
View file

@ -200,6 +200,9 @@ const char *boardIdentifier = TARGET_BOARD_IDENTIFIER;
#define MSP_CF_SERIAL_CONFIG 54 #define MSP_CF_SERIAL_CONFIG 54
#define MSP_SET_CF_SERIAL_CONFIG 55 #define MSP_SET_CF_SERIAL_CONFIG 55
#define MSP_VOLTAGE_METER_CONFIG 56
#define MSP_SET_VOLTAGE_METER_CONFIG 57
// //
// Baseflight MSP commands (if enabled they exist in Cleanflight) // Baseflight MSP commands (if enabled they exist in Cleanflight)
// //
@ -1030,10 +1033,20 @@ static bool processOutCommand(uint8_t cmdMSP)
serialize16(masterConfig.boardAlignment.yawDegrees); serialize16(masterConfig.boardAlignment.yawDegrees);
break; break;
case MSP_CURRENT_METER_CONFIG: case MSP_VOLTAGE_METER_CONFIG:
headSerialReply(4); headSerialReply(4);
serialize8(masterConfig.batteryConfig.vbatscale);
serialize8(masterConfig.batteryConfig.vbatmincellvoltage);
serialize8(masterConfig.batteryConfig.vbatmaxcellvoltage);
serialize8(masterConfig.batteryConfig.vbatwarningcellvoltage);
break;
case MSP_CURRENT_METER_CONFIG:
headSerialReply(7);
serialize16(masterConfig.batteryConfig.currentMeterScale); serialize16(masterConfig.batteryConfig.currentMeterScale);
serialize16(masterConfig.batteryConfig.currentMeterOffset); serialize16(masterConfig.batteryConfig.currentMeterOffset);
serialize8(0); // current meter type
serialize16(masterConfig.batteryConfig.batteryCapacity);
break; break;
case MSP_MIXER: case MSP_MIXER:
@ -1370,9 +1383,18 @@ static bool processInCommand(void)
masterConfig.boardAlignment.yawDegrees = read16(); masterConfig.boardAlignment.yawDegrees = read16();
break; break;
case MSP_SET_VOLTAGE_METER_CONFIG:
masterConfig.batteryConfig.vbatscale = read8(); // actual vbatscale as intended
masterConfig.batteryConfig.vbatmincellvoltage = read8(); // vbatlevel_warn1 in MWC2.3 GUI
masterConfig.batteryConfig.vbatmaxcellvoltage = read8(); // vbatlevel_warn2 in MWC2.3 GUI
masterConfig.batteryConfig.vbatwarningcellvoltage = read8(); // vbatlevel when buzzer starts to alert
break;
case MSP_SET_CURRENT_METER_CONFIG: case MSP_SET_CURRENT_METER_CONFIG:
masterConfig.batteryConfig.currentMeterScale = read16(); masterConfig.batteryConfig.currentMeterScale = read16();
masterConfig.batteryConfig.currentMeterOffset = read16(); masterConfig.batteryConfig.currentMeterOffset = read16();
read(8); // current meter type
masterConfig.batteryConfig.batteryCapacity = read16();
break; break;
#ifndef USE_QUAD_MIXER_ONLY #ifndef USE_QUAD_MIXER_ONLY