Skip to content

Fix compile error with SD_FIRMWARE_UPDATE #12462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 6 commits into from
Nov 18, 2018
Merged

Fix compile error with SD_FIRMWARE_UPDATE #12462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fd01b5
{Bugfix-2.0.x] uniform variable
Ludy87 Nov 16, 2018
4c58056
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
Ludy87 Nov 17, 2018
6e09e6f
compile error SD_FIRMWARE_UPDATE
Ludy87 Nov 17, 2018
40f3a42
Update utility.cpp
thinkyhead Nov 18, 2018
034d9bc
Update persistent_store_eeprom.cpp
thinkyhead Nov 18, 2018
b7b638a
Update configuration_store.cpp
thinkyhead Nov 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Marlin/src/HAL/HAL_AVR/persistent_store_eeprom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "../../inc/MarlinConfig.h"

#if ENABLED(EEPROM_SETTINGS)
#if ENABLED(EEPROM_SETTINGS) || ENABLED(SD_FIRMWARE_UPDATE)

#include "../shared/persistent_store_api.h"

Expand Down Expand Up @@ -64,5 +64,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t

size_t PersistentStore::capacity() { return E2END + 1; }

#endif // EEPROM_SETTINGS
#endif // EEPROM_SETTINGS || SD_FIRMWARE_UPDATE
#endif // __AVR__
2 changes: 1 addition & 1 deletion Marlin/src/HAL/shared/persistent_store_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/
#include "../../inc/MarlinConfigPre.h"

#if ENABLED(EEPROM_SETTINGS)
#if ENABLED(EEPROM_SETTINGS) || ENABLED(SD_FIRMWARE_UPDATE)

#include "persistent_store_api.h"
PersistentStore persistentStore;
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/core/utility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void safe_delay(millis_t ms) {
thermalManager.manage_heater(); // This keeps us safe if too many small safe_delay() calls are made
}

#if ENABLED(EEPROM_SETTINGS)
#if ENABLED(EEPROM_SETTINGS) || ENABLED(SD_FIRMWARE_UPDATE)

void crc16(uint16_t *crc, const void * const data, uint16_t cnt) {
uint8_t *ptr = (uint8_t *)data;
Expand All @@ -46,7 +46,7 @@ void safe_delay(millis_t ms) {
}
}

#endif // EEPROM_SETTINGS
#endif // EEPROM_SETTINGS || SD_FIRMWARE_UPDATE

#if ENABLED(ULTRA_LCD) || ENABLED(DEBUG_LEVELING_FEATURE) || ENABLED(EXTENSIBLE_UI)

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/core/utility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ constexpr char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' };

void safe_delay(millis_t ms);

#if ENABLED(EEPROM_SETTINGS)
#if ENABLED(EEPROM_SETTINGS) || ENABLED(SD_FIRMWARE_UPDATE)
void crc16(uint16_t *crc, const void * const data, uint16_t cnt);
#endif

Expand Down
5 changes: 4 additions & 1 deletion Marlin/src/module/configuration_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@
#include "../gcode/gcode.h"
#include "../Marlin.h"

#if ENABLED(EEPROM_SETTINGS) || ENABLED(SD_FIRMWARE_UPDATE)
#include "../HAL/shared/persistent_store_api.h"
#endif

#if HAS_LEVELING
#include "../feature/bedlevel/bedlevel.h"
#endif
Expand Down Expand Up @@ -381,7 +385,6 @@ void MarlinSettings::postprocess() {
#endif // SD_FIRMWARE_UPDATE

#if ENABLED(EEPROM_SETTINGS)
#include "../HAL/shared/persistent_store_api.h"

#define EEPROM_START() int eeprom_index = EEPROM_OFFSET; persistentStore.access_start()
#define EEPROM_FINISH() persistentStore.access_finish()
Expand Down