dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-24 21:21:24 +01:00
Code Releases Activity

Change to TimerOne and drop Railcom code for now.

Browse Source
This commit is contained in:
Asbelos 2020-06-22 10:47:25 +01:00
parent b2a9022c19
commit 8decd7db0a
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Hardware.cpp
View File

@ -1,13 +1,11 @@
#include <Arduino.h> #include <Arduino.h>
#include <TimerOne.h> #include <TimerOne.h> // use IDE menu Tools..Manage Libraries to locate and install TimerOne
#include <TimerThree.h>
#include "Hardware.h" #include "Hardware.h"
#include "Config.h" #include "Config.h"
#include "DIAG.h" #include "DIAG.h"
#if defined(ARDUINO_ARCH_AVR) #if defined(ARDUINO_ARCH_AVR)
#include <DIO2.h> #include <DIO2.h> // use IDE menu Tools..Manage Libraries to locate and install DIO2
#define WritePin digitalWrite2 #define WritePin digitalWrite2
#else #else
#define WritePin digitalWrite #define WritePin digitalWrite
@ -47,20 +45,22 @@ int Hardware::getCurrentMilliamps(bool isMainTrack) {
} }
void Hardware::setCallback(int duration, void (*isr)()) { void Hardware::setCallback(int duration, void (*isr)()) {
Timer3.initialize(duration);
Timer3.disablePwm(TIMER3_A_PIN);
Timer3.disablePwm(TIMER3_B_PIN);
Timer3.attachInterrupt(isr);
}
void Hardware::setSingleCallback(int duration, void (*isr)()) {
Timer1.initialize(duration); Timer1.initialize(duration);
// We don't want the timer to set pins because these often clash with motor shields etc.
Timer1.disablePwm(TIMER1_A_PIN); Timer1.disablePwm(TIMER1_A_PIN);
Timer1.disablePwm(TIMER1_B_PIN); Timer1.disablePwm(TIMER1_B_PIN);
Timer1.attachInterrupt(isr); Timer1.attachInterrupt(isr);
} }
void Hardware::resetSingleCallback(int duration) { // Railcom support functions, not yet implemented
if (duration==0) Timer1.stop(); void Hardware::setSingleCallback(int duration, void (*isr)()) {
else Timer1.initialize(duration); // Timer2.initialize(duration);
// Timer2.disablePwm(TIMER1_A_PIN);
// Timer2.disablePwm(TIMER1_B_PIN);
// Timer2.attachInterrupt(isr);
}
void Hardware::resetSingleCallback(int duration) {
// if (duration==0) Timer2.stop();
// else Timer2.initialize(duration);
} }