From b0553d2d970f0d4d36a7bca34ccb7e4c57505575 Mon Sep 17 00:00:00 2001 From: Chris Pepper Date: Sat, 2 Mar 2019 02:11:50 +0000 Subject: [PATCH] Add M997 support and simple implementation for LPC176x (#13281) --- Marlin/src/HAL/HAL_LPC1768/HAL.cpp | 4 ++++ Marlin/src/HAL/HAL_LPC1768/HAL.h | 3 +++ Marlin/src/gcode/control/M997.cpp | 34 ++++++++++++++++++++++++++++++ Marlin/src/gcode/gcode.cpp | 4 ++++ Marlin/src/gcode/gcode.h | 5 +++++ 5 files changed, 50 insertions(+) create mode 100644 Marlin/src/gcode/control/M997.cpp diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp b/Marlin/src/HAL/HAL_LPC1768/HAL.cpp index deb77747b..fedca7a1f 100644 --- a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/HAL.cpp @@ -59,4 +59,8 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) { return ind > -2 ? ind : dval; } +void flashFirmware(int16_t value) { + NVIC_SystemReset(); +} + #endif // TARGET_LPC1768 diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.h b/Marlin/src/HAL/HAL_LPC1768/HAL.h index 277e503d6..9593f473d 100644 --- a/Marlin/src/HAL/HAL_LPC1768/HAL.h +++ b/Marlin/src/HAL/HAL_LPC1768/HAL.h @@ -154,3 +154,6 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval); #define HAL_IDLETASK 1 void HAL_idletask(void); + +#define PLATFORM_M997_SUPPORT +void flashFirmware(int16_t value); diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp new file mode 100644 index 000000000..06284a5db --- /dev/null +++ b/Marlin/src/gcode/control/M997.cpp @@ -0,0 +1,34 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +#include "../gcode.h" + +#if ENABLED(PLATFORM_M997_SUPPORT) + +/** + * M997: Perform in-application firmware update + */ +void GcodeSuite::M997() { + flashFirmware(parser.intval('S')); +} + +#endif diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index edc9fa7a2..c9a699517 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -723,6 +723,10 @@ void GcodeSuite::process_parsed_command( case 422: M422(); break; // M422: Set Z Stepper automatic alignment position using probe #endif + #if ENABLED(PLATFORM_M997_SUPPORT) + case 997: M997(); break; // M997: Perform in-application firmware update + #endif + case 999: M999(); break; // M999: Restart after being Stopped #if ENABLED(POWER_LOSS_RECOVERY) diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h index 347317012..63ca8ac1a 100644 --- a/Marlin/src/gcode/gcode.h +++ b/Marlin/src/gcode/gcode.h @@ -254,6 +254,7 @@ * * ************ Custom codes - This can change to suit future G-code regulations * M928 - Start SD logging: "M928 filename.gco". Stop with M29. (Requires SDSUPPORT) + * M997 - Perform in-application firmware update * M999 - Restart after being stopped by error * * "T" Codes @@ -858,6 +859,10 @@ private: static void M951(); #endif + #if ENABLED(PLATFORM_M997_SUPPORT) + static void M997(); + #endif + static void M999(); #if ENABLED(POWER_LOSS_RECOVERY)