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

Fixed reporting of extended ESC sensor data in SmartPort.

Browse source
This commit is contained in:
mikeller 2018-08-05 11:57:07 +12:00
parent d0a9a0fd93
commit c54aba77f1
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -317,6 +317,10 @@ static void smartPortSendPackage(uint16_t id, uint32_t val)
smartPortWriteFrame(&payload);
}
static bool reportExtendedEscSensors(void) {
return feature(FEATURE_ESC_SENSOR) && telemetryConfig()->smartport_use_extra_sensors;
}
#define ADD_SENSOR(dataId) frSkyDataIdTableInfo.table[frSkyDataIdTableInfo.index++] = dataId
static void initSmartPortSensors(void)
@ -328,23 +332,23 @@ static void initSmartPortSensors(void)
if (isBatteryVoltageConfigured()) {
#ifdef USE_ESC_SENSOR
if (!feature(FEATURE_ESC_SENSOR) || !telemetryConfig()->smartport_use_extra_sensors) {
if (!reportExtendedEscSensors())
#endif
{
ADD_SENSOR(FSSP_DATAID_VFAS);
#ifdef USE_ESC_SENSOR
}
#endif
ADD_SENSOR(FSSP_DATAID_A4);
}
if (isAmperageConfigured()) {
#ifdef USE_ESC_SENSOR
if (!feature(FEATURE_ESC_SENSOR) || !telemetryConfig()->smartport_use_extra_sensors) {
if (!reportExtendedEscSensors())
#endif
{
ADD_SENSOR(FSSP_DATAID_CURRENT);
#ifdef USE_ESC_SENSOR
}
#endif
ADD_SENSOR(FSSP_DATAID_FUEL);
}
@ -374,7 +378,7 @@ static void initSmartPortSensors(void)
frSkyDataIdTableInfo.index = 0;
#ifdef USE_ESC_SENSOR
if (feature(FEATURE_ESC_SENSOR && telemetryConfig()->smartport_use_extra_sensors)) {
if (reportExtendedEscSensors())
frSkyEscDataIdTableInfo.size = ESC_DATAID_COUNT;
} else {
frSkyEscDataIdTableInfo.size = 0;