bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

[2.0.x] PersistentStore update followup (#11549)

Browse Source
This commit is contained in:
Chris Pepper
2018-08-14 23:54:12 +01:00
committed by Scott Lahteine
parent 846bd24eb9
commit 5573ef62c6
13 changed files with 25 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/HAL/shared/I2cEeprom.cpp
View File

@ -33,7 +33,7 @@
// Includes
// --------------------------------------------------------------------------
#include HAL_PATH(., HAL.h)
#include HAL_PATH(.., HAL.h)
#include <Wire.h>
// --------------------------------------------------------------------------
@ -157,4 +157,3 @@ void eeprom_read_block(void* pos, const void* eeprom_address, size_t n) {
#endif // ENABLED(I2C_EEPROM)

2
Marlin/src/HAL/shared/SpiEeprom.cpp
View File

@ -29,7 +29,7 @@
#if ENABLED(SPI_EEPROM)
#include HAL_PATH(., HAL.h)
#include HAL_PATH(.., HAL.h)
#define CMD_WREN 6 // WREN
#define CMD_READ 2 // WRITE

30
Marlin/src/HAL/shared/persistent_store_api.cpp Normal file
View File

@ -0,0 +1,30 @@
/**
* Marlin 3D Printer Firmware
*
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
* Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
* Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
*
* 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 <http://www.gnu.org/licenses/>.
*
*/
#include "../../inc/MarlinConfigPre.h"
#if ENABLED(EEPROM_SETTINGS)
#include "persistent_store_api.h"
PersistentStore persistentStore;
#endif

32
Marlin/src/HAL/shared/platforms.h
View File

@ -1,32 +0,0 @@
#ifndef _HAL_PLATFORMS_H_
#define _HAL_PLATFORMS_H_
#ifndef HAL_PLATFORM
#ifdef __AVR__
#define HAL_PLATFORM HAL_AVR
#elif defined(ARDUINO_ARCH_SAM)
#define HAL_PLATFORM HAL_DUE
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
#define HAL_PLATFORM HAL_TEENSY35_36
#elif defined(TARGET_LPC1768)
#define HAL_PLATFORM HAL_LPC1768
#elif defined(__STM32F1__) || defined(TARGET_STM32F1)
#define HAL_PLATFORM HAL_STM32F1
#elif defined(STM32F4) || defined(STM32F4xx)
#define HAL_PLATFORM HAL_STM32F4
#elif defined(STM32F7)
#define HAL_PLATFORM HAL_STM32F7
#elif defined(ARDUINO_ARCH_ESP32)
#define HAL_PLATFORM HAL_ESP32
#else
#error "Unsupported Platform!"
#endif
#endif // HAL_PLATFORM
#define XSTR_(M) #M
#define XSTR(M) XSTR_(M)
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL_PLATFORM/NAME)
#endif // _HAL_PLATFORMS_H_