mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-23 21:01:25 +01:00
Merge branch 'devel' of https://github.com/DCC-EX/CommandStation-EX into devel
This commit is contained in:
commit
3ae1859ec7
@ -1 +1 @@
|
|||||||
#define GITHUB_SHA "devel-202302281422Z"
|
#define GITHUB_SHA "devel-202303071416Z"
|
||||||
|
@ -75,6 +75,23 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
|
|||||||
dualSignal=true;
|
dualSignal=true;
|
||||||
getFastPin(F("SIG2"),signalPin2,fastSignalPin2);
|
getFastPin(F("SIG2"),signalPin2,fastSignalPin2);
|
||||||
pinMode(signalPin2, OUTPUT);
|
pinMode(signalPin2, OUTPUT);
|
||||||
|
|
||||||
|
fastSignalPin2.shadowinout = NULL;
|
||||||
|
if (HAVE_PORTA(fastSignalPin2.inout == &PORTA)) {
|
||||||
|
DIAG(F("Found PORTA pin %d"),signalPin2);
|
||||||
|
fastSignalPin2.shadowinout = fastSignalPin2.inout;
|
||||||
|
fastSignalPin2.inout = &shadowPORTA;
|
||||||
|
}
|
||||||
|
if (HAVE_PORTB(fastSignalPin2.inout == &PORTB)) {
|
||||||
|
DIAG(F("Found PORTB pin %d"),signalPin2);
|
||||||
|
fastSignalPin2.shadowinout = fastSignalPin2.inout;
|
||||||
|
fastSignalPin2.inout = &shadowPORTB;
|
||||||
|
}
|
||||||
|
if (HAVE_PORTC(fastSignalPin2.inout == &PORTC)) {
|
||||||
|
DIAG(F("Found PORTC pin %d"),signalPin2);
|
||||||
|
fastSignalPin2.shadowinout = fastSignalPin2.inout;
|
||||||
|
fastSignalPin2.inout = &shadowPORTC;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else dualSignal=false;
|
else dualSignal=false;
|
||||||
|
|
||||||
|
@ -4,7 +4,8 @@
|
|||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
|
|
||||||
#define VERSION "4.2.22"
|
#define VERSION "4.2.23"
|
||||||
|
// 4.2.23 - Bugfix signalpin2 was not set up in shadow port
|
||||||
// 4.2.22 - Implement broadcast of Track Manager changes
|
// 4.2.22 - Implement broadcast of Track Manager changes
|
||||||
// 4.2.21 - Implement non-blocking I2C for EX-IOExpander device driver
|
// 4.2.21 - Implement non-blocking I2C for EX-IOExpander device driver
|
||||||
// 4.2.20 - <JG> & <JI> commands for multi-track gauges
|
// 4.2.20 - <JG> & <JI> commands for multi-track gauges
|
||||||
|
Loading…
Reference in New Issue
Block a user