Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add detection of Mainboard firmware type( Marlin or Smoothieware), auto-detect LONG_FILENAME_HOST_SUPPORT, on-boardSD and serial_always_on option in config file & other bugfixes #663

Merged
merged 37 commits into from
May 23, 2020
Merged

Add detection of Mainboard firmware type( Marlin or Smoothieware), auto-detect LONG_FILENAME_HOST_SUPPORT, on-boardSD and serial_always_on option in config file & other bugfixes #663

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
41cd973
Add detection of Mainboard firmware type
guruathwal May 8, 2020
b032c71
fix minor bugs
guruathwal May 9, 2020
794ee98
Update config.c
guruathwal May 9, 2020
28fab2c
Fix LCD brightness value display in listview
guruathwal May 10, 2020
3ac8b10
Update FeatureSettings.c
guruathwal May 10, 2020
7786f50
prevent settings from resetting after config update
guruathwal May 10, 2020
27c0b7f
add option in config file to force sdcard in non marlin firmware
guruathwal May 10, 2020
de81a40
Add serial always on in config file & add missing hotend_count in con…
guruathwal May 10, 2020
78a80a0
Add serial always on in config file & add missing hotend_count in con…
guruathwal May 12, 2020
68b0401
Merge branch 'Mainstream' of https://github.com/guruathwal/BIGTREETEC…
guruathwal May 12, 2020
b6b08a7
Update parseACK.c
guruathwal May 12, 2020
6545c25
Update parseACK.c
guruathwal May 12, 2020
e050d73
Fix Fan max speed setting and Preheat temperature update through conf…
guruathwal May 12, 2020
4c85091
fix machine parameters not saving
guruathwal May 12, 2020
c8df879
remove duplicate entries
guruathwal May 13, 2020
cdfb7f5
Fix tool count and fan count
guruathwal May 15, 2020
bbf62af
completely remove EMERGENCY_PARSER & misc fixes
guruathwal May 17, 2020
a4b5f7e
Add auto-detect Long file name support
guruathwal May 17, 2020
7d2af1d
fix typo
guruathwal May 18, 2020
6a11c21
cleanup
guruathwal May 19, 2020
440bfd8
update config.ini
guruathwal May 19, 2020
04ed502
Name & formatting fixes
guruathwal May 19, 2020
f314428
Fix whitespaces
guruathwal May 19, 2020
798b25b
allow negative values in machine size
guruathwal May 20, 2020
af8e255
update config.ini
guruathwal May 20, 2020
14916fa
Update config.h
guruathwal May 20, 2020
25f64c8
improve print codes
guruathwal May 20, 2020
804ecf8
force parse config at the end of config.ini
guruathwal May 20, 2020
ea2959a
Update config.c
guruathwal May 20, 2020
f113c96
fix line ending
guruathwal May 20, 2020
8396ef7
Update config.c
guruathwal May 20, 2020
33fce40
fFix pause resume g-code
guruathwal May 21, 2020
4c662a4
fix printf fomattings
guruathwal May 22, 2020
46969db
Merge branch 'master' into Mainstream
bigtreetech May 23, 2020
eabfe8b
Update Configuration.h
bigtreetech May 23, 2020
842103f
Update Configuration.h
bigtreetech May 23, 2020
5fc1568
Update Configuration.h
bigtreetech May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
completely remove EMERGENCY_PARSER & misc fixes
  • Loading branch information
@guruathwal
guruathwal committed May 17, 2020
commit bbf62afa3ab3f156c034acfa8d2ca09240f84680
20 changes: 9 additions & 11 deletions TFT/src/User/API/parseACK.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@
char dmaL2Cache[ACK_MAX_SIZE];
static u16 ack_index=0;
static u8 ack_cur_src = SERIAL_PORT;
int MODEselect;
// Ignore reply "echo:" message (don't display in popup menu)

// Ignore reply messages which starts with following text (don't display in popup menu)
const char *const ignoreEcho[] = {
"busy: processing",
"Now fresh file:",
"Now doing file:,"
"Probe Z Offset:",
"Probe Offset",
"Flow:",
"echo:;",
"echo: G",
"echo: M",
"echo:;", //M503
"echo: G", //M503
"echo: M", //M503
"Cap:", //M115
"Config:", //M360
};

bool portSeen[_UART_CNT] = {false, false, false, false, false, false};
Expand Down Expand Up @@ -348,10 +350,6 @@ void parseACK(void)
{
infoMachineSettings.caseLightsBrightness = ack_value();
}
else if(ack_seen("Cap:EMERGENCY_PARSER:"))
{
infoMachineSettings.emergencyParser = ack_value();
}
else if(ack_seen("Cap:SDCARD:") && infoSettings.onboardSD == 0)
{
infoMachineSettings.onboard_sd_support = ack_value();
Expand All @@ -371,7 +369,7 @@ void parseACK(void)
}
else if(ack_seen("Probe Offset"))
{
if(ack_seen("Z"))
if(ack_seen("Z:"))
{
setParameter(P_PROBE_OFFSET,Z_STEPPER, ack_value());
}
Expand Down
1 change: 0 additions & 1 deletion TFT/src/User/API/parseACK.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ static const char bsdnoprintingmagic[] = "Not SD printing";


#define ACK_MAX_SIZE 2048
extern int MODEselect;

void setCurrentAckSrc(uint8_t src);
void parseACK(void);
Expand Down
2 changes: 0 additions & 2 deletions TFT/src/User/Menu/Selectmode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ void menuMode(void)
#endif

MKEY_VALUES key_num = MKEY_IDLE;
MODEselect = 1;
bool keyback = false;

int16_t /*nowEncoder =*/ encoderPosition = 0;
Expand Down Expand Up @@ -194,7 +193,6 @@ void menuMode(void)
storePara();
}

MODEselect = 0;
infoMenuSelect();
}

Expand Down
5 changes: 1 addition & 4 deletions TFT/src/User/Menu/Settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,7 @@ void setupMachine(void){
#endif
if(infoMachineSettings.isMarlinFirmware == 1)
{
if (infoMachineSettings.emergencyParser != 1 && wasRestored == true){
popupReminder(textSelect(LABEL_WARNING), textSelect(LABEL_EMERGENCYPARSER));
}
printSetUpdateWaiting(M27_WATCH_OTHER_SOURCES);
printSetUpdateWaiting(infoSettings.m27_active);
}
else //Smoothieware does not report detailed M115 capabilities
{
Expand Down