Browse Source

* Remove redundant externs already included with temperature.h
* Add ifdefs in Dcodes.cpp when using extern variables

Guðni Már Gilbert 2 years ago
parent
commit
31c8e4bc4c
2 changed files with 7 additions and 13 deletions
  1. 6 12
      Firmware/Dcodes.cpp
  2. 1 1
      Firmware/temperature.h

+ 6 - 12
Firmware/Dcodes.cpp

@@ -538,26 +538,20 @@ const char* dcode_9_ADC_name(uint8_t i)
 	return 0;
 }
 
-#ifdef AMBIENT_THERMISTOR
-extern int current_temperature_raw_ambient;
-#endif //AMBIENT_THERMISTOR
-
-#ifdef VOLT_PWR_PIN
-extern int current_voltage_raw_pwr;
-#endif //VOLT_PWR_PIN
-
-#ifdef VOLT_BED_PIN
-extern int current_voltage_raw_bed;
-#endif //VOLT_BED_PIN
-
 uint16_t dcode_9_ADC_val(uint8_t i)
 {
 	switch (i)
 	{
+#ifdef SHOW_TEMP_ADC_VALUES
 	case 0: return current_temperature_raw[0];
+#endif //SHOW_TEMP_ADC_VALUES
 	case 1: return 0;
+#ifdef SHOW_TEMP_ADC_VALUES
 	case 2: return current_temperature_bed_raw;
+#endif //SHOW_TEMP_ADC_VALUES
+#ifdef PINDA_THERMISTOR
 	case 3: return current_temperature_raw_pinda;
+#endif //PINDA_THERMISTOR
 #ifdef VOLT_PWR_PIN
 	case 4: return current_voltage_raw_pwr;
 #endif //VOLT_PWR_PIN

+ 1 - 1
Firmware/temperature.h

@@ -67,7 +67,7 @@ bool has_temperature_compensation();
 #endif
 
 #ifdef AMBIENT_THERMISTOR
-//extern int current_temperature_raw_ambient;
+extern int current_temperature_raw_ambient;
 extern float current_temperature_ambient;
 #endif