Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
f263782f
Commit
f263782f
authored
Apr 2, 2020
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Fix ESP32 eeprom flag
parent
62e8c2dd
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/src/HAL/ESP32/eeprom_impl.cpp
+2
-2
2 additions, 2 deletions
Marlin/src/HAL/ESP32/eeprom_impl.cpp
Marlin/src/HAL/ESP32/inc/Conditionals_post.h
+3
-3
3 additions, 3 deletions
Marlin/src/HAL/ESP32/inc/Conditionals_post.h
with
5 additions
and
5 deletions
Marlin/src/HAL/ESP32/eeprom_impl.cpp
+
2
−
2
View file @
f263782f
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
#include
"../../inc/MarlinConfig.h"
#include
"../../inc/MarlinConfig.h"
#if
ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
#if
USE_WIRED_EEPROM
#include
"../shared/eeprom_api.h"
#include
"../shared/eeprom_api.h"
#include
<EEPROM.h>
#include
<EEPROM.h>
...
@@ -59,5 +59,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
...
@@ -59,5 +59,5 @@ bool PersistentStore::read_data(int &pos, uint8_t* value, size_t size, uint16_t
size_t
PersistentStore
::
capacity
()
{
return
EEPROM_SIZE
;
}
size_t
PersistentStore
::
capacity
()
{
return
EEPROM_SIZE
;
}
#endif //
EEPROM_SETTINGS
#endif //
USE_WIRED_EEPROM
#endif // ARDUINO_ARCH_ESP32
#endif // ARDUINO_ARCH_ESP32
This diff is collapsed.
Click to expand it.
Marlin/src/HAL/ESP32/inc/Conditionals_post.h
+
3
−
3
View file @
f263782f
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
*/
*/
#pragma once
#pragma once
// If no real EEPROM, Flash emulation, or SRAM emulation is available fall back to SD emulation
#undef USE_WIRED_EEPROM
#if ENABLED(EEPROM_SETTINGS) &&
NONE(USE_WIRED_EEPROM, FLASH_EEPROM_EMULATION, SRAM
_EEPROM_EMULATION)
#if ENABLED(EEPROM_SETTINGS) &&
DISABLED(FLASH
_EEPROM_EMULATION)
#define
SDCARD_EEPROM_EMULATION
#define
USE_WIRED_EEPROM 1
#endif
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment