Rebase on #3981

Addition of source temperature sensor's index
iNavFlight · Nov 5, 2018 · 6347696 · 6347696
1 parent 471d6e5
commit 6347696
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
@@ -346,7 +346,8 @@ static const blackboxSimpleFieldDefinition_t blackboxSlowFields[] = {
     {"wind",                   0, SIGNED,   PREDICT(0),      ENCODING(UNSIGNED_VB)},
     {"wind",                   1, SIGNED,   PREDICT(0),      ENCODING(UNSIGNED_VB)},
     {"wind",                   2, SIGNED,   PREDICT(0),      ENCODING(UNSIGNED_VB)},
-    {"gyroTemperature",       -1, SIGNED,   PREDICT(0),      ENCODING(UNSIGNED_VB)},
+    {"temperature",           -1, SIGNED,   PREDICT(0),      ENCODING(UNSIGNED_VB)},
+    {"temperatureSource",     -1, UNSIGNED, PREDICT(0),      ENCODING(UNSIGNED_VB)},
 };
 
 typedef enum BlackboxState {
@@ -445,7 +446,8 @@ typedef struct blackboxSlowState_s {
     uint16_t powerSupplyImpedance;
     uint16_t sagCompensatedVBat;
     int16_t wind[XYZ_AXIS_COUNT];
-    int16_t gyroTemperature;
+    int16_t temperature;
+    uint8_t temperatureSource;
 } __attribute__((__packed__)) blackboxSlowState_t; // We pack this struct so that padding doesn't interfere with memcmp()
 
 //From rc_controls.c
@@ -1033,7 +1035,8 @@ static void writeSlowFrame(void)
 
     blackboxWriteSigned16VBArray(slowHistory.wind, XYZ_AXIS_COUNT);
 
-    blackboxWriteSignedVB(slowHistory.gyroTemperature);
+    blackboxWriteSignedVB(slowHistory.temperature);
+    blackboxWriteSignedVB(slowHistory.temperatureSource);
 
     blackboxSlowFrameIterationTimer = 0;
 }
@@ -1066,7 +1069,8 @@ static void loadSlowState(blackboxSlowState_t *slow)
         slow->wind[i] = 0;
 #endif
 
-    slow->gyroTemperature = getTemperature(TEMP_GYRO);
+    slow->temperature = getCurrentTemperature();
+    slow->temperatureSource = getCurrentTemperatureSensorUsed();
     }
 
 }

diff --git a/src/main/sensors/temperature.c b/src/main/sensors/temperature.c
@@ -45,14 +45,18 @@ float getCurrentTemperature(void)
     return tempSensorValue[tempSensorValid]/10.0f;
 }
 
+tempSensor_e getCurrentTemperatureSensorUsed(void) {
+    return tempSensorValid;
+}
+
 void temperatureUpdate(void)
 {
     // TEMP_GYRO: Update gyro temperature in decidegrees
     if (gyroReadTemperature()) {
         tempSensorValue[TEMP_GYRO] = gyroGetTemperature();
         tempSensorValid = TEMP_GYRO;
     }
-    
+
     #if defined(USE_BARO)
     // TEMP_BARO: Update baro temperature in decidegrees
     if(sensors(SENSOR_BARO)){

diff --git a/src/main/sensors/temperature.h b/src/main/sensors/temperature.h
@@ -28,4 +28,5 @@ typedef enum {
 // Temperature is returned in degC*10
 int16_t getTemperature(tempSensor_e sensor);
 float getCurrentTemperature(void);
+tempSensor_e getCurrentTemperatureSensorUsed(void);
 void temperatureUpdate(void);