Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 04:45:24 +03:00
Code Issues Wiki Activity

Merge pull request #10441 from mikeller/make_frsky_fuel_reporting_consistent

Browse source 
Made fuel reporting for FrSky telemetry consistent.
This commit is contained in:
Michael Keller 2021-01-06 02:31:35 +08:00 • committed by GitHub
commit 3df0053d2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/cli/settings.c
View file

@ -1238,6 +1238,7 @@ const clivalue_t valueTable[] = {
{ "telemetry_disabled_esc_rpm", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = LOG2(ESC_SENSOR_RPM), PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, disabledSensors)},
{ "telemetry_disabled_esc_temperature", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = LOG2(ESC_SENSOR_TEMPERATURE), PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, disabledSensors)},
{ "telemetry_disabled_temperature", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = LOG2(SENSOR_TEMPERATURE), PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, disabledSensors)},
{ "telemetry_disabled_cap_used", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = LOG2(SENSOR_CAP_USED), PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, disabledSensors)},
#else
{ "telemetry_disabled_sensors", VAR_UINT32 | MASTER_VALUE, .config.u32Max = SENSOR_ALL, PG_TELEMETRY_CONFIG, offsetof(telemetryConfig_t, disabledSensors)},
#endif

19
src/main/telemetry/smartport.c
View file

@ -121,11 +121,12 @@ enum
FSSP_DATAID_ADC1 = 0xF102 ,
FSSP_DATAID_ADC2 = 0xF103 ,
FSSP_DATAID_LATLONG = 0x0800 ,
FSSP_DATAID_CAP_USED = 0x0600 ,
FSSP_DATAID_VARIO = 0x0110 ,
FSSP_DATAID_CELLS = 0x0300 ,
FSSP_DATAID_CELLS_LAST = 0x030F ,
FSSP_DATAID_HEADING = 0x0840 ,
// DIY range 0x5100 to 0x52FF
FSSP_DATAID_CAP_USED = 0x5250 ,
#if defined(USE_ACC)
FSSP_DATAID_PITCH = 0x5230 , // custom
FSSP_DATAID_ROLL = 0x5240 , // custom
@ -360,6 +361,10 @@ static void initSmartPortSensors(void)
if (telemetryIsSensorEnabled(SENSOR_FUEL)) {
ADD_SENSOR(FSSP_DATAID_FUEL);
}
if (telemetryIsSensorEnabled(SENSOR_CAP_USED)) {
ADD_SENSOR(FSSP_DATAID_CAP_USED);
}
}
if (telemetryIsSensorEnabled(SENSOR_HEADING)) {
@ -696,6 +701,18 @@ void processSmartPortTelemetry(smartPortPayload_t *payload, volatile bool *clear
*clearToSend = false;
break;
case FSSP_DATAID_FUEL :
{
uint32_t data;
if (batteryConfig()->batteryCapacity > 0) {
data = calculateBatteryPercentageRemaining();
} else {
data = getMAhDrawn();
}
smartPortSendPackage(id, data);
*clearToSend = false;
}
break;
case FSSP_DATAID_CAP_USED :
smartPortSendPackage(id, getMAhDrawn()); // given in mAh, should be in percent according to SmartPort spec
*clearToSend = false;
break;

4
src/main/telemetry/telemetry.c
View file

@ -60,7 +60,7 @@
#include "telemetry/ibus.h"
#include "telemetry/msp_shared.h"
PG_REGISTER_WITH_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_TELEMETRY_CONFIG, 4);
PG_REGISTER_WITH_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig, PG_TELEMETRY_CONFIG, 5);
PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig,
.telemetry_inverted = false,
@ -78,7 +78,7 @@ PG_RESET_TEMPLATE(telemetryConfig_t, telemetryConfig,
IBUS_SENSOR_TYPE_RPM_FLYSKY,
IBUS_SENSOR_TYPE_EXTERNAL_VOLTAGE
},
.disabledSensors = ESC_SENSOR_ALL,
.disabledSensors = ESC_SENSOR_ALL | SENSOR_CAP_USED,
.mavlink_mah_as_heading_divisor = 0,
);

3
src/main/telemetry/telemetry.h
View file

@ -67,7 +67,8 @@ typedef enum {
| ESC_SENSOR_RPM \
| ESC_SENSOR_TEMPERATURE,
SENSOR_TEMPERATURE = 1 << 19,
SENSOR_ALL = (1 << 20) - 1,
SENSOR_CAP_USED = 1 << 20,
SENSOR_ALL = (1 << 21) - 1,
} sensor_e;
typedef struct telemetryConfig_s {