<
From version < 19.1 >
edited by nbw
on 2014/07/24 22:57
To version < 16.1 >
edited by Alexander Schulz-Rosengarten
on 2014/07/16 14:49
>
Change comment: There is no comment for this version

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.nbw
1 +XWiki.als
Content
... ... @@ -41,10 +41,8 @@
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
43 43  ** (((
44 -**schedule** - a JSON Array of integer values, representing the station tracks, encoded in the following fashion
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  )))|=(((
... ... @@ -67,75 +67,75 @@
67 67  Track
68 68  )))
69 69  |(((
70 -9
68 +0
71 71  )))|(((
72 72  KH_ST_1
73 73  )))|(% colspan="1" %)(% colspan="1" %)
74 74  (((
75 -17
73 +8
76 76  )))|(% colspan="1" %)(% colspan="1" %)
77 77  (((
78 78  KH_ST_1 (reverse)
79 79  )))|(((
80 -25
78 +16
81 81  )))|(((
82 82  IC_ST_1
83 83  )))|(% colspan="1" %)(% colspan="1" %)
84 84  (((
85 -33
83 +24
86 86  )))|(% colspan="1" %)(% colspan="1" %)
87 87  (((
88 88  OC_ST_1
89 89  )))
90 90  |(((
91 -10
89 +1
92 92  )))|(((
93 93  KH_ST_2
94 94  )))|(% colspan="1" %)(% colspan="1" %)
95 95  (((
96 -18
94 +9
97 97  )))|(% colspan="1" %)(% colspan="1" %)
98 98  (((
99 99  KH_ST_2 (reverse)
100 100  )))|(((
101 -26
99 +17
102 102  )))|(((
103 103  IC_ST_2
104 104  )))|(% colspan="1" %)(% colspan="1" %)
105 105  (((
106 -34
104 +25
107 107  )))|(% colspan="1" %)(% colspan="1" %)
108 108  (((
109 109  OC_ST_2
110 110  )))
111 111  |(((
112 -11
110 +2
113 113  )))|(((
114 114  KH_ST_3
115 115  )))|(% colspan="1" %)(% colspan="1" %)
116 116  (((
117 -19
115 +10
118 118  )))|(% colspan="1" %)(% colspan="1" %)
119 119  (((
120 120  KH_ST_3 (reverse)
121 121  )))|(((
122 -27
120 +18
123 123  )))|(((
124 124  IC_ST_3
125 125  )))|(% colspan="1" %)(% colspan="1" %)
126 126  (((
127 -35
125 +26
128 128  )))|(% colspan="1" %)(% colspan="1" %)
129 129  (((
130 130  OC_ST_3
131 131  )))
132 132  |(((
133 -12
131 +3
134 134  )))|(((
135 135  KH_ST_4
136 136  )))|(% colspan="1" %)(% colspan="1" %)
137 137  (((
138 -20
136 +11
139 139  )))|(% colspan="1" %)(% colspan="1" %)
140 140  (((
141 141  KH_ST_4 (reverse)
... ... @@ -151,12 +151,12 @@
151 151  
152 152  )))
153 153  |(((
154 -13
152 +4
155 155  )))|(((
156 156  KH_ST_5
157 157  )))|(% colspan="1" %)(% colspan="1" %)
158 158  (((
159 -21
157 +12
160 160  )))|(% colspan="1" %)(% colspan="1" %)
161 161  (((
162 162  KH_ST_5 (reverse)
... ... @@ -179,28 +179,22 @@
179 179  
180 180  
181 181  {{code title="Sample status" language="js" collapse="true"}}
180 +<<OUTDATED>>
181 +
182 182  {"msgType":"status",
183 - "data":{
184 - "debug":false,
185 - "cleanup":false,
186 - "pause":false,
187 - "trainCount":8,
188 - "trains":[
189 - {"trainNum":0, "waitTime":0, "spdSlow":40, "spdCaution":60, "spdNormal":100, "currentIndex":1, "schedule":[9,13,17,21,25,27,33,35]},
190 - {"trainNum":1, "waitTime":2500, "spdSlow":41, "spdCaution":61, "spdNormal":101, "currentIndex":2, "schedule":[9,13,17,21,25,27,33,35]},
191 - {"trainNum":2, "waitTime":0, "spdSlow":42, "spdCaution":62, "spdNormal":102, "currentIndex":3, "schedule":[9,13,17,21,25,27,33,35]},
192 - {"trainNum":3, "waitTime":0, "spdSlow":43, "spdCaution":63, "spdNormal":103, "currentIndex":4, "schedule":[9,13,17,21,25,27,33,35]},
193 - {"trainNum":4, "waitTime":0, "spdSlow":44, "spdCaution":64, "spdNormal":104, "currentIndex":5, "schedule":[9,13,17,21,25,27,33,35]},
194 - {"trainNum":5, "waitTime":10000, "spdSlow":45, "spdCaution":65, "spdNormal":105, "currentIndex":6, "schedule":[9,13,17,21,25,27,33,35]},
195 - {"trainNum":6, "waitTime":0, "spdSlow":46, "spdCaution":66, "spdNormal":106, "currentIndex":7, "schedule":[9,13,17,21,25,27,33,35]},
196 - {"trainNum":7, "waitTime":0, "spdSlow":47, "spdCaution":67, "spdNormal":107, "currentIndex":8, "schedule":[9,13,17,21,25,27,33,35]},
197 - ],
198 - "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]},
199 - "tickTime":[50, 60, 70],
200 - "overallTime":[70, 80, 90]}
183 + "data":{
184 + "debug":false,
185 + "cleanup":false,
186 + "pause":false,
187 + "trainCount":8,
188 + "trains":[
189 + {"trainNum":0, "waiting":false, "waitTime":0, "spdSlow":40, "spdCaution":60, "spdNormal":100, "currentIndex":2, "schedule":[8, 10, 25, 29, 41, 43]},
190 + {"trainNum":1, "waiting":true, "waitTime":1234545667, "spdSlow":50, "spdCaution":70, "spdNormal":100, "currentIndex":0, "schedule":[8]},
191 + ... ],
192 + "locks":[-1, -1, -1, 5, -1, -1, 2, 10, -1, -1, ..., -1]}}
201 201  
202 202  [One line to test via netcat]
203 -{"msgType":"status","data":{"debug":false,"cleanup":false,"pause":false,"trainCount":8,"trains":[{"trainNum":0, "waitTime":0, "spdSlow":40, "spdCaution":60, "spdNormal":100, "currentIndex":1, "schedule":[9,13,17,21,25,27,33,35]},{"trainNum":1, "waitTime":2500, "spdSlow":41, "spdCaution":61, "spdNormal":101, "currentIndex":2, "schedule":[9,13,17,21,25,27,33,35]},{"trainNum":2, "waitTime":0, "spdSlow":42, "spdCaution":62, "spdNormal":102, "currentIndex":3, "schedule":[9,13,17,21,25,27,33,35]},{"trainNum":3, "waitTime":0, "spdSlow":43, "spdCaution":63, "spdNormal":103, "currentIndex":4, "schedule":[9,13,17,21,25,27,33,35]},{"trainNum":4, "waitTime":0, "spdSlow":44, "spdCaution":64, "spdNormal":104, "currentIndex":5, "schedule":[9,13,17,21,25,27,33,35]},{"trainNum":5, "waitTime":10000, "spdSlow":45, "spdCaution":65, "spdNormal":105, "currentIndex":6, "schedule":[9,13,17,21,25,27,33,35]},{"trainNum":6, "waitTime":0, "spdSlow":46, "spdCaution":66, "spdNormal":106, "currentIndex":7, "schedule":[9,13,17,21,25,27,33,35]},{"trainNum":7, "waitTime":0, "spdSlow":47, "spdCaution":67, "spdNormal":107, "currentIndex":8, "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]}
195 +{"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]}}
204 204  {{/code}}
205 205  
206 206  == Messages received by controller ==
... ... @@ -234,6 +234,6 @@
234 234  ** **speeds** - JSON Array with three integer values (% class="confluence-link" %)spdSlow, spdCaution, spdNormal
235 235  * //TIME// (//write//) - 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.
229 +** **times** -
238 238  
239 -{{status colour="Yellow" title="New definition"/}}
231 +{{status colour="Yellow" title="Define a format for this"/}}
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -9471598
1 +9471578
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/9471578/TCP Communication