dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-02-16 22:19:14 +01:00
Code Releases Activity

Rauilcom cutout

Browse Source
This commit is contained in:
Asbelos 2020-05-24 10:27:33 +01:00
parent 76d7be0ef8
commit 0b9f4cf574
2 changed files with 99 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
DCCWaveform.cpp
View File

@ -59,11 +59,19 @@ DCCWaveform::DCCWaveform(byte powerPinNo, byte directionPinNo, byte sensePinNo,
bytes_sent=0; bytes_sent=0;
bits_sent=0; bits_sent=0;
nextSampleDue=0; nextSampleDue=0;
} }
void DCCWaveform::beginTrack() { void DCCWaveform::beginTrack() {
pinMode2f(powerPin,OUTPUT); pinMode2f(powerPin,OUTPUT);
pinMode2f(directionPin,OUTPUT); pinMode2f(directionPin,OUTPUT);
pinMode(sensePin,INPUT); pinMode(sensePin,INPUT);
if (isMainTrack && RAILCOM_CUTOUT) {
railcomBrakePin=Arduino_to_GPIO_pin(RAILCOM_BRAKE_PIN);
pinMode2f(railcomBrakePin, OUTPUT);
digitalWrite2f(railcomBrakePin, LOW);
}
setPowerMode(POWERMODE::ON); setPowerMode(POWERMODE::ON);
DIAG(F("\nTrack started sensePin=%d\n"),sensePin); DIAG(F("\nTrack started sensePin=%d\n"),sensePin);
} }
@ -121,20 +129,23 @@ bool DCCWaveform::interrupt1() {
switch (state) { switch (state) {
case 0: // start of bit transmission case 0: // start of bit transmission
digitalWrite2f(directionPin, HIGH); digitalWrite2f(directionPin, HIGH);
checkRailcom();
state = 1; state = 1;
return true; // must call interrupt2 return true; // must call interrupt2 to set currentBit
case 1: // 58Ms after case 0 case 1: // 58us after case 0
if (currentBit) { if (currentBit) {
digitalWrite2f(directionPin, LOW); digitalWrite2f(directionPin, LOW);
state = 0; state = 0;
} }
else state = 2; else state = 2;
break; break;
case 2: digitalWrite2f(directionPin, LOW); case 2: // 116us after case 0
digitalWrite2f(directionPin, LOW);
state = 3; state = 3;
break; break;
case 3: state = 0; case 3: // finished sending zero bit
state = 0;
break; break;
} }
return false; return false;
@ -186,7 +197,18 @@ void DCCWaveform::interrupt2() {
} }
} }
} }
void DCCWaveform::checkRailcom() {
if (isMainTrack && RAILCOM_CUTOUT) {
byte preamble=PREAMBLE_BITS_MAIN - remainingPreambles;
if (preamble == RAILCOM_PREAMBLES_BEFORE_CUTOUT) {
digitalWrite2f(railcomBrakePin,HIGH);
}
else if (preamble== RAILCOM_PREAMBLES_BEFORE_CUTOUT+RAILCOM_PREAMBLES_SKIPPED_IN_CUTOUT) {
digitalWrite2f(railcomBrakePin,LOW);
}
}
}
// Wait until there is no packet pending, then make this pending // Wait until there is no packet pending, then make this pending
void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repeats) { void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repeats) {

136
DCCWaveform.h
View File

@ -1,17 +1,17 @@
#include <DIO2.h> #include <DIO2.h>
// This hardware configuration would normally be setup in a .h file elsewhere // This hardware configuration would normally be setup in a .h file elsewhere
const byte MAIN_POWER_PIN=3; const byte MAIN_POWER_PIN = 3;
const byte MAIN_SIGNAL_PIN=12; const byte MAIN_SIGNAL_PIN = 12;
const byte MAIN_SENSE_PIN=A0; const byte MAIN_SENSE_PIN = A0;
const byte PROG_POWER_PIN=11; const byte PROG_POWER_PIN = 11;
const byte PROG_SIGNAL_PIN=13; const byte PROG_SIGNAL_PIN = 13;
const byte PROG_SENSE_PIN=A1; const byte PROG_SENSE_PIN = A1;
const int POWER_SAMPLE_MAX=300; const int POWER_SAMPLE_MAX = 300;
const int POWER_SAMPLE_ON_WAIT=100; const int POWER_SAMPLE_ON_WAIT = 100;
const int POWER_SAMPLE_OFF_WAIT=1000; const int POWER_SAMPLE_OFF_WAIT = 1000;
const int POWER_SAMPLE_OVERLOAD_WAIT=4000; const int POWER_SAMPLE_OVERLOAD_WAIT = 4000;
// ACK current analogRead values (vary depending on motor shield and cpu voltage) // ACK current analogRead values (vary depending on motor shield and cpu voltage)
@ -19,71 +19,79 @@ const int ACK_TIMEOUT = 25 ; // millis getAck is prepared to wait for a signa
const int ACK_MAX_NOT_PULSE = 10 ; // current below which this is NOT a pulse any more const int ACK_MAX_NOT_PULSE = 10 ; // current below which this is NOT a pulse any more
const int ACK_MIN_PULSE = 50 ; // current above which a pulse is recognised const int ACK_MIN_PULSE = 50 ; // current above which a pulse is recognised
const int PREAMBLE_BITS_MAIN=16; const int PREAMBLE_BITS_MAIN = 20;
const int PREAMBLE_BITS_PROG=22; const int PREAMBLE_BITS_PROG = 22;
const byte MAX_PACKET_SIZE=12; // Railcom settings
// NOTE: static functions are used for the overall controller, then const bool RAILCOM_CUTOUT = true;
const byte RAILCOM_PREAMBLES_BEFORE_CUTOUT = 1; // how far into the preamble do we cutout
const byte RAILCOM_PREAMBLES_SKIPPED_IN_CUTOUT = 5;
const byte RAILCOM_BRAKE_PIN = 9;
const byte MAX_PACKET_SIZE = 12;
// NOTE: static functions are used for the overall controller, then
// one instance is created for each track. // one instance is created for each track.
enum class POWERMODE { OFF, ON, OVERLOAD }; enum class POWERMODE { OFF, ON, OVERLOAD };
const byte idleMessage[]={0xFF,0x00}; const byte idleMessage[] = {0xFF, 0x00};
const byte resetMessage[]={0x00,0x00}; const byte resetMessage[] = {0x00, 0x00};
const byte idlePacket[]={0xFF,0x00,0xFF}; const byte idlePacket[] = {0xFF, 0x00, 0xFF};
const byte resetPacket[]={0x00,0x00,0x00}; const byte resetPacket[] = {0x00, 0x00, 0x00};
class DCCWaveform { class DCCWaveform {
public: public:
DCCWaveform(byte powerPinNo, byte directionPinNo, byte sensePinNo, byte preambleBits, bool isMain); DCCWaveform(byte powerPinNo, byte directionPinNo, byte sensePinNo, byte preambleBits, bool isMain);
static void begin(); static void begin();
static void loop(); static void loop();
static DCCWaveform mainTrack; static DCCWaveform mainTrack;
static DCCWaveform progTrack; static DCCWaveform progTrack;
void beginTrack(); void beginTrack();
void setPowerMode(POWERMODE); void setPowerMode(POWERMODE);
POWERMODE getPowerMode(); POWERMODE getPowerMode();
void checkPowerOverload(); void checkPowerOverload();
void schedulePacket(const byte buffer[], byte byteCount, byte repeats); void schedulePacket(const byte buffer[], byte byteCount, byte repeats);
volatile bool packetPending; volatile bool packetPending;
bool startAckProcess(); bool startAckProcess();
bool getAck(); bool getAck();
private: private:
static void interruptHandler();
bool interrupt1();
void interrupt2();
POWERMODE powerMode;
// Transmission controller static void interruptHandler();
byte transmitPacket[MAX_PACKET_SIZE]; // packet being transmitted bool interrupt1();
byte transmitLength; void interrupt2();
byte transmitRepeats; // remaining repeats of transmission
byte remainingPreambles; bool isMainTrack;
byte requiredPreambles;
bool currentBit; // bit to be transmitted // Transmission controller
byte transmitPacket[MAX_PACKET_SIZE]; // packet being transmitted
byte transmitLength;
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
void checkRailcom();
byte pendingPacket[MAX_PACKET_SIZE];
byte pendingLength;
byte pendingRepeats;
// Hardware fast pins
GPIO_pin_t directionPin;
GPIO_pin_t powerPin;
GPIO_pin_t railcomBrakePin;
// current sampling
POWERMODE powerMode;
byte sensePin;
unsigned long nextSampleDue;
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
byte pendingPacket[MAX_PACKET_SIZE];
byte pendingLength;
byte pendingRepeats;
// Hardware pins
GPIO_pin_t directionPin;
GPIO_pin_t powerPin;
// current sampling
bool isMainTrack;
byte sensePin;
unsigned long nextSampleDue;
int ackBaseCurrent;
}; };