Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 00:35:34 +03:00
Code Issues Wiki Activity

Merge pull request #2176 from iNavFlight/dzikuvx-current-meter-offset-negative

Browse source 
current_meter_offset allowed to go negative
This commit is contained in:
Konstantin Sharlaimov 2017-09-24 15:12:10 +10:00 • committed by GitHub
commit b7988c946e
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/fc/settings.yaml
View file

@ -450,7 +450,7 @@ groups:
max: 10000
- name: current_meter_offset
field: currentMeterOffset
min: 0
min: -3300
max: 3300
- name: multiwii_current_meter_output
field: multiwiiCurrentMeterOutput

2
src/main/msp/msp_protocol.h
View file

@ -60,7 +60,7 @@
#define MSP_PROTOCOL_VERSION 0 // Same version over MSPv1 & MSPv2 - message format didn't change and it backward compatible
#define API_VERSION_MAJOR 2 // increment when major changes are made
#define API_VERSION_MINOR 0 // increment when any change is made, reset to zero when major changes are released after changing API_VERSION_MAJOR
#define API_VERSION_MINOR 1 // increment when any change is made, reset to zero when major changes are released after changing API_VERSION_MAJOR
#define API_VERSION_LENGTH 2

2
src/main/sensors/battery.h
View file

@ -47,7 +47,7 @@ typedef struct batteryConfig_s {
uint8_t vbatwarningcellvoltage; // warning voltage per cell, this triggers battery warning alarm, in 0.1V units, default is 35 (3.5V)
int16_t currentMeterScale; // scale the current sensor output voltage to milliamps. Value in 1/10th mV/A
uint16_t currentMeterOffset; // offset of the current sensor in millivolt steps
int16_t currentMeterOffset; // offset of the current sensor in millivolt steps
currentSensor_e currentMeterType; // type of current meter used, either ADC or virtual
// FIXME this doesn't belong in here since it's a concern of MSP, not of the battery code.