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

use digitalRead2

Browse Source
This commit is contained in:
Asbelos 2020-07-12 19:12:25 +01:00
parent cb4d9823b5
commit 3691cf87d3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Hardware.cpp
View File

@ -27,8 +27,10 @@
#if defined(ARDUINO_ARCH_AVR) #if defined(ARDUINO_ARCH_AVR)
#include <DIO2.h> // use IDE menu Tools..Manage Libraries to locate and install DIO2 #include <DIO2.h> // use IDE menu Tools..Manage Libraries to locate and install DIO2
#define WritePin digitalWrite2 #define WritePin digitalWrite2
#define ReadPin digitalRead2
#else #else
#define WritePin digitalWrite #define WritePin digitalWrite
#define ReadPin digitalRead
#endif #endif
void Hardware::init() { void Hardware::init() {
@ -66,7 +68,7 @@ int Hardware::getCurrentRaw(bool isMainTrack) {
byte faultpin = isMainTrack ? MAIN_FAULT_PIN : PROG_FAULT_PIN; byte faultpin = isMainTrack ? MAIN_FAULT_PIN : PROG_FAULT_PIN;
byte signalpin = isMainTrack ? MAIN_SIGNAL_PIN : PROG_SIGNAL_PIN; byte signalpin = isMainTrack ? MAIN_SIGNAL_PIN : PROG_SIGNAL_PIN;
if (faultpin != UNUSED_PIN && digitalRead(faultpin) == LOW && digitalRead(signalpin) == HIGH) if (faultpin != UNUSED_PIN && ReadPin(faultpin) == LOW && ReadPin(signalpin) == HIGH)
return 32767; // MAXINT because we don't know the actual current, return as high as we can return 32767; // MAXINT because we don't know the actual current, return as high as we can
// IMPORTANT: This function can be called in Interrupt() time within the 56uS timer // IMPORTANT: This function can be called in Interrupt() time within the 56uS timer
// The default analogRead takes ~100uS which is catastrphic // The default analogRead takes ~100uS which is catastrphic