9 Commits
1.1.7 ... 1.1.9

Author SHA1 Message Date
Knutwurst
5d1444295b - Set MINTEMP to 1 degree celsius
- Bump Verison to 1.1.9
- Bump distribution date
- Add CodeValueInt function to prepare Laser support
2021-01-13 15:36:03 +01:00
Knutwurst
57fb9a40a0 Increase MAX_TEMP 2021-01-13 14:21:05 +01:00
Knutwurst
bf6aab0a93 Set lock script from 60 to 180 days 2021-01-08 08:37:23 +01:00
Knutwurst
14e075c5fb Set prerelease custom Version 2021-01-07 09:54:03 +01:00
Knutwurst
62a2ccc849 Set minimum stepper pulse to 1 (@see: https://www.makerline.de/probleme-mit-linear-advance-und-marlin-2/) 2021-01-05 08:32:59 +01:00
Knutwurst
53cdbaec58 Decrease stepper dir delay to eliminate direction bug for extruders with TMC stepper drivers. 2021-01-01 15:11:43 +01:00
Knutwurst
6bfe25f72c Bump version number and distribution date for upcoming release 2021-01-01 15:08:51 +01:00
Knutwurst
08a1ceed8a - Enable Babystepping without BLTouch
- Revert ARC Settings to default
2020-12-13 13:37:44 +01:00
Knutwurst
eee52d4fd8 Bugfix for special menu not shown anymore when no sd card is inserted 2020-12-07 18:21:41 +01:00
6 changed files with 38 additions and 34 deletions

2
.github/lock.yml vendored
View File

@@ -3,7 +3,7 @@
# #
# Number of days of inactivity before a closed issue or pull request is locked # Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 60 daysUntilLock: 180
# Skip issues and pull requests created before a given timestamp. Timestamp must # Skip issues and pull requests created before a given timestamp. Timestamp must
# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable # follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable

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 300 #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 150 #define BED_MAXTEMP 180
//=========================================================================== //===========================================================================
//============================= PID Settings ================================ //============================= PID Settings ================================

View File

@@ -1487,9 +1487,7 @@
* *
* Warning: Does not respect endstops! * Warning: Does not respect endstops!
*/ */
#if ENABLED(KNUTWURST_BLTOUCH) #define BABYSTEPPING
#define BABYSTEPPING
#endif
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
//#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR //#define INTEGRATED_BABYSTEPPING // EXPERIMENTAL integration of babystepping into the Stepper ISR
//#define BABYSTEP_WITHOUT_HOMING //#define BABYSTEP_WITHOUT_HOMING
@@ -1663,11 +1661,11 @@
// //
#define ARC_SUPPORT // Disable this feature to save ~3226 bytes #define ARC_SUPPORT // Disable this feature to save ~3226 bytes
#if ENABLED(ARC_SUPPORT) #if ENABLED(ARC_SUPPORT)
#define MM_PER_ARC_SEGMENT 0 // (mm) Length (or minimum length) of each arc segment (default: 1) #define MM_PER_ARC_SEGMENT 1 // (mm) Length (or minimum length) of each arc segment (default: 1)
//#define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min //#define ARC_SEGMENTS_PER_R 1 // Max segment length, MM_PER = Min
#define MIN_ARC_SEGMENTS 0 // Minimum number of segments in a complete circle (default: 24) #define MIN_ARC_SEGMENTS 24 // Minimum number of segments in a complete circle (default: 24)
//#define ARC_SEGMENTS_PER_SEC 50 // Use feedrate to choose segment length (with MM_PER_ARC_SEGMENT as the minimum) //#define ARC_SEGMENTS_PER_SEC 50 // Use feedrate to choose segment length (with MM_PER_ARC_SEGMENT as the minimum)
//#define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections #define N_ARC_CORRECTION 25 // Number of interpolated segments between corrections
#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles #define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles
#define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes #define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes
#endif #endif
@@ -1704,8 +1702,8 @@
* *
* Override the default value based on the driver type set in Configuration.h. * Override the default value based on the driver type set in Configuration.h.
*/ */
#define MINIMUM_STEPPER_POST_DIR_DELAY 650 #define MINIMUM_STEPPER_POST_DIR_DELAY 200
#define MINIMUM_STEPPER_PRE_DIR_DELAY 650 #define MINIMUM_STEPPER_PRE_DIR_DELAY 200
/** /**
* Minimum stepper driver pulse width (in µs) * Minimum stepper driver pulse width (in µs)
@@ -1718,7 +1716,7 @@
* *
* Override the default value based on the driver type set in Configuration.h. * Override the default value based on the driver type set in Configuration.h.
*/ */
#define MINIMUM_STEPPER_PULSE 2 #define MINIMUM_STEPPER_PULSE 1
/** /**
* Maximum stepping rate (in Hz) the stepper driver allows * Maximum stepping rate (in Hz) the stepper driver allows

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.7" #define CUSTOM_BUILD_VERSION "1.1.9"
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2020-11-29" #define STRING_DISTRIBUTION_DATE "2021-01-13"
#endif #endif
/** /**

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));
@@ -1385,7 +1390,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
#ifdef SDSUPPORT #ifdef SDSUPPORT
currentTouchscreenSelection[0] = 0; currentTouchscreenSelection[0] = 0;
#if ENABLED(KNUTWURST_SPECIAL_MENU_WO_SD) #if DISABLED(KNUTWURST_SPECIAL_MENU_WO_SD)
if (!IS_SD_INSERTED()) if (!IS_SD_INSERTED())
{ {
HARDWARE_SERIAL_PROTOCOLPGM("J02"); HARDWARE_SERIAL_PROTOCOLPGM("J02");

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
}; };