Environment display view: Show thermistor temperature

Show thermistor temperature if SUPPORT_THERMISTOR and DV_ENVIRONMENT is set.

Tested on Nokia display, but should work for serial display, too.

Author: thomasjfox

Arduino_Pedelec_Controller/display.cpp

@@ -464,7 +464,7 @@ static void display_16x2_view_environment()
 #endif
     lcd.setCursor(0,1);
 
-    // switch between altitude and slope very five seconds
+    // switch between altitude and slope every five seconds
     byte current_second = (millis() / 1000) % 60UL;
     if (current_second % 5 == 0)
         show_altitude = !show_altitude;
@@ -491,6 +491,12 @@ static void display_16x2_view_environment()
     lcd.print((int)sensors.getTempCByIndex(1),1);
     lcd.print(MY_F(" C "));
 #endif
+#if defined(SUPPORT_THERMISTOR)
+    lcd.setCursor(0,0);
+    lcd.print(MY_F("Temp: "));
+    lcd.print(temperature_thermistor,1);
+    lcd.print(MY_F(" C "));
+#endif
 }
 #endif
 
@@ -547,7 +553,7 @@ static void display_16x2_update()
             display_16x2_view_battery();
             break;
 #endif
-#if defined(SUPPORT_BMP085) || defined(SUPPORT_DSPC01) || defined(SUPPORT_TEMP_SENSOR)
+#if defined(SUPPORT_BMP085) || defined(SUPPORT_DSPC01) || defined(SUPPORT_TEMP_SENSOR) || defined(SUPPORT_THERMISTOR)
 #ifdef DV_ENVIRONMENT
         case DISPLAY_VIEW_ENVIRONMENT:
             display_16x2_view_environment();
@@ -1167,7 +1173,7 @@ static void display_nokia_view_environment()
     lcd.print(MY_F(" C"));
 //#endif
     lcd.setCursor(0,2);
-    // switch between altitude and slope very five seconds
+    // switch between altitude and slope every five seconds
     lcd.print(MY_F("Start: "));
     lcd.print((int)(altitude_start));
     lcd.print(MY_F("m")); 
@@ -1190,6 +1196,12 @@ static void display_nokia_view_environment()
     lcd.print((int)sensors.getTempCByIndex(1),1);
     lcd.print(MY_F(" C "));
 #endif
+#if defined(SUPPORT_THERMISTOR)
+    lcd.setCursor(0,0);
+    lcd.print(MY_F("Temp: "));
+    lcd.print(temperature_thermistor,1);
+    lcd.print(MY_F(" C "));
+#endif
 }
 #endif
 
@@ -1218,11 +1230,13 @@ static void display_nokia_update()
 
     switch (display_view)
     {
-#if (defined(SUPPORT_BMP085) || defined(SUPPORT_DSPC01) || defined(SUPPORT_TEMP_SENSOR)) && defined(DV_ENVIRONMENT)
+#if defined(SUPPORT_BMP085) || defined(SUPPORT_DSPC01) || defined(SUPPORT_TEMP_SENSOR) || defined(SUPPORT_THERMISTOR)
+#ifdef DV_ENVIRONMENT
         case DISPLAY_VIEW_ENVIRONMENT:
             display_nokia_view_environment();
             break;
 #endif
+#endif
 #ifdef DV_GRAPHIC
         case DISPLAY_VIEW_GRAPHIC:
             display_nokia_view_graphic();
@@ -1383,4 +1397,4 @@ void display_debug(HardwareSerial* localSerial)
     #endif
 
 #endif
-}
+}

Arduino_Pedelec_Controller/display.h

@@ -58,7 +58,7 @@ typedef enum {DISPLAY_VIEW_MAIN=0,
               DISPLAY_VIEW_BATTERY,
 #endif
 #endif
-#if (defined(SUPPORT_BMP085) || defined(SUPPORT_DSPC01) || defined(SUPPORT_TEMP_SENSOR))&&defined(DV_ENVIRONMENT)
+#if (defined(SUPPORT_BMP085) || defined(SUPPORT_DSPC01) || defined(SUPPORT_TEMP_SENSOR) || defined(SUPPORT_THERMISTOR)) && defined(DV_ENVIRONMENT)
               DISPLAY_VIEW_ENVIRONMENT,
 #endif
 #if defined(DV_HUMAN)

Arduino_Pedelec_Controller/globals.h

@@ -84,6 +84,9 @@ void torque_rezero();
 #include "DallasTemp.h"
 extern DallasTemperature sensors;
 #endif
+#ifdef SUPPORT_THERMISTOR
+extern float temperature_thermistor;
+#endif
 
 // Define own version of F() macro since compile will
 // fail on newer gcc versions with a "const" warning.

Arduino_Pedelec_Controller/switches.cpp

@@ -386,7 +386,7 @@ void handle_switch(const switch_name sw_name, boolean current_state, const switc
     }
 }
 
-// Workhose of switch handling: Detect short
+// Workhorse of switch handling: Detect short
 // or long presses, also debounces the switches.
 static enum switch_result _read_switch(switch_state *state, boolean switch_current)
 {