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

Massive Code Cleanup and Filament Runout Sensor Pin isn't a magic number anymore.

Browse Source
This commit is contained in:
Knutwurst
2020-08-26 14:48:53 +02:00
parent bd2cb8080a
commit f363260a49
3 changed files with 29 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,7 @@
#define CUSTOM_BUILD_VERSION "1.1.5-beta" #define CUSTOM_BUILD_VERSION "1.1.5-beta"
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
//#define STRING_DISTRIBUTION_DATE "2020-07-09" #define STRING_DISTRIBUTION_DATE "2020-08-26"
#define STRING_DISTRIBUTION_DATE "2020-08-24"
#endif #endif
/** /**

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

@@ -121,10 +121,10 @@ void AnycubicTouchscreenClass::Setup()
pinMode(SD_DETECT_PIN, INPUT); pinMode(SD_DETECT_PIN, INPUT);
WRITE(SD_DETECT_PIN, HIGH); WRITE(SD_DETECT_PIN, HIGH);
#endif #endif
pinMode(19, INPUT); pinMode(FILAMENT_RUNOUT_PIN, INPUT);
WRITE(19, HIGH); WRITE(FILAMENT_RUNOUT_PIN, HIGH);
#if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR) #if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
if ((READ(19) == true) && FilamentSensorEnabled) if ((READ(FILAMENT_RUNOUT_PIN) == true) && FilamentSensorEnabled)
{ {
HARDWARE_SERIAL_PROTOCOLPGM("J15"); //J15 FILAMENT LACK HARDWARE_SERIAL_PROTOCOLPGM("J15"); //J15 FILAMENT LACK
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
@@ -990,7 +990,7 @@ void AnycubicTouchscreenClass::FilamentRunout()
if (FilamentSensorEnabled == true) if (FilamentSensorEnabled == true)
{ {
#if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR) #if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
FilamentTestStatus = READ(19) & 0xff; FilamentTestStatus = READ(FILAMENT_RUNOUT_PIN) & 0xff;
if (FilamentTestStatus > FilamentTestLastStatus) if (FilamentTestStatus > FilamentTestLastStatus)
{ {
@@ -1075,49 +1075,34 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
if(!TFTcomment_mode) if(!TFTcomment_mode)
{ {
TFTcomment_mode = false; //for new command TFTcomment_mode = false; //for new command
//TFTfromsd[TFTbufindw] = false;
if(strchr(TFTcmdbuffer[TFTbufindw], 'N') != NULL) if(strchr(TFTcmdbuffer[TFTbufindw], 'N') != NULL)
{ {
/* if(strchr(TFTcmdbuffer[TFTbufindw], '*') != NULL)
TFTstrchr_pointer = strchr(TFTcmdbuffer[TFTbufindw], 'N');
gcode_N = (strtol(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL, 10));
if(gcode_N != gcode_LastN+1 && (strstr_P(TFTcmdbuffer[TFTbufindw], PSTR("M110")) == NULL) )
{ {
HARDWARE_SERIAL_ERROR_START; byte checksum = 0;
NEWFlushSerialRequestResend(); byte count = 0;
serial3_count = 0; while(TFTcmdbuffer[TFTbufindw][count] != '*') checksum = checksum^TFTcmdbuffer[TFTbufindw][count++];
return; TFTstrchr_pointer = strchr(TFTcmdbuffer[TFTbufindw], '*');
if( (int)(strtod(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL)) != checksum)
{
HARDWARE_SERIAL_ERROR_START;
HardwareSerial.flush();
HARDWARE_SERIAL_ERROR_START;
HardwareSerial.flush();
serial3_count = 0;
return;
}
//if no errors, continue parsing
} }
*/ else
if(strchr(TFTcmdbuffer[TFTbufindw], '*') != NULL)
{
byte checksum = 0;
byte count = 0;
while(TFTcmdbuffer[TFTbufindw][count] != '*') checksum = checksum^TFTcmdbuffer[TFTbufindw][count++];
TFTstrchr_pointer = strchr(TFTcmdbuffer[TFTbufindw], '*');
if( (int)(strtod(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL)) != checksum)
{ {
HARDWARE_SERIAL_ERROR_START; HARDWARE_SERIAL_ERROR_START;
HardwareSerial.flush(); HardwareSerial.flush();
HARDWARE_SERIAL_ERROR_START; serial3_count = 0;
HardwareSerial.flush(); return;
serial3_count = 0;
return;
} }
//if no errors, continue parsing
}
else
{
HARDWARE_SERIAL_ERROR_START;
HardwareSerial.flush();
serial3_count = 0;
return;
}
//gcode_LastN = gcode_N;
//if no errors, continue parsing //if no errors, continue parsing
} }
else // if we don't receive 'N' but still see '*' else // if we don't receive 'N' but still see '*'
@@ -1232,11 +1217,6 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
case 8: // A8 GET SD LIST case 8: // A8 GET SD LIST
#ifdef SDSUPPORT #ifdef SDSUPPORT
currentTouchscreenSelection[0] = 0; currentTouchscreenSelection[0] = 0;
if (!IS_SD_INSERTED())
{
//HARDWARE_SERIAL_PROTOCOLPGM("J02"); // J02 SD Card initilized
//HARDWARE_SERIAL_ENTER();
}
if (CodeSeen('S')) if (CodeSeen('S'))
filenumber = CodeValue(); filenumber = CodeValue();
@@ -1636,15 +1616,6 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
} }
currentTouchscreenSelection[0] = 0; currentTouchscreenSelection[0] = 0;
if (!IS_SD_INSERTED())
{
//HARDWARE_SERIAL_PROTOCOLPGM("J02"); // J02 SD Card initilized
//HARDWARE_SERIAL_ENTER();
#ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("TFT Serial Debug: SD card initialized... J02");
#endif
}
#endif #endif
break; break;
#ifdef SERVO_ENDSTOPS #ifdef SERVO_ENDSTOPS

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

@@ -36,6 +36,8 @@ char *ftostr32(const float &);
#define MSG_MY_VERSION CUSTOM_BUILD_VERSION #define MSG_MY_VERSION CUSTOM_BUILD_VERSION
#define MAX_PRINTABLE_FILENAME_LEN 30 #define MAX_PRINTABLE_FILENAME_LEN 30
#define FILAMENT_RUNOUT_PIN 19
#define ANYCUBIC_TFT_STATE_IDLE 0 #define ANYCUBIC_TFT_STATE_IDLE 0
#define ANYCUBIC_TFT_STATE_SDPRINT 1 #define ANYCUBIC_TFT_STATE_SDPRINT 1
#define ANYCUBIC_TFT_STATE_SDPAUSE 2 #define ANYCUBIC_TFT_STATE_SDPAUSE 2