<
From version < 19.1 >
edited by nbw
on 2014/07/24 22:57
To version < 21.1 >
edited by nbw
on 2014/07/30 13:48
>
Change comment: Removed write lock, Added station times

Summary

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 35  * **trains** - a JSON Array with the data of all trains, each entry is a JSON Object with these values\\
36 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
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 +** **currentIndex** - an integer describing the current position in the schedule
41 +** **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.
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  )))|=(((
... ... @@ -215,25 +215,24 @@
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 payload
220 +* //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 payload
222 +* //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 payload
224 +* //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 payload
228 +* //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 train
231 +* //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.
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.
238 238  
239 239  {{status colour="Yellow" title="New definition"/}}
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -9471598
1 +9471606
URL
... ... @@ -1,1 +1,1 @@
1 -https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471598/TCP Communication
1 +https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471606/TCP Communication