wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

- Set MINTEMP to 1 degree celsius

Browse Source 
- Bump Verison to 1.1.9
- Bump distribution date
- Add CodeValueInt function to prepare Laser support
This commit is contained in:
Knutwurst
2021-01-13 15:36:03 +01:00
parent 57fb9a40a0
commit 5d1444295b
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Marlin/Configuration.h
View File

@@ -595,28 +595,28 @@
// Below this temperature the heater will be switched off // Below this temperature the heater will be switched off
// because it probably indicates a broken thermistor wire. // because it probably indicates a broken thermistor wire.
#define HEATER_0_MINTEMP 5 #define HEATER_0_MINTEMP 1
#define HEATER_1_MINTEMP 5 #define HEATER_1_MINTEMP 1
#define HEATER_2_MINTEMP 5 #define HEATER_2_MINTEMP 1
#define HEATER_3_MINTEMP 5 #define HEATER_3_MINTEMP 1
#define HEATER_4_MINTEMP 5 #define HEATER_4_MINTEMP 1
#define HEATER_5_MINTEMP 5 #define HEATER_5_MINTEMP 1
#define HEATER_6_MINTEMP 5 #define HEATER_6_MINTEMP 1
#define HEATER_7_MINTEMP 5 #define HEATER_7_MINTEMP 1
#define BED_MINTEMP 5 #define BED_MINTEMP 1
// Above this temperature the heater will be switched off. // Above this temperature the heater will be switched off.
// This can protect components from overheating, but NOT from shorts and failures. // This can protect components from overheating, but NOT from shorts and failures.
// (Use MINTEMP for thermistor short/failure protection.) // (Use MINTEMP for thermistor short/failure protection.)
#define HEATER_0_MAXTEMP 400 #define HEATER_0_MAXTEMP 400
#define HEATER_1_MAXTEMP 275 #define HEATER_1_MAXTEMP 400
#define HEATER_2_MAXTEMP 275 #define HEATER_2_MAXTEMP 400
#define HEATER_3_MAXTEMP 275 #define HEATER_3_MAXTEMP 400
#define HEATER_4_MAXTEMP 275 #define HEATER_4_MAXTEMP 400
#define HEATER_5_MAXTEMP 275 #define HEATER_5_MAXTEMP 400
#define HEATER_6_MAXTEMP 275 #define HEATER_6_MAXTEMP 400
#define HEATER_7_MAXTEMP 275 #define HEATER_7_MAXTEMP 400
#define BED_MAXTEMP 200 #define BED_MAXTEMP 180
//=========================================================================== //===========================================================================
//============================= PID Settings ================================ //============================= PID Settings ================================

4
Marlin/src/inc/Version.h
View File

@@ -41,10 +41,10 @@
* here we define this default string as the date where the latest release * here we define this default string as the date where the latest release
* version was tagged. * version was tagged.
*/ */
#define CUSTOM_BUILD_VERSION "1.1.8.1" #define CUSTOM_BUILD_VERSION "1.1.9"
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2021-01-01" #define STRING_DISTRIBUTION_DATE "2021-01-13"
#endif #endif
/** /**

9
Marlin/src/lcd/anycubic_touchscreen.cpp
View File

@@ -428,6 +428,11 @@ void AnycubicTouchscreenClass::ParkAfterStop()
#endif #endif
} }
int AnycubicTouchscreenClass::CodeValueInt()
{
return (atoi(&TFTcmdbuffer[TFTbufindr][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindr] + 1]));
}
float AnycubicTouchscreenClass::CodeValue() float AnycubicTouchscreenClass::CodeValue()
{ {
return (strtod(&TFTcmdbuffer[TFTbufindr][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindr] + 1], NULL)); return (strtod(&TFTcmdbuffer[TFTbufindr][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindr] + 1], NULL));
@@ -1806,8 +1811,8 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
else if (CodeSeen('C')) else if (CodeSeen('C'))
; ;
} }
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
break; break;
case 33: // A33 get version info case 33: // A33 get version info
{ {
HARDWARE_SERIAL_PROTOCOLPGM("J33 "); HARDWARE_SERIAL_PROTOCOLPGM("J33 ");

3
Marlin/src/lcd/anycubic_touchscreen.h
View File

@@ -252,7 +252,7 @@ private:
} OutageData; } OutageData;
#endif #endif
int CodeValueInt();
float CodeValue(); float CodeValue();
bool CodeSeen(char); bool CodeSeen(char);
void PrintList(); void PrintList();
@@ -284,6 +284,7 @@ private:
char FilamentTestStatus = false; char FilamentTestStatus = false;
char FilamentTestLastStatus = false; char FilamentTestLastStatus = false;
bool FilamentSetMillis = true; bool FilamentSetMillis = true;
int FilamentRunoutCounter = 0;
#endif #endif
}; };