Merge upstream changes

from https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x
2019-01-28 23:30:14 +01:00
parent b3af9708e9
commit f01ee75004
75 changed files with 420 additions and 177 deletions
--- a/Marlin/power_loss_recovery.cpp
+++ b/Marlin/power_loss_recovery.cpp
@@ -276,7 +276,7 @@ void save_job_recovery_info() {

    // If power-loss pin was triggered, write just once then kill
    #if PIN_EXISTS(POWER_LOSS)
-      if (READ(POWER_LOSS_PIN) == POWER_LOSS_STATE) kill(MSG_POWER_LOSS_RECOVERY);
+      if (READ(POWER_LOSS_PIN) == POWER_LOSS_STATE) kill(PSTR(MSG_POWER_LOSS_RECOVERY));
    #endif
  }
 }