🧑‍💻 Group HAL/*/eeprom code

Marlin/src/HAL/DUE/eeprom/eeprom_flash.cpp

@@ -21,7 +21,7 @@
  */
 #ifdef ARDUINO_ARCH_SAM
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
@@ -132,7 +132,7 @@ static uint8_t buffer[256] = {0},   // The RAM buffer to accumulate writes
                curGroup = 0xFF;     // Current FLASH group
 
 #define DEBUG_OUT ENABLED(EE_EMU_DEBUG)
-#include "../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 static void ee_Dump(const int page, const void *data) {
 
@@ -953,7 +953,7 @@ static void ee_Init() {
 
 /* PersistentStore -----------------------------------------------------------*/
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE 0x1000 // 4KB

Marlin/src/HAL/DUE/eeprom/eeprom_wired.cpp

@@ -21,7 +21,7 @@
  */
 #ifdef ARDUINO_ARCH_SAM
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -30,8 +30,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."

Marlin/src/HAL/GD32_MFL/eeprom/eeprom_bl24cxx.cpp

@@ -25,16 +25,16 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef ARDUINO_ARCH_MFL
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for IIC_BL24CXX_EEPROM."

Marlin/src/HAL/GD32_MFL/eeprom/eeprom_if_iic.cpp

@@ -25,16 +25,16 @@
  * Enable USE_SHARED_EEPROM if not supplied by the framework.
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef ARDUINO_ARCH_MFL
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../../libs/BL24CXX.h"
-#include "../shared/eeprom_if.h"
+#include "../../../libs/BL24CXX.h"
+#include "../../shared/eeprom_if.h"
 
 void eeprom_init() {
   BL24CXX::init();

Marlin/src/HAL/GD32_MFL/eeprom/eeprom_wired.cpp

@@ -19,11 +19,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef ARDUINO_ARCH_MFL
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -32,8 +32,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(E2END + 1)

Marlin/src/HAL/HC32/eeprom/eeprom_bl24cxx.cpp

@@ -26,12 +26,12 @@
  */
 #ifdef ARDUINO_ARCH_HC32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../shared/eeprom_api.h"
-#include "../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for IIC_BL24CXX_EEPROM."

Marlin/src/HAL/HC32/eeprom/eeprom_if_iic.cpp

@@ -26,12 +26,12 @@
  */
 #ifdef ARDUINO_ARCH_HC32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../../libs/BL24CXX.h"
-#include "../shared/eeprom_if.h"
+#include "../../../libs/BL24CXX.h"
+#include "../../shared/eeprom_if.h"
 
 void eeprom_init() {
   BL24CXX::init();

Marlin/src/HAL/HC32/eeprom/eeprom_sdcard.cpp

@@ -25,12 +25,12 @@
  */
 #ifdef ARDUINO_ARCH_HC32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
-#include "../../sd/cardreader.h"
+#include "../../shared/eeprom_api.h"
+#include "../../../sd/cardreader.h"
 
 #define EEPROM_FILENAME "eeprom.dat"
 

Marlin/src/HAL/HC32/eeprom/eeprom_wired.cpp

@@ -21,7 +21,7 @@
  */
 #ifdef ARDUINO_ARCH_HC32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -32,8 +32,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."

Marlin/src/HAL/LPC1768/eeprom/eeprom_flash.cpp

@@ -36,11 +36,11 @@
  * 16Kb I/O buffers (intended to hold DMA USB and Ethernet data, but currently
  * unused).
  */
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 extern "C" {
   #include <lpc17xx_iap.h>

Marlin/src/HAL/LPC1768/eeprom/eeprom_sdcard.cpp

@@ -26,13 +26,13 @@
 
 #ifdef TARGET_LPC1768
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
 //#define DEBUG_SD_EEPROM_EMULATION
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #include <chanfs/diskio.h>
 #include <chanfs/ff.h>

Marlin/src/HAL/LPC1768/eeprom/eeprom_wired.cpp

@@ -21,7 +21,7 @@
  */
 #ifdef TARGET_LPC1768
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -30,8 +30,8 @@
  * with implementations supplied by the framework.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE           0x8000 // 32K

Marlin/src/HAL/RP2040/eeprom/eeprom_flash.cpp

@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef __PLAT_RP2040__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 // NOTE: The Bigtreetech SKR Pico has an onboard W25Q16 flash module
 

Marlin/src/HAL/RP2040/eeprom/eeprom_wired.cpp

@@ -19,11 +19,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef __PLAT_RP2040__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -32,8 +32,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(E2END + 1)

Marlin/src/HAL/SAMD21/eeprom/QSPIFlash.cpp

@@ -24,7 +24,7 @@
  * SAMD21 HAL developed by Bart Meijer (brupje)
  * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
  */
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(QSPI_EEPROM)
 

Marlin/src/HAL/SAMD21/eeprom/eeprom_flash.cpp

@@ -26,7 +26,7 @@
  */
 #ifdef __SAMD21__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
@@ -35,7 +35,7 @@
 /* reserve flash memory */
 static const uint8_t flashdata[TOTAL_FLASH_SIZE]  __attribute__((__aligned__(256))) { }; \
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
 

Marlin/src/HAL/SAMD21/eeprom/eeprom_qspi.cpp

@@ -26,13 +26,13 @@
  */
 #ifdef __SAMD21__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(QSPI_EEPROM)
 
 #error "QSPI_EEPROM emulation Not implemented on SAMD21"
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #include "QSPIFlash.h"
 

Marlin/src/HAL/SAMD21/eeprom/eeprom_wired.cpp

@@ -26,7 +26,7 @@
  */
 #ifdef __SAMD21__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -36,8 +36,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."

Marlin/src/HAL/SAMD51/eeprom/QSPIFlash.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(QSPI_EEPROM)
 

Marlin/src/HAL/SAMD51/eeprom/eeprom_flash.cpp

@@ -25,11 +25,11 @@
  */
 #ifdef __SAMD51__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #define NVMCTRL_CMD(c)    do{                                                 \
                             SYNC(!NVMCTRL->STATUS.bit.READY);                 \

Marlin/src/HAL/SAMD51/eeprom/eeprom_qspi.cpp

@@ -25,11 +25,11 @@
  */
 #ifdef __SAMD51__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(QSPI_EEPROM)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #include "QSPIFlash.h"
 

Marlin/src/HAL/SAMD51/eeprom/eeprom_wired.cpp

@@ -25,7 +25,7 @@
  */
 #ifdef __SAMD51__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -34,8 +34,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."

Marlin/src/HAL/STM32/eeprom/eeprom_bl24cxx.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
@@ -29,12 +29,12 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 //
 // PersistentStore

Marlin/src/HAL/STM32/eeprom/eeprom_flash.cpp

@@ -19,15 +19,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 // Better: "utility/stm32_eeprom.h", but only after updating stm32duino to 2.0.0
 // Use EEPROM.h for compatibility, for now.
@@ -50,10 +50,10 @@
 
 #if ENABLED(FLASH_EEPROM_LEVELING)
 
-  #include "stm32_def.h"
+  #include <stm32_def.h>
 
   #define DEBUG_OUT ENABLED(EEPROM_CHITCHAT)
-  #include "../../core/debug_out.h"
+  #include "../../../core/debug_out.h"
 
   #ifndef MARLIN_EEPROM_SIZE
     #define MARLIN_EEPROM_SIZE    0x1000 // 4KB

Marlin/src/HAL/STM32/eeprom/eeprom_if_iic.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
@@ -29,12 +29,12 @@
  * Enable USE_SHARED_EEPROM if not supplied by the framework.
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../../libs/BL24CXX.h"
-#include "../shared/eeprom_if.h"
+#include "../../../libs/BL24CXX.h"
+#include "../../shared/eeprom_if.h"
 
 void eeprom_init() { BL24CXX::init(); }
 

Marlin/src/HAL/STM32/eeprom/eeprom_sdcard.cpp

@@ -20,7 +20,7 @@
  *
  */
 
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
@@ -28,12 +28,12 @@
  * Implementation of EEPROM settings in SD Card
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
-#include "../../sd/cardreader.h"
+#include "../../shared/eeprom_api.h"
+#include "../../../sd/cardreader.h"
 
 #define EEPROM_FILENAME "eeprom.dat"
 

Marlin/src/HAL/STM32/eeprom/eeprom_sram.cpp

@@ -19,16 +19,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SRAM_EEPROM_EMULATION)
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE 0x1000 // 4KB

Marlin/src/HAL/STM32/eeprom/eeprom_wired.cpp

@@ -19,11 +19,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "../platforms.h"
+#include "../../platforms.h"
 
 #ifdef HAL_STM32
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -32,8 +32,8 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(E2END + 1)

Marlin/src/HAL/STM32F1/eeprom/eeprom_bl24cxx.cpp

@@ -26,12 +26,12 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 //
 // PersistentStore

Marlin/src/HAL/STM32F1/eeprom/eeprom_flash.cpp

@@ -28,11 +28,11 @@
 
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"
 
 #include <flash_stm32.h>
 #include <EEPROM.h>

Marlin/src/HAL/STM32F1/eeprom/eeprom_if_iic.cpp

@@ -27,12 +27,12 @@
 
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(IIC_BL24CXX_EEPROM)
 
-#include "../../libs/BL24CXX.h"
-#include "../shared/eeprom_if.h"
+#include "../../../libs/BL24CXX.h"
+#include "../../shared/eeprom_if.h"
 
 void eeprom_init() { BL24CXX::init(); }
 

Marlin/src/HAL/STM32F1/eeprom/eeprom_sdcard.cpp

@@ -27,12 +27,12 @@
 
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if ENABLED(SDCARD_EEPROM_EMULATION)
 
-#include "../shared/eeprom_api.h"
-#include "../../sd/cardreader.h"
+#include "../../shared/eeprom_api.h"
+#include "../../../sd/cardreader.h"
 
 #define EEPROM_FILENAME "eeprom.dat"
 

Marlin/src/HAL/STM32F1/eeprom/eeprom_wired.cpp

@@ -26,12 +26,12 @@
 
 #ifdef __STM32F1__
 
-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."

platformio.ini

@@ -78,6 +78,7 @@ default_src_filter = +<src/*> -<src/config> -<src/tests>
   -<src/gcode/host>
   -<src/gcode/lcd>
   -<src/gcode/motion>
+  -<src/gcode/ota>
   -<src/gcode/probe>
   -<src/gcode/scara>
   -<src/gcode/sd>