Changes for page wiki_test
Last modified by Mengting Qiu on 2024/09/05 17:35
From version 119.2
edited by Mengting Qiu
on 2023/11/14 10:42
on 2023/11/14 10:42
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
-
Attachments (0 modified, 0 added, 9 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. ting1 +XWiki.Xiaoling - Content
-
... ... @@ -22,19 +22,19 @@ 22 22 23 23 The DS03A-NB will send periodically data every 2 hours as well as for each door open/close action. It also counts the door open times and calculates the last door open duration. Users can also disable the uplink for each open/close event, instead, DS03A-NB can count each open event and uplink periodically. 24 24 25 -DS03A- NB supports (% style="color:blue" %)**Datalog Feature,** (%%)it can save the data when there is no NB-IoT network and uplink when network recover.25 +DS03A-LB supports (% style="color:blue" %)**Datalog Feature,** (%%)it can save the data when there is no NB-IoT network and uplink when network recover. 26 26 27 -DS03A- NB has the (% style="color:blue" %)**Open Alarm Feature**,(%%) user can set this feature so the device will send an alarm if the door has been open for a certain time.27 +DS03A-LB has the (% style="color:blue" %)**Open Alarm Feature**,(%%) user can set this feature so the device will send an alarm if the door has been open for a certain time. 28 28 29 -DS03A- NB is designed for outdoor use. It has a weatherproof enclosure and industrial level battery to work in low to high temperatures29 +DS03A-LB is designed for outdoor use. It has a weatherproof enclosure and industrial level battery to work in low to high temperatures 30 30 31 - DS03A-NB supports different uplink methods including (% style="color:blue" %)**MQTT, MQTTs, UDP & TCP**(%%) for different application requirement, and support uplinks to various IoT Servers.31 +SW3L-NB supports different uplink methods including (% style="color:blue" %)**MQTT, MQTTs, UDP & TCP**(%%) for different application requirement, and support uplinks to various IoT Servers. 32 32 33 - DS03A-NB (% style="color:blue" %)**supports BLE configure **(%%)and(% style="color:blue" %)** OTA update**(%%) which make user easy to use.33 +SW3L-NB (% style="color:blue" %)**supports BLE configure **(%%)and(% style="color:blue" %)** OTA update**(%%) which make user easy to use. 34 34 35 - DS03A-NB is powered by (% style="color:blue" %)**8500mAh Li-SOCI2 battery**(%%), it is designed for long-term use up to several years.35 +SW3L-NB is powered by (% style="color:blue" %)**8500mAh Li-SOCI2 battery**(%%), it is designed for long-term use up to several years. 36 36 37 - DS03A-NB has optional built-in SIM card and default IoT server connection version. Which makes it works with simple configuration.37 +SW3L-NB has optional built-in SIM card and default IoT server connection version. Which makes it works with simple configuration. 38 38 39 39 [[image:image-20231011093807-6.png||height="278" width="879"]] 40 40 ... ... @@ -44,6 +44,7 @@ 44 44 45 45 * NB-IoT Bands: B1/B2/B3/B4/B5/B8/B12/B13/B17/B18/B19/B20/B25/B28/B66/B70/B85 @H-FDD 46 46 * Ultra-low power consumption 47 +* Upload water flow volume 47 47 * Door Open/Close detect 48 48 * Door open/close statistics 49 49 * Datalog Feature ... ... @@ -137,13 +137,10 @@ 137 137 ))) 138 138 |(% style="width:167px" %)Fast press ACT 5 times.|(% style="width:117px" %)Deactivate Device|(% style="width:225px" %)(% style="color:red" %)**Red led**(%%) will solid on for 5 seconds. Means device is in Deep Sleep Mode. 139 139 140 -(% style="color:red" %)**Note: When the device is executing a program, the buttons may become invalid. It is best to press the buttons after the device has completed the program execution.** 141 - 142 - 143 143 == 1.7 BLE connection == 144 144 145 145 146 - DS03A-NB support BLE remote configure and firmware update.144 +SW3L-NB support BLE remote configure and firmware update. 147 147 148 148 149 149 BLE can be used to configure the parameter of sensor or see the console output from sensor. BLE will be only activate on below case: ... ... @@ -206,23 +206,25 @@ 206 206 * Wood Door: 10mm ~~ 30mm 207 207 * Iron Door: 30 ~~ 45mm 208 208 207 + 208 + 209 209 = 2. Use DS03A-NB to communicate with IoT Server = 210 210 211 211 == 2.1 Send data to IoT server via NB-IoT network == 212 212 213 213 214 -The DS03A-NB is equipped with a NB-IoT module, the pre-loaded firmware inDS03A-NB will get environment data from sensors and send the value to local NB-IoT network via the NB-IoT module. The NB-IoT network will forward this value to IoT server via the protocol defined byDS03A-NB.214 +The SW3L-NB is equipped with a NB-IoT module, the pre-loaded firmware in SW3L-NB will get environment data from sensors and send the value to local NB-IoT network via the NB-IoT module. The NB-IoT network will forward this value to IoT server via the protocol defined by SW3L-NB. 215 215 216 216 217 217 Below shows the network structure: 218 218 219 -[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/ DS03A-NB_NB-IoT_Door_Sensor_User_Manual/WebHome/image-20231011093807-6.png?width=879&height=278&rev=1.1||alt="image-20231011093807-6.png"]]219 +[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/SW3L-NB_NB-IoT_Flow_Sensor_User_Manual/WebHome/image-20231010091546-2.png?width=909&height=348&rev=1.1||alt="image-20231010091546-2.png"]] 220 220 221 221 222 -There are two version: (% style="color:blue" %)**-GE**(%%) and (% style="color:blue" %)**-1D**(%%) version of DS03A-NB.222 +There are two version: (% style="color:blue" %)**-GE**(%%) and (% style="color:blue" %)**-1D**(%%) version of SW3L-NB. 223 223 224 224 225 -(% style="color:blue" %)**GE Version**(%%): This version doesn't include SIM card or point to any IoT server. User needs to use AT Commands to configure below two steps to set DS03A-NB send data to IoT server.225 +(% style="color:blue" %)**GE Version**(%%): This version doesn't include SIM card or point to any IoT server. User needs to use AT Commands to configure below two steps to set SW3L-NB send data to IoT server. 226 226 227 227 * Install NB-IoT SIM card and configure APN. See instruction of [[Attach Network>>url:http://wiki.dragino.com/xwiki/bin/view/Main/General%20Configure%20to%20Connect%20to%20IoT%20server%20for%20-NB%20%26%20-NS%20NB-IoT%20models/#H2.AttachNetwork]]. 228 228 ... ... @@ -252,13 +252,13 @@ 252 252 [[image:image-20230819113244-11.png||height="141" width="367"]] 253 253 )))|(% style="width:170px" %) 254 254 255 -(% style="color:blue" %)**1D Version**(%%): This version has 1NCE SIM card pre-installed and configure to send value to DataCake. User Just need to select the sensor type in DataCake and Activate DS03A-NB and user will be able to see data in DataCake. See here for [[DataCake Config Instruction>>url:http://wiki.dragino.com/xwiki/bin/view/Main/General%20Configure%20to%20Connect%20to%20IoT%20server%20for%20-NB%20%26%20-NS%20NB-IoT%20models/#H3.4Datacake]].255 +(% style="color:blue" %)**1D Version**(%%): This version has 1NCE SIM card pre-installed and configure to send value to DataCake. User Just need to select the sensor type in DataCake and Activate SW3L-NB and user will be able to see data in DataCake. See here for [[DataCake Config Instruction>>url:http://wiki.dragino.com/xwiki/bin/view/Main/General%20Configure%20to%20Connect%20to%20IoT%20server%20for%20-NB%20%26%20-NS%20NB-IoT%20models/#H3.4Datacake]]. 256 256 257 257 258 258 == 2.2 Payload Types == 259 259 260 260 261 -To meet different server requirement, DS03A-NB supports different payload type.261 +To meet different server requirement, SW3L-NB supports different payload type. 262 262 263 263 **Includes:** 264 264 ... ... @@ -284,10 +284,10 @@ 284 284 285 285 This is the General Json Format. As below: 286 286 287 -(% style="color:#4472c4" %)**{"IMEI":"86620705 2559857","Model":"DS03A-NB","level status":1,"alarm status":0,"door open num":0,"last open time":0,"level status2":1,"alarm status2":0,"door open num2":0,"last open time2":0,"battery":3.48,"signal":24,"1":{1,0,0,2023/11/1309:59:01},"2":{0,0,261,2023/11/1303:20:00},"3":{237,9896971,263,2023/11/1303:05:00},"4":{0,29,263,2023/11/1302:20:12},"5":{215,9897015,268,2023/11/1301:58:16},"6":{0,79,261,2023/11/1301:43:16},"7":{227,9896991,5368540,2023/11/1301:18:46},"8":{0,19,5367640,2023/11/1108:53:57}}**287 +(% style="color:#4472c4" %)**{"IMEI":"866207058378443","Model":"SW3L-NB","flow":217,"battery":3.54,"signal":24,"1":{221,2023/09/20 09:47:01},"2":{0,2023/09/20 09:15:04},"3":{0,2023/09/20 09:00:04},"4":{0,2023/09/20 08:45:03},"5":{0,2023/09/20 08:30:03},"6":{0,2023/09/20 08:15:03},"7":{0,2023/09/20 08:00:04},"8":{0,2023/09/20 07:45:04}}** 288 288 289 289 290 -[[image:image-2023 1113180055-1.png]]290 +[[image:image-20230920175015-3.png||height="613" width="890"]] 291 291 292 292 293 293 (% style="color:red" %)**Notice, from above payload:** ... ... @@ -299,42 +299,23 @@ 299 299 === 2.2.2 HEX format Payload(Type~=0) === 300 300 301 301 302 -This is the HEX Format. HEXformat Payload Single-channel and double-channelpayload have different byte lengths.302 +This is the HEX Format. As below: 303 303 304 +(% style="color:#4472c4" %)**f8662070583784430b640dda15010003a4650abc400000650ab8180000650ab4940000650ab10f0000650aad8b0000650aaa070000650aa6840000650aa3000000650a9308** 304 304 305 - **The HEX format payload for thesingle-channel modeisas follows:**306 +[[image:image-20230920172200-1.png||height="191" width="1047"]] 306 306 307 -(% style="color:#4472c4" %)**f86620705255985712640d9c180101000000000000006551f424010000000000006551f36500000000000105655195e0ed97040b0001076551925c0000001d000107655187dcd797043700010c655182b80000004f00010565517f34e397041f51eadc655179760000001351e758654f4125** 308 308 309 -[[image:image-20231114091247-2.png||height="186" width="1363"]] 310 - 311 - 312 312 If we use the MQTT client to subscribe to this MQTT topic, we can see the following information when the NB sensor uplink data. 313 313 311 +[[image:image-20230920173352-2.png||height="636" width="919"]] 314 314 315 -[[image:image-20231114094432-3.png]] 316 316 317 - 318 -**The HEX format payload for the double-channel mode is as follows:** 319 - 320 -f86620705255985712640db71701010000000000000001000000000000006552d13401000000000000000000000000006551f365000000000001050000005f00005f655195e0ed97040b0001070000005c00005c6551925c0000001d00010700000033000033655187dcd797043700010c00000033000033655182b80000004f0001050000003300003365517f34e397041f51eadc00000000000000655179760000001351e75800000000000000654f4125 321 - 322 - 323 -[[image:image-20231114091229-1.png||height="180" width="1584"]] 324 - 325 - 326 - 327 -If we use the MQTT client to subscribe to this MQTT topic, we can see the following information when the NB sensor uplink data. 328 - 329 - 330 -[[image:image-20231114094838-5.png]] 331 - 332 - 333 333 (% style="color:blue" %)**Version:** 334 334 335 335 These bytes include the hardware and software version. 336 336 337 -(% style="color:#037691" %)**Higher byte:**(%%) Specify Sensor Model: 0x1 2forDS03A-NB318 +(% style="color:#037691" %)**Higher byte:**(%%) Specify Sensor Model: 0x11 for SW3L-NB 338 338 339 339 (% style="color:#037691" %)**Lower byte:**(%%) Specify the software version: 0x64=100, means firmware version 1.0.0 340 340 ... ... @@ -373,11 +373,12 @@ 373 373 374 374 Type3 payload special design for ThingsBoard, it will also configure other default server to ThingsBoard. 375 375 376 -(% style="color:#4472c4" %)** {"IMEI": "866207058378443","Model": " DS03A","flow": 502,"battery": 3.57,"signal": 23}**357 +(% style="color:#4472c4" %)** {"IMEI": "866207058378443","Model": "SW3L","flow": 502,"battery": 3.57,"signal": 23}** 377 377 378 378 [[image:image-20230922094043-2.png||height="558" width="851"]] 379 379 380 380 362 + 381 381 === 2.2.4 ThingSpeak Payload(Type~=1) === 382 382 383 383 ... ... @@ -387,7 +387,7 @@ 387 387 388 388 As below: 389 389 390 -(% style="color:#4472c4" %)**field1=Flow value&field2=Battery value&field3= signal value**372 +(% style="color:#4472c4" %)**field1=Flow value&field2=Battery value&field3=Singal value** 391 391 392 392 [[image:image-20230921104741-1.png||height="565" width="826"]] 393 393 ... ... @@ -394,325 +394,326 @@ 394 394 395 395 == 2.3 Uplink Payload == 396 396 397 -=== 2.3.1 379 +=== 2.3.1 Sensor Configuration, FPORT~=4 === 398 398 399 399 400 - DS03A-NB will only send this command after getting the downlink command **(0x26 02)** from the server.382 +SW3L-NB will only send this command after getting the downlink command **(0x26 02)** from the server. 401 401 402 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 403 -|(% colspan="8" style="background-color:#4f81bd; color:white; width:515px" %)**Sensor Configuration FPORT=4** 404 -|**Size(bytes)**|(% style="width:75px" %)**3**|(% style="width:50px" %)**1**|(% style="width:100px" %)**1**|(% style="width:90px" %)**2**|(% style="width:100px" %)**1**|(% style="width:100px" %)**2**|(% style="width:98px" %)**1** 405 -|**Value**|(% style="width:75px" %)TDC (unit:sec)|(% style="width:77px" %)Disalarm|(% style="width:96px" %)((( 406 -Keep status1 407 -)))|(% style="width:99px" %)((( 408 -Keep time1(unit: sec) 409 -)))|(% style="width:87px" %)Keep status2|(% style="width:97px" %)((( 410 -Keep time2(unit: sec) 411 -)))|(% style="width:98px" %)((( 412 -Alarm interval(unit: min) 413 -))) 384 +(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:510px" %) 385 +|(% style="background-color:#4f81bd; color:white; width:70px" %) **Size(bytes)**|(% style="background-color:#4f81bd; color:white; width:105px" %)**3**|(% style="background-color:#4f81bd; color:white; width:60px" %)**1**|(% style="background-color:#4f81bd; color:white; width:96px" %)**1**|(% style="background-color:#4f81bd; color:white; width:105px" %)**2**|(% style="background-color:#4f81bd; color:white; width:74px" %)**1** 386 +|**Value**|(% style="width:104px" %)TDC(unit:sec)|(% style="width:43px" %)N/A|(% style="width:91px" %)Stop Timer|(% style="width:100px" %)Alarm Timer|(% style="width:69px" %)Reserve 414 414 415 415 Example parse in TTNv3 416 416 417 -[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/ DS03A-LB/WebHome/image-20230630155527-3.png?width=902&height=146&rev=1.1||alt="image-20230630155527-3.png"]]390 +[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/SW3L-LB_LoRaWAN_Flow_Sensor_User_Manual/WebHome/image-20230614172555-4.png?width=853&height=151&rev=1.1||alt="image-20230614172555-4.png"]] 418 418 419 419 420 -* ((( 421 -(% style="color:blue" %)**TDC: (default: 0x001C20)** 422 -))) 393 +* (% style="color:blue" %)**TDC: (default: 0x0004B0)** 423 423 424 -Uplink interval for the Open/CloseEvent, default value is 0x001C20 which is7200 seconds = 2hours.395 +Uplink interval for the total pulse count, default value is 0x0004B0 which is 1200 seconds = 20 minutes. 425 425 426 426 427 -* ((( 428 -(% style="color:blue" %)**Disalarm: (default: 0)** 429 -))) 398 +* (% style="color:blue" %)**STOP Duration & Alarm Timer** 430 430 431 - **If Disalarm = 1**, DS03A-NB willonlysenduplink atveryTDC periodically. This is normallyuseforpulsemeterapplication, inthis application, thereare many open/close event,and platformonlycare aboutthetotal numberofpulse.400 +Shows the configure value of [[Alarm for continuously water flow>>||anchor="H2.7Alarmforcontinuouslywaterflow"]] 432 432 433 - **If Disalarm = 0**, DS03A-NB will send uplink at every TDC periodically and send data on each open/close event. This is useful for the application user need to monitor the open/close event in real-time. 434 434 435 - (% style="color:red"%)** Note:When Disalarm=0,a high frequentlyopen/close eventwillcauselots of uplinkanddrain battery very fast. **403 +=== 2.3.2 Water Flow Value, Uplink FPORT~=2 === 436 436 437 437 438 - *(((439 - (%style="color:blue" %)**KeepStatus1& KeepTime1&Keep Status2&KeepTime2**406 +((( 407 +SW3L-NB will send this uplink **after** Device Status once join the NB-IoT network successfully. And SW3L-NB will: 440 440 ))) 441 441 442 -Shows the configure value of [[Alarm Base on Timeout Feature>>||anchor="H2.9AlarmBaseonTimeout"]] 410 +((( 411 +periodically send this uplink every 20 minutes, this interval [[can be changed>>||anchor="H2.10SetTransmitIntervalTime"]]. 412 +))) 443 443 444 - 445 -* ((( 446 -(% style="color:blue" %)**Alarm interval(default: 0)** 414 +((( 415 +Uplink Payload totals 11 bytes. 447 447 ))) 448 448 449 -When the state of the door sensor has not been changed after the timeout alarm, the device will send a uplink every alarm interval. It will stop the alarm until the state of the door sensor is changed after the timeout alarm. 418 +(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 419 +|=(% colspan="6" style="width: 515px; background-color:#4F81BD;color:white" %)**Water Flow Value, FPORT=2** 420 +|(% style="width:50px" %)**Size(bytes)**|(% style="width:110px" %)**1**|(% style="width:120px" %)**4**|(% style="width:110px" %)**1**|(% style="width:55px" %)**1**|(% style="width:70px" %)**4** 421 +|(% style="width:110px" %)**Value**|(% style="width:81px" %)Calculate Flag & [[Alarm>>||anchor="H2.7Alarmforcontinuouslywaterflow"]]|(% style="width:95px" %)((( 422 +Total pulse Or Last Pulse 423 +)))|(% style="width:78px" %)((( 424 +MOD & PA4_status & PB15_status 425 +)))|(% style="width:92px" %)Reserve(0x01)|(% style="width:134px" %)Unix TimeStamp 450 450 427 +**Calculate Flag & Alarm:** 451 451 452 -=== 2.3.2 Real-Time Open/Close Status, Uplink FPORT~=2 === 429 +(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:500px" %) 430 +|(% style="background-color:#4f81bd; color:white; width:70px" %)**Size(bit)**|(% style="background-color:#4f81bd; color:white; width:70px" %)**[bit7:bit6]**|(% style="background-color:#4f81bd; color:white; width:90px" %)**[bit5:bit2]**|(% style="background-color:#4f81bd; color:white; width:140px" %)**bit1**|(% style="background-color:#4f81bd; color:white; width:130px" %)**bit0** 431 +|(% style="width:88px" %)**Value**|(% style="width:117px" %)Reserve|(% style="width:117px" %)Calculate Flag|(% style="width:169px" %)Alarm: 0: No Alarm; 1: Alarm|(% style="width:150px" %)TDC flag 0:No;1:Yes 453 453 433 +**MOD & PA4_status & PB15_status:** 454 454 455 -DS03A-NB will send this uplink **after** Device Status once join the LoRaWAN network successfully. And DS03A-NB will send uplinks when: 435 +(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:230px" %) 436 +|(% style="background-color:#4f81bd; color:white; width:50px" %)**Size(bit)**|(% style="background-color:#4f81bd; color:white; width:60px" %)**bit7**|(% style="background-color:#4f81bd; color:white; width:60px" %)**bit6**|(% style="background-color:#4f81bd; color:white; width:60px" %)**[bit5:bit0]** 437 +|(% style="width:88px" %)**Value**|(% style="width:117px" %)PA4_status|(% style="width:117px" %)PB15_status|(% style="width:118px" %)MOD 456 456 457 -* Every 2 hours, this interval [[can be changed>>||anchor="H2.7SetTransmitIntervalTime"]]. 458 -* There is an Open/Close event. (This info can be disabled by AT+DISALARM=1) 439 +(% style="color:#037691" %)** **[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/SW3L-LB_LoRaWAN_Flow_Sensor_User_Manual/WebHome/image-20230626093242-1.png?width=892&height=276&rev=1.1||alt="image-20230626093242-1.png"]] 459 459 460 -**1) When (% style="color:blue" %)AT+TTRCHANNEL=1(%%), Uplink Payload totals (% style="color:blue" %)11 bytes. (Default mode)(%%)** 461 461 462 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 463 -|=(% colspan="5" style="background-color:#4F81BD;color:white;width:515px" %)**Real-Time Open/Close Status, FPORT=2** 464 -|(% style="width:94px" %)**Size(bytes)**|(% style="width:97px" %)**1**|(% style="width:95px" %)**3**|(% style="width:119px" %)**3**|(% style="width:107px" %)**4** 465 -|(% style="width:95px" %)**Value**|(% style="width:97px" %)((( 466 -Status & [[Alarm>>||anchor="2.10TTRIG126TTRIG2timeoutstatusalarm"]] 467 -)))|(% style="width:95px" %)Total open door events|(% style="width:119px" %)((( 468 -The last door open duration (unit: sec) 469 -)))|(% style="width:108px" %)Unix TimeStamp 442 +* ((( 443 +(% style="color:blue" %)**Calculate Flag** 444 +))) 470 470 471 -**Status & Alarm:** 446 +((( 447 +The calculate flag is a user defined field, IoT server can use this flag to handle different meters with different pulse factors. For example, if there are 100 Flow Sensors, meters 1 ~~50 are 1 liter/pulse and meters 51 ~~ 100 has 1.5 liter/pulse. 448 +))) 472 472 473 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 474 -|(% style="background-color:#4f81bd; color:white; width:50px" %)**Size(bit)**|(% style="background-color:#4f81bd; color:white; width:60px" %)**[bit7:bit4]**|(% style="background-color:#4f81bd; color:white; width:80px" %)**bit3**|(% style="background-color:#4f81bd; color:white; width:100px" %)**bit2**|(% style="background-color:#4f81bd; color:white; width:120px" %)**bit1**|(% style="background-color:#4f81bd; color:white; width:105px" %)**bit0** 475 -|(% style="width:76px" %)**Value**|(% style="width:96px" %)Reserve|(% style="width:110px" %)((( 476 -Count mod 477 -)))|(% style="width:106px" %)TDC flag 0:No;1:Yes|(% style="width:148px" %)((( 478 -Alarm 0: No Alarm; 1: Alarm 479 -)))|(% style="width:131px" %)((( 480 -Status 0: Close; 1: Open 450 +((( 451 +**Example: in the default payload:** 481 481 ))) 482 482 483 -[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/DS03A-LB/WebHome/image-20230630155451-2.png?width=928&height=246&rev=1.1||alt="image-20230630155451-2.png"]] 484 - 485 - 486 486 * ((( 487 - (% style="color:blue"%)**Countmod:Default=0**455 +calculate flag=0: for SW3L-004 Flow Sensor: 450 pulse = 1 L 488 488 ))) 489 - 490 -0: Uplink total open door times since factory 491 - 492 -1: Uplink total open door times since last FPORT=2 uplink. 493 - 494 - 495 -* (% style="color:blue" %)**TDC flag** 496 - 497 -When the flag is 1, it means sending packets at normal time intervals. 498 - 499 -Otherwise, it is a packet sent at non-TDC time. 500 - 501 - 502 502 * ((( 503 - (% style="color:#0000ff"%)**Alarm**458 +calculate flag=1: for SW3L-006 Flow Sensor: 390 pulse = 1 L 504 504 ))) 505 - 506 -See [[Alarm Base on Timeout>>||anchor="H3.3.3A0AlarmBaseonTimeout"]] 507 - 508 - 509 509 * ((( 510 - (% style="color:blue"%)**Status**461 +calculate flag=2: for SW3L-010 Flow Sensor: 64 pulse = 1 L 511 511 ))) 512 512 513 -This bit is 1 when the door sensor is open and 0 when it is close. 514 - 515 - 516 -* ((( 517 -(% style="color:blue" %)**Total open door events** 464 +((( 465 +Default value: 0. 518 518 ))) 519 519 520 -Total pulse/counting base on open door. 468 +((( 469 +Range (4 bits): (b)0000 ~~ (b) 1111 521 521 522 - Range(3Bytes):0x000000~~0xFFFFFF.Max:16777215471 +If user use with a meter for example is 0.02L/pulse. To proper decode the correct value in server, 523 523 473 +1) User can set the Calculate Flag of this sensor to 3. 524 524 525 -* ((( 526 -(% style="color:blue" %)**The last door open duration** 475 +2) In server side, when a sensor data arrive, the decoder will check the value of Calculate Flag, It the value is 3, the total volume = 0.02 x Pulse Count. 527 527 ))) 528 528 529 -Door sensor last open duration. 478 +((( 479 +(% style="color:red" %)**NOTE: User need to set Calculate Flag to proper value before use Flow Sensor. Downlink or AT Command see: **(%%)Refer: [[Set Calculate Flag>>||anchor="H2.8Setthecalculateflag"]] 530 530 531 -Unit: sec. 481 +((( 482 + 483 +))) 484 +))) 532 532 533 -[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/DS03A-LB/WebHome/image-20230701094042-1.png?width=763&height=154&rev=1.1||alt="image-20230701094042-1.png"]] 534 534 487 +* ((( 488 +(% style="color:blue" %)**Alarm** 489 +))) 535 535 536 -**2) When (% style="color:blue" %)AT+TTRCHANNEL=2(%%), Uplink Payload totals (% style="color:blue" %)18 bytes(%%)**(% style="color:blue" %). 491 +((( 492 +See [[Alarm for continuously water flow>>||anchor="H2.7Alarmforcontinuouslywaterflow"]] 493 +))) 537 537 538 - (When the maximum DRof some frequenciesis 11bytes,itwill causetheerver toceive empty packets)495 +[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/SW3L%20LoRaWAN%20Outdoor%20Flow%20Sensor/WebHome/image-20220519095946-4.png?width=724&height=65&rev=1.1||alt="image-20220519095946-4.png"]] 539 539 540 -(% style="color:red" %)**Note:When using the AT+TTRCHANNEL=2 command, the Datalog function cannot be used.** 541 541 542 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 543 -|=(% colspan="8" style="background-color:#4F81BD;color:white; width: 515px;" %)**Real-Time Open/Close Status, FPORT=2** 544 -|(% style="width:50px" %)**Size(bytes)**|(% style="width:97px" %)**1**|(% style="width:95px" %)**3**|(% style="width:125px" %)**3**|(% style="width:100px" %)**4**|(% style="width:86px" %)**1**|(% style="width:96px" %)**3**|(% style="width:126px" %)**3** 545 -|(% style="width:95px" %)**Value**|(% style="width:97px" %)((( 546 -Status1 & Alarm1 547 -)))|(% style="width:95px" %)Total open door events1|(% style="width:125px" %)((( 548 -The last door open duration1 (unit: sec) 549 -)))|(% style="width:100px" %)Unix TimeStamp|(% style="width:86px" %)((( 550 -Status2 & Alarm2 551 -)))|(% style="width:96px" %)Total open door events2|(% style="width:126px" %)The last door open duration2 (unit: sec) 498 +((( 499 +* (% style="color:blue" %)**TDC flag** 552 552 553 - **Status1&Alarm1:**501 +When the flag is 1, it means sending packets at normal time intervals. 554 554 555 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:514px" %) 556 -|(% style="background-color:#4f81bd; color:white; width:50px" %)**Size(bit)**|(% style="background-color:#4f81bd; color:white; width:60px" %)**[bit7:bit4]**|(% style="background-color:#4f81bd; color:white; width:70px" %)**bit3**|(% style="background-color:#4f81bd; color:white; width:100px" %)**bit2**|(% style="background-color:#4f81bd; color:white; width:117px" %)**bit1**|(% style="background-color:#4f81bd; color:white; width:117px" %)**bit0** 557 -|(% style="width:76px" %)**Value**|(% style="width:96px" %)Reserve|(% style="width:99px" %)((( 558 -Count mod 559 -)))|(% style="width:103px" %)TDC flag 0:No;1:Yes|(% style="width:216px" %)((( 560 -Alarm1 0: No Alarm; 1: Alarm (PA8 of pin) 561 -)))|(% style="width:181px" %)((( 562 -Status1 0: Close; 1: Open (PA8 of pin) 503 +Otherwise, it is a packet sent at non-TDC time. 563 563 ))) 564 564 565 -**Status2 & Alarm2:** 506 +* ((( 507 +(% style="color:blue" %)**Total pulse** 508 +))) 566 566 567 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:510px" %) 568 -|(% style="background-color:#4f81bd; color:white; width:50px" %)**Size(bit)**|(% style="background-color:#4f81bd; color:white; width:60px" %)**[bit7:bit2]**|(% style="background-color:#4f81bd; color:white; width:200px" %)**bit1**|(% style="background-color:#4f81bd; color:white; width:200px" %)**bit0** 569 -|(% style="width:76px" %)**Value**|(% style="width:113px" %)Reserve|(% style="width:219px" %)((( 570 -Alarm2 0: No Alarm; 1: Alarm (PA4 of pin) 571 -)))|(% style="width:181px" %)((( 572 -Status2 0: Close; 1: Open (PA4 of pin) 510 +((( 511 +Total pulse/counting since factory 573 573 ))) 574 574 575 -[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/DS03A-LB/WebHome/image-20230630155908-6.png?width=927&height=295&rev=1.1||alt="image-20230630155908-6.png"]] 514 +((( 515 +Range (4 Bytes) : 0x00000000~~ 0xFFFFFFFF . 576 576 517 + 518 +))) 577 577 578 578 * ((( 579 -(% style="color:blue" %)** Countmod:Default=0**521 +(% style="color:blue" %)**Last Pulse** 580 580 ))) 581 581 582 -0: Uplink total open door times since factory 524 +((( 525 +Total pulse since last FPORT=2 uplink. (Default 20 minutes) 526 +))) 583 583 584 -1: Uplink total open door times since last FPORT=2 uplink. 528 +((( 529 +Range (4 Bytes) : 0x00000000~~ 0xFFFFFFFF . 585 585 586 586 587 -* (% style="color:blue" %)**TDC flag** 532 +* ((( 533 +(% style="color:blue" %)**PA4_status: Support digital level input below 3.3V** 534 +))) 588 588 589 -When the flag is 1, it means sending packets at normal time intervals. 536 +((( 537 +0 ~-~-> PA4 is at low level. 538 +))) 590 590 591 -Otherwise, it is a packet sent at non-TDC time. 540 +((( 541 +1 ~-~-> PA4 is at high level. 592 592 593 593 594 594 * ((( 595 -(% style="color: #0000ff" %)**Alarm1Alarm2**545 +(% style="color:blue" %)**PB15_status: Support digital level input below 3.3V** 596 596 ))) 597 597 598 -See [[Alarm Base on Timeout>>||anchor="H2.9AlarmBaseonTimeout"]] 548 +((( 549 +0 ~-~-> PB15 is at low level. 550 +))) 599 599 552 +((( 553 +1 ~-~-> PB15 is at high level.. 554 +))) 555 +))) 556 +))) 600 600 601 601 * ((( 602 -(% style="color:blue" %)** Status1 **(% style="color:#0000ff" %)**or **(% style="color:blue" %)**Status2**559 +(% style="color:blue" %)**MOD: Default =0** 603 603 ))) 604 604 605 -This bit is 1 when the door sensor is open and 0 when it is close. 562 +((( 563 +MOD=0 ~-~-> Uplink Total Pulse since factory 564 +))) 606 606 566 +((( 567 +MOD=1 ~-~-> Uplink total pulse since last FPORT=2 uplink. 607 607 569 + 570 +))) 571 + 608 608 * ((( 609 -(% style="color:blue" %)** Total open door events1 **(% style="color:#0000ff"%)**or**(% style="color:blue"%)** Totalopen door events2**573 +(% style="color:blue" %)**Water Flow Value** 610 610 ))) 611 611 612 -Total pulse/counting base on open door. 576 +((( 577 +**Total Water Flow Volume = (Calculate Flag) x (Total Pulse)=9597/450=21.3L** 578 +))) 613 613 614 - Range(3 Bytes):0x000000~~0xFFFFFF . Max:16777215580 +[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/SW3L%20LoRaWAN%20Outdoor%20Flow%20Sensor/WebHome/image-20220519095946-5.png?width=727&height=50&rev=1.1||alt="image-20220519095946-5.png"]] 615 615 616 616 617 - *(((618 - (% style="color:blue" %)**Thelastdoor openduration1**(%style="color:#0000ff"%)**or**(%style="color:blue"%)** Thelastdoor open duration2**583 +((( 584 +**Total Water Flow for TDC timer = (Calculate Flag) x (Last Pulse)=79/450=0.2L** 619 619 ))) 620 620 621 - Doorsensorlastpenuration.587 +[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/SW3L%20LoRaWAN%20Outdoor%20Flow%20Sensor/WebHome/image-20220519095946-6.png?width=733&height=43&rev=1.1||alt="image-20220519095946-6.png"]] ** ** 622 622 623 -Unit: sec. 624 624 625 - [[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/DS03A-LB/WebHome/image-20230701094042-1.png?width=763&height=154&rev=1.1||alt="image-20230701094042-1.png"]]590 +=== 2.3.3 Historical Water Flow Status, FPORT~=3 === 626 626 627 627 628 -=== 2.3.3 Historical Door Open/Close Event, FPORT~=3 === 593 +((( 594 +SW3L-NB stores sensor values and users can retrieve these history values via the downlink command. 595 +))) 629 629 597 +((( 598 +The historical payload includes one or multiplies entries and every entry has the same payload as Real-Time water flow status. 630 630 631 -DS03A-NB stores sensor values and users can retrieve these history values via the downlink command. 600 +(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 601 +|=(% colspan="6" style="width: 515px; background-color:#4F81BD;color:white" %)**Water Flow Value, FPORT=3** 602 +|(% style="width:50px" %)**Size(bytes)**|(% style="width:110px" %)**1**|(% style="width:120px" %)**4**|(% style="width:110px" %)**1**|(% style="width:55px" %)**1**|(% style="width:70px" %)**4** 603 +|(% style="width:110px" %)**Value**|(% style="width:81px" %)Calculate Flag & [[Alarm>>||anchor="H2.7Alarmforcontinuouslywaterflow"]]|(% style="width:95px" %)((( 604 +Total pulse Or Last Pulse 605 +)))|(% style="width:78px" %)((( 606 +MOD & PA4_status & PB15_status 607 +)))|(% style="width:92px" %)Reserve(0x01)|(% style="width:134px" %)Unix TimeStamp 632 632 633 - The historicalpayload includes one or multiplies entriesand every entry has thesame payloadasReal-Time open/close status.609 +**Calculate Flag & Alarm:** 634 634 635 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:510px" %) 636 -|=(% colspan="5" style="background-color:#4F81BD;color:white;width:515px" %)**Real-Time Open/Close Status, FPORT=3** 637 -|(% style="width:60px" %)**Size(bytes)**|(% style="width:80px" %)**1**|(% style="width:120px" %)**3**|(% style="width:150px" %)**3**|(% style="width:90px" %)**4** 638 -|(% style="width:95px" %)**Value**|(% style="width:97px" %)((( 639 -Status & [[Alarm>>||anchor="H2.9A0AlarmBaseonTimeout"]] 640 -)))|(% style="width:95px" %)Total open door events|(% style="width:119px" %)((( 641 -The last door open duration (unit: sec) 642 -)))|(% style="width:108px" %)Unix TimeStamp 611 +(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 612 +|(% style="background-color:#4f81bd; color:white; width:50px" %)**Size(bit)**|(% style="background-color:#4f81bd; color:white; width:89px" %)**bit7**|(% style="background-color:#4f81bd; color:white; width:89px" %)**bit6**|(% style="background-color:#4f81bd; color:white; width:69px" %)**[bit5:bit2]**|(% style="background-color:#4f81bd; color:white; width:129px" %)**bit1**|(% style="background-color:#4f81bd; color:white; width:89px" %)**bit0** 613 +|(% style="width:88px" %)**Value**|(% style="width:96px" %)((( 614 +No ACK message 615 +)))|(% style="width:94px" %)Poll Message Flag|(% style="width:115px" %)Calculate Flag|(% style="width:136px" %)Alarm: 0: No Alarm; 1: Alarm|(% style="width:120px" %)TDC flag 0:No;1:Yes 643 643 644 -** Status &Alarm:**617 +**MOD & PA4_status & PB15_status:** 645 645 646 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 647 -|(% style="background-color:#4f81bd; color:white; width:50px" %)**Size(bit)**|(% style="background-color:#4f81bd; color:white; width:75px" %)**bit7**|(% style="background-color:#4f81bd; color:white; width:65px" %)**bit6**|(% style="background-color:#4f81bd; color:white; width:50px" %)**[bit5:bit4]**|(% style="background-color:#4f81bd; color:white; width:50px" %)**bit3**|(% style="background-color:#4f81bd; color:white; width:70px" %)**bit2**|(% style="background-color:#4f81bd; color:white; width:80px" %)**bit1**|(% style="background-color:#4f81bd; color:white; width:75px" %)**bit0** 648 -|(% style="width:76px" %)**Value**|(% style="width:88px" %)No ACK message|(% style="width:92px" %)Poll Message Flag|(% style="width:89px" %)Reserve|(% style="width:90px" %)((( 649 -Count mod 650 -)))|(% style="width:95px" %)((( 651 -TDC flag 0:No; 1:Yes 652 -)))|(% style="width:116px" %)((( 653 -Alarm 0: No Alarm; 1: Alarm 654 -)))|(% style="width:112px" %)((( 655 -Status 0:Close; 1: Open 619 +(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:240px" %) 620 +|(% style="background-color:#4f81bd; color:white; width:60px" %)**Size(bit)**|(% style="background-color:#4f81bd; color:white; width:60px" %)**bit7**|(% style="background-color:#4f81bd; color:white; width:60px" %)**bit6**|(% style="background-color:#4f81bd; color:white; width:60px" %)**[bit5:bit0]** 621 +|(% style="width:88px" %)**Value**|(% style="width:117px" %)PA4_status|(% style="width:117px" %)PB15_status|(% style="width:118px" %)MOD 656 656 ))) 657 657 658 658 * ((( 659 -Each data entry is 11 bytes and has the same structure as [[ Real-Timeopen/closestatus>>||anchor="H2.3.2A0Real-TimeOpen2FCloseStatus2CUplinkFPORT3D2"]], to save airtime and battery,DS03A-NBwill send max bytes according to the current DR and Frequency bands.625 +Each data entry is 11 bytes and has the same structure as [[real time water flow status>>||anchor="H2.3.2A0WaterFlowValue2CUplinkFPORT3D2"]], to save airtime and battery, SW3L will send max bytes according to the current DR and Frequency bands. 660 660 ))) 661 661 628 +((( 662 662 For example, in the US915 band, the max payload for different DR is: 630 +))) 663 663 664 664 ((( 665 -** ~1.DR0**:max is 11 bytes so one entry of data633 +(% style="color:blue" %)**a) DR0:**(%%) max is 11 bytes so one entry of data 666 666 ))) 667 667 668 668 ((( 669 -** 2.DR1**:max is 53 bytes so devices will upload 4 entries of data (total 44 bytes)637 +(% style="color:blue" %)**b) DR1:**(%%) max is 53 bytes so devices will upload 4 entries of data (total 44 bytes) 670 670 ))) 671 671 672 672 ((( 673 -** 3.DR2**:total payload includes 11 entries of data641 +(% style="color:blue" %)**c) DR2:**(%%) total payload includes 11 entries of data 674 674 ))) 675 675 676 676 ((( 677 -** 4.DR3**:total payload includes 22 entries of data.645 +(% style="color:blue" %)**d) DR3:**(%%) total payload includes 22 entries of data. 678 678 ))) 679 679 680 -If DS03A-NB doesn't have any data in the polling time. It will uplink 11 bytes of 0 648 +((( 649 +If SW3L-NB doesn't have any data in the polling time. It will uplink 11 bytes of 0 681 681 682 -[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/DS03A-LB/WebHome/image-20230630155556-4.png?width=938&height=146&rev=1.1||alt="image-20230630155556-4.png"]] 651 + 652 +))) 683 683 684 -**Downlink:** 654 +((( 655 +(% style="color:#037691" %)**Downlink:** 656 +))) 685 685 686 -0x31 64 9E 7D 34 64 9E 7E 9C 05 658 +((( 659 +0x31 64 92 C5 AC 64 92 C7 8C 05 660 +))) 687 687 662 +[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/SW3L-LB_LoRaWAN_Flow_Sensor_User_Manual/WebHome/image-20230626093440-2.png?width=890&height=160&rev=1.1||alt="image-20230626093440-2.png"]] 688 688 689 -**Uplink:** 690 690 691 -45 00 00 00 00 00 00 64 9E 7D 48 40 00 00 00 00 00 63 64 9E 7D 9C 41 00 00 01 00 00 63 64 9E 7D A4 40 00 00 01 00 00 8D 64 9E 7E 31 43 00 00 02 00 00 8D 64 9E 7E 44 48 00 00 02 00 00 1F 64 9E 7E 59 4B 00 00 03 00 00 1F 64 9E 7E 6B 665 +((( 666 +(% style="color:#037691" %)**Uplink:** 667 +))) 692 692 669 +((( 670 +41 00 01 00 00 00 08 64 92 C5 E4 40 00 01 00 00 00 08 64 92 C6 06 49 41 01 00 00 00 00 64 92 C6 8B 49 81 01 00 00 00 00 64 92 C7 34 4A 01 01 00 00 00 2D 64 92 C7 7C 693 693 694 -**Parsed Value:** 672 + 673 +))) 695 695 696 -[COUNTMOD, TDC_FLAG, ALARM, DOOR_STATUS, OPEN_DOOR_TIMES, LAST_DOOR_OPEN_DURATION, TIME] 675 +((( 676 +(% style="color:#037691" %)**Parsed Value:** 677 +))) 697 697 679 +((( 680 +[TDC_flag, Alarm, Calculate Flag, PA4_status, PB15_status, MOD, Total pulse or Last Pulse,** **Water Flow Value, TIME] 681 +))) 698 698 699 -[SUM,YES,FALSE,OPEN,0,0,2023-06-30 06:59:20], 700 700 701 -[SUM,NO,FALSE,CLOSE,0,99,2023-06-30 07:00:44], 684 +((( 685 +[YES,FALSE,0,L,L, 0,8, 0.0,2023-06-21 09:41:56], 702 702 703 -[ SUM,NO,FALSE,OPEN,1,99,2023-06-3007:00:52],687 +[NO,FALSE,0,L,L, 0,8, 0.0,2023-06-21 09:42:30], 704 704 705 -[S UM,NO,FALSE,CLOSE,1,141,2023-06-3007:03:13],689 +[YES,FALSE,2,L,H,1,0, 0.0,2023-06-21 09:44:43], 706 706 707 -[S UM,NO,TRUE,OPEN,2,141,2023-06-3007:03:32],691 +[YES,FALSE,2,H,L,1,0, 0.0,2023-06-21 09:47:32], 708 708 709 -[PART,NO,FALSE,CLOSE,2,31,2023-06-30 07:03:53], 693 +[NO,TRUE ,2, L,L,1,45,0.7,2023-06-21 09:48:44], 694 +))) 710 710 711 -[ PART,NO,TRUE,OPEN,3,31,2023-06-3007:04:11],696 +[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/SW3L-LB_LoRaWAN_Flow_Sensor_User_Manual/WebHome/image-20230626093703-3.png?width=894&height=156&rev=1.1||alt="image-20230626093703-3.png"]] 712 712 713 -[[image:http://wiki.dragino.com/xwiki/bin/download/Main/User%20Manual%20for%20LoRaWAN%20End%20Nodes/DS03A-LB/WebHome/image-20230630172740-1.png?width=868&height=199&rev=1.1||alt="image-20230630172740-1.png"]] 714 714 715 - 716 716 == 2.4 Test Uplink and Change Update Interval == 717 717 718 718 ... ... @@ -728,7 +728,7 @@ 728 728 == 2.5 Multi-Samplings and One uplink == 729 729 730 730 731 -To save battery life, DS03A-NB will sample Water Flow data every 15 minutes and send one uplink every 2 hours. So each uplink it will include 8 stored data + 1 real-time data. They are defined by:714 +To save battery life, SW3L-NB will sample Water Flow data every 15 minutes and send one uplink every 2 hours. So each uplink it will include 8 stored data + 1 real-time data. They are defined by: 732 732 733 733 * (% style="color:#037691" %)**AT+TR=900** (%%) ~/~/ The unit is seconds, and the default is to record data once every 900 seconds (15 minutes, the minimum can be set to 180 seconds) 734 734 ... ... @@ -742,7 +742,7 @@ 742 742 == 2.6 Trggier an uplink by external interrupt == 743 743 744 744 745 - DS03A-NB has an external trigger interrupt function. Users can use the PB15 pin to trigger the upload of data packets.728 +SW3L-NB has an external trigger interrupt function. Users can use the PB15 pin to trigger the upload of data packets. 746 746 747 747 (% style="color:blue" %)**AT command:** 748 748 ... ... @@ -756,293 +756,167 @@ 756 756 757 757 * (% style="color:#037691" %)**AT+INTMOD=3 **(%%) ~/~/ Trigger by rising edge 758 758 759 -== 2.7 SetTransmitIntervalTime==742 +== 2.7 Alarm for continuously water flow == 760 760 761 761 762 762 ((( 763 - Feature:ChangeNB-IoTEnd Node TransmitInterval.746 +This feature is to monitor and send Alarm for continuously water flow. 764 764 ))) 765 765 766 766 ((( 767 - (% style="color:blue"%)**ATCommand:AT+TDC**750 +Example case is for Toilet water monitoring, if some one push toilet button, the toilet will have water flow. If the toilet button has broken and can't returned to original state, the water flow will keep for hours or days which cause huge waste for water. 768 768 ))) 769 769 770 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:510px" %) 771 -|=(% style="width: 156px;background-color:#4F81BD;color:white" %)**Command Example**|=(% style="width: 137px;background-color:#4F81BD;color:white" %)**Function**|=(% style="background-color:#4F81BD;color:white" %)**Response** 772 -|(% style="width:156px" %)AT+TDC=?|(% style="width:137px" %)Show current transmit Interval|((( 773 -30000 774 -OK 775 -the interval is 30000ms = 30s 753 +((( 754 +To monitor this faulty and send alarm, there are two settings: 776 776 ))) 777 - |(% style="width:156px" %)AT+TDC=60000|(% style="width:137px" %)Set Transmit Interval|(((778 - OK779 - Settransmitinterval to60000ms=60 seconds756 + 757 +* ((( 758 +(% style="color:blue" %)**Stop Duration: Unit: Second** 780 780 ))) 781 781 782 782 ((( 783 - (%style="color:blue"%)**DownlinkCommand:0x01**762 +Default: 15s, If SW3L-NB didn't see any water flow in 15s, SW3L-NB will consider stop of water flow event. 784 784 ))) 785 785 765 +* ((( 766 +(% style="color:blue" %)**Alarm Timer: Units: Minute; Default 0 minutes (means Alarm disable)** 767 +))) 768 + 786 786 ((( 787 - Format:CommandCode(0x01)followedby3 bytes timevalue.770 +**Example:** 3 minutes, if SW3L-NB detect a start of water flow event and didn't detect a stop event within Alarm timer, SW3L-NB will send an Alarm to indicate a water flow abnormal alarm. 788 788 ))) 789 789 790 790 ((( 791 -If the downlinkpayload=0100003C,itmeansset theENDNode'sTransmit Intervalto0x00003C=60(S),whiletypecodeis01.774 +So for example, If we set stop duration=15s and Alarm Timer=3minutes. If the toilet water flow continuously for more than 3 minutes, Sensor will send an alarm (in Confirmed MODE) to platform. 792 792 ))) 793 793 794 - *(((795 - Example1:DownlinkPayload: 0100001E~/~/SetTransmitInterval(TDC)=30seconds777 +((( 778 +(% style="color:red" %)**Note:** **After this alarm is send, sensor will consider a stop of water flow and count for another new event. So if water flow waste last for 1 hour, Sensor will keep sending alarm every 3 minutes.** 796 796 ))) 797 -* ((( 798 -Example 2: Downlink Payload: 0100003C ~/~/ Set Transmit Interval (TDC) = 60 seconds 799 799 800 - 801 - 781 +((( 782 +(% style="color:blue" %)**AT Command to configure:** 802 802 ))) 803 803 804 -== 2.8 Enable / Disable Alarm == 805 - 806 - 807 -Feature: Enable/Disable Alarm for open/close event. Default value 0. 808 - 809 -(% style="color:blue" %)**AT Command: ** 810 - 811 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 812 -|(% style="background-color:#4f81bd; color:white; width:153px" %)**Command Example**|(% style="background-color:#4f81bd; color:white; width:276px" %)**Function**|(% style="background-color:#4f81bd; color:white; width:86px" %)**Response** 813 -|(% style="width:154px" %)AT+DISALARM=1|(% style="width:278px" %)End node will only send packets in TDC time.|OK 814 -|(% style="width:154px" %)AT+DISALARM=0|(% style="width:278px" %)End node will send packets in TDC time or status change for door sensor|OK 815 - 816 -(% style="color:blue" %)**Downlink Command: ** 817 - 818 -0xA7 01 ~/~/ Same As AT+DISALARM=1 819 - 820 -0xA7 00 ~/~/ Same As AT+DISALARM=0 821 - 822 - 823 -== 2.9 Alarm Base on Timeout == 824 - 825 - 826 -DS03A-NB can monitor the timeout for a status change, this feature can be used to monitor some events such as door opening too long etc. Related Parameters are: 827 - 828 828 * ((( 829 - (% style="color:blue"%)**KeepStatus:Statustobe monitor**786 +AT+PTRIG=15,3 ~-~-> Set Stop duration: 15s, Alarm Timer: 3 minutes. 830 830 ))) 831 831 832 -(% style="color:#037691" %)**Keep Status = 1**(%%): Monitor Close to Open event 833 - 834 -(% style="color:#037691" %)**Keep Status = 0**(%%): Monitor Open to Close event 835 - 836 - 837 837 * ((( 838 - (%style="color:blue"%)**Keep Time:TimeouttosendanAlarm**790 +AT+ PTRIG=15,0 ~-~-> Default Value, disable water waste Alarm. 839 839 ))) 840 840 841 -Range 0 ~~ 65535(0xFFFF) seconds. 793 +((( 794 +(% style="color:blue" %)**Downlink Command to configure:** 795 +))) 842 842 843 -If (% style="color:#037691" %)**keep time = 0**(%%), Disable Alarm Base on Timeout feature. 844 - 845 -If (% style="color:#037691" %)**keep time > 0**(%%), device will monitor the keep status event and send an alarm when status doesn't change after timeout. 846 - 847 - 848 -* ((( 849 -(% style="color:blue" %)**Downlink Command** 797 +((( 798 +Command: **0xAA aa bb cc** 850 850 ))) 851 851 852 -(% style="color:#037691" %)**Command: 0xA9 aa bb cc dd** 853 - 854 -**A9:** Command Type Code 855 - 856 -**aa: **01:TTRIG1; 02:TTRIG2 857 - 858 -**bb:** status to be monitored 859 - 860 -**cc dd:** timeout. 861 - 862 - 863 -**1) AT+TTRIG1 : (PA8 of pin)** 864 - 865 -(% style="color:blue" %)**AT Command to configure:** 866 - 867 -* ((( 868 -(% style="color:#037691" %)**AT+TTRIG1=1,30** (%%) **~-~->** When the **Keep Status** change from close to open, and device remains in open status for more than 30 seconds. DS03A-NB will send an uplink packet, the Alarm1 bit(the second bit of 1^^st^^ byte of payload) on this uplink packet is set to 1. 869 - 870 -(% style="color:#037691" %)**AT+TTRIG1=0,30** (%%) **~-~->** When the **Keep Status** change from open to close, and device remains in open status for more than 30 seconds. DS03A-NB will send an uplink packet, the Alarm1 bit (the second bit of 1^^st^^ byte of payload) on this uplink packet is set to 1. 801 +((( 802 +AA: Command Type Code 871 871 ))) 872 872 873 -* ((( 874 -(% style="color:#037691" %)**AT+TTRIG1=0,0** (%%) **~-~-> ** Default Value, disable timeout Alarm. 875 - 876 - 805 +((( 806 +aa: Stop duration 877 877 ))) 878 878 879 -(% style="color:blue" %)**Downlink Command to configure:** 880 - 881 -If user send 0xA9 01 01 00 1E: equal to AT+TTRIG1=1,30 **or** 0xA9 01 00 00 00: Equal to AT+TTRIG1=0,0. 882 - 883 - 884 -**2) AT+TTRIG2 : (PA4 of pin,need to use AT+TTRCHANNEL=2)** 885 - 886 -(% style="color:blue" %)**AT Command to configure:** 887 - 888 -* ((( 889 -(% style="color:#037691" %)**AT+TTRIG2=1,30** (%%) **~-~->** When the **Keep Status** change from close to open, and device remains in open status for more than 30 seconds. DS03A-NB will send an uplink packet, the Alarm2 bit (the second bit of 12^^st^^ byte of payload) on this uplink packet is set to 1. 890 - 891 -(% style="color:#037691" %)**AT+TTRIG2=0,30** (%%) **~-~->** When the **Keep Status** change from open to close, and device remains in open status for more than 30 seconds. DS03A-NB will send an uplink packet, the Alarm2 bit (the second bit of 12^^st^^ byte of payload) on this uplink packet is set to 1. 809 +((( 810 +bb cc: Alarm Timer 892 892 ))) 893 893 894 -* ((( 895 -(% style="color:#037691" %)**AT+TTRIG2=0,0** (%%) **~-~-> ** Default Value, disable timeout Alarm. 896 - 897 - 813 +((( 814 +If user send 0xAA 0F 00 03: equal to AT+PTRIG=15,3 898 898 ))) 899 899 900 -(% style="color:blue" %)**Downlink Command to configure:** 901 901 902 - Ifuser send 0xA9 0200 00 1E:equaltoAT+TTRIG2=0,30 **or** 0xA9 02 00 00 00: EqualoAT+TTRIG2=0,0.818 +== 2.8 Set the calculate flag == 903 903 904 904 905 - == 2.10 TTRIG1 & TTRIG2 timeoutstatusalarm==821 +Feature: Set the calculate flag 906 906 823 +(% style="color:blue" %)**AT Command: AT+CALCFLAG** 907 907 908 -It needs to be used with AT+TTRIG1 or AT+TTRIG2. When TTRIG1 or TTRIG2 times out and causes an alarm, and the status does not change subsequently, an alarm packet will be sent at the alarm interval. 825 +(% border="1" cellspacing="5" style="background-color:#f2f2f2; width:461px" %) 826 +|=(% style="width: 158px;background-color:#4F81BD;color:white" %)**Command Example**|=(% style="width: 193px;background-color:#4F81BD;color:white" %)**Function**|=(% style="width: 110px;background-color:#4F81BD;color:white" %)**Response** 827 +|(% style="width:158px" %)AT+CALCFLAG =1|(% style="width:192px" %)Set the calculate flag to 1.|(% style="width:109px" %)OK 828 +|(% style="width:158px" %)AT+CALCFLAG =2|(% style="width:192px" %)Set the calculate flag to 2.|(% style="width:109px" %)OK 909 909 910 -(% style="color:blue" %)**AT Command:** 911 - 912 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:510px" %) 913 -|=(% style="width: 155px;background-color:#4F81BD;color:white" %)**Command Example**|=(% style="width: 279px;background-color:#4F81BD;color:white" %)**Function**|=(% style="width: 76px;background-color:#4F81BD;color:white" %)**Response** 914 -|(% style="width:155px" %)((( 915 -AT+TTRALARM=0 916 -)))|(% style="width:279px" %)((( 917 -disable continuous alarm 918 -)))|(% style="width:84px" %)((( 919 -OK 920 -))) 921 -|(% style="width:155px" %)((( 922 -AT+TTRALARM=60 923 -)))|(% style="width:279px" %)((( 924 -The alarm interval is 60 minutes (unit: minutes) 925 -)))|(% style="width:84px" %)((( 926 -OK 927 -))) 928 - 929 929 (% style="color:blue" %)**Downlink Command:** 930 930 931 -Example: Caa=>AT+TTRALARM=aa832 +* **Example**: 0XA501 ~/~/ Same as AT+CALCFLAG =1 932 932 834 +== 2.9 Set count number == 933 933 934 -== 2.11 Count Mod == 935 935 837 +Feature: Manually set the count number 936 936 937 - Feature:Manuallysetthentmode.839 +(% style="color:blue" %)**AT Command: AT+SETCNT** 938 938 939 -(% style="color:blue" %)**AT Command:** 841 +(% border="1" cellspacing="5" style="background-color:#f2f2f2; width:479px" %) 842 +|=(% style="width: 160px;background-color:#4F81BD;color:white" %)**Command Example**|=(% style="width: 223px;background-color:#4F81BD;color:white" %)**Function**|=(% style="width: 96px;background-color:#4F81BD;color:white" %)**Response** 843 +|(% style="width:160px" %)AT+ SETCNT =0|(% style="width:221px" %)Set the count number to 0.|(% style="width:95px" %)OK 844 +|(% style="width:160px" %)AT+ SETCNT =100|(% style="width:221px" %)Set the count number to 100.|(% style="width:95px" %)OK 940 940 941 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:515px" %) 942 -|=(% style="width: 154px;background-color:#4F81BD;color:white" %)**Command Example**|=(% style="width: 275px;background-color:#4F81BD;color:white" %)**Function**|=(% style="width: 86px;background-color:#4F81BD;color:white" %)**Response** 943 -|(% style="width:155px" %)((( 944 -AT+COUNTMOD=0 945 -)))|(% style="width:277px" %)((( 946 -the count value keeps accumulating mode 947 -)))|(% style="width:86px" %)((( 948 -OK 949 -))) 950 -|(% style="width:155px" %)((( 951 -AT+COUNTMOD=1 952 -)))|(% style="width:277px" %)((( 953 -the count value will be reset after each TDC time(Last Close Duration Reset after each uplink) 954 -)))|(% style="width:86px" %)((( 955 -OK 956 -))) 957 - 958 958 (% style="color:blue" %)**Downlink Command:** 959 959 960 -Example: Baa=>AT+COUNTMOD=second byte848 +* **Example**: 0xA6000001 ~/~/ Same as AT+ SETCNT =1 961 961 850 +* **Example**: 0xA6000064 ~/~/ Same as AT+ SETCNT =100 962 962 963 -== 2.1 2Numberof channelof door sensors==852 +== 2.10 Set Transmit Interval Time == 964 964 965 965 966 -Feature: Set the number of door sensor channels. 855 +((( 856 +Feature: Change NB-IoT End Node Transmit Interval. 857 +))) 967 967 968 -(% style="color:blue" %)**AT Command:** 859 +((( 860 +(% style="color:blue" %)**AT Command: AT+TDC** 861 +))) 969 969 970 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:500px" %) 971 -|=(% style="width: 155px;background-color:#4F81BD;color:white" %)**Command Example**|=(% style="width: 288px; background-color:#4F81BD;color:white" %)**Function**|=(% style="width: 57px;background-color:#4F81BD;color:white" %)**Response** 972 -|(% style="width:155px" %)((( 973 -AT+TTRCHANNEL=1 974 -)))|(% style="width:259px" %)((( 975 -Set as single channel, only use PA8 pin as interrupt pin. 976 -)))|(% style="width:44px" %)((( 863 +(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:510px" %) 864 +|=(% style="width: 156px;background-color:#4F81BD;color:white" %)**Command Example**|=(% style="width: 137px;background-color:#4F81BD;color:white" %)**Function**|=(% style="background-color:#4F81BD;color:white" %)**Response** 865 +|(% style="width:156px" %)AT+TDC=?|(% style="width:137px" %)Show current transmit Interval|((( 866 +30000 977 977 OK 868 +the interval is 30000ms = 30s 978 978 ))) 979 -|(% style="width:155px" %)((( 980 -AT+TTRCHANNEL=2 981 -)))|(% style="width:259px" %)((( 982 -Set as dual channel, use PA8 pin and PA4 pin as interrupt pin. 983 -)))|(% style="width:44px" %)((( 870 +|(% style="width:156px" %)AT+TDC=60000|(% style="width:137px" %)Set Transmit Interval|((( 984 984 OK 872 +Set transmit interval to 60000ms = 60 seconds 985 985 ))) 986 986 987 -(% style="color:blue" %)**Downlink Command:** 875 +((( 876 +(% style="color:blue" %)**Downlink Command: 0x01** 877 +))) 988 988 989 -Example: 0D aa => AT+TTRCHANNEL = second byte 879 +((( 880 +Format: Command Code (0x01) followed by 3 bytes time value. 881 +))) 990 990 883 +((( 884 +If the downlink payload=0100003C, it means set the END Node's Transmit Interval to 0x00003C=60(S), while type code is 01. 885 +))) 991 991 992 -== 2.13 Clear the open door times and the duration of the last open door == 993 - 994 - 995 -(% style="color:blue" %)**AT Command:** 996 - 997 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:510px" %) 998 -|=(% style="width: 163px;background-color:#4F81BD;color:white" %)**Command Example**|=(% style="width: 290px; background-color:#4F81BD;color:white" %)**Function**|=(% style="width: 57px;background-color:#4F81BD;color:white" %)**Response** 999 -|(% style="width:155px" %)AT+CLRC|(% style="width:259px" %)clear the open door times and the duration of the last open door.|(% style="width:44px" %)((( 1000 -OK 887 +* ((( 888 +Example 1: Downlink Payload: 0100001E ~/~/ Set Transmit Interval (TDC) = 30 seconds 1001 1001 ))) 890 +* ((( 891 +Example 2: Downlink Payload: 0100003C ~/~/ Set Transmit Interval (TDC) = 60 seconds 1002 1002 1003 -(% style="color:blue" %)**Downlink Command:**(%%)0xA6 01 1004 1004 1005 -The sensor will clear the open door times and the duration of the last open door. 1006 - 1007 - 1008 -== 2.14 Set the count value of the number of open door == 1009 - 1010 - 1011 -(% style="color:blue" %)**AT Command:** 1012 - 1013 -(% border="1" cellspacing="4" style="background-color:#f2f2f2; width:500px" %) 1014 -|=(% style="width: 155px;background-color:#4F81BD;color:white" %)**Command Example**|=(% style="width: 288px; background-color:#4F81BD;color:white" %)**Function**|=(% style="width: 57px;background-color:#4F81BD;color:white" %)**Response** 1015 -|(% style="width:155px" %)((( 1016 -AT+SETCNT=1,100 1017 -)))|(% style="width:259px" %)((( 1018 -Set the open door times of PA8 pin to 100 times. 1019 -)))|(% style="width:44px" %)((( 1020 -OK 894 + 1021 1021 ))) 1022 -|(% style="width:155px" %)AT+SETCNT=1,0|(% style="width:259px" %)Clear the open door times of PA8 pin.|(% style="width:44px" %)OK 1023 -|(% style="width:155px" %)((( 1024 -AT+SETCNT=2,50 1025 -)))|(% style="width:259px" %)((( 1026 -Set the open door times of PA4 pin to 100 times. 1027 -)))|(% style="width:44px" %)((( 1028 -OK 1029 -))) 1030 1030 1031 - (% style="color:blue"%)**DownlinkCommand:**897 += 3. Configure SW3L-NB = 1032 1032 1033 -0xA6 01 00 00 64 ==> AT+SETCNT=1,100 1034 - 1035 -0xA6 01 00 00 00 ==> AT+SETCNT=1,0 1036 - 1037 -0xA6 02 00 00 32 ==> AT+SETCNT=2,50 1038 - 1039 - 1040 -= 3. Configure DS03A-NB = 1041 - 1042 1042 == 3.1 Configure Methods == 1043 1043 1044 1044 1045 - DS03A-NB supports below configure method:902 +SW3L-NB supports below configure method: 1046 1046 1047 1047 * AT Command via Bluetooth Connection (**Recommended**): [[BLE Configure Instruction>>http://wiki.dragino.com/xwiki/bin/view/Main/BLE%20Bluetooth%20Remote%20Configure/]]. 1048 1048 ... ... @@ -1131,7 +1131,7 @@ 1131 1131 = 4. Battery & Power Consumption = 1132 1132 1133 1133 1134 - DS03A-NB use ER26500 + SPC1520 battery pack. See below link for detail information about the battery info and how to replace.991 +SW3L-NB use ER26500 + SPC1520 battery pack. See below link for detail information about the battery info and how to replace. 1135 1135 1136 1136 [[**Battery Info & Power Consumption Analyze**>>http://wiki.dragino.com/xwiki/bin/view/Main/How%20to%20calculate%20the%20battery%20life%20of%20Dragino%20sensors%3F/]] . 1137 1137 ... ... @@ -1145,7 +1145,7 @@ 1145 1145 1146 1146 * Fix bugs. 1147 1147 1148 -Firmware and changelog can be downloaded from : **[[Firmware download link>>https://www.dropbox.com/sh/ zbsm9p4coksqwd5/AADy2ZJc39KsvfbhTMCUGmz1a?dl=0]]**1005 +Firmware and changelog can be downloaded from : **[[Firmware download link>>https://www.dropbox.com/sh/l0bszumyrmil3yv/AAAg8LYGeAgDsD_ycCnweD72a?dl=0]]** 1149 1149 1150 1150 Methods to Update Firmware: 1151 1151 ... ... @@ -1166,7 +1166,7 @@ 1166 1166 = 7. Order Info = 1167 1167 1168 1168 1169 -Part Number: (% style="color:blue" %)** DS03A-NB-XX**1026 +Part Number: (% style="color:blue" %)**SW3L-NB-XX-YY** 1170 1170 1171 1171 (% style="color:red" %)**XX**(%%): 1172 1172 ... ... @@ -1176,13 +1176,43 @@ 1176 1176 1177 1177 (% style="color:#037691" %)**1NCE SIM Card NB-IoT network coverage**(%%): Austria, Belgium, Bulgaria, Croatia, Czech Republic, Denmark, Finland, Germany, Great Britain, Greece, Hungary, Ireland, Italy, Latvia, Malta, Netherlands, Norway, Puerto Rico, Russia, Slovak , Republic, Slovenia, Spain, Sweden, Switzerland, Taiwan, USA, US Virgin Islands 1178 1178 1036 +((( 1037 +(% style="color:blue" %)**YY**(%%): Flow Sensor Model: 1038 +))) 1179 1179 1040 +((( 1041 + **004:** DW-004 Flow Sensor: diameter: G1/2” / DN15. 450 pulse = 1 L 1042 +))) 1043 + 1044 +((( 1045 + **006:** DW-006 Flow Sensor: diameter: G3/4” / DN20. 390 pulse = 1 L 1046 +))) 1047 + 1048 +((( 1049 + **010:** DW-010 Flow Sensor: diameter: G 1” / DN25. 64 pulse = 1 L 1050 +))) 1051 + 1052 +* ((( 1053 +calculate flag=0: for SW3L-004 Flow Sensor: 450 pulse = 1 L 1054 +))) 1055 + 1056 +* ((( 1057 +calculate flag=1: for SW3L-006 Flow Sensor: 390 pulse = 1 L 1058 +))) 1059 + 1060 +* ((( 1061 +calculate flag=2: for SW3L-010 Flow Sensor: 64 pulse = 1 L 1062 + 1063 + 1064 + 1065 +))) 1066 + 1180 1180 = 8. Packing Info = 1181 1181 1182 1182 1183 1183 (% style="color:#037691" %)**Package Includes**: 1184 1184 1185 -* DS03A-NB NB-IoT Doorsensor x 11072 +* SW3L-NB NB-IoT Distance Detection sensor x 1 1186 1186 1187 1187 * External antenna x 1 1188 1188
- image-20231102094508-1.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.ting - Size
-
... ... @@ -1,1 +1,0 @@ 1 -26.6 KB - Content
- image-20231102100109-2.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.ting - Size
-
... ... @@ -1,1 +1,0 @@ 1 -33.1 KB - Content
- image-20231113180055-1.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.ting - Size
-
... ... @@ -1,1 +1,0 @@ 1 -85.2 KB - Content
- image-20231113180254-2.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.ting - Size
-
... ... @@ -1,1 +1,0 @@ 1 -71.5 KB - Content
- image-20231114091229-1.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.ting - Size
-
... ... @@ -1,1 +1,0 @@ 1 -32.8 KB - Content
- image-20231114091247-2.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.ting - Size
-
... ... @@ -1,1 +1,0 @@ 1 -26.0 KB - Content
- image-20231114094432-3.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.ting - Size
-
... ... @@ -1,1 +1,0 @@ 1 -73.6 KB - Content
- image-20231114094816-4.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.ting - Size
-
... ... @@ -1,1 +1,0 @@ 1 -78.0 KB - Content
- image-20231114094838-5.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.ting - Size
-
... ... @@ -1,1 +1,0 @@ 1 -78.0 KB - Content