zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix Malyan M200 config and protocol (#14394)

Browse source
This commit is contained in:
J.C. Nelson 2019-06-26 01:35:52 -07:00 committed by Scott Lahteine
parent 8c55bd5451
commit 30a3db4f22
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Marlin/src/lcd/extui_malyan_lcd.cpp
View file

@ -113,7 +113,8 @@ void write_to_lcd(const char * const message) {
*/ */
void process_lcd_c_command(const char* command) { void process_lcd_c_command(const char* command) {
switch (command[0]) { switch (command[0]) {
case 'C': { case 'C': // Cope with both V1 early rev and later LCDs.
case 'S': {
int raw_feedrate = atoi(command + 1); int raw_feedrate = atoi(command + 1);
feedrate_percentage = raw_feedrate * 10; feedrate_percentage = raw_feedrate * 10;
feedrate_percentage = constrain(feedrate_percentage, 10, 999); feedrate_percentage = constrain(feedrate_percentage, 10, 999);
@ -319,11 +320,6 @@ void process_lcd_s_command(const char* command) {
write_to_lcd(message_buffer); write_to_lcd(message_buffer);
} break; } break;
case 'H':
// Home all axis
queue.inject_P(PSTR("G28"));
break;
case 'L': { case 'L': {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
if (!card.isDetected()) card.initsd(); if (!card.isDetected()) card.initsd();
@ -474,14 +470,15 @@ namespace ExtUI {
#endif #endif
} }
void onStatusChanged(const char * const msg) { // {E:<msg>} is for error states.
void onPrinterKilled(PGM_P msg) {
write_to_lcd_P(PSTR("{E:")); write_to_lcd_P(PSTR("{E:"));
write_to_lcd(msg); write_to_lcd_P(msg);
write_to_lcd_P("}"); write_to_lcd_P("}");
} }
// Not needed for Malyan LCD // Not needed for Malyan LCD
void onPrinterKilled(PGM_P const msg) { UNUSED(msg); } void onStatusChanged(const char * const msg) { UNUSED(msg); }
void onMediaInserted() {}; void onMediaInserted() {};
void onMediaError() {}; void onMediaError() {};
void onMediaRemoved() {}; void onMediaRemoved() {};

4
config/examples/Malyan/M200/Configuration.h
View file

@ -104,7 +104,7 @@
* *
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7] * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
*/ */
#define SERIAL_PORT 0 #define SERIAL_PORT -1
/** /**
* Select a secondary serial port on the board to use for communication with the host. * Select a secondary serial port on the board to use for communication with the host.
@ -132,7 +132,7 @@
// The following define selects which electronics board you have. // The following define selects which electronics board you have.
// Please choose the name from boards.h that matches your setup // Please choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD #ifndef MOTHERBOARD
#define MOTHERBOARD BOARD_RAMPS_14_EFB #define MOTHERBOARD BOARD_MALYAN_M200
#endif #endif
// Optional custom name for your RepStrap or other custom machine // Optional custom name for your RepStrap or other custom machine