diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d30a97f6..88f72dc0 100755 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -595,28 +595,28 @@ // Below this temperature the heater will be switched off // because it probably indicates a broken thermistor wire. -#define HEATER_0_MINTEMP 5 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 -#define HEATER_3_MINTEMP 5 -#define HEATER_4_MINTEMP 5 -#define HEATER_5_MINTEMP 5 -#define HEATER_6_MINTEMP 5 -#define HEATER_7_MINTEMP 5 -#define BED_MINTEMP 5 +#define HEATER_0_MINTEMP 1 +#define HEATER_1_MINTEMP 1 +#define HEATER_2_MINTEMP 1 +#define HEATER_3_MINTEMP 1 +#define HEATER_4_MINTEMP 1 +#define HEATER_5_MINTEMP 1 +#define HEATER_6_MINTEMP 1 +#define HEATER_7_MINTEMP 1 +#define BED_MINTEMP 1 // Above this temperature the heater will be switched off. // This can protect components from overheating, but NOT from shorts and failures. // (Use MINTEMP for thermistor short/failure protection.) #define HEATER_0_MAXTEMP 400 -#define HEATER_1_MAXTEMP 275 -#define HEATER_2_MAXTEMP 275 -#define HEATER_3_MAXTEMP 275 -#define HEATER_4_MAXTEMP 275 -#define HEATER_5_MAXTEMP 275 -#define HEATER_6_MAXTEMP 275 -#define HEATER_7_MAXTEMP 275 -#define BED_MAXTEMP 200 +#define HEATER_1_MAXTEMP 400 +#define HEATER_2_MAXTEMP 400 +#define HEATER_3_MAXTEMP 400 +#define HEATER_4_MAXTEMP 400 +#define HEATER_5_MAXTEMP 400 +#define HEATER_6_MAXTEMP 400 +#define HEATER_7_MAXTEMP 400 +#define BED_MAXTEMP 180 //=========================================================================== //============================= PID Settings ================================ diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 62fdfcd7..3c95967c 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -41,10 +41,10 @@ * here we define this default string as the date where the latest release * version was tagged. */ - #define CUSTOM_BUILD_VERSION "1.1.8.1" + #define CUSTOM_BUILD_VERSION "1.1.9" #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2021-01-01" + #define STRING_DISTRIBUTION_DATE "2021-01-13" #endif /** diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index de16d481..aa2cfc30 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -428,6 +428,11 @@ void AnycubicTouchscreenClass::ParkAfterStop() #endif } +int AnycubicTouchscreenClass::CodeValueInt() +{ + return (atoi(&TFTcmdbuffer[TFTbufindr][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindr] + 1])); +} + float AnycubicTouchscreenClass::CodeValue() { return (strtod(&TFTcmdbuffer[TFTbufindr][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindr] + 1], NULL)); @@ -1806,8 +1811,8 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() else if (CodeSeen('C')) ; } - HARDWARE_SERIAL_ENTER(); - break; + HARDWARE_SERIAL_ENTER(); + break; case 33: // A33 get version info { HARDWARE_SERIAL_PROTOCOLPGM("J33 "); diff --git a/Marlin/src/lcd/anycubic_touchscreen.h b/Marlin/src/lcd/anycubic_touchscreen.h index 8309200b..ca270fc8 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.h +++ b/Marlin/src/lcd/anycubic_touchscreen.h @@ -252,7 +252,7 @@ private: } OutageData; #endif - + int CodeValueInt(); float CodeValue(); bool CodeSeen(char); void PrintList(); @@ -284,6 +284,7 @@ private: char FilamentTestStatus = false; char FilamentTestLastStatus = false; bool FilamentSetMillis = true; + int FilamentRunoutCounter = 0; #endif };