1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-27 01:56:14 +01:00

Maeging with master

This commit is contained in:
David Cutting 2020-08-22 14:04:09 -06:00
commit b74fba5809
2 changed files with 12 additions and 5 deletions

View File

@ -18,7 +18,7 @@
*/ */
#include <Arduino.h> #include <Arduino.h>
#include <CommandStation.h> #include <DCC-EX-Lib.h>
#include <ArduinoTimers.h> #include <ArduinoTimers.h>
#include "Config.h" #include "Config.h"
@ -134,7 +134,7 @@ void setup() {
CommManager::registerInterface(new SerialInterface(Serial)); CommManager::registerInterface(new SerialInterface(Serial));
Wire.begin(); // Needed for EEPROM to work Wire.begin(); // Needed for EEPROM to work
EEStore::init(&Serial); EEStore::init(&Serial);
#elif defined(ARDUINO_ARCH_AVR) #elif defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_MEGAAVR)
CommManager::registerInterface(new SerialInterface(Serial)); CommManager::registerInterface(new SerialInterface(Serial));
EEStore::init(&Serial); EEStore::init(&Serial);
#endif #endif

View File

@ -9,12 +9,12 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[platformio] [platformio]
default_envs = samd21, mega2560, mega328 default_envs = samd21, mega2560, mega328, unowifiR2
src_dir = . src_dir = .
[env] [env]
lib_deps = lib_deps =
https://github.com/DCC-EX/CommandStation.git#issue18-LocoMgmt https://github.com/DCC-EX/DCC-EX-Lib.git#master
https://github.com/davidcutting42/ArduinoTimers.git#master https://github.com/davidcutting42/ArduinoTimers.git#master
[env:samd21] [env:samd21]
@ -40,4 +40,11 @@ board = uno
framework = arduino framework = arduino
lib_deps = lib_deps =
${env.lib_deps} ${env.lib_deps}
DIO2 DIO2
[env:unowifiR2]
platform = atmelmegaavr
board = uno_wifi_rev2
framework = arduino
lib_deps =
${env.lib_deps}