Changes for page TCP Communication
Last modified by csp on 2025/01/30 12:05
Summary
-
Page properties (2 modified, 0 added, 0 removed)
-
Objects (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. csp1 +XWiki.nbw - Content
-
... ... @@ -41,8 +41,10 @@ 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 + 46 46 |=((( 47 47 Number 48 48 )))|=((( ... ... @@ -65,75 +65,75 @@ 65 65 Track 66 66 ))) 67 67 |((( 68 - 170 +9 69 69 )))|((( 70 70 KH_ST_1 71 71 )))|(% colspan="1" %)(% colspan="1" %) 72 72 ((( 73 - 675 +17 74 74 )))|(% colspan="1" %)(% colspan="1" %) 75 75 ((( 76 76 KH_ST_1 (reverse) 77 77 )))|((( 78 - 1180 +25 79 79 )))|((( 80 -IC_ST_ 382 +IC_ST_1 81 81 )))|(% colspan="1" %)(% colspan="1" %) 82 82 ((( 83 - 1485 +33 84 84 )))|(% colspan="1" %)(% colspan="1" %) 85 85 ((( 86 -OC_ST_ 388 +OC_ST_1 87 87 ))) 88 88 |((( 89 - 291 +10 90 90 )))|((( 91 91 KH_ST_2 92 92 )))|(% colspan="1" %)(% colspan="1" %) 93 93 ((( 94 - 796 +18 95 95 )))|(% colspan="1" %)(% colspan="1" %) 96 96 ((( 97 97 KH_ST_2 (reverse) 98 98 )))|((( 99 - 12101 +26 100 100 )))|((( 101 101 IC_ST_2 102 102 )))|(% colspan="1" %)(% colspan="1" %) 103 103 ((( 104 - 15106 +34 105 105 )))|(% colspan="1" %)(% colspan="1" %) 106 106 ((( 107 107 OC_ST_2 108 108 ))) 109 109 |((( 110 - 3112 +11 111 111 )))|((( 112 112 KH_ST_3 113 113 )))|(% colspan="1" %)(% colspan="1" %) 114 114 ((( 115 - 8117 +19 116 116 )))|(% colspan="1" %)(% colspan="1" %) 117 117 ((( 118 118 KH_ST_3 (reverse) 119 119 )))|((( 120 - 13122 +27 121 121 )))|((( 122 -IC_ST_ 1124 +IC_ST_3 123 123 )))|(% colspan="1" %)(% colspan="1" %) 124 124 ((( 125 - 16127 +35 126 126 )))|(% colspan="1" %)(% colspan="1" %) 127 127 ((( 128 -OC_ST_ 1130 +OC_ST_3 129 129 ))) 130 130 |((( 131 - 4133 +12 132 132 )))|((( 133 133 KH_ST_4 134 134 )))|(% colspan="1" %)(% colspan="1" %) 135 135 ((( 136 - 9138 +20 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 - 5154 +13 153 153 )))|((( 154 154 KH_ST_5 155 155 )))|(% colspan="1" %)(% colspan="1" %) 156 156 ((( 157 -1 0159 +21 158 158 )))|(% colspan="1" %)(% colspan="1" %) 159 159 ((( 160 160 KH_ST_5 (reverse) ... ... @@ -171,22 +171,34 @@ 171 171 ))) 172 172 ))) 173 173 * **locks** - a JSON Array containing the current value of the track permissions, ordered by the default encoding (Hoermann API) 176 +* **tickTime** - Time consumption of tick function. 3 element array [min,avg,max]. 177 +* **overallTime** - Time consumption of overall controller loop. 3 element array [min,avg,max]. 174 174 179 + 180 + 175 175 {{code title="Sample status" language="js" collapse="true"}} 176 176 {"msgType":"status", 177 - "data":{ 178 - "debug":false, 179 - "cleanup":false, 180 - "pause":false, 181 - "trainCount":8, 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]}, 185 - ... ], 186 - "locks":[-1, -1, -1, 5, -1, -1, 2, 10, -1, -1, ..., -1]}} 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]} 187 187 188 188 [One line to test via netcat] 189 -{"msgType":"status", ing":false, "waitTime":0, "spdSlow":40, "spdCaution":60, "spdNormal":100, "currentIndex":2, "schedule":[1,1,4,6]},ing":true, "waitTime":9999999999, "spdSlow":51, "spdCaution":71, "spdNormal":101, "currentIndex":0, "schedule":[2,1,4,6]},ing":false, "waitTime":0, "spdSlow":52, "spdCaution":72, "spdNormal":102, "currentIndex":1, "schedule":[3,1,4,6]},ing":false, "waitTime":0, "spdSlow":53, "spdCaution":73, "spdNormal":103, "currentIndex":1, "schedule":[4,1,4,6]},ing":false, "waitTime":0, "spdSlow":54, "spdCaution":74, "spdNormal":104, "currentIndex":2, "schedule":[5,1,4,6]},ing":false, "waitTime":0, "spdSlow":55, "spdCaution":75, "spdNormal":105, "currentIndex":3, "schedule":[6,1,4,6]},ing":false, "waitTime":0, "spdSlow":56, "spdCaution":76, "spdNormal":106, "currentIndex":1, "schedule":[7,1,4,6]},ing":false, "waitTime":0, "spdSlow":57, "spdCaution":77, "spdNormal":107, "currentIndex":0, "schedule":[8,1,4,6]}],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]}}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]} 190 190 {{/code}} 191 191 192 192 == Messages received by controller == ... ... @@ -220,6 +220,6 @@ 220 220 ** **speeds** - JSON Array with three integer values (% class="confluence-link" %)spdSlow, spdCaution, spdNormal 221 221 * //TIME// (//write//) - Change the waiting times for a train 222 222 ** **train** - integer train identification 223 -** **times** - 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. 224 224 225 -{{status colour="Yellow" title=" Define a formatfor this"/}}239 +{{status colour="Yellow" title="New definition"/}}
- Confluence.Code.ConfluencePageClass[0]
-
- Id
-
... ... @@ -1,1 +1,1 @@ 1 -94715 671 +9471598 - URL
-
... ... @@ -1,1 +1,1 @@ 1 -https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/94715 67/TCP Communication1 +https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/SS14Railway/pages/9471598/TCP Communication