david.tahir/QuadMeUp_Crossbow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #67 from kadrim/patch-1

Browse Source 
Add EEPROM Emulation Layer for SAMD CPU (Feather M0 etc.)
This commit is contained in:
Paweł Spychalski
2018-07-10 10:27:01 +02:00
committed by GitHub
parent 85fd50d8bf 7b47d02315
commit 2d1e685ba3
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -23,11 +23,11 @@ before_install:
fi fi
- arduino --pref "boardsmanager.additional.urls=" --save-prefs - arduino --pref "boardsmanager.additional.urls=" --save-prefs
install: install:
- arduino --install-library "U8g2" - arduino --install-library "U8g2","FlashStorage"
script: script:
- cp -f $PWD/crossbow/configurations/config_${CONFIG}.h $PWD/crossbow/config.h && - cp -f $PWD/crossbow/configurations/config_${CONFIG}.h $PWD/crossbow/config.h &&
arduino --verify --board $BOARD $PWD/crossbow/crossbow.ino arduino --verify --board $BOARD $PWD/crossbow/crossbow.ino
notifications: notifications:
email: email:
on_success: change on_success: change
on_failure: change on_failure: change

3
README.md
View File

@@ -23,6 +23,7 @@ Needs implementation:
To compile, following libraries have to be installed: To compile, following libraries have to be installed:
* [U8g2](https://github.com/olikraus/u8g2) for OLED support in TX module * [U8g2](https://github.com/olikraus/u8g2) for OLED support in TX module
* [FlashStorage](https://github.com/cmaglie/FlashStorage) for EEPROM-Emulation if using a SAMD-Board (M0 etc.)
# Protocol # Protocol
@@ -147,4 +148,4 @@ After flashing TX and RX, binding is required.
# RX module connection diagram # RX module connection diagram
![Diagram](docs/RX_module_schem.png) ![Diagram](docs/RX_module_schem.png)

8
crossbow/platform_node.cpp
View File

@@ -20,6 +20,9 @@ void PlatformNode::seed(void) {
EEPROM.write(EEPROM_ADDRESS_BIND_2, random(1, 255)); //Yes, from 1 to 254 EEPROM.write(EEPROM_ADDRESS_BIND_2, random(1, 255)); //Yes, from 1 to 254
EEPROM.write(EEPROM_ADDRESS_BIND_3, random(1, 255)); //Yes, from 1 to 254 EEPROM.write(EEPROM_ADDRESS_BIND_3, random(1, 255)); //Yes, from 1 to 254
EEPROM.write(EEPROM_ADDRESS_BIND_KEY_SEEDED, 0xf1); EEPROM.write(EEPROM_ADDRESS_BIND_KEY_SEEDED, 0xf1);
#ifdef ARDUINO_SAMD_FEATHER_M0
EEPROM.commit();
#endif
} }
} }
@@ -36,6 +39,9 @@ void PlatformNode::saveBindKey(uint8_t key[]) {
EEPROM.write(EEPROM_ADDRESS_BIND_2, key[2]); EEPROM.write(EEPROM_ADDRESS_BIND_2, key[2]);
EEPROM.write(EEPROM_ADDRESS_BIND_3, key[3]); EEPROM.write(EEPROM_ADDRESS_BIND_3, key[3]);
EEPROM.write(EEPROM_ADDRESS_BIND_KEY_SEEDED, 0xf1); EEPROM.write(EEPROM_ADDRESS_BIND_KEY_SEEDED, 0xf1);
#ifdef ARDUINO_SAMD_FEATHER_M0
EEPROM.commit();
#endif
} }
int PlatformNode::getRcChannel(uint8_t channel) { int PlatformNode::getRcChannel(uint8_t channel) {
@@ -75,4 +81,4 @@ void PlatformNode::leaveBindMode(void) {
isBindMode = false; isBindMode = false;
loadBindKey(bindKey); loadBindKey(bindKey);
radioNode.reset(); radioNode.reset();
} }

7
crossbow/platform_node.h
View File

@@ -2,7 +2,12 @@
#include "Arduino.h" #include "Arduino.h"
#include "radio_node.h" #include "radio_node.h"
#ifdef ARDUINO_AVR_FEATHER32U4
#include <EEPROM.h> #include <EEPROM.h>
#elif defined(ARDUINO_SAMD_FEATHER_M0)
// Include EEPROM-like API for FlashStorage
#include <FlashAsEEPROM.h>
#endif
#ifndef PLATFORM_NODE_H #ifndef PLATFORM_NODE_H
#define PLATFORM_NODE_H #define PLATFORM_NODE_H
@@ -48,4 +53,4 @@ class PlatformNode {
volatile int _channels[PLATFORM_TOTAL_CHANNEL_COUNT]; volatile int _channels[PLATFORM_TOTAL_CHANNEL_COUNT];
}; };
#endif #endif