From ff3e0b51c8d2005bb6e7f51197f360a0864b86cc Mon Sep 17 00:00:00 2001 From: Dan Lipsitt Date: Tue, 10 Mar 2015 11:34:17 -0700 Subject: [PATCH 1/4] Send serial messages while heating. --- Marlin/Marlin_main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index c4afca7f685c..f36a2b5adf22 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1911,6 +1911,7 @@ void process_commands() if(setTargetedHotend(109)){ break; } + SERIAL_PROTOCOLPGM("Heating"); LCD_MESSAGEPGM(MSG_HEATING); #ifdef AUTOTEMP autotemp_enabled=false; @@ -1992,6 +1993,7 @@ void process_commands() } #endif //TEMP_RESIDENCY_TIME } + SERIAL_PROTOCOLPGM(MSG_HEATING_COMPLETE); LCD_MESSAGEPGM(MSG_HEATING_COMPLETE); starttime=millis(); previous_millis_cmd = millis(); @@ -1999,6 +2001,7 @@ void process_commands() break; case 190: // M190 - Wait for bed heater to reach target. #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 + SERIAL_PROTOCOLPGM(MSG_BED_HEATING); LCD_MESSAGEPGM(MSG_BED_HEATING); if (code_seen('S')) { setTargetBed(code_value()); @@ -2030,6 +2033,7 @@ void process_commands() lcd_update(); } LCD_MESSAGEPGM(MSG_BED_DONE); + SERIAL_PROTOCOLPGM(MSG_BED_DONE); previous_millis_cmd = millis(); #endif break; From 45640e62751561c23bd25f7ecb303033ff371df6 Mon Sep 17 00:00:00 2001 From: Dan Lipsitt Date: Tue, 10 Mar 2015 11:36:53 -0700 Subject: [PATCH 2/4] Set MACHINE_NAME and FIRMWARE_URL for Series 1. Used in MSG_M115_REPORT and potentially elsewhere. --- Marlin/language.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Marlin/language.h b/Marlin/language.h index 1aadb1e2e3df..44a0df06a9f3 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -50,6 +50,9 @@ #define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/" #endif +// Overrides for Type A Machines Series 1 +#define MACHINE_NAME "Type A Machines Series 1" +#define FIRMWARE_URL "https://www.bitbucket.org/typeamachines/marlin" #ifndef MACHINE_UUID #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" From 3ce0e3eaa8d88f7590554f1d9ff418ee6d49c885 Mon Sep 17 00:00:00 2001 From: Dan Lipsitt Date: Tue, 10 Mar 2015 11:58:50 -0700 Subject: [PATCH 3/4] M115 message mentions Type A. --- Marlin/language.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/language.h b/Marlin/language.h index 44a0df06a9f3..d30c720f6a66 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -222,7 +222,7 @@ #define MSG_HEATING_COMPLETE "Heating done." #define MSG_BED_HEATING "Bed Heating." #define MSG_BED_DONE "Bed done." - #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" + #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin for Type A Machines Series 1 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" #define MSG_COUNT_X " Count X: " #define MSG_ERR_KILLED "Print interrupted by stop button. To re-enable printing, push the front panel button back in, in the Connection section click on Connect then wait for the printer to reconnect. You will need to restart your print." #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" From 07e69eed6c583aea8c7500f4bf543740ffcbee0f Mon Sep 17 00:00:00 2001 From: Dan Lipsitt Date: Tue, 10 Mar 2015 13:01:47 -0700 Subject: [PATCH 4/4] Consolidate version strings and bump version. * New macro "STRING_VERSION" (backported from current upstream Marlin). * Use STRING_VERSION in STRING_CONFIG_H_AUTHOR and MSG_M115_REPORT. --- Marlin/Configuration.h | 3 ++- Marlin/language.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 64a2083011c2..d9cd7529d9af 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -15,8 +15,9 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. +#define STRING_VERSION "1.2.0a" #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time -#define STRING_CONFIG_H_AUTHOR "(Type A Machines v1.1.0)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(Type A Machines v" STRING_VERSION ")" // Who made the changes. // SERIAL_PORT selects which serial port should be used for communication with the host. // This allows the connection of wireless adapters (for instance) to non-default port pins. diff --git a/Marlin/language.h b/Marlin/language.h index d30c720f6a66..a42bc57b43d3 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -222,7 +222,7 @@ #define MSG_HEATING_COMPLETE "Heating done." #define MSG_BED_HEATING "Bed Heating." #define MSG_BED_DONE "Bed done." - #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin for Type A Machines Series 1 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" + #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin " STRING_CONFIG_H_AUTHOR " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" #define MSG_COUNT_X " Count X: " #define MSG_ERR_KILLED "Print interrupted by stop button. To re-enable printing, push the front panel button back in, in the Connection section click on Connect then wait for the printer to reconnect. You will need to restart your print." #define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"