mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-24 21:21:24 +01:00
Wave-state machine ( part 11)
This commit is contained in:
parent
b8d61fb839
commit
4e6f79589a
@ -56,6 +56,10 @@ void DCCWaveform::interruptHandler() {
|
||||
// after the rising edge of the signal
|
||||
if (mainCall2) mainTrack.interrupt2();
|
||||
if (progCall2) progTrack.interrupt2();
|
||||
|
||||
// Read current if in high middle of zero wave (state is set for NEXT interrupt!)
|
||||
if (mainTrack.state==WAVE_MID_0) mainTrack.lastCurrent=mainTrack.motorDriver->getCurrentRaw();
|
||||
if (progTrack.state==WAVE_MID_0) progTrack.lastCurrent=progTrack.motorDriver->getCurrentRaw();
|
||||
}
|
||||
|
||||
|
||||
@ -74,7 +78,7 @@ DCCWaveform::DCCWaveform( byte preambleBits, bool isMain) {
|
||||
isMainTrack = isMain;
|
||||
packetPending = false;
|
||||
memcpy(transmitPacket, idlePacket, sizeof(idlePacket));
|
||||
state = 0;
|
||||
state = WAVE_START;
|
||||
// The +1 below is to allow the preamble generator to create the stop bit
|
||||
// fpr the previous packet.
|
||||
requiredPreambles = preambleBits+1;
|
||||
@ -112,7 +116,6 @@ void DCCWaveform::checkPowerOverload() {
|
||||
break;
|
||||
case POWERMODE::ON:
|
||||
// Check current
|
||||
lastCurrent = motorDriver->getCurrentRaw();
|
||||
if (lastCurrent <= tripValue) {
|
||||
sampleDelay = POWER_SAMPLE_ON_WAIT;
|
||||
if(power_good_counter<100)
|
||||
@ -144,41 +147,49 @@ void DCCWaveform::checkPowerOverload() {
|
||||
|
||||
// process time-edge sensitive part of interrupt
|
||||
// return true if second level required
|
||||
|
||||
bool DCCWaveform::interrupt1() {
|
||||
// NOTE: this must consume transmission buffers even if the power is off
|
||||
// otherwise can cause hangs in main loop waiting for the pendingBuffer.
|
||||
byte sigwave;
|
||||
switch (state) {
|
||||
case 0: // start of bit transmission
|
||||
setSignal(HIGH);
|
||||
state = 1;
|
||||
return true; // must call interrupt2 to set currentBit
|
||||
// Each section of this case is designed to run as near as possible in the same cpu time
|
||||
// hence some unnecessary duplication and pin setting.
|
||||
// Breaking this causes jitter in the prog track waveform.
|
||||
|
||||
case 1: // 58us after case 0
|
||||
if (currentBit) {
|
||||
setSignal(LOW);
|
||||
state = 0;
|
||||
}
|
||||
else {
|
||||
setSignal(HIGH); // jitter prevention
|
||||
state = 2;
|
||||
}
|
||||
case WAVE_START: // start of bit transmission
|
||||
sigwave=HIGH;
|
||||
state = WAVE_PENDING;
|
||||
break; // must call interrupt2 to set next state
|
||||
|
||||
case WAVE_MID_1: // 58us after case 0 with currentbit=1
|
||||
sigwave=LOW;
|
||||
state = WAVE_START;
|
||||
break;
|
||||
case 2: // 116us after case 0
|
||||
setSignal(LOW);
|
||||
state = 3;
|
||||
|
||||
case WAVE_HIGH_0: // 58us after case 0 with currentbit=0
|
||||
sigwave=HIGH;
|
||||
state = WAVE_MID_0;
|
||||
break;
|
||||
case 3: // finished sending zero bit
|
||||
setSignal(LOW); // jitter prevention
|
||||
state = 0;
|
||||
|
||||
case WAVE_MID_0: // 116us after case 0 with currentbit=0
|
||||
sigwave=LOW;
|
||||
state = WAVE_LOW_0;
|
||||
break;
|
||||
|
||||
case WAVE_LOW_0: // half way through zero-low
|
||||
sigwave=LOW; // jitter prevention
|
||||
state = WAVE_START;
|
||||
break;
|
||||
}
|
||||
|
||||
setSignal(sigwave);
|
||||
|
||||
// ACK check is prog track only and will only be checked if
|
||||
// this is not case(0) which needs relatively expensive packet change code to be called.
|
||||
if (ackPending) checkAck();
|
||||
|
||||
return false;
|
||||
if (ackPending && state!=WAVE_PENDING) checkAck();
|
||||
|
||||
return state==WAVE_PENDING; // true, caller must call Interrupt2
|
||||
}
|
||||
|
||||
void DCCWaveform::setSignal(bool high) {
|
||||
@ -193,16 +204,16 @@ void DCCWaveform::setSignal(bool high) {
|
||||
}
|
||||
|
||||
void DCCWaveform::interrupt2() {
|
||||
// set currentBit to be the next bit to be sent.
|
||||
// calculate the next bit to be sent.
|
||||
|
||||
if (remainingPreambles > 0 ) {
|
||||
currentBit = true;
|
||||
state=WAVE_MID_1; // switch state to trigger LOW on next interrupt
|
||||
remainingPreambles--;
|
||||
return;
|
||||
}
|
||||
|
||||
// beware OF 9-BIT MASK generating a zero to start each byte
|
||||
currentBit = transmitPacket[bytes_sent] & bitMask[bits_sent];
|
||||
state=(transmitPacket[bytes_sent] & bitMask[bits_sent])? WAVE_MID_1 : WAVE_HIGH_0;
|
||||
bits_sent++;
|
||||
|
||||
// If this is the last bit of a byte, prepare for the next byte
|
||||
@ -267,7 +278,7 @@ int DCCWaveform::getLastCurrent() {
|
||||
|
||||
void DCCWaveform::setAckBaseline() {
|
||||
if (isMainTrack) return;
|
||||
int baseline = motorDriver->getCurrentRaw();
|
||||
int baseline = lastCurrent;
|
||||
ackThreshold= baseline + motorDriver->mA2raw(ackLimitmA);
|
||||
if (Diag::ACK) DIAG(F("\nACK baseline=%d/%dmA Threshold=%d/%dmA Duration: %dus <= pulse <= %dus"),
|
||||
baseline,motorDriver->raw2mA(baseline),
|
||||
@ -302,7 +313,6 @@ void DCCWaveform::checkAck() {
|
||||
return;
|
||||
}
|
||||
|
||||
lastCurrent=motorDriver->getCurrentRaw();
|
||||
if (lastCurrent > ackMaxCurrent) ackMaxCurrent=lastCurrent;
|
||||
// An ACK is a pulse lasting between minAckPulseDuration and maxAckPulseDuration uSecs (refer @haba)
|
||||
|
||||
|
@ -38,6 +38,7 @@ const byte MAX_PACKET_SIZE = 12;
|
||||
|
||||
|
||||
enum class POWERMODE { OFF, ON, OVERLOAD };
|
||||
enum WAVE_STATE {WAVE_START,WAVE_MID_1,WAVE_HIGH_0,WAVE_MID_0,WAVE_LOW_0,WAVE_PENDING};
|
||||
|
||||
const byte idlePacket[] = {0xFF, 0x00, 0xFF};
|
||||
const byte resetPacket[] = {0x00, 0x00, 0x00};
|
||||
@ -118,11 +119,9 @@ class DCCWaveform {
|
||||
byte transmitRepeats; // remaining repeats of transmission
|
||||
byte remainingPreambles;
|
||||
byte requiredPreambles;
|
||||
bool currentBit; // bit to be transmitted
|
||||
byte bits_sent; // 0-8 (yes 9 bits) sent for current byte
|
||||
byte bytes_sent; // number of bytes sent from transmitPacket
|
||||
byte state; // wave generator state machine
|
||||
|
||||
WAVE_STATE state; // wave generator state machine
|
||||
byte pendingPacket[MAX_PACKET_SIZE];
|
||||
byte pendingLength;
|
||||
byte pendingRepeats;
|
||||
|
@ -45,6 +45,7 @@ MotorDriver::MotorDriver(byte power_pin, byte signal_pin, byte signal_pin2, int8
|
||||
faultPin=fault_pin;
|
||||
tripMilliamps=trip_milliamps;
|
||||
rawCurrentTripValue=(int)(trip_milliamps / sense_factor);
|
||||
simulatedOverload=(int)(32000/senseFactor);
|
||||
pinMode(powerPin, OUTPUT);
|
||||
pinMode(brakePin < 0 ? -brakePin : brakePin, OUTPUT);
|
||||
setBrake(false);
|
||||
@ -91,7 +92,7 @@ void MotorDriver::setSignal( bool high) {
|
||||
|
||||
int MotorDriver::getCurrentRaw() {
|
||||
if (faultPin != UNUSED_PIN && ReadPin(faultPin) == LOW && ReadPin(powerPin) == HIGH)
|
||||
return (int)(32000/senseFactor);
|
||||
return simulatedOverload;
|
||||
|
||||
// IMPORTANT: This function can be called in Interrupt() time within the 56uS timer
|
||||
// The default analogRead takes ~100uS which is catastrphic
|
||||
|
@ -43,5 +43,6 @@ class MotorDriver {
|
||||
float senseFactor;
|
||||
unsigned int tripMilliamps;
|
||||
int rawCurrentTripValue;
|
||||
int simulatedOverload;
|
||||
};
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user