Skip to content

Add Mock Support for EEPROM #174

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.

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
merged 8 commits into from
Oct 9, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
### Added
- Support for EEPROM
- Support for mock EEPROM (but only if board supports it; added mega2560 to TestSomething config)

### Changed
- Move repository from https://github.com/ianfixes/arduino_ci to https://github.com/Arduino-CI/arduino_ci
Expand All @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Removed

### Fixed
- Don't define `ostream& operator<<(nullptr_t)` if already defined by Apple

### Security

Expand Down
1 change: 1 addition & 0 deletions SampleProjects/TestSomething/.arduino-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ unittest:
platforms:
- uno
- due
- mega2560

compile:
platforms:
Expand Down
4 changes: 4 additions & 0 deletions SampleProjects/TestSomething/test/eeprom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
#include <Arduino.h>
#include <EEPROM.h>

#ifdef EEPROM_SIZE

unittest(length)
{
assertEqual(EEPROM_SIZE, EEPROM.length());
}

#endif

unittest_main()
7 changes: 4 additions & 3 deletions cpp/arduino/EEPROM.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include <inttypes.h>
#include <avr/io.h>

// I see EEPROM_SIZE defined in various arv/io*.h files; why isn't it defined here?
#define EEPROM_SIZE (4096)
#ifdef EEPROM_SIZE

// Is this all the custom code required?
static uint8_t eeprom[EEPROM_SIZE];
inline uint8_t eeprom_read_byte( uint8_t* index ) { return eeprom[(unsigned long) index % EEPROM_SIZE]; }
Expand Down Expand Up @@ -152,4 +152,5 @@ struct EEPROMClass{
};

static EEPROMClass EEPROM;
#endif
#endif
#endif
4 changes: 4 additions & 0 deletions cpp/unittest/OstreamHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@

#include <ostream>

#if (defined __apple_build_version__) && (__apple_build_version__ >= 12000000)
// defined in /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/ostream:223:20
#else
inline std::ostream& operator << (std::ostream& out, const std::nullptr_t &np) { return out << "nullptr"; }
#endif
1 change: 1 addition & 0 deletions misc/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ platforms:
features:
defines:
- __AVR_ATmega2560__
- EEPROM_SIZE=(4096)
warnings:
flags:
cplayClassic:
Expand Down