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

Merge pull request #5616 from giacomo892/giacomo892_esc_blackbox

Browse source 
add ESC RPM and Temperature to Blackbox
This commit is contained in:
giacomo892 2020-04-30 09:37:31 +02:00 • committed by GitHub
commit f28a622b80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/blackbox/blackbox.c
View file

@ -77,6 +77,7 @@
#include "sensors/pitotmeter.h" #include "sensors/pitotmeter.h"
#include "sensors/rangefinder.h" #include "sensors/rangefinder.h"
#include "sensors/sensors.h" #include "sensors/sensors.h"
#include "sensors/esc_sensor.h"
#include "flight/wind_estimator.h" #include "flight/wind_estimator.h"
#include "sensors/temperature.h" #include "sensors/temperature.h"
@ -390,6 +391,10 @@ static const blackboxSimpleFieldDefinition_t blackboxSlowFields[] = {
{"sens6Temp", -1, SIGNED, PREDICT(0), ENCODING(SIGNED_VB)}, {"sens6Temp", -1, SIGNED, PREDICT(0), ENCODING(SIGNED_VB)},
{"sens7Temp", -1, SIGNED, PREDICT(0), ENCODING(SIGNED_VB)}, {"sens7Temp", -1, SIGNED, PREDICT(0), ENCODING(SIGNED_VB)},
#endif #endif
#ifdef USE_ESC_SENSOR
{"escRPM", -1, UNSIGNED, PREDICT(0), ENCODING(UNSIGNED_VB)},
{"escTemperature", -1, SIGNED, PREDICT(PREVIOUS), ENCODING(SIGNED_VB)},
#endif
}; };
typedef enum BlackboxState { typedef enum BlackboxState {
@ -498,6 +503,10 @@ typedef struct blackboxSlowState_s {
#ifdef USE_TEMPERATURE_SENSOR #ifdef USE_TEMPERATURE_SENSOR
int16_t tempSensorTemperature[MAX_TEMP_SENSORS]; int16_t tempSensorTemperature[MAX_TEMP_SENSORS];
#endif #endif
#ifdef USE_ESC_SENSOR
uint32_t escRPM;
int8_t escTemperature;
#endif
} __attribute__((__packed__)) blackboxSlowState_t; // We pack this struct so that padding doesn't interfere with memcmp() } __attribute__((__packed__)) blackboxSlowState_t; // We pack this struct so that padding doesn't interfere with memcmp()
//From rc_controls.c //From rc_controls.c
@ -1104,6 +1113,10 @@ static void writeSlowFrame(void)
blackboxWriteSigned16VBArray(slowHistory.tempSensorTemperature, MAX_TEMP_SENSORS); blackboxWriteSigned16VBArray(slowHistory.tempSensorTemperature, MAX_TEMP_SENSORS);
#endif #endif
#ifdef USE_ESC_SENSOR
blackboxWriteUnsignedVB(slowHistory.escRPM);
blackboxWriteSignedVB(slowHistory.escTemperature);
#endif
blackboxSlowFrameIterationTimer = 0; blackboxSlowFrameIterationTimer = 0;
} }
@ -1156,6 +1169,11 @@ static void loadSlowState(blackboxSlowState_t *slow)
} }
#endif #endif
#ifdef USE_ESC_SENSOR
escSensorData_t * escSensor = escSensorGetData();
slow->escRPM = escSensor->rpm;
slow->escTemperature = escSensor->temperature;
#endif
} }
/** /**