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

prevent usage of pins for DC than can not do PWM

Browse Source
This commit is contained in:
Harald Barth 2022-05-25 09:28:28 +02:00
parent 1c78792dda
commit 06e7ad5c53
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "TM-PORTX-20220524" #define GITHUB_SHA "TM-PORTX-20220525"

4
MotorDriver.h
View File

@ -111,8 +111,8 @@ class MotorDriver {
virtual int getCurrentRawInInterrupt(); virtual int getCurrentRawInInterrupt();
virtual unsigned int raw2mA( int raw); virtual unsigned int raw2mA( int raw);
virtual int mA2raw( unsigned int mA); virtual int mA2raw( unsigned int mA);
inline bool canBrake() { inline bool brakeCanPWM() {
return brakePin!=UNUSED_PIN; return ((brakePin!=UNUSED_PIN) && (digitalPinToTimer(brakePin)));
} }
inline int getRawCurrentTripValue() { inline int getRawCurrentTripValue() {
return rawCurrentTripValue; return rawCurrentTripValue;

4
TrackManager.cpp
View File

@ -139,8 +139,8 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
//DIAG(F("Track=%c"),trackToSet+'A'); //DIAG(F("Track=%c"),trackToSet+'A');
// DC tracks require a motorDriver that can set brake! // DC tracks require a motorDriver that can set brake!
if ((mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX) if ((mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX)
&& !track[trackToSet]->canBrake()) { && !track[trackToSet]->brakeCanPWM()) {
DIAG(F("No brake:no DC")); DIAG(F("Brake pin can't PWM: No DC"));
return false; return false;
} }