Changes for page TCP Communication
Last modified by csp on 2025/01/30 12:05
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Objects (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -30,21 +30,18 @@ 30 30 * **debug** - true if the controller is set to verbose debug output, false otherwise 31 31 * **cleanup** - true after cleanup mode has been engaged, false before that point 32 32 * **pause** - true while the controller is paused, false otherwise 33 -* **write** - true if receiving client has write access, false otherwise 34 34 * **trainCount** - an integer with the number of active trains on the railway 35 -* **trains** - a JSON Array with the data of all trains, each entry is a JSON Object with these values\\ 36 -** **trainNum** - the individual controller number of the train 37 -** --**waiting** - boolean value, true if the train is waiting in a station, false otherwise -- 38 -** **{{status colour="Red" title="Removed"/}}waitTime** - (integer) remaining milliseconds until departure (0 if not waiting) 39 -** **{{status colour="Yellow" title="changed"/}}spdSlow** - the integer PWM value of this train while driving slow 34 +* **trains** - a JSON Array with the data of all trains, each entry is a JSON Object with these values 35 +** **state** - integer value for current train state (0 = travelling, 1 = waiting, 2 = forced travel, 3 = forced wait) 36 +** **waitTime** - (integer) remaining milliseconds until departure (0 if not waiting) 37 +** **spdSlow** - the integer PWM value of this train while driving slow 40 40 ** **spdCaution** - the integer PWM value of this train while driving caution 41 41 ** **spdNormal** - the integer PWM value of this train while driving normally 42 -** **currentIndex** -an integer describing the current position in the schedule 40 +** **stationTimes** - a flat array of the form [station1_minTime, station1_maxTime, station2_minTime, station2_maxTime, ...]. The order of the stations is defined by the order in the table below but the KH (reverse) tracks are omitted. 41 +** **currentIndex** - an integer describing the current position in the schedule 43 43 ** ((( 44 44 **schedule** - a JSON Array of integer values, representing the station tracks, encoded in the following fashion 45 45 46 -{{status colour="Yellow" title="CHANGED"/}} 47 - 48 48 |=((( 49 49 Number 50 50 )))|=((( ... ... @@ -180,27 +180,27 @@ 180 180 181 181 {{code title="Sample status" language="js" collapse="true"}} 182 182 {"msgType":"status", 183 - 184 - 185 - 186 - 187 - 188 - 189 - rainNum":0,190 - rainNum":1,191 - rainNum":2,192 - rainNum":3,193 - rainNum":4,194 - rainNum":5,195 - rainNum":6,196 - rainNum":7,8,197 - 198 - },199 - 200 - 180 +"data":{ 181 + "debug":false, 182 + "cleanup":false, 183 + "pause":false, 184 + "trainCount":8, 185 + "trains":[ 186 + {"state":3,"waitTime":0,"spdSlow":40,"spdCaution":60,"spdNormal":100,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":1,"schedule":[9,13,17,21,25,27,33,35]}, 187 + {"state":1,"waitTime":2500,"spdSlow":41,"spdCaution":61,"spdNormal":101,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":2,"schedule":[9,13,17,21,25,27,33,35]}, 188 + {"state":0,"waitTime":0,"spdSlow":42,"spdCaution":62,"spdNormal":102,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":3,"schedule":[9,13,17,21,25,27,33,35]}, 189 + {"state":0,"waitTime":0,"spdSlow":43,"spdCaution":63,"spdNormal":103,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":4,"schedule":[9,13,17,21,25,27,33,35]}, 190 + {"state":0,"waitTime":0,"spdSlow":44,"spdCaution":64,"spdNormal":104,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":5,"schedule":[9,13,17,21,25,27,33,35]}, 191 + {"state":1,"waitTime":10000,"spdSlow":45,"spdCaution":65,"spdNormal":105,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":6,"schedule":[9,13,17,21,25,27,33,35]}, 192 + {"state":2,"waitTime":0,"spdSlow":46,"spdCaution":66,"spdNormal":106,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":7,"schedule":[9,13,17,21,25,27,33,35]}, 193 + {"state":0,"waitTime":0,"spdSlow":47,"spdCaution":67,"spdNormal":107,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":4,"schedule":[9,13,17,21,25,27,33,35]}, 194 + ], 195 + "locks":[-1,-1,-1,-1,-1,0,-1,-1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,5,-1,-1,-1,3,3,7,7,-1,-1,-1,-1,-1,-1,6,-1,-1], 196 + "tickTime":[50,60,70], 197 + "overallTime":[70,80,90]}} 201 201 202 202 [One line to test via netcat] 203 -{"msgType":"status","data":{"debug":false,"cleanup":false,"pause":false,"trainCount":8,"trains":[{"t rainNum":0,rainNum":1,rainNum":2,rainNum":3,rainNum":4,rainNum":5,rainNum":6,rainNum":7,8,},200 +{"msgType":"status","data":{"debug":false,"cleanup":false,"pause":false,"trainCount":8,"trains":[{"state":3,"waitTime":0,"spdSlow":40,"spdCaution":60,"spdNormal":100,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":1,"schedule":[9,13,17,21,25,27,33,35]},{"state":1,"waitTime":2500,"spdSlow":41,"spdCaution":61,"spdNormal":101,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":2,"schedule":[9,13,17,21,25,27,33,35]},{"state":0,"waitTime":0,"spdSlow":42,"spdCaution":62,"spdNormal":102,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":3,"schedule":[9,13,17,21,25,27,33,35]},{"state":0,"waitTime":0,"spdSlow":43,"spdCaution":63,"spdNormal":103,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":4,"schedule":[9,13,17,21,25,27,33,35]},{"state":0,"waitTime":0,"spdSlow":44,"spdCaution":64,"spdNormal":104,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":5,"schedule":[9,13,17,21,25,27,33,35]},{"state":1,"waitTime":10000,"spdSlow":45,"spdCaution":65,"spdNormal":105,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":6,"schedule":[9,13,17,21,25,27,33,35]},{"state":2,"waitTime":0,"spdSlow":46,"spdCaution":66,"spdNormal":106,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":7,"schedule":[9,13,17,21,25,27,33,35]},{"state":0,"waitTime":0,"spdSlow":47,"spdCaution":67,"spdNormal":107,"stationTimes":[5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10,5,10],"currentIndex":4,"schedule":[9,13,17,21,25,27,33,35]},],"locks":[-1,-1,-1,-1,-1,0,-1,-1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,5,-1,-1,-1,3,3,7,7,-1,-1,-1,-1,-1,-1,6,-1,-1],"tickTime":[50,60,70],"overallTime":[70,80,90]}} 204 204 {{/code}} 205 205 206 206 == Messages received by controller == ... ... @@ -215,25 +215,22 @@ 215 215 * //LOGOUT// - Closing the connection, leaving the controller running 216 216 * //PAUSE// - suspend or resume the controller, must supply additional payload 217 217 ** **state** - boolean value, true if controller should be suspended 218 -* //WRITE// - Acquire write access mutex to the controller 219 -* //CLEANUP// (//write//) - Start the cleanup procedure, sending the trains back to their home tacks 220 -* //DEBUG// (//write//) - enable or disable verbose output, must supply additional payload 215 +* //CLEANUP// - Start the cleanup procedure, sending the trains back to their home tacks 216 +* //DEBUG// - enable or disable verbose output, must supply additional payload 221 221 ** **state** - boolean value, true if verbose output should be activated 222 -* //LIGHT (write//)- activate or deactivate the lights on the railway, must supply additional payload\\218 +* //LIGHT// - activate or deactivate the lights on the railway, must supply additional payload\\ 223 223 ** **state** - boolean value, true if lights should be lit 224 -* //WAIT// (//write//)- Force a train to wait in the next station, must supply additional payload220 +* //WAIT// - Force a train to wait in the next station, must supply additional payload 225 225 ** **train** - integer train identification 226 -* //START (write//)- Force a waiting train to immediately abort the waiting timer, must supply additional payload222 +* //START// - Force a waiting train to immediately abort the waiting timer, must supply additional payload 227 227 ** **train** - integer train identification 228 -* //SCHEDULE// (//write//)- Set the new schedule for a train, needs additional payload224 +* //SCHEDULE// - Set the new schedule for a train, needs additional payload 229 229 ** **train** - integer train identification 230 230 ** **currentIndex** - current integer position in the schedule array 231 231 ** **tracks** - a JSON Array of integer values, representing the station tracks in encoding above 232 -* //SPEED (write//)- Change the speed settings of a train, needs additional payload228 +* //SPEED //- Change the speed settings of a train, needs additional payload 233 233 ** **train** - integer train identification 234 234 ** **speeds** - JSON Array with three integer values (% class="confluence-link" %)spdSlow, spdCaution, spdNormal 235 -* //TIME// (//write//)- Change the waiting times for a train231 +* //TIME// - Change the waiting times for a train 236 236 ** **train** - integer train identification 237 -** **times** - a flat array of the form [station1_minTime, station1_maxTime, station2_minTime, station2_maxTime, ...]. The order of the stations is defined by the order in the table above. 238 - 239 -{{status colour="Yellow" title="New definition"/}} 233 +**times** - a flat array of the form [station1_minTime, station1_maxTime, station2_minTime, station2_maxTime, ...]. The order of the stations is defined by the order in the table above but the KH (reverse) tracks are omitted.
- Confluence.Code.ConfluencePageClass[0]
-
- Id
-
... ... @@ -1,1 +1,1 @@ 1 -9471 5981 +9471629 - URL
-
... ... @@ -1,1 +1,1 @@ 1 -https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471 598/TCP Communication1 +https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471629/TCP Communication