Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +03:00
Code Issues Wiki Activity

Spektrum TM. Added ESC combined average RPM.

Browse source
This commit is contained in:
Anders Hoglund 2019-02-20 12:22:20 +01:00
parent 6e28a50bc4
commit fe45689ea8
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/telemetry/srxl.c
View file

@ -56,6 +56,7 @@
#include "sensors/battery.h" #include "sensors/battery.h"
#include "sensors/adcinternal.h" #include "sensors/adcinternal.h"
#include "sensors/esc_sensor.h"
#include "telemetry/telemetry.h" #include "telemetry/telemetry.h"
#include "telemetry/srxl.h" #include "telemetry/srxl.h"
@ -157,6 +158,13 @@ typedef struct
bool srxlFrameRpm(sbuf_t *dst, timeUs_t currentTimeUs) bool srxlFrameRpm(sbuf_t *dst, timeUs_t currentTimeUs)
{ {
uint16_t period_us = SPEKTRUM_RPM_UNUSED;
#ifdef USE_ESC_SENSOR_TELEMETRY
escSensorData_t *escData = getEscSensorData(ESC_SENSOR_COMBINED);
if (escData != NULL) {
period_us = 60000000 / escData->rpm; // revs/minute -> microSeconds
}
#endif
int16_t coreTemp = SPEKTRUM_TEMP_UNUSED; int16_t coreTemp = SPEKTRUM_TEMP_UNUSED;
#if defined(USE_ADC_INTERNAL) #if defined(USE_ADC_INTERNAL)
@ -168,7 +176,7 @@ bool srxlFrameRpm(sbuf_t *dst, timeUs_t currentTimeUs)
sbufWriteU8(dst, SRXL_FRAMETYPE_TELE_RPM); sbufWriteU8(dst, SRXL_FRAMETYPE_TELE_RPM);
sbufWriteU8(dst, SRXL_FRAMETYPE_SID); sbufWriteU8(dst, SRXL_FRAMETYPE_SID);
sbufWriteU16BigEndian(dst, SPEKTRUM_RPM_UNUSED); // pulse leading edges sbufWriteU16BigEndian(dst, period_us); // pulse leading edges
if (telemetryConfig()->report_cell_voltage) { if (telemetryConfig()->report_cell_voltage) {
sbufWriteU16BigEndian(dst, getBatteryAverageCellVoltage()); // Cell voltage is in units of 0.01V sbufWriteU16BigEndian(dst, getBatteryAverageCellVoltage()); // Cell voltage is in units of 0.01V
} else { } else {
@ -383,7 +391,6 @@ bool srxlFrameFlightPackCurrent(sbuf_t *dst, timeUs_t currentTimeUs)
timeUs_t keepAlive = currentTimeUs - lastTimeSentFPmAh; timeUs_t keepAlive = currentTimeUs - lastTimeSentFPmAh;
if ( amps != sentAmps || if ( amps != sentAmps ||
mah != sentMah || mah != sentMah ||
keepAlive > FP_MAH_KEEPALIVE_TIME_OUT ) { keepAlive > FP_MAH_KEEPALIVE_TIME_OUT ) {