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

remove global usePWM flag

Browse Source
This commit is contained in:
Harald Barth 2022-06-11 20:09:21 +02:00
parent 40dfda47c7
commit 4297ed5572
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MotorDriver.cpp
View File

@ -25,7 +25,6 @@
#include "DCCTimer.h" #include "DCCTimer.h"
#include "DIAG.h" #include "DIAG.h"
bool MotorDriver::usePWM=false;
bool MotorDriver::commonFaultPin=false; bool MotorDriver::commonFaultPin=false;
volatile byte fakePORTA; volatile byte fakePORTA;

3
MotorDriver.h
View File

@ -122,8 +122,7 @@ class MotorDriver {
} }
bool isPWMCapable(); bool isPWMCapable();
bool canMeasureCurrent(); bool canMeasureCurrent();
bool trackPWM; bool trackPWM; // this track uses PWM timer to generate the DCC waveform
static bool usePWM; // TODO: Remove
static bool commonFaultPin; // This is a stupid motor shield which has only a common fault pin for both outputs static bool commonFaultPin; // This is a stupid motor shield which has only a common fault pin for both outputs
inline byte getFaultPin() { inline byte getFaultPin() {
return faultPin; return faultPin;

6
TrackManager.cpp
View File

@ -73,8 +73,6 @@ void TrackManager::Setup(const FSH * shieldname,
// TODO Fault pin config for odd motor boards (example pololu) // TODO Fault pin config for odd motor boards (example pololu)
// MotorDriver::commonFaultPin = ((mainDriver->getFaultPin() == progDriver->getFaultPin()) // MotorDriver::commonFaultPin = ((mainDriver->getFaultPin() == progDriver->getFaultPin())
// && (mainDriver->getFaultPin() != UNUSED_PIN)); // && (mainDriver->getFaultPin() != UNUSED_PIN));
DIAG(F("Signal pin config: %S accuracy waveform"),
MotorDriver::usePWM ? F("high") : F("normal") );
DCC::begin(shieldname); DCC::begin(shieldname);
} }
@ -211,10 +209,6 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
} }
DCCTimer::clearPWM(); // has to be AFTER trackPWM changes because if trackPWM==true this is undone for that track DCCTimer::clearPWM(); // has to be AFTER trackPWM changes because if trackPWM==true this is undone for that track
} }
//if (MotorDriver::usePWM != canDo)
// DIAG(F("HA mode changed from %d to %d"), MotorDriver::usePWM, canDo);
MotorDriver::usePWM=canDo;
// Normal running tracks are set to the global power state // Normal running tracks are set to the global power state
track[trackToSet]->setPower( track[trackToSet]->setPower(