dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-27 10:06:13 +01:00
Code Releases Activity

Merge branch 'dex/unowifi' of https://github.com/DCC-EX/CommandStation-EX into dex/unowifi

Browse Source
This commit is contained in:
Asbelos 2020-12-09 12:01:36 +00:00
commit 7d888e9aa9
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DCCWaveform.cpp
View File

@ -41,7 +41,7 @@ void DCCWaveform::begin(MotorDriver * mainDriver, MotorDriver * progDriver, byte
progTrack.setPowerMode(POWERMODE::OFF); progTrack.setPowerMode(POWERMODE::OFF);
switch (timerNumber) { switch (timerNumber) {
case 1: interruptTimer= &TimerA; break; case 1: interruptTimer= &TimerA; break;
#ifndef ARDUINO_AVR_UNO_WIFI_REV2 #ifndef ARDUINO_ARCH_MEGAAVR
case 2: interruptTimer= &TimerB; break; case 2: interruptTimer= &TimerB; break;
#ifndef ARDUINO_AVR_UNO #ifndef ARDUINO_AVR_UNO
case 3: interruptTimer= &TimerC; break; case 3: interruptTimer= &TimerC; break;

12
Timer.cpp
View File

@ -62,4 +62,14 @@ ISR(TIMER2_OVF_vect)
TimerB.isrCallback(); TimerB.isrCallback();
} }
#endif #elif defined(ARDUINO_AVR_UNO_WIFI_REV2)
#include "ATMEGA4809/Timer.h"
Timer TimerA(0);
ISR(TCA0_OVF_vect) {
TimerA.isrCallback();
}
#endif

1
platformio.ini
View File

@ -65,6 +65,7 @@ lib_deps =
mathertel/LiquidCrystal_PCF8574 mathertel/LiquidCrystal_PCF8574
monitor_speed = 115200 monitor_speed = 115200
monitor_flags = --echo monitor_flags = --echo
build_flags = "-DF_CPU=16000000L -DARDUINO=10813 -DARDUINO_AVR_UNO_WIFI_DEV_ED -DARDUINO_ARCH_AVR -DESP_CH_UART -DESP_CH_UART_BR=19200"g
[env:uno] [env:uno]
platform = atmelavr platform = atmelavr