Merged in danlipsitt/marlin/feature/better_messages (pull request Mar…

…linFirmware#3) enabled m115 report for FW, enabled Serial calls on heating commands
realloser · Mar 11, 2015 · c8973fd · c8973fd
2 parents 2967244 + 07e69ee
commit c8973fd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git 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/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,13 +1993,15 @@ void process_commands()
           }
         #endif //TEMP_RESIDENCY_TIME
         }
+        SERIAL_PROTOCOLPGM(MSG_HEATING_COMPLETE);
         LCD_MESSAGEPGM(MSG_HEATING_COMPLETE);
         starttime=millis();
         previous_millis_cmd = millis();
       }
       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;

diff --git 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"
@@ -219,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 " 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)"