1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00

Merge branch 'port-changes' of https://github.com/ledvinap/cleanflight into ledvinap-port-changes

Conflicts:
	src/main/blackbox/blackbox.c
	src/main/io/serial.c
This commit is contained in:
Dominic Clifton 2015-03-09 22:23:04 +01:00
commit bce6c6722c
25 changed files with 162 additions and 89 deletions

View file

@ -37,7 +37,17 @@ TEST(BatteryTest, BatteryADCToVoltage)
{
// given
batteryConfig_t batteryConfig;
batteryConfig_t batteryConfig = {
.vbatscale = 110,
.vbatmaxcellvoltage = 43,
.vbatmincellvoltage = 33,
.vbatwarningcellvoltage = 35,
.currentMeterScale = 400,
.currentMeterOffset = 0,
.currentMeterType = CURRENT_SENSOR_NONE,
.multiwiiCurrentMeterOutput = 0,
.batteryCapacity = 2200,
};
// batteryInit() reads a bunch of fields including vbatscale, so set up the config with useful initial values:
memset(&batteryConfig, 0, sizeof(batteryConfig));