3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove redundant externs already included with temperature.h

Browse Source 
* Add ifdefs in Dcodes.cpp when using extern variables
This commit is contained in:
Guðni Már Gilbert 2021-06-19 13:40:50 +00:00 committed by DRracer
parent eb9c8c8c20
commit 31c8e4bc4c
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Firmware/Dcodes.cpp
View File

@ -538,26 +538,20 @@ const char* dcode_9_ADC_name(uint8_t i)
return 0; 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) uint16_t dcode_9_ADC_val(uint8_t i)
{ {
switch (i) switch (i)
{ {
#ifdef SHOW_TEMP_ADC_VALUES
case 0: return current_temperature_raw[0]; case 0: return current_temperature_raw[0];
#endif //SHOW_TEMP_ADC_VALUES
case 1: return 0; case 1: return 0;
#ifdef SHOW_TEMP_ADC_VALUES
case 2: return current_temperature_bed_raw; case 2: return current_temperature_bed_raw;
#endif //SHOW_TEMP_ADC_VALUES
#ifdef PINDA_THERMISTOR
case 3: return current_temperature_raw_pinda; case 3: return current_temperature_raw_pinda;
#endif //PINDA_THERMISTOR
#ifdef VOLT_PWR_PIN #ifdef VOLT_PWR_PIN
case 4: return current_voltage_raw_pwr; case 4: return current_voltage_raw_pwr;
#endif //VOLT_PWR_PIN #endif //VOLT_PWR_PIN

2
Firmware/temperature.h
View File

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