mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-23 08:06:13 +01:00
4861e592c7
* Start adding back unowifi stuffz
* Uno Wifi compiling
* Fixes for compile arduino unowifi r2
* FlasString and Timers for Uno Wifi
ALL these changes should be portable back to master
* Remove extra timer that was already added
* Changed to EveryTimerB
* Add everytimerb.h
* Cleanup
* Linear address <a> cmd
* Allow lower case keywords
* Add the F define to be on safe side if it is not present in the library core code
* Clean simple Timer interface
Removes overkill files, puts all timer in a single small file. (DCCTimer)
* Timer port
* Timer working
And slow wave command removed
* Correcting non-portables merged from master
* Wave-state machine ( part 11)
* Microtuning waveform
Significant reduction in code paths and call overheads
* Current check cleanup
* Fix no-loco id
Has to handle -1 correctly
* fix wrong format letter
* redo flow through wifisetup again
* version++
* bugfixes wifi setup
* Retry harder for AP mode
* Remove unued if
* DIO2 replacement
Currently for writing signal pins during waveform.
* Drop analogReadFast (see DCCTimer)
AnalogRead speed set in DCCTimer for ease of porting.
Code tidy and diagnostics in MotorDriver
* UNTESTED fast power,brake,fault pins
* Distunguish between in/out of FASTPIN
* minor performance tweaks
* Config comments and example use
* Config/example loading
* IP/PORT on LCD
* Ethernet simulated mac
Plus fixed listening port
* Github SHA
* Committing a SHA
* Fix for nano compile
* Comments and a reliability fix.
* UnoRev2 protection
* PWM pin implementation
* fix wifi setup issue
* Reinstate IP_PORT
* Wifi channel and code cleaninga
* Reduce duplicated F() macros
Compiler isn't as clever as one might expect
* Committing a SHA
* Update config.example.h
Add comment to wifi channel section
* Committing a SHA
* Handle shields with common fault pins (Pololu)
* Committing a SHA
* remove warning
* Committing a SHA
* only do the sha generation on master
* yaml syntax
* Fast SSD1306 OLED driver
Incorporate code from SSD1306Ascii library to speed up OLED screen updates, reduce memory requirements and eliminate some library dependences.
* Fix auto-configure from cold boot.
Add call to Wire.begin().
* Update comment for OLED_DRIVER define.
* Update MotorDrivers.h
Add a motor board definition for using the IBT_2 board for a high current to the main track and keep the Arduino Motor Shield for operating the programming track.
* Committing a SHA
* Fix missing F in motor drivers
* JOIN relay pin
* Swap Join Relay high/low
* Hide WIFI_CONNECT_TIMEOUT
This is not what the config suggests it is... The timeout is in the ES and defaults to 15 seconds. Abandoning it early leads to confused setup.
* Enhance OLED/LCD speed
Write one character or position command per loop entry so as not to hold up the loop. Add support for SH1106 OLED as 132x64 size option.
* Enhance OLED/LCD speed
* Delete comment about OLED on UNO.
* Trim unwanted code
* Handle display types correctly
* Update comments
* Speed up OLED writes
Add new flushDisplay() to end any in-progress I2C transaction. Previously, an redundant command was sent that ended the in-progress transaction but also sent another complete, but unnecessary, transaction.
* Comments and copyright update
* Reduce RAM and flash requirement a few more bytes.
* Move statics into LCDDisplay class, and reduce RAM.
Some state variables were static in LCDDisplay.write(). Moved to class members. Also, types of data items like row, column & character position changed to int8_t to save a few bytes of RAM.
* Type lcdCols and lcdRows to unsigned.
Since lcdCols is normally 128, it needs to be uint8_t, not int8_t.
* remove timeout from user config
* faultpin is common only if it exists ; make code prettier
* Rationalisation of SSD1306 driver
Merge SSD1306AsciiWire.cpp into SSD1306Ascii.cpp and rename SSD1306AsciiWire.h as SSD1306Ascii.h.
Merge allFonts.h into System5x7.h and rename as SSD1306font.h.
Move all SSD1306 files into root folder to facilitate compilation in Arduino IDE.
* Fix some font attributes as const.
* Remove unused initialisation sequences for tiny oled screens
* Add m_ to variables
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Revert "Bump up I2C speed"
This reverts commit 1c1168f433
.
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Drop duplicate DIAG
* ignore mySetup.h files
* Restore uno to default_envs
Restore uno (previously commented out) to default_envs.
* Update objdump.bat
Allows other editors as Notepad is very slow on large files
* Prog Track overload during cv read
* Faster LCD Driver
Extract LCD driver from library;
Trim unused functionality;
Reduce I2C communications to minimum;
Speed up I2C clock to 400kHz.
* Update config.example.h
Add IBT_2_WITH_ARDUINO to example config
* Update config.example.h
* Screen enhancements (#126)
* Add I2CManager to coordinate I2C shared parameters.
* Add use of I2CManager, and experimental scrolling strategies.
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
* Scrolling updates
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
Reformat.
* Add I2CManager calls. Remove unnecessary delays.
* Add I2CManager calls, remove unnecessary I2C delays.
* SSD1306: Move methods from .h to .cpp and reformat.
* Fix compiler warning in LiquidCrystal_I2C
* Allow forcing of I2C clock speed.
New method forceClock allows the I2C speed to be overridden. For example, if the I2C bus is long then the speed can be forced lower. It can also be forced higher to gain performance if devices are capable.
* Make Config.h conditionally included.
Allow for non-existence of Config.h.
* Correct scrolling and allow longer messages
Correct the handling of scrolling in scrollmode 1 to avoid a blank page being displayed. Also, allow MAX_MSG_SIZE to be optionally configured to override maximum message length on screens.
* compiler warning on uno
Co-authored-by: dexslab <dex35803@gmail.com>
Co-authored-by: Asbelos <asbelos@btinternet.com>
Co-authored-by: Harald Barth <haba@kth.se>
Co-authored-by: Neil McKechnie <neilmck999@gmail.com>
Co-authored-by: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com>
871 lines
29 KiB
C++
871 lines
29 KiB
C++
/*
|
|
* © 2020, Chris Harlow. All rights reserved.
|
|
* © 2020, Harald Barth
|
|
*
|
|
* This file is part of Asbelos DCC API
|
|
*
|
|
* 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/>.
|
|
*/
|
|
#include "DIAG.h"
|
|
#include "DCC.h"
|
|
#include "DCCWaveform.h"
|
|
#include "EEStore.h"
|
|
#include "GITHUB_SHA.h"
|
|
#include "version.h"
|
|
#include "FSH.h"
|
|
|
|
// This module is responsible for converting API calls into
|
|
// messages to be sent to the waveform generator.
|
|
// It has no visibility of the hardware, timers, interrupts
|
|
// nor of the waveform issues such as preambles, start bits checksums or cutouts.
|
|
//
|
|
// Nor should it have to deal with JMRI responsess other than the OK/FAIL
|
|
// or cv value returned. I will move that back to the JMRI interface later
|
|
//
|
|
// The interface to the waveform generator is narrowed down to merely:
|
|
// Scheduling a message on the prog or main track using a function
|
|
// Obtaining ACKs from the prog track using a function
|
|
// There are no volatiles here.
|
|
|
|
const byte FN_GROUP_1=0x01;
|
|
const byte FN_GROUP_2=0x02;
|
|
const byte FN_GROUP_3=0x04;
|
|
const byte FN_GROUP_4=0x08;
|
|
const byte FN_GROUP_5=0x10;
|
|
|
|
FSH* DCC::shieldName=NULL;
|
|
byte DCC::joinRelay=UNUSED_PIN;
|
|
|
|
void DCC::begin(const FSH * motorShieldName, MotorDriver * mainDriver, MotorDriver* progDriver,
|
|
byte joinRelayPin) {
|
|
shieldName=(FSH *)motorShieldName;
|
|
DIAG(F("<iDCC-EX V-%S / %S / %S G-%S>\n"), F(VERSION), F(ARDUINO_TYPE), shieldName, F(GITHUB_SHA));
|
|
|
|
joinRelay=joinRelayPin;
|
|
if (joinRelay!=UNUSED_PIN) {
|
|
pinMode(joinRelay,OUTPUT);
|
|
digitalWrite(joinRelay,LOW); // high is relay disengaged
|
|
}
|
|
// Load stuff from EEprom
|
|
(void)EEPROM; // tell compiler not to warn this is unused
|
|
EEStore::init();
|
|
|
|
DCCWaveform::begin(mainDriver,progDriver);
|
|
}
|
|
|
|
void DCC::setThrottle( uint16_t cab, uint8_t tSpeed, bool tDirection) {
|
|
byte speedCode = (tSpeed & 0x7F) + tDirection * 128;
|
|
setThrottle2(cab, speedCode);
|
|
// retain speed for loco reminders
|
|
updateLocoReminder(cab, speedCode );
|
|
}
|
|
|
|
void DCC::setThrottle2( uint16_t cab, byte speedCode) {
|
|
|
|
uint8_t b[4];
|
|
uint8_t nB = 0;
|
|
// DIAG(F("\nsetSpeedInternal %d %x"),cab,speedCode);
|
|
|
|
if (cab > 127)
|
|
b[nB++] = highByte(cab) | 0xC0; // convert train number into a two-byte address
|
|
b[nB++] = lowByte(cab);
|
|
b[nB++] = SET_SPEED; // 128-step speed control byte
|
|
b[nB++] = speedCode; // for encoding see setThrottle
|
|
|
|
DCCWaveform::mainTrack.schedulePacket(b, nB, 0);
|
|
}
|
|
|
|
void DCC::setFunctionInternal(int cab, byte byte1, byte byte2) {
|
|
// DIAG(F("\nsetFunctionInternal %d %x %x"),cab,byte1,byte2);
|
|
byte b[4];
|
|
byte nB = 0;
|
|
|
|
if (cab > 127)
|
|
b[nB++] = highByte(cab) | 0xC0; // convert train number into a two-byte address
|
|
b[nB++] = lowByte(cab);
|
|
if (byte1!=0) b[nB++] = byte1;
|
|
b[nB++] = byte2;
|
|
|
|
DCCWaveform::mainTrack.schedulePacket(b, nB, 3); // send packet 3 times
|
|
}
|
|
|
|
uint8_t DCC::getThrottleSpeed(int cab) {
|
|
int reg=lookupSpeedTable(cab);
|
|
if (reg<0) return -1;
|
|
return speedTable[reg].speedCode & 0x7F;
|
|
}
|
|
|
|
bool DCC::getThrottleDirection(int cab) {
|
|
int reg=lookupSpeedTable(cab);
|
|
if (reg<0) return false ;
|
|
return (speedTable[reg].speedCode & 0x80) !=0;
|
|
}
|
|
|
|
// Set function to value on or off
|
|
void DCC::setFn( int cab, byte functionNumber, bool on) {
|
|
if (cab<=0 || functionNumber>28) return;
|
|
int reg = lookupSpeedTable(cab);
|
|
if (reg<0) return;
|
|
|
|
// Take care of functions:
|
|
// Set state of function
|
|
unsigned long funcmask = (1UL<<functionNumber);
|
|
if (on) {
|
|
speedTable[reg].functions |= funcmask;
|
|
} else {
|
|
speedTable[reg].functions &= ~funcmask;
|
|
}
|
|
updateGroupflags(speedTable[reg].groupFlags, functionNumber);
|
|
return;
|
|
}
|
|
|
|
// Change function according to how button was pressed,
|
|
// typically in WiThrottle.
|
|
// Returns new state or -1 if nothing was changed.
|
|
int DCC::changeFn( int cab, byte functionNumber, bool pressed) {
|
|
int funcstate = -1;
|
|
if (cab<=0 || functionNumber>28) return funcstate;
|
|
int reg = lookupSpeedTable(cab);
|
|
if (reg<0) return funcstate;
|
|
|
|
// Take care of functions:
|
|
// Imitate how many command stations do it: Button press is
|
|
// toggle but for F2 where it is momentary
|
|
unsigned long funcmask = (1UL<<functionNumber);
|
|
if (functionNumber == 2) {
|
|
// turn on F2 on press and off again at release of button
|
|
if (pressed) {
|
|
speedTable[reg].functions |= funcmask;
|
|
funcstate = 1;
|
|
} else {
|
|
speedTable[reg].functions &= ~funcmask;
|
|
funcstate = 0;
|
|
}
|
|
} else {
|
|
// toggle function on press, ignore release
|
|
if (pressed) {
|
|
speedTable[reg].functions ^= funcmask;
|
|
}
|
|
funcstate = speedTable[reg].functions & funcmask;
|
|
}
|
|
updateGroupflags(speedTable[reg].groupFlags, functionNumber);
|
|
return funcstate;
|
|
}
|
|
|
|
int DCC::getFn( int cab, byte functionNumber) {
|
|
if (cab<=0 || functionNumber>28) return -1; // unknown
|
|
int reg = lookupSpeedTable(cab);
|
|
if (reg<0) return -1;
|
|
|
|
unsigned long funcmask = (1UL<<functionNumber);
|
|
return (speedTable[reg].functions & funcmask)? 1 : 0;
|
|
}
|
|
|
|
// Set the group flag to say we have touched the particular group.
|
|
// A group will be reminded only if it has been touched.
|
|
void DCC::updateGroupflags(byte & flags, int functionNumber) {
|
|
byte groupMask;
|
|
if (functionNumber<=4) groupMask=FN_GROUP_1;
|
|
else if (functionNumber<=8) groupMask=FN_GROUP_2;
|
|
else if (functionNumber<=12) groupMask=FN_GROUP_3;
|
|
else if (functionNumber<=20) groupMask=FN_GROUP_4;
|
|
else groupMask=FN_GROUP_5;
|
|
flags |= groupMask;
|
|
}
|
|
|
|
void DCC::setAccessory(int address, byte number, bool activate) {
|
|
// use masks to detect wrong values and do nothing
|
|
if(address != (address & 511))
|
|
return;
|
|
if(number != (number & 3))
|
|
return;
|
|
byte b[2];
|
|
|
|
b[0] = address % 64 + 128; // first byte is of the form 10AAAAAA, where AAAAAA represent 6 least signifcant bits of accessory address
|
|
b[1] = ((((address / 64) % 8) << 4) + (number % 4 << 1) + activate % 2) ^ 0xF8; // second byte is of the form 1AAACDDD, where C should be 1, and the least significant D represent activate/deactivate
|
|
|
|
DCCWaveform::mainTrack.schedulePacket(b, 2, 4); // Repeat the packet four times
|
|
}
|
|
|
|
void DCC::writeCVByteMain(int cab, int cv, byte bValue) {
|
|
byte b[5];
|
|
byte nB = 0;
|
|
if (cab > 127)
|
|
b[nB++] = highByte(cab) | 0xC0; // convert train number into a two-byte address
|
|
|
|
b[nB++] = lowByte(cab);
|
|
b[nB++] = cv1(WRITE_BYTE_MAIN, cv); // any CV>1023 will become modulus(1024) due to bit-mask of 0x03
|
|
b[nB++] = cv2(cv);
|
|
b[nB++] = bValue;
|
|
|
|
DCCWaveform::mainTrack.schedulePacket(b, nB, 4);
|
|
}
|
|
|
|
void DCC::writeCVBitMain(int cab, int cv, byte bNum, bool bValue) {
|
|
byte b[5];
|
|
byte nB = 0;
|
|
bValue = bValue % 2;
|
|
bNum = bNum % 8;
|
|
|
|
if (cab > 127)
|
|
b[nB++] = highByte(cab) | 0xC0; // convert train number into a two-byte address
|
|
|
|
b[nB++] = lowByte(cab);
|
|
b[nB++] = cv1(WRITE_BIT_MAIN, cv); // any CV>1023 will become modulus(1024) due to bit-mask of 0x03
|
|
b[nB++] = cv2(cv);
|
|
b[nB++] = WRITE_BIT | (bValue ? BIT_ON : BIT_OFF) | bNum;
|
|
|
|
DCCWaveform::mainTrack.schedulePacket(b, nB, 4);
|
|
}
|
|
|
|
void DCC::setProgTrackSyncMain(bool on) {
|
|
if (joinRelay!=UNUSED_PIN) digitalWrite(joinRelay,on?HIGH:LOW);
|
|
DCCWaveform::progTrackSyncMain=on;
|
|
}
|
|
void DCC::setProgTrackBoost(bool on) {
|
|
DCCWaveform::progTrackBoosted=on;
|
|
}
|
|
|
|
FSH* DCC::getMotorShieldName() {
|
|
return shieldName;
|
|
}
|
|
|
|
const ackOp FLASH WRITE_BIT0_PROG[] = {
|
|
BASELINE,
|
|
W0,WACK,
|
|
V0, WACK, // validate bit is 0
|
|
ITC1, // if acked, callback(1)
|
|
FAIL // callback (-1)
|
|
};
|
|
const ackOp FLASH WRITE_BIT1_PROG[] = {
|
|
BASELINE,
|
|
W1,WACK,
|
|
V1, WACK, // validate bit is 1
|
|
ITC1, // if acked, callback(1)
|
|
FAIL // callback (-1)
|
|
};
|
|
|
|
const ackOp FLASH VERIFY_BIT0_PROG[] = {
|
|
BASELINE,
|
|
V0, WACK, // validate bit is 0
|
|
ITC0, // if acked, callback(0)
|
|
V1, WACK, // validate bit is 1
|
|
ITC1,
|
|
FAIL // callback (-1)
|
|
};
|
|
const ackOp FLASH VERIFY_BIT1_PROG[] = {
|
|
BASELINE,
|
|
V1, WACK, // validate bit is 1
|
|
ITC1, // if acked, callback(1)
|
|
V0, WACK,
|
|
ITC0,
|
|
FAIL // callback (-1)
|
|
};
|
|
|
|
const ackOp FLASH READ_BIT_PROG[] = {
|
|
BASELINE,
|
|
V1, WACK, // validate bit is 1
|
|
ITC1, // if acked, callback(1)
|
|
V0, WACK, // validate bit is zero
|
|
ITC0, // if acked callback 0
|
|
FAIL // bit not readable
|
|
};
|
|
|
|
const ackOp FLASH WRITE_BYTE_PROG[] = {
|
|
BASELINE,
|
|
WB,WACK, // Write
|
|
VB,WACK, // validate byte
|
|
ITC1, // if ok callback (1)
|
|
FAIL // callback (-1)
|
|
};
|
|
|
|
const ackOp FLASH VERIFY_BYTE_PROG[] = {
|
|
BASELINE,
|
|
VB,WACK, // validate byte
|
|
ITCB, // if ok callback value
|
|
STARTMERGE, //clear bit and byte values ready for merge pass
|
|
// each bit is validated against 0 and the result inverted in MERGE
|
|
// this is because there tend to be more zeros in cv values than ones.
|
|
// There is no need for one validation as entire byte is validated at the end
|
|
V0, WACK, MERGE, // read and merge first tested bit (7)
|
|
ITSKIP, // do small excursion if there was no ack
|
|
SETBIT,(ackOp)7,
|
|
V1, WACK, NAKFAIL, // test if there is an ack on the inverse of this bit (7)
|
|
SETBIT,(ackOp)6, // and abort whole test if not else continue with bit (6)
|
|
SKIPTARGET,
|
|
V0, WACK, MERGE, // read and merge second tested bit (6)
|
|
V0, WACK, MERGE, // read and merge third tested bit (5) ...
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
VB, WACK, ITCB, // verify merged byte and return it if acked ok
|
|
FAIL };
|
|
|
|
|
|
const ackOp FLASH READ_CV_PROG[] = {
|
|
BASELINE,
|
|
STARTMERGE, //clear bit and byte values ready for merge pass
|
|
// each bit is validated against 0 and the result inverted in MERGE
|
|
// this is because there tend to be more zeros in cv values than ones.
|
|
// There is no need for one validation as entire byte is validated at the end
|
|
V0, WACK, MERGE, // read and merge first tested bit (7)
|
|
ITSKIP, // do small excursion if there was no ack
|
|
SETBIT,(ackOp)7,
|
|
V1, WACK, NAKFAIL, // test if there is an ack on the inverse of this bit (7)
|
|
SETBIT,(ackOp)6, // and abort whole test if not else continue with bit (6)
|
|
SKIPTARGET,
|
|
V0, WACK, MERGE, // read and merge second tested bit (6)
|
|
V0, WACK, MERGE, // read and merge third tested bit (5) ...
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
VB, WACK, ITCB, // verify merged byte and return it if acked ok
|
|
FAIL }; // verification failed
|
|
|
|
|
|
const ackOp FLASH LOCO_ID_PROG[] = {
|
|
BASELINE,
|
|
SETCV, (ackOp)1,
|
|
SETBIT, (ackOp)7,
|
|
V0,WACK,NAKFAIL, // test CV 1 bit 7 is a zero... NAK means no loco found
|
|
|
|
SETCV, (ackOp)19, // CV 19 is consist setting
|
|
SETBYTE, (ackOp)0,
|
|
VB, WACK, ITSKIP, // ignore consist if cv19 is zero (no consist)
|
|
SETBYTE, (ackOp)128,
|
|
VB, WACK, ITSKIP, // ignore consist if cv19 is 128 (no consist, direction bit set)
|
|
STARTMERGE, // Setup to read cv 19
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
VB, WACK, ITCB7, // return 7 bits only, No_ACK means CV19 not supported so ignore it
|
|
|
|
SKIPTARGET, // continue here if CV 19 is zero or fails all validation
|
|
SETCV,(ackOp)29,
|
|
SETBIT,(ackOp)5,
|
|
V0, WACK, ITSKIP, // Skip to SKIPTARGET if bit 5 of CV29 is zero
|
|
|
|
// Long locoid
|
|
SETCV, (ackOp)17, // CV 17 is part of locoid
|
|
STARTMERGE,
|
|
V0, WACK, MERGE, // read and merge bit 1 etc
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
VB, WACK, NAKFAIL, // verify merged byte and return -1 it if not acked ok
|
|
STASHLOCOID, // keep stashed cv 17 for later
|
|
// Read 2nd part from CV 18
|
|
SETCV, (ackOp)18,
|
|
STARTMERGE,
|
|
V0, WACK, MERGE, // read and merge bit 1 etc
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
VB, WACK, NAKFAIL, // verify merged byte and return -1 it if not acked ok
|
|
COMBINELOCOID, // Combile byte with stash to make long locoid and callback
|
|
|
|
// ITSKIP Skips to here if CV 29 bit 5 was zero. so read CV 1 and return that
|
|
SKIPTARGET,
|
|
SETCV, (ackOp)1,
|
|
STARTMERGE,
|
|
SETBIT, (ackOp)6, // skip over first bit as we know its a zero
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
V0, WACK, MERGE,
|
|
VB, WACK, ITCB, // verify merged byte and callback
|
|
FAIL
|
|
};
|
|
|
|
const ackOp FLASH SHORT_LOCO_ID_PROG[] = {
|
|
BASELINE,
|
|
SETCV,(ackOp)19,
|
|
SETBYTE, (ackOp)0,
|
|
WB,WACK, // ignore router without cv19 support
|
|
// Turn off long address flag
|
|
SETCV,(ackOp)29,
|
|
SETBIT,(ackOp)5,
|
|
W0,WACK,NAKFAIL,
|
|
SETCV, (ackOp)1,
|
|
SETBYTEL, // low byte of word
|
|
WB,WACK,NAKFAIL,
|
|
VB,WACK,ITCB,
|
|
FAIL
|
|
};
|
|
|
|
const ackOp FLASH LONG_LOCO_ID_PROG[] = {
|
|
BASELINE,
|
|
// Clear consist CV 19
|
|
SETCV,(ackOp)19,
|
|
SETBYTE, (ackOp)0,
|
|
WB,WACK, // ignore router without cv19 support
|
|
// Turn on long address flag cv29 bit 5
|
|
SETCV,(ackOp)29,
|
|
SETBIT,(ackOp)5,
|
|
W1,WACK,NAKFAIL,
|
|
// Store high byte of address in cv 17
|
|
SETCV, (ackOp)17,
|
|
SETBYTEH, // high byte of word
|
|
WB,WACK,NAKFAIL,
|
|
VB,WACK,NAKFAIL,
|
|
// store
|
|
SETCV, (ackOp)18,
|
|
SETBYTEL, // low byte of word
|
|
WB,WACK,NAKFAIL,
|
|
VB,WACK,ITC1, // callback(1) means Ok
|
|
FAIL
|
|
};
|
|
|
|
// On the following prog-track functions blocking defaults to false.
|
|
// blocking=true forces the API to block, waiting for the response and invoke the callback BEFORE returning.
|
|
// During that wait, other parts of the system will be unresponsive.
|
|
// blocking =false means the callback will be called some time after the API returns (typically a few tenths of a second)
|
|
// but that would be very inconvenient in a Wifi situaltion where the stream becomes
|
|
// unuavailable immediately after the API rerturns.
|
|
|
|
void DCC::writeCVByte(int cv, byte byteValue, ACK_CALLBACK callback, bool blocking) {
|
|
ackManagerSetup(cv, byteValue, WRITE_BYTE_PROG, callback, blocking);
|
|
}
|
|
|
|
|
|
void DCC::writeCVBit(int cv, byte bitNum, bool bitValue, ACK_CALLBACK callback, bool blocking) {
|
|
if (bitNum >= 8) callback(-1);
|
|
else ackManagerSetup(cv, bitNum, bitValue?WRITE_BIT1_PROG:WRITE_BIT0_PROG, callback, blocking);
|
|
}
|
|
|
|
void DCC::verifyCVByte(int cv, byte byteValue, ACK_CALLBACK callback, bool blocking) {
|
|
ackManagerSetup(cv, byteValue, VERIFY_BYTE_PROG, callback, blocking);
|
|
}
|
|
|
|
|
|
void DCC::verifyCVBit(int cv, byte bitNum, bool bitValue, ACK_CALLBACK callback, bool blocking) {
|
|
if (bitNum >= 8) callback(-1);
|
|
else ackManagerSetup(cv, bitNum, bitValue?VERIFY_BIT1_PROG:VERIFY_BIT0_PROG, callback, blocking);
|
|
}
|
|
|
|
|
|
void DCC::readCVBit(int cv, byte bitNum, ACK_CALLBACK callback, bool blocking) {
|
|
if (bitNum >= 8) callback(-1);
|
|
else ackManagerSetup(cv, bitNum,READ_BIT_PROG, callback, blocking);
|
|
}
|
|
|
|
void DCC::readCV(int cv, ACK_CALLBACK callback, bool blocking) {
|
|
ackManagerSetup(cv, 0,READ_CV_PROG, callback, blocking);
|
|
}
|
|
|
|
void DCC::getLocoId(ACK_CALLBACK callback, bool blocking) {
|
|
ackManagerSetup(0,0, LOCO_ID_PROG, callback, blocking);
|
|
}
|
|
|
|
void DCC::setLocoId(int id,ACK_CALLBACK callback, bool blocking) {
|
|
if (id<1 || id>10239) { //0x27FF according to standard
|
|
callback(-1);
|
|
return;
|
|
}
|
|
if (id<=127)
|
|
ackManagerSetup(id, SHORT_LOCO_ID_PROG, callback, blocking);
|
|
else
|
|
ackManagerSetup(id | 0xc000,LONG_LOCO_ID_PROG, callback, blocking);
|
|
}
|
|
|
|
void DCC::forgetLoco(int cab) { // removes any speed reminders for this loco
|
|
int reg=lookupSpeedTable(cab);
|
|
if (reg>=0) speedTable[reg].loco=0;
|
|
}
|
|
void DCC::forgetAllLocos() { // removes all speed reminders
|
|
for (int i=0;i<MAX_LOCOS;i++) speedTable[i].loco=0;
|
|
}
|
|
|
|
byte DCC::loopStatus=0;
|
|
|
|
void DCC::loop() {
|
|
DCCWaveform::loop(ackManagerProg!=NULL); // power overload checks
|
|
ackManagerLoop(false); // maintain prog track ack manager
|
|
issueReminders();
|
|
}
|
|
|
|
void DCC::issueReminders() {
|
|
// if the main track transmitter still has a pending packet, skip this time around.
|
|
if ( DCCWaveform::mainTrack.packetPending) return;
|
|
|
|
// This loop searches for a loco in the speed table starting at nextLoco and cycling back around
|
|
for (int reg=0;reg<MAX_LOCOS;reg++) {
|
|
int slot=reg+nextLoco;
|
|
if (slot>=MAX_LOCOS) slot-=MAX_LOCOS;
|
|
if (speedTable[slot].loco > 0) {
|
|
// have found the next loco to remind
|
|
// issueReminder will return true if this loco is completed (ie speed and functions)
|
|
if (issueReminder(slot)) nextLoco=slot+1;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool DCC::issueReminder(int reg) {
|
|
unsigned long functions=speedTable[reg].functions;
|
|
int loco=speedTable[reg].loco;
|
|
byte flags=speedTable[reg].groupFlags;
|
|
|
|
switch (loopStatus) {
|
|
case 0:
|
|
// DIAG(F("\nReminder %d speed %d"),loco,speedTable[reg].speedCode);
|
|
setThrottle2(loco, speedTable[reg].speedCode);
|
|
break;
|
|
case 1: // remind function group 1 (F0-F4)
|
|
if (flags & FN_GROUP_1)
|
|
setFunctionInternal(loco,0, 128 | ((functions>>1)& 0x0F) | ((functions & 0x01)<<4)); // 100D DDDD
|
|
break;
|
|
case 2: // remind function group 2 F5-F8
|
|
if (flags & FN_GROUP_2)
|
|
setFunctionInternal(loco,0, 176 | ((functions>>5)& 0x0F)); // 1011 DDDD
|
|
break;
|
|
case 3: // remind function group 3 F9-F12
|
|
if (flags & FN_GROUP_3)
|
|
setFunctionInternal(loco,0, 160 | ((functions>>9)& 0x0F)); // 1010 DDDD
|
|
break;
|
|
case 4: // remind function group 4 F13-F20
|
|
if (flags & FN_GROUP_4)
|
|
setFunctionInternal(loco,222, ((functions>>13)& 0xFF));
|
|
flags&= ~FN_GROUP_4; // dont send them again
|
|
break;
|
|
case 5: // remind function group 5 F21-F28
|
|
if (flags & FN_GROUP_5)
|
|
setFunctionInternal(loco,223, ((functions>>21)& 0xFF));
|
|
flags&= ~FN_GROUP_5; // dont send them again
|
|
break;
|
|
}
|
|
loopStatus++;
|
|
// if we reach status 6 then this loco is done so
|
|
// reset status to 0 for next loco and return true so caller
|
|
// moves on to next loco.
|
|
if (loopStatus>5) loopStatus=0;
|
|
return loopStatus==0;
|
|
}
|
|
|
|
|
|
|
|
|
|
///// Private helper functions below here /////////////////////
|
|
|
|
byte DCC::cv1(byte opcode, int cv) {
|
|
cv--;
|
|
return (highByte(cv) & (byte)0x03) | opcode;
|
|
}
|
|
byte DCC::cv2(int cv) {
|
|
cv--;
|
|
return lowByte(cv);
|
|
}
|
|
|
|
int DCC::lookupSpeedTable(int locoId) {
|
|
// determine speed reg for this loco
|
|
int firstEmpty = MAX_LOCOS;
|
|
int reg;
|
|
for (reg = 0; reg < MAX_LOCOS; reg++) {
|
|
if (speedTable[reg].loco == locoId) break;
|
|
if (speedTable[reg].loco == 0 && firstEmpty == MAX_LOCOS) firstEmpty = reg;
|
|
}
|
|
if (reg == MAX_LOCOS) reg = firstEmpty;
|
|
if (reg >= MAX_LOCOS) {
|
|
DIAG(F("\nToo many locos\n"));
|
|
return -1;
|
|
}
|
|
if (reg==firstEmpty){
|
|
speedTable[reg].loco = locoId;
|
|
speedTable[reg].speedCode=128; // default direction forward
|
|
speedTable[reg].groupFlags=0;
|
|
speedTable[reg].functions=0;
|
|
}
|
|
return reg;
|
|
}
|
|
|
|
void DCC::updateLocoReminder(int loco, byte speedCode) {
|
|
|
|
if (loco==0) {
|
|
// broadcast stop/estop but dont change direction
|
|
for (int reg = 0; reg < MAX_LOCOS; reg++) {
|
|
speedTable[reg].speedCode = (speedTable[reg].speedCode & 0x80) | (speedCode & 0x7f);
|
|
}
|
|
return;
|
|
}
|
|
|
|
// determine speed reg for this loco
|
|
int reg=lookupSpeedTable(loco);
|
|
if (reg>=0) speedTable[reg].speedCode = speedCode;
|
|
}
|
|
|
|
DCC::LOCO DCC::speedTable[MAX_LOCOS];
|
|
int DCC::nextLoco = 0;
|
|
|
|
//ACK MANAGER
|
|
ackOp const * DCC::ackManagerProg;
|
|
byte DCC::ackManagerByte;
|
|
byte DCC::ackManagerStash;
|
|
int DCC::ackManagerWord;
|
|
int DCC::ackManagerCv;
|
|
byte DCC::ackManagerBitNum;
|
|
bool DCC::ackReceived;
|
|
|
|
ACK_CALLBACK DCC::ackManagerCallback;
|
|
|
|
void DCC::ackManagerSetup(int cv, byte byteValueOrBitnum, ackOp const program[], ACK_CALLBACK callback, bool blocking) {
|
|
ackManagerCv = cv;
|
|
ackManagerProg = program;
|
|
ackManagerByte = byteValueOrBitnum;
|
|
ackManagerBitNum=byteValueOrBitnum;
|
|
ackManagerCallback = callback;
|
|
if (blocking) ackManagerLoop(blocking);
|
|
}
|
|
|
|
void DCC::ackManagerSetup(int wordval, ackOp const program[], ACK_CALLBACK callback, bool blocking) {
|
|
ackManagerWord=wordval;
|
|
ackManagerProg = program;
|
|
ackManagerCallback = callback;
|
|
if (blocking) ackManagerLoop(blocking);
|
|
}
|
|
|
|
const byte RESET_MIN=8; // tuning of reset counter before sending message
|
|
|
|
// checkRessets return true if the caller should yield back to loop and try later.
|
|
bool DCC::checkResets(bool blocking, uint8_t numResets) {
|
|
if (blocking) {
|
|
// must block waiting for restest to be issued
|
|
while(DCCWaveform::progTrack.sentResetsSincePacket < numResets);
|
|
return false; // caller need not yield
|
|
}
|
|
return DCCWaveform::progTrack.sentResetsSincePacket < numResets;
|
|
}
|
|
|
|
void DCC::ackManagerLoop(bool blocking) {
|
|
while (ackManagerProg) {
|
|
byte opcode=GETFLASH(ackManagerProg);
|
|
|
|
// breaks from this switch will step to next prog entry
|
|
// returns from this switch will stay on same entry
|
|
// (typically waiting for a reset counter or ACK waiting, or when all finished.)
|
|
// if blocking then we must ONLY return AFTER callback issued
|
|
switch (opcode) {
|
|
case BASELINE:
|
|
if (DCCWaveform::progTrack.getPowerMode() == POWERMODE::OFF) {
|
|
if (Diag::ACK) DIAG(F("\nAuto Prog power on"));
|
|
DCCWaveform::progTrack.setPowerMode(POWERMODE::ON);
|
|
DCCWaveform::progTrack.sentResetsSincePacket = 0;
|
|
DCCWaveform::progTrack.autoPowerOff=true;
|
|
if (!blocking) return;
|
|
}
|
|
if (checkResets(blocking, DCCWaveform::progTrack.autoPowerOff ? 20 : 3)) return;
|
|
DCCWaveform::progTrack.setAckBaseline();
|
|
break;
|
|
case W0: // write 0 bit
|
|
case W1: // write 1 bit
|
|
{
|
|
if (checkResets(blocking, RESET_MIN)) return;
|
|
if (Diag::ACK) DIAG(F("\nW%d cv=%d bit=%d"),opcode==W1, ackManagerCv,ackManagerBitNum);
|
|
byte instruction = WRITE_BIT | (opcode==W1 ? BIT_ON : BIT_OFF) | ackManagerBitNum;
|
|
byte message[] = {cv1(BIT_MANIPULATE, ackManagerCv), cv2(ackManagerCv), instruction };
|
|
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
|
|
DCCWaveform::progTrack.setAckPending();
|
|
}
|
|
break;
|
|
|
|
case WB: // write byte
|
|
{
|
|
if (checkResets(blocking, RESET_MIN)) return;
|
|
if (Diag::ACK) DIAG(F("\nWB cv=%d value=%d"),ackManagerCv,ackManagerByte);
|
|
byte message[] = {cv1(WRITE_BYTE, ackManagerCv), cv2(ackManagerCv), ackManagerByte};
|
|
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
|
|
DCCWaveform::progTrack.setAckPending();
|
|
}
|
|
break;
|
|
|
|
case VB: // Issue validate Byte packet
|
|
{
|
|
if (checkResets(blocking, RESET_MIN)) return;
|
|
if (Diag::ACK) DIAG(F("\nVB cv=%d value=%d"),ackManagerCv,ackManagerByte);
|
|
byte message[] = { cv1(VERIFY_BYTE, ackManagerCv), cv2(ackManagerCv), ackManagerByte};
|
|
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
|
|
DCCWaveform::progTrack.setAckPending();
|
|
}
|
|
break;
|
|
|
|
case V0:
|
|
case V1: // Issue validate bit=0 or bit=1 packet
|
|
{
|
|
if (checkResets(blocking, RESET_MIN)) return;
|
|
if (Diag::ACK) DIAG(F("\nV%d cv=%d bit=%d"),opcode==V1, ackManagerCv,ackManagerBitNum);
|
|
byte instruction = VERIFY_BIT | (opcode==V0?BIT_OFF:BIT_ON) | ackManagerBitNum;
|
|
byte message[] = {cv1(BIT_MANIPULATE, ackManagerCv), cv2(ackManagerCv), instruction };
|
|
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), PROG_REPEATS);
|
|
DCCWaveform::progTrack.setAckPending();
|
|
}
|
|
break;
|
|
|
|
case WACK: // wait for ack (or absence of ack)
|
|
{
|
|
byte ackState=2; // keep polling
|
|
if (blocking) {
|
|
while(ackState==2) ackState=DCCWaveform::progTrack.getAck();
|
|
}
|
|
else {
|
|
ackState=DCCWaveform::progTrack.getAck();
|
|
if (ackState==2) return; // keep polling
|
|
}
|
|
ackReceived=ackState==1;
|
|
break; // we have a genuine ACK result
|
|
}
|
|
case ITC0:
|
|
case ITC1: // If True Callback(0 or 1) (if prevous WACK got an ACK)
|
|
if (ackReceived) {
|
|
ackManagerProg = NULL; // all done now
|
|
callback(opcode==ITC0?0:1);
|
|
return;
|
|
}
|
|
break;
|
|
|
|
case ITCB: // If True callback(byte)
|
|
if (ackReceived) {
|
|
ackManagerProg = NULL; // all done now
|
|
callback(ackManagerByte);
|
|
return;
|
|
}
|
|
break;
|
|
|
|
case ITCB7: // If True callback(byte & 0xF)
|
|
if (ackReceived) {
|
|
ackManagerProg = NULL; // all done now
|
|
callback(ackManagerByte & 0x7F);
|
|
return;
|
|
}
|
|
break;
|
|
|
|
case NAKFAIL: // If nack callback(-1)
|
|
if (!ackReceived) {
|
|
ackManagerProg = NULL; // all done now
|
|
callback(-1);
|
|
return;
|
|
}
|
|
break;
|
|
|
|
case FAIL: // callback(-1)
|
|
ackManagerProg = NULL;
|
|
callback(-1);
|
|
return;
|
|
|
|
case STARTMERGE:
|
|
ackManagerBitNum=7;
|
|
ackManagerByte=0;
|
|
break;
|
|
|
|
case MERGE: // Merge previous Validate zero wack response with byte value and update bit number (use for reading CV bytes)
|
|
ackManagerByte <<= 1;
|
|
// ackReceived means bit is zero.
|
|
if (!ackReceived) ackManagerByte |= 1;
|
|
ackManagerBitNum--;
|
|
break;
|
|
|
|
case SETBIT:
|
|
ackManagerProg++;
|
|
ackManagerBitNum=GETFLASH(ackManagerProg);
|
|
break;
|
|
|
|
case SETCV:
|
|
ackManagerProg++;
|
|
ackManagerCv=GETFLASH(ackManagerProg);
|
|
break;
|
|
|
|
case SETBYTE:
|
|
ackManagerProg++;
|
|
ackManagerByte=GETFLASH(ackManagerProg);
|
|
break;
|
|
|
|
case SETBYTEH:
|
|
ackManagerByte=highByte(ackManagerWord);
|
|
break;
|
|
|
|
case SETBYTEL:
|
|
ackManagerByte=lowByte(ackManagerWord);
|
|
break;
|
|
|
|
case STASHLOCOID:
|
|
ackManagerStash=ackManagerByte; // stash value from CV17
|
|
break;
|
|
|
|
case COMBINELOCOID:
|
|
// ackManagerStash is cv17, ackManagerByte is CV 18
|
|
ackManagerProg=NULL;
|
|
callback( ackManagerByte + ((ackManagerStash - 192) << 8));
|
|
return;
|
|
|
|
case ITSKIP:
|
|
if (!ackReceived) break;
|
|
// SKIP opcodes until SKIPTARGET found
|
|
while (opcode!=SKIPTARGET) {
|
|
ackManagerProg++;
|
|
opcode=GETFLASH(ackManagerProg);
|
|
}
|
|
break;
|
|
case SKIPTARGET:
|
|
break;
|
|
default:
|
|
DIAG(F("\n!! ackOp %d FAULT!!"),opcode);
|
|
ackManagerProg=NULL;
|
|
callback( -1);
|
|
return;
|
|
|
|
} // end of switch
|
|
ackManagerProg++;
|
|
}
|
|
}
|
|
void DCC::callback(int value) {
|
|
if (DCCWaveform::progTrack.autoPowerOff) {
|
|
if (Diag::ACK) DIAG(F("\nAuto Prog power off"));
|
|
DCCWaveform::progTrack.doAutoPowerOff();
|
|
}
|
|
if (Diag::ACK) DIAG(F("\nCallback(%d)\n"),value);
|
|
(ackManagerCallback)( value);
|
|
}
|
|
|
|
void DCC::displayCabList(Print * stream) {
|
|
|
|
int used=0;
|
|
for (int reg = 0; reg < MAX_LOCOS; reg++) {
|
|
if (speedTable[reg].loco>0) {
|
|
used ++;
|
|
StringFormatter::send(stream,F("\ncab=%d, speed=%d, dir=%c "),
|
|
speedTable[reg].loco, speedTable[reg].speedCode & 0x7f,(speedTable[reg].speedCode & 0x80) ? 'F':'R');
|
|
}
|
|
}
|
|
StringFormatter::send(stream,F("\nUsed=%d, max=%d\n"),used,MAX_LOCOS);
|
|
|
|
}
|