From 635f8fc18acff8ca6d314f42332e516cd74780b1 Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Sun, 11 Nov 2018 03:33:41 +0900
Subject: [PATCH 1/2] Add debug mode for adc internal sensor calibration

---
 src/main/build/debug.c         | 2 +-
 src/main/build/debug.h         | 2 +-
 src/main/sensors/adcinternal.c | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/build/debug.c b/src/main/build/debug.c
index 87237bdd4e..03382a7f52 100644
--- a/src/main/build/debug.c
+++ b/src/main/build/debug.c
@@ -63,7 +63,6 @@ const char * const debugModeNames[DEBUG_COUNT] = {
     "RANGEFINDER",
     "RANGEFINDER_QUALITY",
     "LIDAR_TF",
-    "CORE_TEMP",
     "RUNAWAY_TAKEOFF",
     "SDIO",
     "CURRENT_SENSOR",
@@ -76,4 +75,5 @@ const char * const debugModeNames[DEBUG_COUNT] = {
     "RX_SIGNAL_LOSS",
     "RC_SMOOTHING_RATE",
     "ANTI_GRAVITY",
+    "ADC_INTERNAL",
 };
diff --git a/src/main/build/debug.h b/src/main/build/debug.h
index 03111c48a4..26b9a45be8 100644
--- a/src/main/build/debug.h
+++ b/src/main/build/debug.h
@@ -81,7 +81,6 @@ typedef enum {
     DEBUG_RANGEFINDER,
     DEBUG_RANGEFINDER_QUALITY,
     DEBUG_LIDAR_TF,
-    DEBUG_CORE_TEMP,
     DEBUG_RUNAWAY_TAKEOFF,
     DEBUG_SDIO,
     DEBUG_CURRENT,
@@ -94,6 +93,7 @@ typedef enum {
     DEBUG_RX_SIGNAL_LOSS,
     DEBUG_RC_SMOOTHING_RATE,
     DEBUG_ANTI_GRAVITY,
+    DEBUG_ADC_INTERNAL,
     DEBUG_COUNT
 } debugType_e;
 
diff --git a/src/main/sensors/adcinternal.c b/src/main/sensors/adcinternal.c
index f21aa9fe96..cd8b278bf1 100644
--- a/src/main/sensors/adcinternal.c
+++ b/src/main/sensors/adcinternal.c
@@ -89,7 +89,9 @@ void adcInternalProcess(timeUs_t currentTimeUs)
     int32_t adcTempsensorAdjusted = (int32_t)adcTempsensorValue * 3300 / getVrefMv();
     coreTemperature = ((adcTempsensorAdjusted - adcTSCAL1) * adcTSSlopeK + 30 * 1000 + 500) / 1000;
 
-    DEBUG_SET(DEBUG_CORE_TEMP, 0, coreTemperature);
+    DEBUG_SET(DEBUG_ADC_INTERNAL, 0, vrefintSample);
+    DEBUG_SET(DEBUG_ADC_INTERNAL, 1, tempsensorSample);
+    DEBUG_SET(DEBUG_ADC_INTERNAL, 2, coreTemperature);
 
     adcInternalStartConversion(); // Start next conversion
 }

From a6728611848b62c6290f2accd20dcc27ae005ae5 Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Mon, 12 Nov 2018 04:51:06 +0900
Subject: [PATCH 2/2] Keep coreTemperature's position for bblog backward
 compatibility

---
 src/main/build/debug.c         | 2 +-
 src/main/build/debug.h         | 2 +-
 src/main/sensors/adcinternal.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/build/debug.c b/src/main/build/debug.c
index 03382a7f52..bf5b201ad4 100644
--- a/src/main/build/debug.c
+++ b/src/main/build/debug.c
@@ -63,6 +63,7 @@ const char * const debugModeNames[DEBUG_COUNT] = {
     "RANGEFINDER",
     "RANGEFINDER_QUALITY",
     "LIDAR_TF",
+    "ADC_INTERNAL",
     "RUNAWAY_TAKEOFF",
     "SDIO",
     "CURRENT_SENSOR",
@@ -75,5 +76,4 @@ const char * const debugModeNames[DEBUG_COUNT] = {
     "RX_SIGNAL_LOSS",
     "RC_SMOOTHING_RATE",
     "ANTI_GRAVITY",
-    "ADC_INTERNAL",
 };
diff --git a/src/main/build/debug.h b/src/main/build/debug.h
index 26b9a45be8..cbe0bb3576 100644
--- a/src/main/build/debug.h
+++ b/src/main/build/debug.h
@@ -81,6 +81,7 @@ typedef enum {
     DEBUG_RANGEFINDER,
     DEBUG_RANGEFINDER_QUALITY,
     DEBUG_LIDAR_TF,
+    DEBUG_ADC_INTERNAL,
     DEBUG_RUNAWAY_TAKEOFF,
     DEBUG_SDIO,
     DEBUG_CURRENT,
@@ -93,7 +94,6 @@ typedef enum {
     DEBUG_RX_SIGNAL_LOSS,
     DEBUG_RC_SMOOTHING_RATE,
     DEBUG_ANTI_GRAVITY,
-    DEBUG_ADC_INTERNAL,
     DEBUG_COUNT
 } debugType_e;
 
diff --git a/src/main/sensors/adcinternal.c b/src/main/sensors/adcinternal.c
index cd8b278bf1..969b6d9c22 100644
--- a/src/main/sensors/adcinternal.c
+++ b/src/main/sensors/adcinternal.c
@@ -89,9 +89,9 @@ void adcInternalProcess(timeUs_t currentTimeUs)
     int32_t adcTempsensorAdjusted = (int32_t)adcTempsensorValue * 3300 / getVrefMv();
     coreTemperature = ((adcTempsensorAdjusted - adcTSCAL1) * adcTSSlopeK + 30 * 1000 + 500) / 1000;
 
-    DEBUG_SET(DEBUG_ADC_INTERNAL, 0, vrefintSample);
-    DEBUG_SET(DEBUG_ADC_INTERNAL, 1, tempsensorSample);
-    DEBUG_SET(DEBUG_ADC_INTERNAL, 2, coreTemperature);
+    DEBUG_SET(DEBUG_ADC_INTERNAL, 0, coreTemperature);
+    DEBUG_SET(DEBUG_ADC_INTERNAL, 1, vrefintSample);
+    DEBUG_SET(DEBUG_ADC_INTERNAL, 2, tempsensorSample);
 
     adcInternalStartConversion(); // Start next conversion
 }