mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-23 21:01:25 +01:00
977802f160
Prepping for version 4.1 SERVO_SIGNAL definition in EXRAIL SERVO_SIGNAL(vpin, redpos, amberpos, greenpos) use RED/AMBER/GREEN as for led signals. * SIGNALH, ATGTE, ATLT UNTESTED * Automatic ALIAS(name) and _ in keywords * EXRAIL FORGET current loco * EXRAIL </KILL ALL> * EXRAIL VIRTUAL_TURNOUT * Cleanup version.h * Update version.h (#223) Rewrite & Updated the 4.0.0 Section * </KILL ALL> fix * Incoming LCN turnout throw. * KILLALL macro and DIAGNOSTIC messages when KILL command used. * EXRAIL PARSE * Rebuild throttle info getters UNTESTED... create different methods to obtain throttle info without being withrottle specific. Also implements turnout description of "*" as hidden. * J command parsing JA JR JT commands parsed EXRAIL sets hidden turnout state HIDDEN description macro Turnouts hidden flag bit UNO seems OK, MEGA UNTESTED * Assist notes draft & syntax tweaks * Throttle notes * uno memory saver * JA JR and <t cab> * Subtle corrections * Update version.h * I2C code corrections Corrections to I2C code: 1) I2CManager_Mega4809.h: Correct bitwise 'and' to logical 'and' - no impact. 2) I2CManager_Wire.h: Ensure that error codes from Wire subsystem are passed back to caller in queueRequest(). * RAG Ifs and cmds * IF block perf/memory * Allow negative route ids. * correct GREEN keyword * Update version.h * myFilter auto detect * Update version.h * fix weak ref to myFilter * ACK defaults now 50-2000-20000 * Update version.h * Improved SIGNALs startup and diagnostics * Update IO_PCA9685.cpp * Allow turnout id 0 * Position servo pin used as GPIO * NoPowerOff LEDS * CALLBACK parameter optional for Write * WRITE CV ON PROG <W CV VALUE> Callback parameters are now optional on PROG * Updated CV read command <R cv> Equivalent to <V cv 0> uses the verify callback. Co-authored-by: Asbelos <asbelos@btinternet.com> Co-authored-by: Kcsmith0708 <kcsmith0708@wowway.com> Co-authored-by: Neil McKechnie <neilmck999@gmail.com> Co-authored-by: Ash-4 <81280775+Ash-4@users.noreply.github.com>
77 lines
2.5 KiB
C++
77 lines
2.5 KiB
C++
/*
|
|
* © 2021 M Steve Todd
|
|
* © 2021 Mike S
|
|
* © 2021 Fred Decker
|
|
* © 2020-2021 Harald Barth
|
|
* © 2020-2021 Chris Harlow
|
|
* All rights reserved.
|
|
*
|
|
* This file is part of CommandStation-EX
|
|
*
|
|
* This is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* It is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with CommandStation. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef DCCWaveform_h
|
|
#define DCCWaveform_h
|
|
|
|
#include "MotorDriver.h"
|
|
|
|
|
|
|
|
// Number of preamble bits.
|
|
const int PREAMBLE_BITS_MAIN = 16;
|
|
const int PREAMBLE_BITS_PROG = 22;
|
|
const byte MAX_PACKET_SIZE = 5; // NMRA standard extended packets, payload size WITHOUT checksum.
|
|
|
|
|
|
// The WAVE_STATE enum is deliberately numbered because a change of order would be catastrophic
|
|
// to the transform array.
|
|
enum WAVE_STATE : byte {WAVE_START=0,WAVE_MID_1=1,WAVE_HIGH_0=2,WAVE_MID_0=3,WAVE_LOW_0=4,WAVE_PENDING=5};
|
|
|
|
// NOTE: static functions are used for the overall controller, then
|
|
// one instance is created for each track.
|
|
|
|
class DCCWaveform {
|
|
public:
|
|
DCCWaveform( byte preambleBits, bool isMain);
|
|
static void begin();
|
|
static void loop();
|
|
static DCCWaveform mainTrack;
|
|
static DCCWaveform progTrack;
|
|
inline void clearRepeats() { transmitRepeats=0; }
|
|
void schedulePacket(const byte buffer[], byte byteCount, byte repeats);
|
|
volatile bool packetPending;
|
|
volatile byte sentResetsSincePacket;
|
|
|
|
private:
|
|
|
|
static void interruptHandler();
|
|
void interrupt2();
|
|
|
|
bool isMainTrack;
|
|
// Transmission controller
|
|
byte transmitPacket[MAX_PACKET_SIZE+1]; // +1 for checksum
|
|
byte transmitLength;
|
|
byte transmitRepeats; // remaining repeats of transmission
|
|
byte remainingPreambles;
|
|
byte requiredPreambles;
|
|
byte bits_sent; // 0-8 (yes 9 bits) sent for current byte
|
|
byte bytes_sent; // number of bytes sent from transmitPacket
|
|
WAVE_STATE state; // wave generator state machine
|
|
byte pendingPacket[MAX_PACKET_SIZE+1]; // +1 for checksum
|
|
byte pendingLength;
|
|
byte pendingRepeats;
|
|
|
|
};
|
|
#endif
|