mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2025-04-21 12:31:19 +02:00
saving: works
This commit is contained in:
travis-farmer
parent
250a34bc09
commit
74cb0c12b0
372
IO_RSproto.cpp
372
IO_RSproto.cpp
@ -71,14 +71,40 @@ uint16_t RSproto::crc16(uint8_t *data, uint16_t length) {
|
||||
return crc;
|
||||
}
|
||||
|
||||
void RSprotonode::_pollDigital(unsigned long currentMicros) {
|
||||
|
||||
}
|
||||
|
||||
void RSprotonode::_pollAnalog(unsigned long currentMicros) {
|
||||
RSproto *bus = RSproto::findBus(0);
|
||||
|
||||
}
|
||||
|
||||
void RSproto::_loop(unsigned long currentMicros) {
|
||||
_currentMicros = currentMicros;
|
||||
//if (_busy == true) return;
|
||||
if (_currentNode == NULL) _currentNode = _nodeListStart;
|
||||
if (!hasTasks() && _currentNode->isInitialised()) {
|
||||
_cycleStartTime = _currentMicros;
|
||||
uint8_t buffA[3];
|
||||
buffA[0] = (_currentNode->getNodeID());
|
||||
buffA[1] = (0);
|
||||
buffA[2] = (EXIORDD);
|
||||
addTask(buffA, 3, EXIORDD);
|
||||
uint8_t buffB[3];
|
||||
buffB[0] = (_currentNode->getNodeID());
|
||||
buffB[1] = (0);
|
||||
buffB[2] = (EXIORDAN);
|
||||
addTask(buffB, 3, EXIORDAN);
|
||||
//DIAG(F("Polling node: %i"), _currentNode->getNodeID());
|
||||
_currentNode = _currentNode->getNext();
|
||||
}
|
||||
|
||||
//if (currentTask == nullptr) return;
|
||||
|
||||
if ( hasTasks()){
|
||||
if ( hasTasks() && _currentMicros - _cycleStartTimeA >= _cycleTime){
|
||||
_cycleStartTimeA = _currentMicros;
|
||||
Task* currentTask = getTaskById(getNextTaskId());
|
||||
if (currentTask == nullptr) return;
|
||||
if (!currentTask->rxMode) { // Check if a task was found
|
||||
currentTask->crcPassFail = 0;
|
||||
uint16_t response_crc = crc16((uint8_t*)currentTask->commandArray, currentTask->byteCount-1);
|
||||
@ -99,209 +125,167 @@ void RSproto::_loop(unsigned long currentMicros) {
|
||||
// delete task command after sending, for now
|
||||
currentTask->rxMode = true;
|
||||
|
||||
} else if (currentTask->rxMode) {
|
||||
if (_serial->available() && currentTask->rxMode) {
|
||||
//DIAG(F("Polling Task: %i"), currentTask->taskID);
|
||||
markTaskCompleted(currentTask->taskID);
|
||||
}
|
||||
}
|
||||
if ( _serial->available()) {
|
||||
|
||||
|
||||
uint16_t calculated_crc;
|
||||
int byteCount = 100;
|
||||
uint16_t calculated_crc;
|
||||
int byteCount = 100;
|
||||
|
||||
uint8_t byte_array[byteCount];
|
||||
int curByte = _serial->read();
|
||||
int curByte = _serial->read();
|
||||
|
||||
if (curByte == 0xFE && flagStart == false) flagStart = true;
|
||||
else if ( curByte == 0xFE && flagStart == true) {
|
||||
flagProc = false;
|
||||
byteCounter = 0;
|
||||
flagStarted = true;
|
||||
flagStart = false;
|
||||
flagEnded = false;
|
||||
rxStart = true;
|
||||
rxEnd = false;
|
||||
crcPass = false;
|
||||
memset(received_data, 0, ARRAY_SIZE);
|
||||
}else if (flagStarted) {
|
||||
crc[0] = curByte;
|
||||
byteCounter++;
|
||||
flagStarted = false;
|
||||
} else if (byteCounter == 1) {
|
||||
crc[1] = curByte;
|
||||
received_crc = (crc[0] << 8) | crc[1];
|
||||
byteCounter++;
|
||||
} else if (byteCounter == 2) {
|
||||
byteCount = curByte;
|
||||
byteCounter++;
|
||||
} else if (flagEnded == false && byteCounter >= 3) {
|
||||
received_data[byteCounter-3] = curByte;
|
||||
byteCounter++;
|
||||
}
|
||||
if (curByte == 0xFD && flagEnd == false) flagEnd = true;
|
||||
else if ( curByte == 0xFD && flagEnd == true) {
|
||||
flagEnded = true;
|
||||
flagEnd = false;
|
||||
rxEnd = true;
|
||||
byteCount = byteCounter;
|
||||
byteCounter = 0;
|
||||
}
|
||||
if (flagEnded) {
|
||||
calculated_crc = crc16((uint8_t*)received_data, byteCount-6);
|
||||
if (received_crc == calculated_crc) {
|
||||
//DIAG(F("Loop CRC PASS"));
|
||||
crcPass = true;
|
||||
currentTask->crcPassFail = 1;
|
||||
}else {
|
||||
//DIAG(F("Loop CRC Fail %x %x"),received_crc,calculated_crc);
|
||||
currentTask->processed = true;
|
||||
|
||||
currentTask->crcPassFail = -1;
|
||||
}
|
||||
flagEnded = false;
|
||||
|
||||
|
||||
}
|
||||
// Check CRC validity
|
||||
if (crcPass) {
|
||||
// Data received successfully, process it (e.g., print)
|
||||
int nodeTo = received_data[0];
|
||||
if (nodeTo == 0) { // for master. master does not retransmit, or a loop will runaway.
|
||||
flagProc = true;
|
||||
currentTask->gotCallback = true;
|
||||
|
||||
}
|
||||
|
||||
} else {
|
||||
//DIAG(F("IO_RSproto: CRC Error!"));
|
||||
}
|
||||
if (curByte == 0xFE && flagStart == false) flagStart = true;
|
||||
else if ( curByte == 0xFE && flagStart == true) {
|
||||
flagProc = false;
|
||||
byteCounter = 0;
|
||||
flagStarted = true;
|
||||
flagStart = false;
|
||||
flagEnded = false;
|
||||
rxStart = true;
|
||||
rxEnd = false;
|
||||
crcPass = false;
|
||||
memset(received_data, 0, ARRAY_SIZE);
|
||||
}else if (flagStarted) {
|
||||
crc[0] = curByte;
|
||||
byteCounter++;
|
||||
flagStarted = false;
|
||||
} else if (byteCounter == 1) {
|
||||
crc[1] = curByte;
|
||||
received_crc = (crc[0] << 8) | crc[1];
|
||||
byteCounter++;
|
||||
} else if (byteCounter == 2) {
|
||||
byteCount = curByte;
|
||||
byteCounter++;
|
||||
} else if (flagEnded == false && byteCounter >= 3) {
|
||||
received_data[byteCounter-3] = curByte;
|
||||
byteCounter++;
|
||||
}
|
||||
if (curByte == 0xFD && flagEnd == false) flagEnd = true;
|
||||
else if ( curByte == 0xFD && flagEnd == true) {
|
||||
flagEnded = true;
|
||||
flagEnd = false;
|
||||
rxEnd = true;
|
||||
byteCount = byteCounter;
|
||||
byteCounter = 0;
|
||||
}
|
||||
if (flagEnded) {
|
||||
calculated_crc = crc16((uint8_t*)received_data, byteCount-6);
|
||||
if (received_crc == calculated_crc) {
|
||||
//DIAG(F("Loop CRC PASS"));
|
||||
crcPass = true;
|
||||
}else {
|
||||
//DIAG(F("Loop CRC Fail %x %x"),received_crc,calculated_crc);
|
||||
}
|
||||
flagEnded = false;
|
||||
|
||||
|
||||
}
|
||||
// Check CRC validity
|
||||
if (crcPass) {
|
||||
// Data received successfully, process it (e.g., print)
|
||||
int nodeTo = received_data[0];
|
||||
if (nodeTo == 0) { // for master. master does not retransmit, or a loop will runaway.
|
||||
flagProc = true;
|
||||
}
|
||||
|
||||
} else {
|
||||
//DIAG(F("IO_RSproto: CRC Error!"));
|
||||
}
|
||||
|
||||
if (flagProc) {
|
||||
int nodeTo = received_data[0];
|
||||
int nodeFr = received_data[1];
|
||||
RSprotonode *node = findNode(nodeFr);
|
||||
//DIAG(F("Node from %i %i"), nodeFr, node->getNodeID());
|
||||
int AddrCode = received_data[2];
|
||||
//DIAG(F("From: %i, To: %i | %i %i %i %i %i"), nodeFr,nodeTo, received_data[3], received_data[4], received_data[5], received_data[6],received_data[7]);
|
||||
//return;
|
||||
|
||||
switch (AddrCode) {
|
||||
case EXIOPINS:
|
||||
{node->setnumDigitalPins(received_data[3]);
|
||||
node->setnumAnalogPins(received_data[4]);
|
||||
|
||||
// See if we already have suitable buffers assigned
|
||||
if (node->getnumDigialPins()>0) {
|
||||
size_t digitalBytesNeeded = (node->getnumDigialPins() + 7) / 8;
|
||||
if (node->getdigitalPinBytes() < digitalBytesNeeded) {
|
||||
// Not enough space, free any existing buffer and allocate a new one
|
||||
if (node->cleandigitalPinStates(digitalBytesNeeded)) {
|
||||
node->setdigitalPinBytes(digitalBytesNeeded);
|
||||
} else {
|
||||
DIAG(F("EX-IOExpander485 node:%d ERROR alloc %d bytes"), nodeFr, digitalBytesNeeded);
|
||||
//_deviceState = DEVSTATE_FAILED;
|
||||
node->setdigitalPinBytes(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (node->getnumAnalogPins()>0) {
|
||||
size_t analogueBytesNeeded = node->getnumAnalogPins() * 2;
|
||||
if (node->getanalogPinBytes() < analogueBytesNeeded) {
|
||||
// Free any existing buffers and allocate new ones.
|
||||
|
||||
if (node->cleanAnalogStates(analogueBytesNeeded)) {
|
||||
node->setanalogPinBytes(analogueBytesNeeded);
|
||||
} else {
|
||||
DIAG(F("EX-IOExpander485 node:%d ERROR alloc analog pin bytes"), nodeFr);
|
||||
//_deviceState = DEVSTATE_FAILED;
|
||||
node->setanalogPinBytes(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;}
|
||||
case EXIOINITA: {
|
||||
for (int i = 0; i < node->getnumAnalogPins(); i++) {
|
||||
node->setanalogPinMap(received_data[i+3], i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case EXIOVER: {
|
||||
node->setMajVer(received_data[3]);
|
||||
node->setMinVer(received_data[4]);
|
||||
node->setPatVer(received_data[5]);
|
||||
DIAG(F("EX-IOExpander485: Found node %i v%i.%i.%i"),node->getNodeID(), node->getMajVer(), node->getMinVer(), node->getPatVer());
|
||||
node->setInitialised();
|
||||
//DIAG(F("EX-IOExpander485: Initialized Node:%d "), node->getNodeID());
|
||||
break;
|
||||
}
|
||||
case EXIORDY: {
|
||||
break;
|
||||
}
|
||||
case EXIOERR: {
|
||||
DIAG(F("EX-IOExplorer485: Some sort of error was received... WHAT DID YOU DO!")); // ;-)
|
||||
break;
|
||||
}
|
||||
case EXIORDAN: {
|
||||
for (int i = 0; i < node->_numAnaloguePins; i++) {
|
||||
node->setanalogInputBuffer(received_data[i+3], i);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case EXIORDD: {
|
||||
for (int i = 0; i < (node->_numDigitalPins+7)/8; i++) {
|
||||
node->setdigitalInputStates(received_data[i+3], i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
flagProc = false;
|
||||
}
|
||||
|
||||
// temp debug
|
||||
|
||||
|
||||
if (flagProc) {
|
||||
int nodeTo = received_data[0];
|
||||
int nodeFr = received_data[1];
|
||||
RSprotonode *node = findNode(nodeFr);
|
||||
//DIAG(F("Node from %i %i"), nodeFr, node->getNodeID());
|
||||
int AddrCode = received_data[2];
|
||||
//DIAG(F("From: %i, To: %i | %i %i %i %i %i"), nodeFr,nodeTo, received_data[3], received_data[4], received_data[5], received_data[6],received_data[7]);
|
||||
//return;
|
||||
|
||||
switch (AddrCode) {
|
||||
case EXIOPINS:
|
||||
{node->setnumDigitalPins(received_data[3]);
|
||||
node->setnumAnalogPins(received_data[4]);
|
||||
|
||||
// See if we already have suitable buffers assigned
|
||||
if (node->getnumDigialPins()>0) {
|
||||
size_t digitalBytesNeeded = (node->getnumDigialPins() + 7) / 8;
|
||||
if (node->getdigitalPinBytes() < digitalBytesNeeded) {
|
||||
// Not enough space, free any existing buffer and allocate a new one
|
||||
if (node->cleandigitalPinStates(digitalBytesNeeded)) {
|
||||
node->setdigitalPinBytes(digitalBytesNeeded);
|
||||
} else {
|
||||
DIAG(F("EX-IOExpander485 node:%d ERROR alloc %d bytes"), nodeFr, digitalBytesNeeded);
|
||||
//_deviceState = DEVSTATE_FAILED;
|
||||
node->setdigitalPinBytes(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (node->getnumAnalogPins()>0) {
|
||||
size_t analogueBytesNeeded = node->getnumAnalogPins() * 2;
|
||||
if (node->getanalogPinBytes() < analogueBytesNeeded) {
|
||||
// Free any existing buffers and allocate new ones.
|
||||
|
||||
if (node->cleanAnalogStates(analogueBytesNeeded)) {
|
||||
node->setanalogPinBytes(analogueBytesNeeded);
|
||||
} else {
|
||||
DIAG(F("EX-IOExpander485 node:%d ERROR alloc analog pin bytes"), nodeFr);
|
||||
//_deviceState = DEVSTATE_FAILED;
|
||||
node->setanalogPinBytes(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
currentTask->processed = true;
|
||||
node->resFlag[currentTask->retFlag] = 1;
|
||||
break;}
|
||||
case EXIOINITA: {
|
||||
for (int i = 0; i < node->getnumAnalogPins(); i++) {
|
||||
node->setanalogPinMap(received_data[i+3], i);
|
||||
}
|
||||
currentTask->processed = true;
|
||||
node->resFlag[currentTask->retFlag] = 1;
|
||||
break;
|
||||
}
|
||||
case EXIOVER: {
|
||||
node->setMajVer(received_data[3]);
|
||||
node->setMinVer(received_data[4]);
|
||||
node->setPatVer(received_data[5]);
|
||||
DIAG(F("EX-IOExpander485: Found node %i v%i.%i.%i"),nodeFr, node->getMajVer(), node->getMinVer(), node->getPatVer());
|
||||
//if (!_currentNode->isInitialised()) {
|
||||
//_currentNode->setInitialised();
|
||||
//DIAG(F("EX-IOExpander485: Initialized Node:%d "), nodeFr);
|
||||
//}
|
||||
currentTask->processed = true;
|
||||
node->resFlag[currentTask->retFlag] = 1;
|
||||
break;
|
||||
}
|
||||
case EXIORDY: {
|
||||
currentTask->processed = true;
|
||||
node->resFlag[currentTask->retFlag] = 1;
|
||||
break;
|
||||
}
|
||||
case EXIOERR: {
|
||||
currentTask->processed = true;
|
||||
node->resFlag[currentTask->retFlag] = -1;
|
||||
DIAG(F("Some sort of error was received... WHAT DID YOU DO!"));
|
||||
break;
|
||||
}
|
||||
case EXIORDD: {
|
||||
for (int i = 0; i < (node->_numDigitalPins+7)/8; i++) {
|
||||
node->setanalogInputStates(received_data[i+3], i);
|
||||
}
|
||||
currentTask->processed = true;
|
||||
node->resFlag[currentTask->retFlag] = 1;
|
||||
break;
|
||||
}
|
||||
case EXIORDAN: {
|
||||
for (int i = 0; i < node->_numAnaloguePins; i++) {
|
||||
node->setanalogInputBuffer(received_data[i+3], i);
|
||||
}
|
||||
currentTask->processed = true;
|
||||
node->resFlag[currentTask->retFlag] = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
flagProc = false;
|
||||
|
||||
}
|
||||
if (currentTask->processed) {
|
||||
markTaskCompleted(currentTask->taskID);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (_currentMicros - _cycleStartTime >= _cycleTime/* && _currentNode->isInitialised()*/) {
|
||||
_cycleStartTime = _currentMicros;
|
||||
if (_currentNode == NULL) _currentNode = _nodeListStart;
|
||||
RSproto *bus = RSproto::findBus(0);
|
||||
uint8_t buffB[3];
|
||||
buffB[0] = (_currentNode->getNodeID());
|
||||
buffB[1] = (0);
|
||||
buffB[2] = (EXIORDD);
|
||||
bus->setBusy();
|
||||
bus->addTask(buffB, 3, EXIORDD);
|
||||
|
||||
buffB[0] = (_currentNode->getNodeID());
|
||||
buffB[1] = (0);
|
||||
buffB[2] = (EXIORDD);
|
||||
bus->setBusy();
|
||||
bus->addTask(buffB, 3, EXIORDAN);
|
||||
_currentNode = _currentNode->getNext();
|
||||
//DIAG(F("Polling"));
|
||||
}
|
||||
}
|
||||
|
||||
// Link to chain of RSproto instances, left over from RSproto template.
|
||||
@ -406,7 +390,7 @@ void RSprotonode::_begin() {
|
||||
bus->addTask(buff, 3, EXIOVER);
|
||||
|
||||
|
||||
setInitialised();
|
||||
//setInitialised();
|
||||
#ifdef DIAG_IO
|
||||
_display();
|
||||
#endif
|
||||
|
||||
14
IO_RSproto.h
14
IO_RSproto.h
@ -122,6 +122,8 @@ public:
|
||||
Bounce = 4, // For semaphores/turnouts with a bit of bounce!!
|
||||
NoPowerOff = 0x80, // Flag to be ORed in to suppress power off after move.
|
||||
};
|
||||
void _pollDigital(unsigned long currentMicros);
|
||||
void _pollAnalog(unsigned long currentMicros);
|
||||
|
||||
uint8_t _numDigitalPins = 0;
|
||||
uint8_t getnumDigialPins() {
|
||||
@ -277,6 +279,7 @@ private:
|
||||
// Here we define the device-specific variables.
|
||||
uint8_t _busNo;
|
||||
unsigned long _cycleStartTime = 0;
|
||||
unsigned long _cycleStartTimeA = 0;
|
||||
unsigned long _timeoutStart = 0;
|
||||
unsigned long _cycleTime; // target time between successive read/write cycles, microseconds
|
||||
unsigned long _timeoutPeriod; // timeout on read responses, in microseconds.
|
||||
@ -286,7 +289,7 @@ private:
|
||||
int _operationCount = 0;
|
||||
int _refreshOperation = 0;
|
||||
byte bufferLength;
|
||||
static const int ARRAY_SIZE = 75;
|
||||
static const int ARRAY_SIZE = 150;
|
||||
int buffer[ARRAY_SIZE];
|
||||
byte inCommandPayload;
|
||||
static RSproto *_busList; // linked list of defined bus instances
|
||||
@ -321,7 +324,7 @@ private:
|
||||
int byteCounter = 0;
|
||||
public:
|
||||
struct Task {
|
||||
static const int ARRAY_SIZE = 254;
|
||||
static const int ARRAY_SIZE = 150;
|
||||
int taskID;
|
||||
uint8_t commandArray[ARRAY_SIZE];
|
||||
int byteCount;
|
||||
@ -332,7 +335,7 @@ struct Task {
|
||||
bool completed;
|
||||
bool processed;
|
||||
};
|
||||
static const int MAX_TASKS = 100;
|
||||
static const int MAX_TASKS = 50;
|
||||
int taskIDCntr = 0;
|
||||
Task taskBuffer[MAX_TASKS]; // Buffer to hold up to 100 tasks
|
||||
int currentTaskIndex = 0;
|
||||
@ -363,7 +366,7 @@ void addTask(const uint8_t* cmd, int byteCount, uint8_t retFlag) {
|
||||
DIAG(F("Task Buffer Full!"));
|
||||
return;
|
||||
}
|
||||
for (int i = 0; i < ARRAY_SIZE; i++) taskBuffer[emptySlot].commandArray[i] = cmd[i];
|
||||
for (int i = 0; i < byteCount; i++) taskBuffer[emptySlot].commandArray[i] = cmd[i];
|
||||
taskBuffer[emptySlot].byteCount = byteCount;
|
||||
taskBuffer[emptySlot].retFlag = retFlag;
|
||||
taskBuffer[emptySlot].rxMode = false;
|
||||
@ -447,6 +450,9 @@ uint16_t crc16(uint8_t *data, uint16_t length);
|
||||
uint16_t _pullup;
|
||||
uint16_t _pin;
|
||||
int8_t _txPin;
|
||||
int8_t getTxPin() {
|
||||
return _txPin;
|
||||
}
|
||||
bool _busy = false;
|
||||
void setBusy() {
|
||||
_busy = true;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user