Summary

• Page properties (2 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • Confluence.Code.ConfluencePageClass[0]

Details

Page properties

Author

...	...	@@ -1,1 +1,1 @@
1		-XWiki.als
	1	+XWiki.nbw

Content

...	...	@@ -30,13 +30,10 @@
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	+** **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	42	** **currentIndex** -an integer describing the current position in the schedule
...	...	@@ -65,75 +65,75 @@
65	65	Track
66	66	)))
67	67	|(((
68		-0
	65	+1
69	69	)))|(((
70	70	KH_ST_1
71	71	)))|(% colspan="1" %)(% colspan="1" %)
72	72	(((
73		-8
	70	+6
74	74	)))|(% colspan="1" %)(% colspan="1" %)
75	75	(((
76	76	KH_ST_1 (reverse)
77	77	)))|(((
78		-16
	75	+11
79	79	)))|(((
80	80	IC_ST_3
81	81	)))|(% colspan="1" %)(% colspan="1" %)
82	82	(((
83		-24
	80	+14
84	84	)))|(% colspan="1" %)(% colspan="1" %)
85	85	(((
86	86	OC_ST_3
87	87	)))
88	88	|(((
89		-1
	86	+2
90	90	)))|(((
91	91	KH_ST_2
92	92	)))|(% colspan="1" %)(% colspan="1" %)
93	93	(((
94		-9
	91	+7
95	95	)))|(% colspan="1" %)(% colspan="1" %)
96	96	(((
97	97	KH_ST_2 (reverse)
98	98	)))|(((
99		-17
	96	+12
100	100	)))|(((
101	101	IC_ST_2
102	102	)))|(% colspan="1" %)(% colspan="1" %)
103	103	(((
104		-25
	101	+15
105	105	)))|(% colspan="1" %)(% colspan="1" %)
106	106	(((
107	107	OC_ST_2
108	108	)))
109	109	|(((
110		-2
	107	+3
111	111	)))|(((
112	112	KH_ST_3
113	113	)))|(% colspan="1" %)(% colspan="1" %)
114	114	(((
115		-10
	112	+8
116	116	)))|(% colspan="1" %)(% colspan="1" %)
117	117	(((
118	118	KH_ST_3 (reverse)
119	119	)))|(((
120		-18
	117	+13
121	121	)))|(((
122	122	IC_ST_1
123	123	)))|(% colspan="1" %)(% colspan="1" %)
124	124	(((
125		-26
	122	+16
126	126	)))|(% colspan="1" %)(% colspan="1" %)
127	127	(((
128	128	OC_ST_1
129	129	)))
130	130	|(((
131		-3
	128	+4
132	132	)))|(((
133	133	KH_ST_4
134	134	)))|(% colspan="1" %)(% colspan="1" %)
135	135	(((
136		-11
	133	+9
137	137	)))|(% colspan="1" %)(% colspan="1" %)
138	138	(((
139	139	KH_ST_4 (reverse)
...	...	@@ -149,12 +149,12 @@
149	149
150	150	)))
151	151	|(((
152		-4
	149	+5
153	153	)))|(((
154	154	KH_ST_5
155	155	)))|(% colspan="1" %)(% colspan="1" %)
156	156	(((
157		-12
	154	+10
158	158	)))|(% colspan="1" %)(% colspan="1" %)
159	159	(((
160	160	KH_ST_5 (reverse)
...	...	@@ -180,13 +180,10 @@
180	180	"pause":false,
181	181	"trainCount":8,
182	182	"trains":[
183		- {"trainNum":0, "waiting":false, "waitTime":0, "spdSlow":40, "spdCaution":60, "spdNormal":100, "currentIndex":2, "schedule":[8, 10, 25, 29, 41, 43]},
184		- {"trainNum":1, "waiting":true, "waitTime":1234545667, "spdSlow":50, "spdCaution":70, "spdNormal":100, "currentIndex":0, "schedule":[8]},
	180	+ {"trainNum":0, "spdSlow":40, "spdCaution":60, "spdNormal":100, "currentIndex":2, "schedule":[8, 10, 25, 29, 41, 43]},
	181	+ {"trainNum":1, "spdSlow":50, "spdCaution":70, "spdNormal":100, "currentIndex":0, "schedule":[8]},
185	185	... ],
186	186	"locks":[-1, -1, -1, 5, -1, -1, 2, 10, -1, -1, ..., -1]}}
187		-
188		-[One line to test via netcat]
189		-{"msgType":"status", "data":{"debug":false, "cleanup":false, "pause":false, "trainCount":8, "trains":[ {"trainNum":0, "waiting":false, "waitTime":0, "spdSlow":40, "spdCaution":60, "spdNormal":100, "currentIndex":2, "schedule":[1, 1, 11, 14, 6]}, {"trainNum":1, "waiting":true, "waitTime":9999999999, "spdSlow":51, "spdCaution":71, "spdNormal":101, "currentIndex":0, "schedule":[2, 1, 11, 14, 6]}, {"trainNum":2, "waiting":false, "waitTime":0, "spdSlow":52, "spdCaution":72, "spdNormal":102, "currentIndex":1, "schedule":[3, 1, 11, 14, 6]}, {"trainNum":3, "waiting":false, "waitTime":0, "spdSlow":53, "spdCaution":73, "spdNormal":103, "currentIndex":1, "schedule":[4, 1, 11, 14, 6]}, {"trainNum":4, "waiting":false, "waitTime":0, "spdSlow":54, "spdCaution":74, "spdNormal":104, "currentIndex":2, "schedule":[5, 1, 11, 14, 6]}, {"trainNum":5, "waiting":false, "waitTime":0, "spdSlow":55, "spdCaution":75, "spdNormal":105, "currentIndex":3, "schedule":[6, 1, 11, 14, 6]}, {"trainNum":6, "waiting":false, "waitTime":0, "spdSlow":56, "spdCaution":76, "spdNormal":106, "currentIndex":1, "schedule":[7, 1, 11, 14, 6]}, {"trainNum":7, "waiting":false, "waitTime":0, "spdSlow":57, "spdCaution":77, "spdNormal":107, "currentIndex":0, "schedule":[8, 1, 11, 14, 6]}], "locks":[-1, -1, -1, 5, -1, -1, 2, 3, -1, -1, -1, -1, 6, -1, -1, -1, -1, -1, -1, 4, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, 7, -1, -1, -1, -1, -1, -1]}}
190	190	{{/code}}
191	191
192	192	== Messages received by controller ==
...	...	@@ -196,29 +196,28 @@
196	196
197	197	=== Valid commands ===
198	198
199		-* //STATUS// - Poll for the current status, should trigger a status reply message
200	200	* //SHUTDOWN// - Causing the controller to end the program and close all sockets
201	201	* //LOGOUT// - Closing the connection, leaving the controller running
	195	+* //STATUS// - Poll for the current status, should trigger a status reply message
	196	+* //CLEANUP// - Start the cleanup procedure, sending the trains back to their home tacks
	197	+* //DEBUG// - enable or disable verbose output, must supply additional payload
	198	+** **state** - boolean value, true if verbose output should be activated
202	202	* //PAUSE// - suspend or resume the controller, must supply additional payload
203	203	** **state** - boolean value, true if controller should be suspended
204		-* //WRITE// - Acquire write access mutex to the controller
205		-* //CLEANUP// (//write//) - Start the cleanup procedure, sending the trains back to their home tacks
206		-* //DEBUG// (//write//) - enable or disable verbose output, must supply additional payload
207		-** **state** - boolean value, true if verbose output should be activated
208		-* //LIGHT (write//) - activate or deactivate the lights on the railway, must supply additional payload\\
	201	+* //LIGHT// - activate or deactivate the lights on the railway, must supply additional payload\\
209	209	** **state** - boolean value, true if lights should be lit
210		-* //WAIT// (//write//) - Force a train to wait in the next station, must supply additional payload
	203	+* //WAIT// - Force a train to wait in the next station, must supply additional payload
211	211	** **train** - integer train identification
212		-* //START (write//) - Force a waiting train to immediately abort the waiting timer, must supply additional payload
	205	+* //START// - Force a waiting train to immediately abort the waiting timer, must supply additional payload
213	213	** **train** - integer train identification
214		-* //SCHEDULE// (//write//) - Set the new schedule for a train, needs additional payload
	207	+* //SCHEDULE// - Set the new schedule for a train, needs additional payload
215	215	** **train** - integer train identification
216	216	** **currentIndex** - current integer position in the schedule array
217	217	** **tracks** - a JSON Array of integer values, representing the station tracks in encoding above
218		-* //SPEED (write//) - Change the speed settings of a train, needs additional payload
	211	+* //SPEED// - Change the speed settings of a train, needs additional payload
219	219	** **train** - integer train identification
220	220	** **speeds** - JSON Array with three integer values (% class="confluence-link" %)spdSlow, spdCaution, spdNormal
221		-* //TIME// (//write//) - Change the waiting times for a train
	214	+* //TIME// - Change the waiting times for a train
222	222	** **train** - integer train identification
223	223	** **times** -
224	224

Confluence.Code.ConfluencePageClass[0]

Id

...	...	@@ -1,1 +1,1 @@
1		-9471568
	1	+9471513

URL

...	...	@@ -1,1 +1,1 @@
1		-https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471568/TCP Communication
	1	+https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471513/TCP Communication