dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-23 12:51:24 +01:00
Code Releases Activity

move mark/commit into CommandDistributor::parse()

Browse Source
This commit is contained in:
Harald Barth 2022-08-16 19:22:19 +02:00
parent 5d415366d8
commit 9633e77c0a
6 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CommandDistributor.cpp
View File

@ -69,13 +69,28 @@ void CommandDistributor::parse(byte clientId,byte * buffer, RingStream * stream
clients[clientId]=WITHROTTLE_TYPE;
}
// mark buffer that is sent to parser
ring->mark(clientId);
// When type is known, send the string
// to the right parser
if (clients[clientId] == COMMAND_TYPE)
if (clients[clientId] == COMMAND_TYPE) {
DCCEXParser::parse(stream, buffer, ring);
else if (clients[clientId] == WITHROTTLE_TYPE)
} else if (clients[clientId] == WITHROTTLE_TYPE) {
WiThrottle::getThrottle(clientId)->parse(ring, buffer);
}
if (ring->peekTargetMark()!=RingStream::NO_CLIENT) {
// The commit call will either write the length bytes
// OR rollback to the mark because the reply is empty
// or the command generated more output than fits in
// the buffer
if (!ring->commit()) {
DIAG(F("OUTBOUND FULL processing cmd:%s"),buffer);
}
} else {
DIAG(F("CD parse: was alredy committed")); //XXX Could have been committed by broadcastClient?!
}
}
void CommandDistributor::forget(byte clientId) {
@ -111,7 +126,7 @@ void CommandDistributor::broadcastToClients(clientType type) {
ring->commit();
}
}
if (ring->peekTargetMark()!=RingStream::NO_CLIENT) {
if (ring->peekTargetMark() == RingStream::NO_CLIENT) {
//DIAG(F("CD postmark client %d"), rememberClient);
ring->mark(rememberClient);
}

2
EthernetInterface.cpp
View File

@ -163,9 +163,7 @@ void EthernetInterface::loop()
buffer[count] = '\0'; // terminate the string properly
if (Diag::ETHERNET) DIAG(F(",count=%d:%e"), socket,buffer);
// execute with data going directly back
outboundRing->mark(socket);
CommandDistributor::parse(socket,buffer,outboundRing);
outboundRing->commit();
return; // limit the amount of processing that takes place within 1 loop() cycle.
}
}

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "PORTX-HAL-20220813"
#define GITHUB_SHA "PORTX-HAL-20220816"

3
WifiESP32.cpp
View File

@ -264,10 +264,7 @@ void WifiESP::loop() {
cmd[i]=clients[clientId].wifi.read();
}
cmd[len]=0;
outboundRing->mark(clientId);
CommandDistributor::parse(clientId,cmd,outboundRing);
if (outboundRing->peekTargetMark()!=RingStream::NO_CLIENT)
outboundRing->commit();
}
}
} // all clients

6
WifiInboundHandler.cpp
View File

@ -84,13 +84,7 @@ void WifiInboundHandler::loop1() {
cmd[count]=0;
if (Diag::WIFI) DIAG(F("%e"),cmd);
outboundRing->mark(clientId); // remember start of outbound data
CommandDistributor::parse(clientId,cmd,outboundRing);
// The commit call will either write the lenbgth bytes
// OR rollback to the mark because the reply is empty or commend generated more than fits the buffer
if (!outboundRing->commit()) {
DIAG(F("OUTBOUND FULL processing cmd:%s"),cmd);
}
return;
}
}

2
version.h
View File

@ -4,7 +4,7 @@
#include "StringFormatter.h"
#define VERSION "4.2.1 rc1"
#define VERSION "4.2.2 rc1"
// 4.2.1 ESP32 alpha
// Ready for alpha test on ESP32. Track switching with <=> untested
// Send DCC signal on MAIN