Browse Source

Merge pull request #7217 from benlye/add-kill-action

Add configurable action command to send when printer is killed
Scott Lahteine 7 years ago
parent
commit
a2babb532d
27 changed files with 186 additions and 0 deletions
  1. 7
    0
      Marlin/Configuration_adv.h
  2. 4
    0
      Marlin/Marlin_main.cpp
  3. 7
    0
      Marlin/example_configurations/Anet/A6/Configuration_adv.h
  4. 7
    0
      Marlin/example_configurations/Anet/A8/Configuration_adv.h
  5. 7
    0
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  6. 7
    0
      Marlin/example_configurations/Felix/Configuration_adv.h
  7. 7
    0
      Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h
  8. 7
    0
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  9. 7
    0
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  10. 7
    0
      Marlin/example_configurations/K8200/Configuration_adv.h
  11. 7
    0
      Marlin/example_configurations/K8400/Configuration_adv.h
  12. 7
    0
      Marlin/example_configurations/M150/Configuration_adv.h
  13. 7
    0
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  14. 7
    0
      Marlin/example_configurations/SCARA/Configuration_adv.h
  15. 7
    0
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  16. 7
    0
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  17. 7
    0
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  18. 7
    0
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
  19. 7
    0
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
  20. 7
    0
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  21. 7
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  22. 7
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  23. 7
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  24. 7
    0
      Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h
  25. 7
    0
      Marlin/example_configurations/makibox/Configuration_adv.h
  26. 7
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  27. 7
    0
      Marlin/example_configurations/wt150/Configuration_adv.h

+ 7
- 0
Marlin/Configuration_adv.h View File

@@ -1268,6 +1268,13 @@
1268 1268
   #define USER_GCODE_5 "G28\nM503"
1269 1269
 #endif
1270 1270
 
1271
+/**
1272
+ * Specify an action command to send to the host when the printer is killed.
1273
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1274
+ * The host must be configured to handle the action command.
1275
+ */
1276
+//#define ACTION_ON_KILL "poweroff"
1277
+
1271 1278
 //===========================================================================
1272 1279
 //====================== I2C Position Encoder Settings ======================
1273 1280
 //===========================================================================

+ 4
- 0
Marlin/Marlin_main.cpp View File

@@ -12839,6 +12839,10 @@ void kill(const char* lcd_msg) {
12839 12839
   _delay_ms(250); //Wait to ensure all interrupts routines stopped
12840 12840
   thermalManager.disable_all_heaters(); //turn off heaters again
12841 12841
 
12842
+  #if defined(ACTION_ON_KILL)
12843
+    SERIAL_ECHOLNPGM("//action:" ACTION_ON_KILL);
12844
+  #endif
12845
+  
12842 12846
   #if HAS_POWER_SWITCH
12843 12847
     SET_INPUT(PS_ON_PIN);
12844 12848
   #endif

+ 7
- 0
Marlin/example_configurations/Anet/A6/Configuration_adv.h View File

@@ -1268,6 +1268,13 @@
1268 1268
   #define USER_GCODE_5 "G28\nM503"
1269 1269
 #endif
1270 1270
 
1271
+/**
1272
+ * Specify an action command to send to the host when the printer is killed.
1273
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1274
+ * The host must be configured to handle the action command.
1275
+ */
1276
+//#define ACTION_ON_KILL "poweroff"
1277
+
1271 1278
 //===========================================================================
1272 1279
 //====================== I2C Position Encoder Settings ======================
1273 1280
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/Anet/A8/Configuration_adv.h View File

@@ -1268,6 +1268,13 @@
1268 1268
   #define USER_GCODE_5 "G28\nM503"
1269 1269
 #endif
1270 1270
 
1271
+/**
1272
+ * Specify an action command to send to the host when the printer is killed.
1273
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1274
+ * The host must be configured to handle the action command.
1275
+ */
1276
+//#define ACTION_ON_KILL "poweroff"
1277
+
1271 1278
 //===========================================================================
1272 1279
 //====================== I2C Position Encoder Settings ======================
1273 1280
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   #define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/Felix/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   //#define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h View File

@@ -1274,6 +1274,13 @@
1274 1274
   //#define USER_GCODE_5 "G28\nM503"
1275 1275
 #endif
1276 1276
 
1277
+/**
1278
+ * Specify an action command to send to the host when the printer is killed.
1279
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1280
+ * The host must be configured to handle the action command.
1281
+ */
1282
+//#define ACTION_ON_KILL "poweroff"
1283
+
1277 1284
 //===========================================================================
1278 1285
 //====================== I2C Position Encoder Settings ======================
1279 1286
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   //#define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

@@ -1244,6 +1244,13 @@
1244 1244
   //#define USER_GCODE_5 "G28\nM503"
1245 1245
 #endif
1246 1246
 
1247
+/**
1248
+ * Specify an action command to send to the host when the printer is killed.
1249
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1250
+ * The host must be configured to handle the action command.
1251
+ */
1252
+//#define ACTION_ON_KILL "poweroff"
1253
+
1247 1254
 //===========================================================================
1248 1255
 //====================== I2C Position Encoder Settings ======================
1249 1256
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/K8200/Configuration_adv.h View File

@@ -1274,6 +1274,13 @@
1274 1274
   //#define USER_GCODE_5 "G28\nM503"
1275 1275
 #endif
1276 1276
 
1277
+/**
1278
+ * Specify an action command to send to the host when the printer is killed.
1279
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1280
+ * The host must be configured to handle the action command.
1281
+ */
1282
+//#define ACTION_ON_KILL "poweroff"
1283
+
1277 1284
 //===========================================================================
1278 1285
 //====================== I2C Position Encoder Settings ======================
1279 1286
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/K8400/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   //#define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/M150/Configuration_adv.h View File

@@ -1268,6 +1268,13 @@
1268 1268
   #define USER_GCODE_5 "G28\nM503"
1269 1269
 #endif
1270 1270
 
1271
+/**
1272
+ * Specify an action command to send to the host when the printer is killed.
1273
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1274
+ * The host must be configured to handle the action command.
1275
+ */
1276
+//#define ACTION_ON_KILL "poweroff"
1277
+
1271 1278
 //===========================================================================
1272 1279
 //====================== I2C Position Encoder Settings ======================
1273 1280
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   //#define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   //#define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   //#define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/TinyBoy2/Configuration_adv.h View File

@@ -1264,6 +1264,13 @@
1264 1264
   //#define USER_GCODE_5 "G28\nM503"
1265 1265
 #endif
1266 1266
 
1267
+/**
1268
+ * Specify an action command to send to the host when the printer is killed.
1269
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1270
+ * The host must be configured to handle the action command.
1271
+ */
1272
+//#define ACTION_ON_KILL "poweroff"
1273
+
1267 1274
 //===========================================================================
1268 1275
 //====================== I2C Position Encoder Settings ======================
1269 1276
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   //#define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h View File

@@ -1266,6 +1266,13 @@
1266 1266
   #define USER_GCODE_5 "G28\nM503"
1267 1267
 #endif
1268 1268
 
1269
+/**
1270
+ * Specify an action command to send to the host when the printer is killed.
1271
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1272
+ * The host must be configured to handle the action command.
1273
+ */
1274
+//#define ACTION_ON_KILL "poweroff"
1275
+
1269 1276
 //===========================================================================
1270 1277
 //====================== I2C Position Encoder Settings ======================
1271 1278
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h View File

@@ -1265,6 +1265,13 @@
1265 1265
   #define USER_GCODE_5 "G28\nM503"
1266 1266
 #endif
1267 1267
 
1268
+/**
1269
+ * Specify an action command to send to the host when the printer is killed.
1270
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1271
+ * The host must be configured to handle the action command.
1272
+ */
1273
+//#define ACTION_ON_KILL "poweroff"
1274
+
1268 1275
 //===========================================================================
1269 1276
 //====================== I2C Position Encoder Settings ======================
1270 1277
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

@@ -1263,6 +1263,13 @@
1263 1263
   #define USER_GCODE_5 "G28\nM503"
1264 1264
 #endif
1265 1265
 
1266
+/**
1267
+ * Specify an action command to send to the host when the printer is killed.
1268
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1269
+ * The host must be configured to handle the action command.
1270
+ */
1271
+//#define ACTION_ON_KILL "poweroff"
1272
+
1266 1273
 //===========================================================================
1267 1274
 //====================== I2C Position Encoder Settings ======================
1268 1275
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

@@ -1263,6 +1263,13 @@
1263 1263
   #define USER_GCODE_5 "G28\nM503"
1264 1264
 #endif
1265 1265
 
1266
+/**
1267
+ * Specify an action command to send to the host when the printer is killed.
1268
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1269
+ * The host must be configured to handle the action command.
1270
+ */
1271
+//#define ACTION_ON_KILL "poweroff"
1272
+
1266 1273
 //===========================================================================
1267 1274
 //====================== I2C Position Encoder Settings ======================
1268 1275
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

@@ -1268,6 +1268,13 @@
1268 1268
   #define USER_GCODE_5 "G28\nM503"
1269 1269
 #endif
1270 1270
 
1271
+/**
1272
+ * Specify an action command to send to the host when the printer is killed.
1273
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1274
+ * The host must be configured to handle the action command.
1275
+ */
1276
+//#define ACTION_ON_KILL "poweroff"
1277
+
1271 1278
 //===========================================================================
1272 1279
 //====================== I2C Position Encoder Settings ======================
1273 1280
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

@@ -1263,6 +1263,13 @@
1263 1263
   //#define USER_GCODE_5 "G28\nM503"
1264 1264
 #endif
1265 1265
 
1266
+/**
1267
+ * Specify an action command to send to the host when the printer is killed.
1268
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1269
+ * The host must be configured to handle the action command.
1270
+ */
1271
+//#define ACTION_ON_KILL "poweroff"
1272
+
1266 1273
 //===========================================================================
1267 1274
 //====================== I2C Position Encoder Settings ======================
1268 1275
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h View File

@@ -1270,6 +1270,13 @@
1270 1270
   //#define USER_GCODE_5 "G28\nM503"
1271 1271
 #endif
1272 1272
 
1273
+/**
1274
+ * Specify an action command to send to the host when the printer is killed.
1275
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1276
+ * The host must be configured to handle the action command.
1277
+ */
1278
+//#define ACTION_ON_KILL "poweroff"
1279
+
1273 1280
 //===========================================================================
1274 1281
 //====================== I2C Position Encoder Settings ======================
1275 1282
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/makibox/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   //#define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

@@ -1261,6 +1261,13 @@
1261 1261
   //#define USER_GCODE_5 "G28\nM503"
1262 1262
 #endif
1263 1263
 
1264
+/**
1265
+ * Specify an action command to send to the host when the printer is killed.
1266
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1267
+ * The host must be configured to handle the action command.
1268
+ */
1269
+//#define ACTION_ON_KILL "poweroff"
1270
+
1264 1271
 //===========================================================================
1265 1272
 //====================== I2C Position Encoder Settings ======================
1266 1273
 //===========================================================================

+ 7
- 0
Marlin/example_configurations/wt150/Configuration_adv.h View File

@@ -1351,6 +1351,13 @@
1351 1351
 
1352 1352
 #endif
1353 1353
 
1354
+/**
1355
+ * Specify an action command to send to the host when the printer is killed.
1356
+ * Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
1357
+ * The host must be configured to handle the action command.
1358
+ */
1359
+//#define ACTION_ON_KILL "poweroff"
1360
+
1354 1361
 //===========================================================================
1355 1362
 //====================== I2C Position Encoder Settings ======================
1356 1363
 //===========================================================================

Loading…
Cancel
Save