3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-06-26 09:25:18 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🧑‍💻 Group HAL/*/eeprom code

Browse source
This commit is contained in:
Scott Lahteine 2025-04-25 21:54:53 -05:00
parent ad71b81b0c
commit e0d8ea57a8
36 changed files with 100 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/HAL/DUE/eeprom_flash.cpp → Marlin/src/HAL/DUE/eeprom/eeprom_flash.cpp
View file

@ -21,7 +21,7 @@
*/ */
#ifdef ARDUINO_ARCH_SAM #ifdef ARDUINO_ARCH_SAM
#include "../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"
#if ENABLED(FLASH_EEPROM_EMULATION) #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 curGroup = 0xFF; // Current FLASH group
#define DEBUG_OUT ENABLED(EE_EMU_DEBUG) #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) { static void ee_Dump(const int page, const void *data) {
@ -953,7 +953,7 @@ static void ee_Init() {
/* PersistentStore -----------------------------------------------------------*/ /* PersistentStore -----------------------------------------------------------*/
#include "../shared/eeprom_api.h" #include "../../shared/eeprom_api.h"
#ifndef MARLIN_EEPROM_SIZE #ifndef MARLIN_EEPROM_SIZE
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB #define MARLIN_EEPROM_SIZE 0x1000 // 4KB

6
Marlin/src/HAL/DUE/eeprom_wired.cpp → Marlin/src/HAL/DUE/eeprom/eeprom_wired.cpp
View file

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

8
Marlin/src/HAL/GD32_MFL/eeprom_bl24cxx.cpp → Marlin/src/HAL/GD32_MFL/eeprom/eeprom_bl24cxx.cpp
View file

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

8
Marlin/src/HAL/GD32_MFL/eeprom_if_iic.cpp → Marlin/src/HAL/GD32_MFL/eeprom/eeprom_if_iic.cpp
View file

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

8
Marlin/src/HAL/GD32_MFL/eeprom_wired.cpp → Marlin/src/HAL/GD32_MFL/eeprom/eeprom_wired.cpp
View file

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

6
Marlin/src/HAL/HC32/eeprom_bl24cxx.cpp → Marlin/src/HAL/HC32/eeprom/eeprom_bl24cxx.cpp
View file

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

6
Marlin/src/HAL/HC32/eeprom_if_iic.cpp → Marlin/src/HAL/HC32/eeprom/eeprom_if_iic.cpp
View file

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

6
Marlin/src/HAL/HC32/eeprom_sdcard.cpp → Marlin/src/HAL/HC32/eeprom/eeprom_sdcard.cpp
View file

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

6
Marlin/src/HAL/HC32/eeprom_wired.cpp → Marlin/src/HAL/HC32/eeprom/eeprom_wired.cpp
View file

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

4
Marlin/src/HAL/LPC1768/eeprom_flash.cpp → Marlin/src/HAL/LPC1768/eeprom/eeprom_flash.cpp
View file

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

4
Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp → Marlin/src/HAL/LPC1768/eeprom/eeprom_sdcard.cpp
View file

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

6
Marlin/src/HAL/LPC1768/eeprom_wired.cpp → Marlin/src/HAL/LPC1768/eeprom/eeprom_wired.cpp
View file

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

6
Marlin/src/HAL/RP2040/eeprom_flash.cpp → Marlin/src/HAL/RP2040/eeprom/eeprom_flash.cpp
View file

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

8
Marlin/src/HAL/RP2040/eeprom_wired.cpp → Marlin/src/HAL/RP2040/eeprom/eeprom_wired.cpp
View file

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

2
Marlin/src/HAL/SAMD21/QSPIFlash.cpp → Marlin/src/HAL/SAMD21/eeprom/QSPIFlash.cpp
View file

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

0
Marlin/src/HAL/SAMD21/QSPIFlash.h → Marlin/src/HAL/SAMD21/eeprom/QSPIFlash.h
View file

4
Marlin/src/HAL/SAMD21/eeprom_flash.cpp → Marlin/src/HAL/SAMD21/eeprom/eeprom_flash.cpp
View file

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

4
Marlin/src/HAL/SAMD21/eeprom_qspi.cpp → Marlin/src/HAL/SAMD21/eeprom/eeprom_qspi.cpp
View file

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

6
Marlin/src/HAL/SAMD21/eeprom_wired.cpp → Marlin/src/HAL/SAMD21/eeprom/eeprom_wired.cpp
View file

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

2
Marlin/src/HAL/SAMD51/QSPIFlash.cpp → Marlin/src/HAL/SAMD51/eeprom/QSPIFlash.cpp
View file

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

0
Marlin/src/HAL/SAMD51/QSPIFlash.h → Marlin/src/HAL/SAMD51/eeprom/QSPIFlash.h
View file

4
Marlin/src/HAL/SAMD51/eeprom_flash.cpp → Marlin/src/HAL/SAMD51/eeprom/eeprom_flash.cpp
View file

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

4
Marlin/src/HAL/SAMD51/eeprom_qspi.cpp → Marlin/src/HAL/SAMD51/eeprom/eeprom_qspi.cpp
View file

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

6
Marlin/src/HAL/SAMD51/eeprom_wired.cpp → Marlin/src/HAL/SAMD51/eeprom/eeprom_wired.cpp
View file

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

8
Marlin/src/HAL/STM32/eeprom_bl24cxx.cpp → Marlin/src/HAL/STM32/eeprom/eeprom_bl24cxx.cpp
View file

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

10
Marlin/src/HAL/STM32/eeprom_flash.cpp → Marlin/src/HAL/STM32/eeprom/eeprom_flash.cpp
View file

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

8
Marlin/src/HAL/STM32/eeprom_if_iic.cpp → Marlin/src/HAL/STM32/eeprom/eeprom_if_iic.cpp
View file

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

8
Marlin/src/HAL/STM32/eeprom_sdcard.cpp → Marlin/src/HAL/STM32/eeprom/eeprom_sdcard.cpp
View file

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

8
Marlin/src/HAL/STM32/eeprom_sram.cpp → Marlin/src/HAL/STM32/eeprom/eeprom_sram.cpp
View file

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

8
Marlin/src/HAL/STM32/eeprom_wired.cpp → Marlin/src/HAL/STM32/eeprom/eeprom_wired.cpp
View file

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

6
Marlin/src/HAL/STM32F1/eeprom_bl24cxx.cpp → Marlin/src/HAL/STM32F1/eeprom/eeprom_bl24cxx.cpp
View file

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

4
Marlin/src/HAL/STM32F1/eeprom_flash.cpp → Marlin/src/HAL/STM32F1/eeprom/eeprom_flash.cpp
View file

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

6
Marlin/src/HAL/STM32F1/eeprom_if_iic.cpp → Marlin/src/HAL/STM32F1/eeprom/eeprom_if_iic.cpp
View file

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

6
Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp → Marlin/src/HAL/STM32F1/eeprom/eeprom_sdcard.cpp
View file

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

6
Marlin/src/HAL/STM32F1/eeprom_wired.cpp → Marlin/src/HAL/STM32F1/eeprom/eeprom_wired.cpp
View file

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

1
platformio.ini
View file

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