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

Move has_temperature_compensation() into temperature.cpp. 

No change in FLASH usage.
This commit is contained in:
Marek Bel 2020-06-16 00:41:21 +02:00
parent bdf53387b1
commit 23cc22bc22
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Firmware/temperature.cpp
View File

@ -2196,4 +2196,15 @@ float unscalePID_d(float d)
#endif //PIDTEMP #endif //PIDTEMP
#ifdef PINDA_THERMISTOR
bool has_temperature_compensation()
{
#ifdef DETECT_SUPERPINDA
return (current_temperature_pinda >= PINDA_MINTEMP) ? true : false;
#else
return true;
#endif
}
#endif //PINDA_THERMISTOR

1
Firmware/temperature.h
View File

@ -63,6 +63,7 @@ extern float current_temperature_bed;
#ifdef PINDA_THERMISTOR #ifdef PINDA_THERMISTOR
extern uint16_t current_temperature_raw_pinda; extern uint16_t current_temperature_raw_pinda;
extern float current_temperature_pinda; extern float current_temperature_pinda;
bool has_temperature_compensation();
#endif #endif
#ifdef AMBIENT_THERMISTOR #ifdef AMBIENT_THERMISTOR

9
Firmware/ultralcd.cpp
View File

@ -334,15 +334,6 @@ bool bSettings; // flag (i.e. 'fake parameter'
const char STR_SEPARATOR[] PROGMEM = "------------"; const char STR_SEPARATOR[] PROGMEM = "------------";
static bool has_temperature_compensation()
{
#ifdef DETECT_SUPERPINDA
return (current_temperature_pinda >= PINDA_MINTEMP) ? true : false;
#else
return true;
#endif
}
static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* filename, char* longFilename) static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* filename, char* longFilename)
{ {