Changes for page 2 Script
Last modified by Devin Chen on 2025/06/06 14:03
Summary
-
Page properties (2 modified, 0 added, 0 removed)
-
Attachments (0 modified, 0 added, 22 removed)
- image-20220709165226-1.png
- image-20220709165402-1.png
- image-20220709165402-10.png
- image-20220709165402-11.png
- image-20220709165402-12.png
- image-20220709165402-13.png
- image-20220709165402-14.png
- image-20220709165402-15.png
- image-20220709165402-16.png
- image-20220709165402-17.png
- image-20220709165402-18.png
- image-20220709165402-19.png
- image-20220709165402-2.png
- image-20220709165402-20.png
- image-20220709165402-21.png
- image-20220709165402-3.png
- image-20220709165402-4.png
- image-20220709165402-5.png
- image-20220709165402-6.png
- image-20220709165402-7.png
- image-20220709165402-8.png
- image-20220709165402-9.png
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. admin1 +XWiki.Leo - Content
-
... ... @@ -7,25 +7,25 @@ 7 7 ))) 8 8 9 9 (% style="text-align:center" %) 10 -[[image:1624245865976-320.png||height="182" width="1000" class="img-thumbnail"]]10 +[[image:1624245865976-320.png||class="img-thumbnail" height="182" width="1000"]] 11 11 12 12 Depend on diffferent format of data.V-Box use different script functions. 13 13 for example. addr_setshort(addr,num) Function: Write 16-bit signed decimal address 14 14 addr_getshort(addr) Function:Read 16-bit signed decimal address 15 15 addr_getword(string addr)Function: Read 16-bit unsigned decimal address 16 -More script function are in the second section of [[“V-BOX Script Interface Manual”>>doc:V-BOX.V-Net.1\.User Manual.04 Lua Script.01Functions.WebHome]]16 +More script function are in the second section of [[“V-BOX Script Interface Manual”>>doc:V-BOX.V-Net.1\.User Manual.04 Lua script.01\.Lua script function.WebHome]] 17 17 18 18 == **1.2 Arithmetic** == 19 19 20 20 (% style="text-align:center" %) 21 -[[image:1624249623612-177.png||height="337" width="400" class="img-thumbnail"]]21 +[[image:1624249623612-177.png||class="img-thumbnail" height="337" width="400"]] 22 22 23 -== **1.3 Set 100 to D0~-~-D19** ==23 +== **1.3 set 100 to D0~-~-D19** == 24 24 25 25 (% style="text-align:center" %) 26 -[[image:1624249693457-742.png||height="135" width="400" class="img-thumbnail"]]26 +[[image:1624249693457-742.png||class="img-thumbnail" height="135" width="400"]] 27 27 28 -== **1.4 Short message** ==28 +== **1.4 short message** == 29 29 30 30 When the alarm condition is reached: temp1 > 5 & temp2 >10 & temp3 < 20(lasts more than 5 seconds) , then send an "alarm trigger" sms. 31 31 ... ... @@ -32,109 +32,40 @@ 32 32 When the alarm condition is released,then send an "alarm release" sms. 33 33 34 34 (% style="text-align:center" %) 35 -[[image:1645535936750-316.png||height="385" width="400" class="img-thumbnail"]]35 +[[image:1645535936750-316.png||class="img-thumbnail" height="385" width="400"]] 36 36 37 37 Script is as below: 38 38 39 -{{code language="Lua"}} 39 +(% class="box infomessage" %) 40 +((( 40 40 function sms.main() 41 -------send condition------ 42 +~-~-~-~-~-~-send condition~-~-~-~-~-~- 42 42 local temp1 = addr_getword("@Temperature1") 43 43 local temp2 = addr_getword("@Temperature2") 44 44 local temp3 = addr_getword("@Temperature3") 45 45 local timer = addr_getword("@Timer") 46 46 local tag = addr_getbit("@Tag") 47 -------lasting time------ 48 +~-~-~-~-~-~-lasting time~-~-~-~-~-~- 48 48 if temp1 > 5 and temp2 > 10 and temp3 < 20 then 49 - timer = timer + 1 50 - addr_setword("@Timer",timer) 50 + timer = timer + 1 51 + addr_setword("@Timer",timer) 51 51 else 52 - timer = 0 53 - addr_setword("@Timer",timer) 53 + timer = 0 54 + addr_setword("@Timer",timer) 54 54 end 55 -------send sms & output Y0------ 56 +~-~-~-~-~-~-send sms & output Y0~-~-~-~-~-~- 56 56 if timer > 5 then 57 - if tag == 0 then 58 - send_sms_ira("19859254700","alarm trigger") 59 - addr_setbit("@Tag",1) 60 - end 58 + if tag == 0 then 59 + send_sms_ira("19859254700","alarm trigger") 60 + addr_setbit("@Tag",1) 61 + end 61 61 elseif tag == 1 then 62 62 send_sms_ira("19859254700","alarm release") 63 63 addr_setbit("@Tag",0) 64 64 end 65 65 end 66 - {{/code}}67 +))) 67 67 68 -== **1.5 Telegram notification** == 69 - 70 -This example shows how to use the Bot API to send message into Telegram group or channel. When monitoring bit "@HDX" changes, it will trigger and send the message. Please replace with your own Token and chat id. 71 - 72 -{{code language="Lua"}} 73 -local tempBit = 0 74 -local tempWord = 0 75 - 76 -local botToken = "5504549693:AAEy6a5G-sOF3CINONxMNABeYnoS4ABVlfg" 77 -local chatID = "-641959124"--The chat id from Channel or Group 78 - 79 -local https = require("https") 80 -local json = require("json") 81 - 82 --- Send http.get request and return response result 83 -function getHttpsUrl(url) 84 - local body = {} 85 - local bodyJson = json.encode(body) 86 - local header = {} 87 - header["content-type"] = "application/json" 88 - local result_table, code, headers, status = https.request(url, bodyJson) 89 - print("code:"..code) 90 - if code~= 200 then 91 - return 92 - else 93 - return body 94 - end 95 -end 96 - 97 -function sendAlarm(telegramBotToken, message, telegramChatID) 98 - local url = "https://api.telegram.org/bot"..telegramBotToken.."/sendMessage?text="..message.."&chat_id="..telegramChatID 99 - --local url = 'http://v-box.net' 100 - --local url = 'https://www.google.com/' 101 - print("Get the link:"..url) 102 - getHttpsUrl(url) 103 -end 104 - 105 - 106 -function AlarmNotificate.main() 107 - local bitValue = addr_getbit("@HDX"); 108 - local message = '' 109 - print("b=="..bitValue) 110 - if bitValue == 1 and bitValue ~= tempBit then 111 - message = 'Alarm triggered, the monitoring point test value is '.. bitValue 112 - sendAlarm(botToken, message, chatID) 113 - print("Notification pushed of triggering alarm,"..bitValue) 114 - elseif bitValue == 0 and bitValue ~= tempBit then 115 - message = 'Alarm dismissed, the monitoring point test value is '.. bitValue 116 - sendAlarm(botToken, message, chatID) 117 - print("Notification pushed of dismissing alarm,"..bitValue) 118 - end 119 - tempBit = bitValue----Prevent monitoring values from continuous being sent to the platform 120 - 121 - local wordValue = addr_getword("@HDW10") 122 - print("w=="..wordValue) 123 - --dosomething 124 - if wordValue >= 100 and wordValue ~= tempWord and tempWord <= 100 then 125 - message = 'Word alarm triggered, the word value is '.. wordValue 126 - sendAlarm(botToken, message, chatID) 127 - print("Notification pushed of triggering alarm,"..wordValue) 128 - elseif wordValue < 100 and wordValue ~= tempWord and tempWord >= 100 then 129 - message = 'Word alarm dismissed, the word value is '.. wordValue 130 - sendAlarm(botToken, message, chatID) 131 - print("Notification pushed of dismissing alarm,"..wordValue) 132 - end 133 - tempWord = wordValue----Prevent monitoring values from continuous being sent to the platform 134 -end 135 -{{/code}} 136 - 137 - 138 138 = **2 V-Box connect with third part server** = 139 139 140 140 V-Box have two mode.One is for V-Net,User need to use WECON server to store data.We call this V-NET platform. ... ... @@ -159,148 +159,144 @@ 159 159 160 160 Demo1: 161 161 162 -{{code language="Lua"}} 163 --- Meta class 164 ---main 93 +(% class="box infomessage" %) 94 +((( 95 +~-~- Meta class 96 +~-~-main 165 165 function mq.main() 166 - if not mq.m then 167 - local err = "" 98 + if not mq.m then 99 + local err = "" 100 +\\ mq.m, err = mqtt.create("tcp:~/~/grouprobotinfo.com:1883", "ClienID") ~-~- create connection 101 + if mq.m then 102 + mq.config = { 103 + username = "",~-~- ID 104 + password = "",~-~- password 105 + netway = 1, ~-~- Ethernet connection, WIFI=1 106 + ~-~- keepalive = 100, ~-~- Optional, set the connection heartbeat interval for 100 seconds. 107 + ~-~- cleansession = 0, ~-~- Optional, keep session 108 + } 109 + mq.m:on("message", function(topic, msg) ~-~- Register for receiving message callbacks 110 + local str = string.format("%s:%s", topic, msg) 111 + ~-~- print("mqtt msg:", str) ~-~- Print out the received topics and content 112 + end 113 + ) 114 + mq.m:on("offline", function (cause) ~-~- Register for lost connection callbacks 115 + ~-~- addr_setstring("@xxx", "cause"..(cause or " got nil")) 116 + end) 117 + mq.m:on("arrived", function() ~-~- Registration for sending messages to callbacks 118 + print("msg arrived") 119 + end) 120 + else 121 + print("mqtt create failed:", err) ~-~- Create object failed 122 + end 123 + else 124 + if mq.m:isconnected() then ~-~- If online, post a message 125 + local phaseStatus ="unknow" 126 + if addr_getbit("@Standby")== 1 then 127 + phaseStatus = "Standby" 128 + elseif addr_getbit("@Pre-Freeze")==1 then 129 + phaseStatus= "Pre-Freeze" 130 + elseif addr_getbit("@Prepare")==1 then 131 + phaseStatus ="Prepare" 132 + elseif addr_getbit("@Primary Dry")==1 then 133 + phaseStatus = "Primary dry" 134 + elseif addr_getbit("@Secondary Dry")==1 then 135 + phaseStatus = "Secondary Dry" 136 + end 137 +~-~- print(addr_getbit("@Primary Dry")) 138 +~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-- 139 + local activating ="unknow" 140 + if addr_getbit("@Compressor")==1 then 141 + activating = ",".."Compressor" 142 + end 143 + if addr_getbit("@Silicone Pump")==1 then 144 + activating = activating..",".."Silicone Pump" 145 + end 146 + if addr_getbit("@Vacuum Pump")==1 then 147 + activating = activating..",".."Vacuum Pump" 148 + end 149 + if addr_getbit("@Root Pump")==1 then 150 + activating = activating..",".."Root Pump" 151 + end 152 + if addr_getbit("@Heater")==1 then 153 + activating = activating..",".."Heater" 154 + end 155 + if addr_getbit("@Valve Silicone")==1 then 156 + activating = activating..",".."Valve Silicone" 157 + end 158 + if addr_getbit("@Valve Ice Condenser")==1 then 159 + activating = activating..",".."Valve Ice Condenser" 160 + end 161 + if addr_getbit("@Valve Vacuum Pump")==1 then 162 + activating = activating..",".."Valve Vacuum Pump" 163 + end 164 + local pr_activating =string.sub(activating,2) 165 + ~-~- print(pr_activating) 168 168 169 - mq.m, err = mqtt.create("tcp://grouprobotinfo.com:1883", "ClienID") -- create connection 170 - if mq.m then 171 - mq.config = { 172 - username = "",-- ID 173 - password = "",-- password 174 - netway = 1, -- Ethernet connection, WIFI=1 175 - -- keepalive = 100, -- Optional, set the connection heartbeat interval for 100 seconds. 176 - -- cleansession = 0, -- Optional, keep session 177 - } 178 - mq.m:on("message", function(topic, msg) -- Register for receiving message callbacks 179 - local str = string.format("%s:%s", topic, msg) 180 - -- print("mqtt msg:", str) -- Print out the received topics and content 181 - end 182 - ) 183 - mq.m:on("offline", function (cause) -- Register for lost connection callbacks 184 - -- addr_setstring("@xxx", "cause"..(cause or " got nil")) 185 - end) 186 - mq.m:on("arrived", function() -- Registration for sending messages to callbacks 187 - print("msg arrived") 188 - end) 189 - else 190 - print("mqtt create failed:", err) -- Create object failed 191 - end 192 - else 193 - if mq.m:isconnected() then -- If online, post a message 194 - local phaseStatus ="unknow" 195 - if addr_getbit("@Standby")== 1 then 196 - phaseStatus = "Standby" 197 - elseif addr_getbit("@Pre-Freeze")==1 then 198 - phaseStatus= "Pre-Freeze" 199 - elseif addr_getbit("@Prepare")==1 then 200 - phaseStatus ="Prepare" 201 - elseif addr_getbit("@Primary Dry")==1 then 202 - phaseStatus = "Primary dry" 203 - elseif addr_getbit("@Secondary Dry")==1 then 204 - phaseStatus = "Secondary Dry" 205 - end 206 --- print(addr_getbit("@Primary Dry")) 207 -------------------------------------------------------------------------------------------------------------------------- 208 - local activating ="unknow" 209 - if addr_getbit("@Compressor")==1 then 210 - activating = ",".."Compressor" 211 - end 212 - if addr_getbit("@Silicone Pump")==1 then 213 - activating = activating..",".."Silicone Pump" 214 - end 215 - if addr_getbit("@Vacuum Pump")==1 then 216 - activating = activating..",".."Vacuum Pump" 217 - end 218 - if addr_getbit("@Root Pump")==1 then 219 - activating = activating..",".."Root Pump" 220 - end 221 - if addr_getbit("@Heater")==1 then 222 - activating = activating..",".."Heater" 223 - end 224 - if addr_getbit("@Valve Silicone")==1 then 225 - activating = activating..",".."Valve Silicone" 226 - end 227 - if addr_getbit("@Valve Ice Condenser")==1 then 228 - activating = activating..",".."Valve Ice Condenser" 229 - end 230 - if addr_getbit("@Valve Vacuum Pump")==1 then 231 - activating = activating..",".."Valve Vacuum Pump" 232 - end 233 - local pr_activating =string.sub(activating,2) 234 - -- print(pr_activating) 235 235 236 - 237 - 238 - local status_text ="unknow" 239 - if addr_getbit("@Status Run")==1 then 240 - status_text = "RUNNING" 241 - else 242 - status_text = "STOP" 243 - end 244 -------------------------------------------------------------------------------------------------------------------------- 245 - 246 - local js = {type="status", 247 - mc_name ="FD300", 248 - status=status_text, 249 - elapsed_time={ 250 - hour=addr_getword("@Elapsed Time (Hour)"), 251 - min=addr_getword("@Elapsed Time (Minute)"), 252 - sec=addr_getword("@Elapsed Time (Second)") 253 - }, 254 - phase = phaseStatus, 255 - step = addr_getword("@Step"), 256 - activating_output = pr_activating, 257 - sv=addr_getshort("@SV Silicone")/10, 258 - pv=addr_getshort("@PV Silicone")/10, 259 - product1=addr_getshort("@Product 1")/10, 260 - 261 - product2=addr_getshort("@Product 2")/10, 262 - product3=addr_getshort("@Product 3")/10, 263 - product4=addr_getshort("@Product 4")/10, 264 - ice1=addr_getshort("@Ice condenser 1")/10, 265 - ice2=addr_getshort("@Ice condenser 2")/10, 266 - vacuum=addr_getfloat("@Vacuum") 267 - 268 - } 269 - local jsAlarm = { HPC = addr_getbit("@B_25395#W0.00"), 270 - ODPC = addr_getbit("@B_25395#W0.01"), 271 - MTPC=addr_getbit("@B_25395#W0.02"), 272 - HTT = addr_getbit("@B_25395#W1.03"), 273 - CPC = addr_getbit("@B_25395#W0.08"), 274 - CPSP =addr_getbit("@B_25395#W1.00"), 275 - CPVP =addr_getbit("@B_25395#W0.10"), 276 - CPRP =addr_getbit("@B_25395#W0.11"), 277 - HP =addr_getbit("@B_25395#W1.01"), 278 - PP= addr_getbit("@B_25395#W1.02"), 279 - PO=addr_getbit("@B_25395#W0.07"), 280 - FSE=addr_getbit("@B_25395#W2.04"), 281 - AVVSVV=addr_getbit("@B_25395#W1.12"), 282 - ICHT=addr_getbit("@B_25395#W3.06") 283 - 284 - } 285 - 286 - -- ("@B_25395#CIO1.02") 287 - mq.m:publish("mqtt-v-box-epsilon-fd300", json.encode(js) , 0, 0) 288 - mq.m:publish("mqtt-v-box-epsilon-alarm-fd300", json.encode(jsAlarm) , 0, 0) 289 - else 290 - local stat, err = mq.m:connect(mq.config) -- connection 291 - if stat == nil then --Determine whether to connect 292 - print("mqtt connect failed:", err) 293 - return -- Connection failed, return directly 294 - end 295 - mq.m:subscribe("mqtt-v-box-epsilon", 0)-- Subscribe to topics 296 - 297 - end 298 - -- mq.m:unsubscribe("stc/test") 299 - -- mq.m:disconnect() -- close matt 300 - -- mq.m:close() -- close clase 301 - end 168 + local status_text ="unknow" 169 + if addr_getbit("@Status Run")==1 then 170 + status_text = "RUNNING" 171 + else 172 + status_text = "STOP" 173 + end 174 +~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-- 175 +\\ local js = {type="status", 176 + mc_name ="FD300", 177 + status=status_text, 178 + elapsed_time={ 179 + hour=addr_getword("@Elapsed Time (Hour)"), 180 + min=addr_getword("@Elapsed Time (Minute)"), 181 + sec=addr_getword("@Elapsed Time (Second)") 182 + }, 183 + phase = phaseStatus, 184 + step = addr_getword("@Step"), 185 + activating_output = pr_activating, 186 + sv=addr_getshort("@SV Silicone")/10, 187 + pv=addr_getshort("@PV Silicone")/10, 188 + product1=addr_getshort("@Product 1")/10, 189 + 190 + product2=addr_getshort("@Product 2")/10, 191 + product3=addr_getshort("@Product 3")/10, 192 + product4=addr_getshort("@Product 4")/10, 193 + ice1=addr_getshort("@Ice condenser 1")/10, 194 + ice2=addr_getshort("@Ice condenser 2")/10, 195 + vacuum=addr_getfloat("@Vacuum") 196 + 197 + } 198 + local jsAlarm = { HPC = addr_getbit("@B_25395#W0.00"), 199 + ODPC = addr_getbit("@B_25395#W0.01"), 200 + MTPC=addr_getbit("@B_25395#W0.02"), 201 + HTT = addr_getbit("@B_25395#W1.03"), 202 + CPC = addr_getbit("@B_25395#W0.08"), 203 + CPSP =addr_getbit("@B_25395#W1.00"), 204 + CPVP =addr_getbit("@B_25395#W0.10"), 205 + CPRP =addr_getbit("@B_25395#W0.11"), 206 + HP =addr_getbit("@B_25395#W1.01"), 207 + PP= addr_getbit("@B_25395#W1.02"), 208 + PO=addr_getbit("@B_25395#W0.07"), 209 + FSE=addr_getbit("@B_25395#W2.04"), 210 + AVVSVV=addr_getbit("@B_25395#W1.12"), 211 + ICHT=addr_getbit("@B_25395#W3.06") 212 + 213 + } 214 +\\ ~-~- ("@B_25395#CIO1.02") 215 + mq.m:publish("mqtt-v-box-epsilon-fd300", json.encode(js) , 0, 0) 216 + mq.m:publish("mqtt-v-box-epsilon-alarm-fd300", json.encode(jsAlarm) , 0, 0) 217 + else 218 + local stat, err = mq.m:connect(mq.config) ~-~- connection 219 + if stat == nil then ~-~-Determine whether to connect 220 + print("mqtt connect failed:", err) 221 + return ~-~- Connection failed, return directly 222 + end 223 + mq.m:subscribe("mqtt-v-box-epsilon", 0)~-~- Subscribe to topics 224 +\\ end 225 + ~-~- mq.m:unsubscribe("stc/test") 226 + ~-~- mq.m:disconnect() ~-~- close matt 227 + ~-~- mq.m:close() ~-~- close clase 228 + end 302 302 end 303 - {{/code}}230 +))) 304 304 305 305 == **2.2 V-Box connect with Azure platform** == 306 306 ... ... @@ -312,129 +312,126 @@ 312 312 313 313 Script is as below 314 314 315 -{{code language="Lua"}} 316 ---https://support.huaweicloud.com/qs-IoT/iot_05_0005.html mqtt.fx monitor to connect azure iot 242 +(% class="box infomessage" %) 243 +((( 244 +~-~-https:~/~/support.huaweicloud.com/qs-IoT/iot_05_0005.html mqtt.fx monitor to connect azure iot 317 317 sprint = print 318 318 319 ---Get custom configuration parameters (vbox custom information) 320 ---local CUSTOM = bns_get_config("bind") 321 ---local DS_ID = CUSTOM.DSID or "60a71ccbbbe12002c08f3a1a_WECON" 247 +~-~-Get custom configuration parameters (vbox custom information) 248 +~-~-local CUSTOM = bns_get_config("bind") 249 +~-~-local DS_ID = CUSTOM.DSID or "60a71ccbbbe12002c08f3a1a_WECON" 322 322 323 323 324 - 325 ---Cloud mode interface to obtain the MQTT information configured by the cloud platform: (5 returns, namely the server address, client ID, connection table, last word table, certificate table) 252 +~-~-Cloud mode interface to obtain the MQTT information configured by the cloud platform: (5 returns, namely the server address, client ID, connection table, last word table, certificate table) 326 326 local MQTT_URL, MQTT_CLIENTID, MQTT_CFG, MQTT_LWT, MQTT_CART = mqtt.setup_cfg() 327 327 328 ---MQTT_CFG.username = '60a71ccbbbe12002c08f3a1a_WECON' 329 ---MQTT_CFG.password='wecon123' 330 ---MQTT_CLIENTID = '60a71ccbbbe12002c08f3a1a_WECON_0_0_2021052110usernxame:60a71ccbbbe12002c08f3a1a_WECONpassword:a0a951581855aa8e0262129da6cf1b43f2c0ecfac4fa56117fc5a20c90be169a' 255 +~-~-MQTT_CFG.username = '60a71ccbbbe12002c08f3a1a_WECON' 256 +~-~-MQTT_CFG.password='wecon123' 257 +~-~-MQTT_CLIENTID = '60a71ccbbbe12002c08f3a1a_WECON_0_0_2021052110usernxame:60a71ccbbbe12002c08f3a1a_WECONpassword:a0a951581855aa8e0262129da6cf1b43f2c0ecfac4fa56117fc5a20c90be169a' 331 331 332 ---publish to topics 259 +~-~-publish to topics 333 333 local pub_RE_TOPIC = string.format('devices/wecon_02/messages/events/') 334 ---Subscribe topics 261 +~-~-Subscribe topics 335 335 local Subscribe_RE_TOPIC1 = string.format('devices/wecon_02/messages/devicebound/#') 336 336 337 ---variable 264 +~-~-variable 338 338 local last_time = 0 339 339 340 340 341 - 342 ---Timing main function 268 +~-~-Timing main function 343 343 function Azure.main() 344 344 345 - 346 - 347 - 348 - 349 - 350 - 351 - 352 - 353 - 354 - 355 - 356 - 357 - 358 - 271 + sprint(os.date("%Y-%m-%d %H:%M %S", os.time()) .. " Azureiot.main start") 272 + if g_mq then 273 + if g_mq:isconnected() then 274 + send_Data() 275 + else 276 + if os.time() - last_time > 20 then 277 + last_time = os.time() 278 + mymqtt_connect() 279 + end 280 + end 281 + else 282 + mymqtt_init() 283 + end 284 + sprint(os.date("%Y-%m-%d %H:%M %S", os.time()) .. " Azureiot.main end") 359 359 end 360 360 361 --- Initialize MQTT 287 +~-~- Initialize MQTT 362 362 function mymqtt_init() 363 - 364 - 365 - 366 - 367 - 368 - 369 - 370 - 289 + sprint(string.format("mqtt init mqtt_url:%s mqtt_clientid:%s", MQTT_URL, MQTT_CLIENTID)) 290 + g_mq, err = mqtt.create(MQTT_URL, MQTT_CLIENTID) ~-~- Create the object and declare it as a global variable 291 + if g_mq then 292 + g_mq:on("message", mymqtt_msg_callback) ~-~- Register to receive message callbacks 293 + sprint("mqtt init success") 294 + else 295 + sprint("mqtt init failed:", err) 296 + end 371 371 end 372 372 373 --- Connect to MQTT server 299 +~-~- Connect to MQTT server 374 374 function mymqtt_connect() 375 - 376 - 377 - 378 - 379 - 380 - 381 - 382 - 383 - 301 + sprint("mqtt connecting...") 302 + local stat, err = g_mq:connect(MQTT_CFG,MQTT_LWT, MQTT_CART) 303 + if stat == nil then 304 + sprint("mqtt connect failed:", err) 305 + return 306 + else 307 + sprint("mqtt connected") 308 + end 309 + g_mq:subscribe(Subscribe_RE_TOPIC1, 0) 384 384 end 385 385 386 --- Receive MQTT message callback function 312 +~-~- Receive MQTT message callback function 387 387 function mymqtt_msg_callback(topic, msg) 388 - 389 - 390 - 391 - 392 --- if string.match(topic,Subscribe_RE_TOPIC1) then 393 - 394 - 395 - 314 + print("topic:",topic) 315 + print("revdata:",msg) 316 + ~-~- local revData = json.decode(msg) 317 + ~-~- if topic == Subscribe_RE_TOPIC1 then ~-~-Process topic information subscribed from the cloud 318 +~-~- if string.match(topic,Subscribe_RE_TOPIC1) then 319 + ~-~- print("topi11:",topic) 320 + setValue(revData) 321 + ~-~- end 396 396 end 397 397 398 ---Process the received data 399 ---function setValue(revData) 400 - 401 - 402 - 403 - 404 - 405 ---end 324 +~-~-Process the received data 325 +~-~-function setValue(revData) 326 + ~-~- if revData ~~=nil then 327 + ~-~- for i,v in pairs(revData) do 328 + ~-~- print("Data received:",i,v) 329 + ~-~- end 330 + ~-~- end 331 +~-~-end 406 406 407 ---Get real-time data 333 +~-~-Get real-time data 408 408 function getData() 409 - 410 - 411 - 412 - 413 - 414 - 415 - 416 - 417 - 418 -end 335 + local jdata = {} 336 + local addr = bns_get_alldata() 337 + print(json.encode(addr)) 338 + for i,v in pairs(addr) do 339 + if v[2] == 1 then 340 + jdata[v[3]] = v[4] 341 + end 342 + end 343 + return jdata 344 +end 419 419 420 420 421 - 422 ---send data 347 +~-~-send data 423 423 function send_Data() 424 - local pub_data = {100 425 - -- services={{ 426 - 427 - --serviceId ='Temperature', 428 - -- properties={ 429 - -- value = 55 430 - -- }, 431 - -- }} 349 + local pub_data = {100 350 + ~-~- services=~{~{ 351 +\\ ~-~-serviceId ='Temperature', 352 + ~-~- properties={ 353 + ~-~- value = 55 354 + ~-~- }, 355 + ~-~- }} 432 432 } 433 433 sprint(json.encode(pub_data)) 434 434 print("..........",pub_RE_TOPIC) 435 - 359 + return g_mq:publish(pub_RE_TOPIC, json.encode(pub_data), 0, 0) 436 436 end 437 - {{/code}}361 +))) 438 438 439 439 == **2.3 How to configure the Huawei platform?(✎Note: Huawei IOT DA function is only in China area.If you want this function,you need to use chinese mobile to register)** == 440 440 ... ... @@ -447,7 +447,7 @@ 447 447 3.Create product 448 448 449 449 (% style="text-align:center" %) 450 -[[image:1624433478954-859.png||height="497" width="1100" class="img-thumbnail"]]374 +[[image:1624433478954-859.png||class="img-thumbnail" height="497" width="1100"]] 451 451 452 452 4.Product name,manufacturer,device type and industry,set according to your own needs. 453 453 ... ... @@ -458,7 +458,7 @@ 458 458 After finishing configuration,please click "OK" 459 459 460 460 (% style="text-align:center" %) 461 -[[image:1624433531968-337.png||height="568" width="700" class="img-thumbnail"]]385 +[[image:1624433531968-337.png||class="img-thumbnail" height="568" width="700"]] 462 462 463 463 5.Device 464 464 ... ... @@ -478,10 +478,10 @@ 478 478 After configuration, click OK to generate a device ID and password, which will be used for device access later. 479 479 480 480 (% style="text-align:center" %) 481 -[[image:1624436421499-613.png||height="499" width="700" class="img-thumbnail"]]405 +[[image:1624436421499-613.png||class="img-thumbnail" height="499" width="700"]] 482 482 483 483 (% style="text-align:center" %) 484 -[[image:1624437798012-126.png||height="366" width="500" class="img-thumbnail"]]408 +[[image:1624437798012-126.png||class="img-thumbnail" height="366" width="500"]] 485 485 486 486 6. Connection authentication (use MQTT.fx tool to access the IoT platform) 487 487 ... ... @@ -490,7 +490,7 @@ 490 490 **[[Download>>https://wecon-disk.oss-ap-southeast-1.aliyuncs.com/Download/WIKI/V-BOX/Demo/Huawei/mqttClientIdGenerator-19.2.0.zip]]** 491 491 492 492 (% style="text-align:center" %) 493 -[[image:1624437573798-815.png||height="351" width="700" class="img-thumbnail"]]417 +[[image:1624437573798-815.png||class="img-thumbnail" height="351" width="700"]] 494 494 495 495 (2)Fill in the device ID and secret (deviceid and secret generated when registering the device) to generate connection message 496 496 ... ... @@ -497,7 +497,7 @@ 497 497 Client ID, user name, password 498 498 499 499 (% style="text-align:center" %) 500 -[[image:1624437756866-251.png||height="405" width="700" class="img-thumbnail"]]424 +[[image:1624437756866-251.png||class="img-thumbnail" height="405" width="700"]] 501 501 502 502 (3) Download certificate file"North-Beijing4" 503 503 ... ... @@ -504,10 +504,10 @@ 504 504 [[https:~~/~~/support.huaweicloud.com/en-us/devg-iothub/iot_02_1004.html>>https://support.huaweicloud.com/en-us/devg-iothub/iot_02_1004.html]] 505 505 506 506 (% style="text-align:center" %) 507 -[[image:1624438225398-363.png||height="403" width="800" class="img-thumbnail"]]431 +[[image:1624438225398-363.png||class="img-thumbnail" height="403" width="800"]] 508 508 509 509 (% style="text-align:center" %) 510 -[[image:1624438260025-610.png||height="408" width="700" class="img-thumbnail"]]434 +[[image:1624438260025-610.png||class="img-thumbnail" height="408" width="700"]] 511 511 512 512 7.Run MQTTfx tool to connect with Huawei 513 513 ... ... @@ -516,7 +516,7 @@ 516 516 (1)Click on the setting ICON 517 517 518 518 (% style="text-align:center" %) 519 -[[image:1624438821280-974.png||height="198" width="500" class="img-thumbnail"]]443 +[[image:1624438821280-974.png||class="img-thumbnail" height="198" width="500"]] 520 520 521 521 (2)Fill in IIOT MQTT device access address, and configure authentication parameters. 522 522 First: It is the server and port connected to Huawei IOT, which can be viewed through the overview of the interface. ... ... @@ -531,7 +531,7 @@ 531 531 Client ID: check step 6 532 532 533 533 (% style="text-align:center" %) 534 -[[image:1624439672168-492.png||height="458" width="600" class="img-thumbnail"]]458 +[[image:1624439672168-492.png||class="img-thumbnail" height="458" width="600"]] 535 535 536 536 (3)Upload SSL certificate file,check step 6 537 537 ... ... @@ -538,15 +538,15 @@ 538 538 Select folder java~-~->DigiCertGlobalRootCA.crt.pem and click OK or apply button 539 539 540 540 (% style="text-align:center" %) 541 -[[image:1624439912938-659.png||height="458" width="600" class="img-thumbnail"]]465 +[[image:1624439912938-659.png||class="img-thumbnail" height="458" width="600"]] 542 542 543 543 (4)Connect and test publish and subscribe 544 544 545 545 (% style="text-align:center" %) 546 -[[image:1624440014872-688.png||height="232" width="700" class="img-thumbnail"]]470 +[[image:1624440014872-688.png||class="img-thumbnail" height="232" width="700"]] 547 547 548 548 (% style="text-align:center" %) 549 -[[image:1624440026937-386.png||height="215" width="700" class="img-thumbnail"]]473 +[[image:1624440026937-386.png||class="img-thumbnail" height="215" width="700"]] 550 550 551 551 Huawei publish topic format: $oc/devices/{device_id}/sys/properties/report 552 552 ... ... @@ -570,20 +570,20 @@ 570 570 ②Custom model: used to display the service ID name of the configuration report. 571 571 572 572 (% style="text-align:center" %) 573 -[[image:1624440793982-974.png||height="410" width="700" class="img-thumbnail"]]497 +[[image:1624440793982-974.png||class="img-thumbnail" height="410" width="700"]] 574 574 575 575 (% style="text-align:center" %) 576 -[[image:1624440883015-105.png||height="370" width="600" class="img-thumbnail"]]500 +[[image:1624440883015-105.png||class="img-thumbnail" height="370" width="600"]] 577 577 578 578 ③Add property, ID of monitoring point, and data format: 579 579 580 580 (% style="text-align:center" %) 581 -[[image:1624441052296-108.png||height="477" width="600" class="img-thumbnail"]]505 +[[image:1624441052296-108.png||class="img-thumbnail" height="477" width="600"]] 582 582 583 583 ④After the configuration is complete, check the received data on the device 584 584 585 585 (% style="text-align:center" %) 586 -[[image:1624441186851-536.png||height="434" width="700" class="img-thumbnail"]]510 +[[image:1624441186851-536.png||class="img-thumbnail" height="434" width="700"]] 587 587 588 588 == **2.4 V-Box connect with Huawei platform** == 589 589 ... ... @@ -594,7 +594,7 @@ 594 594 2.configure MQTT configuration 595 595 596 596 (% style="text-align:center" %) 597 -[[image:1624506363847-661.png||height="507" width="1000" class="img-thumbnail"]]521 +[[image:1624506363847-661.png||class="img-thumbnail" height="507" width="1000"]] 598 598 599 599 3.Create a script with the demo as below. 600 600 ... ... @@ -701,348 +701,11 @@ 701 701 4.Download project access into V-Box to test in debug page 702 702 703 703 (% style="text-align:center" %) 704 -[[image:1624506710354-406.png||height="658" width="1000" class="img-thumbnail"]]628 +[[image:1624506710354-406.png||class="img-thumbnail" height="658" width="1000"]] 705 705 706 706 (% style="text-align:center" %) 707 -[[image:1624506666650-161.png||height="547" width="1000" class="img-thumbnail"]]631 +[[image:1624506666650-161.png||class="img-thumbnail" height="547" width="1000"]] 708 708 709 709 == **2.5 V-Box connect with AWS platform** == 710 710 711 -=== **Log in AWS** === 712 - 713 -Login aws account and click“Connect an IoT device” 714 - 715 -[[image:image-20220709165402-1.png]] 716 - 717 -[[image:image-20220709165402-2.png]] 718 - 719 - 720 -=== **Create policy** === 721 - 722 -Click “Secure”~-~-->“Policies”~-~-->“Create policy”~-~-->Click “Create” 723 - 724 -[[image:image-20220709165402-3.png]] 725 - 726 -Name the policy~-~-->Click “JSON”~-~-->Copy the following content~-~-->Click “Create” 727 - 728 -[[image:image-20220709165402-5.png]] 729 - 730 -[[image:image-20220709165402-4.png]] 731 - 732 -{{code language="java"}} 733 -{ 734 - 735 - "Version": "2012-10-17", 736 - 737 - "Statement": [ 738 - 739 - { 740 - 741 - "Effect": "Allow", 742 - 743 - "Action": [ 744 - 745 - "iot:Connect", 746 - 747 - "iot:Publish", 748 - 749 - "iot:Subscribe", 750 - 751 - "iot:Receive", 752 - 753 - "greengrass:Discover" 754 - 755 - ], 756 - 757 - "Resource": "*" 758 - 759 - } 760 - 761 - ] 762 - 763 -} 764 -{{/code}} 765 - 766 -1. **Create things** 767 - 768 -Click “Manage”~-~-->“Things”~-~-->“Create things”~-~-->“Create single thing” 769 - 770 - 771 -| 772 -| |[[image:image-20220709165402-6.png]] 773 - 774 -| 775 -| |[[image:image-20220709165402-7.png]] 776 - 777 -| 778 -| |[[image:image-20220709165402-8.png]] 779 - 780 -Name the thing~-~-->Click “Next” 781 - 782 - 783 -Select the way to create certificate 784 - 785 - 786 -| 787 -| |[[image:image-20220709165402-9.png]] 788 - 789 -Select policy 790 - 791 - 792 -| 793 -| |[[image:image-20220709165402-10.png]] 794 - 795 - 796 - 797 - 798 - 799 - 800 -| 801 -| |[[image:image-20220709165402-11.png]] 802 - 803 - 804 - 805 -1. **Test with MQTT.fx tool** 806 - 807 -Click “View Setting” to get the “Broker Adress” 808 - 809 - 810 -| 811 -| |[[image:image-20220709165402-12.png]] 812 - 813 -| 814 -| |[[image:image-20220709165402-13.png]] 815 - 816 - 817 - 818 - 819 - 820 -| 821 -| |[[image:image-20220709165402-14.png]] 822 - 823 -Create one connection in MQTT.fx tool, set broker port as 8883. 824 - 825 -Upload the CA File, Client Certificate File, Client Key File 826 - 827 - 828 -| 829 -| |[[image:image-20220709165402-15.png]] 830 - 831 -Publish message to topic “TEST” 832 - 833 - 834 -| 835 -| |[[image:image-20220709165402-16.png]] 836 - 837 -| 838 -| |[[image:image-20220709165402-17.png]] 839 - 840 -Click”Test”~-~-->”MQTT test client”~-~-->”Subscrible to a topic”, to get message publish from MQTT.fx tool. 841 - 842 -And we can also send message form AWS platform to MQTT.fx tool. 843 - 844 - 845 -| 846 -| |[[image:image-20220709165402-18.png]] 847 - 848 -1. **Configurate in CloudTool** 849 - 850 -Copy the same setting in MQTT.fx to MQTT configuration 851 - 852 - 853 -| 854 -| |[[image:image-20220709165402-19.png]] 855 - 856 - Add a lua script and copy the lua demo into it. 857 - 858 - 859 -| 860 -| |[[image:image-20220709165402-20.png]] 861 - 862 -sprint = print 863 - 864 -~-~-Cloud mode interface to obtain the MQTT information configured by the cloud platform: (5 returns, namely the server address, client ID, connection table, last word table, certificate table) 865 - 866 -local MQTT_URL, MQTT_CLIENTID, MQTT_CFG, MQTT_LWT, MQTT_CART = mqtt.setup_cfg() 867 - 868 -~-~-publish to topics 869 - 870 -local pub_RE_TOPIC = string.format('TEST') 871 - 872 -~-~-Subscribe topics 873 - 874 -local Subscribe_RE_TOPIC1 = string.format('TEST') 875 - 876 -~-~-variable 877 - 878 -local last_time = 0 879 - 880 -~-~-Timing main function 881 - 882 -function aws.main() 883 - 884 - sprint(os.date("%Y-%m-%d %H:%M %S", os.time()) .. " aws.main start") 885 - 886 - if g_mq then 887 - 888 - if g_mq:isconnected() then 889 - 890 - send_Data() 891 - 892 - else 893 - 894 - if os.time() - last_time > 5 then 895 - 896 - last_time = os.time() 897 - 898 - mymqtt_connect() 899 - 900 - end 901 - 902 - end 903 - 904 - else 905 - 906 - mymqtt_init() 907 - 908 - end 909 - 910 - sprint(os.date("%Y-%m-%d %H:%M %S", os.time()) .. " aws.main end") 911 - 912 -end 913 - 914 - 915 -~-~- Initialize MQTT 916 - 917 -function mymqtt_init() 918 - 919 - sprint(string.format("mqtt init mqtt_url:%s mqtt_clientid:%s", MQTT_URL, MQTT_CLIENTID)) 920 - 921 - g_mq, err = mqtt.create(MQTT_URL, MQTT_CLIENTID) ~-~- Create the object and declare it as a global variable 922 - 923 - if g_mq then 924 - 925 - g_mq:on("message", mymqtt_msg_callback) ~-~- Register to receive message callbacks 926 - 927 - sprint("mqtt init success") 928 - 929 - else 930 - 931 - sprint("mqtt init failed:", err) 932 - 933 - end 934 - 935 -end 936 - 937 -~-~- Connect to MQTT server 938 - 939 -function mymqtt_connect() 940 - 941 - sprint("mqtt connecting...") 942 - 943 - local stat, err = g_mq:connect(MQTT_CFG,MQTT_LWT, MQTT_CART) 944 - 945 - if stat == nil then 946 - 947 - sprint("mqtt connect failed:", err) 948 - 949 - return 950 - 951 - else 952 - 953 - sprint("mqtt connected") 954 - 955 - end 956 - 957 - g_mq:subscribe(TEST, 0) 958 - 959 -end 960 - 961 -~-~- Receive MQTT message callback function 962 - 963 -function mymqtt_msg_callback(topic, msg) 964 - 965 - print("topic:",topic) 966 - 967 - print("revdata:",msg) 968 - 969 - local revData = json.decode(msg) 970 - 971 - print (revData) 972 - 973 - if topic == Subscribe_RE_TOPIC1 then ~-~-Process topic information subscribed from the cloud 974 - 975 -if string.match(topic,Subscribe_RE_TOPIC1) then 976 - 977 - ~-~-if revData ~~= nil then 978 - 979 - for k,v in pairs (revData) do 980 - 981 - print("printing revdata after kv here") 982 - 983 - print (k,v) 984 - 985 - end 986 - 987 - print ("current state is",fanstate) 988 - 989 - ~-~-end 990 - 991 -end 992 - 993 -end 994 - 995 -end 996 - 997 - 998 -~-~-Get real-time data 999 - 1000 -function getData() 1001 - 1002 - local jdata = {} 1003 - 1004 - local addr = bns_get_alldata() 1005 - 1006 - print(json.encode(addr)) 1007 - 1008 - for i,v in pairs(addr) do 1009 - 1010 - if v[2] == 1 then 1011 - 1012 - jdata[v[3]] = v[4] 1013 - 1014 - end 1015 - 1016 - end 1017 - 1018 - return jdata 1019 - 1020 -end 1021 - 1022 -~-~-send data 1023 - 1024 -function send_Data() 1025 - 1026 - local pub_data = 1027 - 1028 - { 1029 - 1030 -123 1031 - 1032 -} 1033 - 1034 -sprint(json.encode(pub_data)) 1035 - 1036 -print("..........",pub_RE_TOPIC) 1037 - 1038 - return g_mq:publish(pub_RE_TOPIC, json.encode(pub_data), 0, 0) 1039 - 1040 -end 1041 - 1042 - 1043 - 1044 -Get message in AWS 1045 - 1046 - 1047 -| 1048 -| |[[image:image-20220709165402-21.png]] 635 +[[https:~~/~~/ftp.we-con.com.cn/Download/WIKI/V-BOX/Demo/AWS/AWS.zip>>https://ftp.we-con.com.cn/Download/WIKI/V-BOX/Demo/AWS/AWS.zip]]
- image-20220709165226-1.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -1.2 MB - Content
- image-20220709165402-1.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -200.2 KB - Content
- image-20220709165402-10.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -19.0 KB - Content
- image-20220709165402-11.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -105.9 KB - Content
- image-20220709165402-12.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -29.0 KB - Content
- image-20220709165402-13.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -158.8 KB - Content
- image-20220709165402-14.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -48.1 KB - Content
- image-20220709165402-15.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -46.9 KB - Content
- image-20220709165402-16.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -140.7 KB - Content
- image-20220709165402-17.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -12.5 KB - Content
- image-20220709165402-18.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -32.2 KB - Content
- image-20220709165402-19.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -66.6 KB - Content
- image-20220709165402-2.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -188.5 KB - Content
- image-20220709165402-20.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -33.3 KB - Content
- image-20220709165402-21.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -124.8 KB - Content
- image-20220709165402-3.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -103.9 KB - Content
- image-20220709165402-4.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -4.0 KB - Content
- image-20220709165402-5.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -66.5 KB - Content
- image-20220709165402-6.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -110.0 KB - Content
- image-20220709165402-7.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -25.4 KB - Content
- image-20220709165402-8.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -64.2 KB - Content
- image-20220709165402-9.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Jim - Size
-
... ... @@ -1,1 +1,0 @@ 1 -37.5 KB - Content