Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-02-06 19:31:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Marlin: Better handling of startup, correction to last commit

Browse Source
This commit is contained in:
Rob Giseburt
2017-02-06 16:52:38 -06:00
parent f65b89425d
commit f76dec86d2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
g2core/controller.cpp
View File

@@ -233,7 +233,6 @@ static void _dispatch_kernel(const devflags_t flags)
#if MARLIN_COMPAT_ENABLED == true
// marlin_handle_fake_stk500 returns true if it responded to a stk500v2 message
if (marlin_handle_fake_stk500(cs.bufp)) {
cs.comm_mode = MARLIN_COMM_MODE;
js.json_mode = MARLIN_COMM_MODE;
sr.status_report_verbosity = SR_OFF;
@@ -350,7 +349,7 @@ static stat_t _controller_state()
_connection_timeout.set(10);
#endif
} else if ((cs.controller_state == CONTROLLER_STARTUP) && (_connection_timeout.isPast())) { // first time through after reset
if (cs.comm_mode != MARLIN_COMM_MODE) { // MARLIN_COMM_MODE is always defined, just not always used
if (js.json_mode != MARLIN_COMM_MODE) { // MARLIN_COMM_MODE is always defined, just not always used
_reset_comms_mode();
}
cs.controller_state = CONTROLLER_READY;
@@ -372,6 +371,7 @@ void controller_set_connected(bool is_connected) {
if (is_connected) {
cs.controller_state = CONTROLLER_CONNECTED; // we JUST connected
} else { // we just disconnected from the last device, we'll expect a banner again
_reset_comms_mode();
cs.controller_state = CONTROLLER_NOT_CONNECTED;
}
}