Changes for page MQTT Forward Instruction
Last modified by Kilight Cao on 2024/08/31 16:26
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Attachments (0 modified, 0 added, 4 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,19 +1,13 @@ 1 - **~ontents:**1 += INTRODUCTION = 2 2 3 -{{toc/}} 4 - 5 - 6 -= 1. Introduction = 7 - 8 8 Dragino LoRa/LoRaWAN gateway support MQTT forwarding. It can forward the sensor data from LoRa network to MQTT server , and vice verse. 9 9 5 +== Support Devices == 10 10 11 -== 1.1 Support Devices == 12 - 13 13 This MQTT forward instruction is for below devices: 14 14 15 15 * Firmware Version > LG02_LG08-5.3.1580178039 [[Firmware Download>>url:http://www.dragino.com/downloads/index.php?dir=LoRa_Gateway/LPS8/Firmware/Release/]] 16 -* LG01N, OLG01N ( (% style="color:red" %)**Warning**(%%): LG01-P LG01-S use another instruction: [[MQTT for LG01-P/LG01S>>url:https://wiki.dragino.com/index.php/Through_MQTT_to_upload_data]])10 +* LG01N, OLG01N (Warning: LG01-P LG01-S use another instruction: [[MQTT for LG01-P/LG01S>>url:https://wiki.dragino.com/index.php/Through_MQTT_to_upload_data]]) 17 17 * LG02, OLG02 18 18 * LG308, DLOS8 19 19 * LPS8 ... ... @@ -20,81 +20,67 @@ 20 20 * LIG16 21 21 * MS14 series if installed with the same firmware. (in this case, the MQTT forward will work , but no LoRa support) 22 22 23 -= 2. Firmware Change Log for MQTT feature = 24 24 25 -((( 18 +\\ 19 + 20 += Firmware Change Log for MQTT feature = 21 + 26 26 This instruction is wrote start from LG02_LG08-5.3.1580178039. Below is related change log since this version of firmware. 27 -))) 28 28 29 29 * LG02_LG08-5.3.1580178039 30 30 ** Initiate version 31 31 32 -= 3. MQTT forward operating principle = 33 33 34 - ==3.1 Network Structure ==28 +\\ 35 35 30 += MQTT forward operating principle = 31 + 32 +== Network Structure == 33 + 36 36 Below shows the network structure for MQTT forwarding. 37 37 38 38 * For Uplink: The sensor sends data to LoRa Gateway via LoRa wireless, The gateway will process these data and forward to remote MQTT Broker via Internet. 39 39 * For Downlink: The gateway subscribe a topic in the MQTT broker, when there is update on the topic, the gateway will know and broadcast the data to Local LoRa network, 40 40 41 -[[image:image -20220527133547-1.png]]39 +[[~[~[image:https://wiki.dragino.com/images/thumb/4/45/MQTT_Forward_1.png/600px-MQTT_Forward_1.png~|~|height="348" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Forward_1.png]] 42 42 43 43 General MQTT structure 44 44 43 +== How sensor data is forwarded == 45 45 46 -== 3.2 How sensor data is forwarded == 47 - 48 48 In this MQTT forward feature, the key point is how the gateway process the sensor data. 49 49 47 +=== Upstream === 50 50 51 -=== 3.2.1 Upstream === 52 - 53 53 Assume there are two sensor nodes, their ID are Node1 ID: 6734 , Node2 ID: 7456. In the remote MQTT broker there are two topics: Topic1: /channel/765800, Topic2: /channel/367860. We can set up in the gateway to map Node1 to Topic1 and Node2 to Topic2. So when there is a sensor data from Node1, the gateway will forward the data to Topic1, when there is sensor data from Node2, the gateway will forward to Topic2. 54 54 55 -((( 56 56 The data flow works as below diagram. 57 -))) 58 58 59 -[[image:image -20220527134000-2.png]]53 +[[~[~[image:https://wiki.dragino.com/images/thumb/2/2a/MQTT_Forward_2.png/600px-MQTT_Forward_2.png~|~|height="355" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Forward_2.png]] 60 60 61 -((( 62 62 Upstream path 63 -))) 64 64 65 -((( 66 66 Note: The sensor data can base or LoRa or other method, as long as there are data on the file /var/iot/channels. /span> 67 -))) 68 68 69 -((( 70 - 71 -))) 59 +=== Downstream === 72 72 73 -=== 3.2.2 Downstream === 74 - 75 75 The gateway subscribes to a topic of the remote MQTT broker topic. When there is some one publish a value on this topic. The gateway will get it and broadcast to local LoRa Network. 76 76 77 -((( 78 78 Below are the data flow for downstream. 79 -))) 80 80 81 -[[image:image -20220527134038-3.png]]65 +[[~[~[image:https://wiki.dragino.com/images/thumb/3/3a/MQTT_Forward_3.png/600px-MQTT_Forward_3.png~|~|height="368" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Forward_3.png]] 82 82 83 83 Downstream path 84 84 85 85 86 -== 3.3Macro Definition ==70 +== Macro Definition == 87 87 88 88 The MQTT publish command use Macro settings to generate flexible upstream payload for MQTT publish. 89 89 90 -((( 91 -Currently the (% style="color:#4f81bd" %)**-t (topic)**(%%) and (% style="color:#4f81bd" %)**-m (message)**(%%) support Macros. 74 +Currently the -t (topic) and -m (message) support Macros. 92 92 93 - 94 -))) 76 +=== -t topic macro === 95 95 96 -=== 3.3.1 -t topic macro === 97 - 98 98 * CHANNEL: Remote Channel ID 99 99 * CLIENTID: Client ID , Same as -i 100 100 * WRITE_API: Remote Channel Write API ... ... @@ -101,9 +101,8 @@ 101 101 * USERNAME: User ID (-u) 102 102 * HOSTNAME: Device Hostname 103 103 84 +=== -m message macro === 104 104 105 -=== 3.3.2 -m message macro === 106 - 107 107 * HOSTNAME: Device Hostname 108 108 * CHANNEL: Remote Channel ID 109 109 * DATA: Sensor Data without time stamp and rssi ... ... @@ -110,11 +110,10 @@ 110 110 * META: Completely sensor data with time stamp and rssi 111 111 * JSON: Convert META to json format. 112 112 92 +=== Example for Macro === 113 113 114 - === 3.3.3 ExampleforMacro===94 +[[~[~[image:https://wiki.dragino.com/images/thumb/c/c7/MQTT_Command_9.png/600px-MQTT_Command_9.png~|~|height="385" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_9.png]] 115 115 116 -[[image:image-20220527134251-4.png]] 117 - 118 118 MQTT Publish configure 119 119 120 120 Above screen shots shows below format: ... ... @@ -124,173 +124,174 @@ 124 124 125 125 When there is a LoRa sensor arrive. it will be store at the /var/iot/channels as below: 126 126 127 -[[image:https://wiki.dragino.com/images/thumb/c/c4/MQTT_Command_20.png/600px-MQTT_Command_20.png||height="325" width="600"]] 105 +[[~[~[image:https://wiki.dragino.com/images/thumb/c/c4/MQTT_Command_20.png/600px-MQTT_Command_20.png~|~|height="325" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_20.png]] 128 128 129 129 Sensor Data 130 130 131 -((( 132 -According to above macro. Gateway will publish (% class="mark" %)**field1=22.0&field2=49.0**(%%) to topic: (% class="mark" %)**dragino-1b7060/78901/data**(%%), where 78901 is the remote channel for this node ID. 133 -))) 109 +According to above macro. Gateway will publish field1=22.0&field2=49.0 to topic: dragino-1b7060/78901/data, where 78901 is the remote channel for this node ID. 134 134 135 135 136 - ==3.4 Modify the MQTT to support more options ==112 +\\ 137 137 114 + 115 +== Modify the MQTT to support more options == 116 + 138 138 The MQTT Client Utility used in Dragino is **mosquitto_pub** and **mosquitto_sub**. User can add more options to the mqtt commands. User can check the valid options by command mosquitto_pub ~-~-help. as below: 139 139 140 -(% class="box" %) 141 -((( 142 -root@dragino-1ec39c:~~# mosquitto_pub ~-~-help 119 +{{{root@dragino-1ec39c:~# mosquitto_pub --help 143 143 mosquitto_pub is a simple mqtt client that will publish a message on a single topic and exit. 144 144 mosquitto_pub version 1.6.4 running on libmosquitto 1.6.4. 145 -\\Usage: mosquitto_pub {[-h host] [-p port] [-u username] [-P password] -t topic | -L URL} 122 + 123 +Usage: mosquitto_pub {[-h host] [-p port] [-u username] [-P password] -t topic | -L URL} 146 146 {-f file | -l | -n | -m message} 147 - [-c] [-k keepalive] [-q qos] [-r] [ ~-~-repeat N] [~-~-repeat-delay time]125 + [-c] [-k keepalive] [-q qos] [-r] [--repeat N] [--repeat-delay time] 148 148 [-A bind_address] 149 149 [-i id] [-I id_prefix] 150 - [-d] [ ~-~-quiet]128 + [-d] [--quiet] 151 151 [-M max_inflight] 152 152 [-u username [-P password]] 153 - [ ~-~-will-topic [~-~-will-payload payload] [~-~-will-qos qos] [~-~-will-retain]]154 - [{ ~-~-cafile file |~-~-capath dir} [~-~-cert file] [~-~-key file]155 - [ ~-~-ciphers ciphers] [~-~-insecure]156 - [ ~-~-tls-alpn protocol]157 - [ ~-~-tls-engine engine] [~-~-keyform keyform] [~-~-tls-engine-kpass-sha1]]158 - [ ~-~-psk hex-key~-~-psk-identity identity [~-~-ciphers ciphers]]159 - [ ~-~-proxy socks-url]160 - [ ~-~-property command identifier value]131 + [--will-topic [--will-payload payload] [--will-qos qos] [--will-retain]] 132 + [{--cafile file | --capath dir} [--cert file] [--key file] 133 + [--ciphers ciphers] [--insecure] 134 + [--tls-alpn protocol] 135 + [--tls-engine engine] [--keyform keyform] [--tls-engine-kpass-sha1]] 136 + [--psk hex-key --psk-identity identity [--ciphers ciphers]] 137 + [--proxy socks-url] 138 + [--property command identifier value] 161 161 [-D command identifier value] 162 - mosquitto_pub ~-~-help 163 -\\-A : bind the outgoing socket to this host/ip address. Use to control which interface 140 + mosquitto_pub --help 141 + 142 + -A : bind the outgoing socket to this host/ip address. Use to control which interface 164 164 the client communicates over. 165 --d : enable debug messages. 166 --D : Define MQTT v5 properties. See the documentation for more details. 167 --f : send the contents of a file as the message. 168 --h : mqtt host to connect to. Defaults to localhost. 169 --i : id to use for this client. Defaults to mosquitto_pub_ appended with the process id. 170 --I : define the client id as id_prefix appended with the process id. Useful for when the 144 + -d : enable debug messages. 145 + -D : Define MQTT v5 properties. See the documentation for more details. 146 + -f : send the contents of a file as the message. 147 + -h : mqtt host to connect to. Defaults to localhost. 148 + -i : id to use for this client. Defaults to mosquitto_pub_ appended with the process id. 149 + -I : define the client id as id_prefix appended with the process id. Useful for when the 171 171 broker is using the clientid_prefixes option. 172 --k : keep alive in seconds for this client. Defaults to 60. 173 --L : specify user, password, hostname, port and topic as a URL in the form: 174 - mqtt(s): ~/~/[username[:password]@]host[:port]/topic175 --l : read messages from stdin, sending a separate message for each line. 176 --m : message payload to send. 177 --M : the maximum inflight messages for QoS 1/2.. 178 --n : send a null (zero length) message. 179 --p : network port to connect to. Defaults to 1883 for plain MQTT and 8883 for MQTT over TLS. 180 --P : provide a password 181 --q : quality of service level to use for all messages. Defaults to 0. 182 --r : message should be retained. 183 --s : read message from stdin, sending the entire input as a message. 184 --t : mqtt topic to publish to. 185 --u : provide a username 186 --V : specify the version of the MQTT protocol to use when connecting. 151 + -k : keep alive in seconds for this client. Defaults to 60. 152 + -L : specify user, password, hostname, port and topic as a URL in the form: 153 + mqtt(s)://[username[:password]@]host[:port]/topic 154 + -l : read messages from stdin, sending a separate message for each line. 155 + -m : message payload to send. 156 + -M : the maximum inflight messages for QoS 1/2.. 157 + -n : send a null (zero length) message. 158 + -p : network port to connect to. Defaults to 1883 for plain MQTT and 8883 for MQTT over TLS. 159 + -P : provide a password 160 + -q : quality of service level to use for all messages. Defaults to 0. 161 + -r : message should be retained. 162 + -s : read message from stdin, sending the entire input as a message. 163 + -t : mqtt topic to publish to. 164 + -u : provide a username 165 + -V : specify the version of the MQTT protocol to use when connecting. 187 187 Can be mqttv5, mqttv311 or mqttv31. Defaults to mqttv311. 188 - ~-~-help : display this message.189 - ~-~-repeat : if publish mode is -f, -m, or -s, then repeat the publish N times.190 - ~-~-repeat-delay : if using~-~-repeat, wait time seconds between publishes. Defaults to 0.191 - ~-~-quiet :(% class="mark" %)don't print error messages.192 - ~-~-will-payload : payload for the client Will, which is sent by the broker in case of167 + --help : display this message. 168 + --repeat : if publish mode is -f, -m, or -s, then repeat the publish N times. 169 + --repeat-delay : if using --repeat, wait time seconds between publishes. Defaults to 0. 170 + --quiet : don't print error messages. 171 + --will-payload : payload for the client Will, which is sent by the broker in case of 193 193 unexpected disconnection. If not given and will-topic is set, a zero 194 194 length message will be sent. 195 - ~-~-will-qos : QoS level for the client Will.196 - ~-~-will-retain : if given, make the client Will retained.197 - ~-~-will-topic : the topic on which to publish the client Will.198 - ~-~-cafile : path to a file containing trusted CA certificates to enable encrypted174 + --will-qos : QoS level for the client Will. 175 + --will-retain : if given, make the client Will retained. 176 + --will-topic : the topic on which to publish the client Will. 177 + --cafile : path to a file containing trusted CA certificates to enable encrypted 199 199 communication. 200 - ~-~-capath : path to a directory containing trusted CA certificates to enable encrypted179 + --capath : path to a directory containing trusted CA certificates to enable encrypted 201 201 communication. 202 - ~-~-cert : client certificate for authentication, if required by server.203 - ~-~-key : client private key for authentication, if required by server.204 - ~-~-keyform : keyfile type, can be either "pem" or "engine".205 - ~-~-ciphers : openssl compatible list of TLS ciphers to support.206 - ~-~-tls-version : TLS protocol version, can be one of tlsv1.3 tlsv1.2 or tlsv1.1.181 + --cert : client certificate for authentication, if required by server. 182 + --key : client private key for authentication, if required by server. 183 + --keyform : keyfile type, can be either "pem" or "engine". 184 + --ciphers : openssl compatible list of TLS ciphers to support. 185 + --tls-version : TLS protocol version, can be one of tlsv1.3 tlsv1.2 or tlsv1.1. 207 207 Defaults to tlsv1.2 if available. 208 - ~-~-insecure : do not check that the server certificate hostname matches the remote187 + --insecure : do not check that the server certificate hostname matches the remote 209 209 hostname. Using this option means that you cannot be sure that the 210 210 remote host is the server you wish to connect to and so is insecure. 211 211 Do not use this option in a production environment. 212 - ~-~-tls-engine : If set, enables the use of a TLS engine device.213 - ~-~-tls-engine-kpass-sha1 : SHA1 of the key password to be used with the selected SSL engine.214 - ~-~-psk : pre-shared-key in hexadecimal (no leading 0x) to enable TLS-PSK mode.215 - ~-~-psk-identity : client identity string for TLS-PSK mode.216 - ~-~-proxy : SOCKS5 proxy URL of the form:217 - socks5h: ~/~/[username[:password]@]hostname[:port]191 + --tls-engine : If set, enables the use of a TLS engine device. 192 + --tls-engine-kpass-sha1 : SHA1 of the key password to be used with the selected SSL engine. 193 + --psk : pre-shared-key in hexadecimal (no leading 0x) to enable TLS-PSK mode. 194 + --psk-identity : client identity string for TLS-PSK mode. 195 + --proxy : SOCKS5 proxy URL of the form: 196 + socks5h://[username[:password]@]hostname[:port] 218 218 Only "none" and "username" authentication is supported. 219 - \\See https:~/~/mosquitto.org/ for more information.220 - )))198 + 199 +See https://mosquitto.org/ for more information.}}} 221 221 222 222 223 -((( 224 224 and modify the /usr/bin/mqtt_process.sh script, the location to change the command option is below lines: 225 -))) 226 226 227 -(% class="box" %) 228 -((( 229 -# Call MQTT Publish command 230 -\\# 1. Case with User, Password and Client ID present (e.g. Azure) 204 +{{{# Call MQTT Publish command 205 + 206 +# 1. Case with User, Password and Client ID present (e.g. Azure) 231 231 if [ ! -z "$pass" ] && [ ! -z "$user" ] && [ ! -z "$clientID" ]; then 232 -case="1" 233 -mosquitto_pub $D -h $server -p $port -q $pub_qos -i $clientID -t $pub_topic -u $user -P "$pass" $C $cafile $PUB_FLAG "$mqtt_data" 234 -\\# 2. Case with Certificate, Key and ClientID present (e.g. AWS) 208 + case="1" 209 + mosquitto_pub $D -h $server -p $port -q $pub_qos -i $clientID -t $pub_topic -u $user -P "$pass" $C $cafile $PUB_FLAG "$mqtt_data" 210 + 211 +# 2. Case with Certificate, Key and ClientID present (e.g. AWS) 235 235 elif [ ! -z "$certfile" ] && [ ! -z "$key" ] && [ ! -z "$clientID" ]; then 236 -case="2" 237 -mosquitto_pub $D -h $server -p $port -q $pub_qos -i $clientID -t $pub_topic ~-~-cert $cert ~-~-key $key $C $cafile $PUB_FLAG "$mqtt_data" 238 -\\# 3. Case with no User, Certificate or ClientID present 213 + case="2" 214 + mosquitto_pub $D -h $server -p $port -q $pub_qos -i $clientID -t $pub_topic --cert $cert --key $key $C $cafile $PUB_FLAG "$mqtt_data" 215 + 216 +# 3. Case with no User, Certificate or ClientID present 239 239 elif [ -z "$user" ] && [ -z "$certfile" ] && [ -z "$clientID" ]; then 240 -case="3" 241 -mosquitto_pub $D -h $server -p $port -q $pub_qos -t $pub_topic $PUB_FLAG "$mqtt_data" 242 -\\# 4. Case with no User, Certificate, but with ClientID present 218 + case="3" 219 + mosquitto_pub $D -h $server -p $port -q $pub_qos -t $pub_topic $PUB_FLAG "$mqtt_data" 220 + 221 +# 4. Case with no User, Certificate, but with ClientID present 243 243 elif [ -z "$user" ] && [ -z "$certfile" ] && [ ! -z "$clientID" ]; then 244 -case="4" 245 -mosquitto_pub $D -h $server -p $port -q $pub_qos -i $clientID -t $pub_topic $PUB_FLAG "$mqtt_data" 246 -\\# 5. Case with User and ClientID present, but no Password and no Certificate present 223 + case="4" 224 + mosquitto_pub $D -h $server -p $port -q $pub_qos -i $clientID -t $pub_topic $PUB_FLAG "$mqtt_data" 225 + 226 +# 5. Case with User and ClientID present, but no Password and no Certificate present 247 247 elif [ -z "$pass" ] && [ -z "$certfile" ] && [ ! -z "$user" ] && [ ! -z "$clientID" ]; then 248 -case="5" 249 -mosquitto_pub $D -h $server -p $port -q $pub_qos -i $clientID -t $pub_topic -u $user $PUB_FLAG "$mqtt_data" 250 -\\# 6. Case with User and Password present, but no ClientID and no Certificate present 228 + case="5" 229 + mosquitto_pub $D -h $server -p $port -q $pub_qos -i $clientID -t $pub_topic -u $user $PUB_FLAG "$mqtt_data" 230 + 231 +# 6. Case with User and Password present, but no ClientID and no Certificate present 251 251 elif [ ! -z "$user" ] && [ ! -z "$pass" ] && [ -z "$clientID" ] && [ -z "$certfile" ]; then 252 -case="6" 253 -mosquitto_pub $D -h $server -p $port -q $pub_qos -t $pub_topic -u $user -P "$pass" $PUB_FLAG "$mqtt_data" 254 -\\# 0. Else - invalid parameters, just log 233 + case="6" 234 + mosquitto_pub $D -h $server -p $port -q $pub_qos -t $pub_topic -u $user -P "$pass" $PUB_FLAG "$mqtt_data" 235 + 236 +# 0. Else - invalid parameters, just log 255 255 else 256 -case="Invalid parameters" 257 -logger "[IoT.MQTT]:Invalid Parameters - mosquitto_pub not called." 258 -fi 259 -))) 238 + case="Invalid parameters" 239 + logger "[IoT.MQTT]:Invalid Parameters - mosquitto_pub not called." 240 +fi}}} 260 260 261 261 262 -= 4.Example to communicate to a simple MQTT server =243 += Example to communicate to a simple MQTT server = 263 263 264 -== 4.1Overview ==245 +== Overview == 265 265 266 266 This section is an example to show how to set up LG01-N to communicate with a MQTT server. The MQTT server is a simple utility set up in a local PC. Note: User can set up same server via [[this instruction>>url:http://www.steves-internet-guide.com/install-mosquitto-broker/]]. 267 267 268 -== 4.2Simulate via MQTT.fx utility ==249 +== Simulate via MQTT.fx utility == 269 269 270 270 The [[MQTT.fx>>url:http://mqttfx.jensd.de/index.php/download]] is a MQTT client tool. We can use this to simulate a MQTT connection to our MQTT broker first to make sure the MQTT broker works. This will also help us understand how it works. 271 271 272 -((( 273 273 In this test, the MQTT broker and MQTT.fx are installed in the same PC, so the MQTT server address in MQTT.fx should be localhost. Below shows how to connect to the server. 274 -))) 275 275 276 -[[image:https://wiki.dragino.com/images/thumb/0/06/MQTT_Forward_4.png/600px-MQTT_Forward_4.png||height="201" width="600"]] 255 +[[~[~[image:https://wiki.dragino.com/images/thumb/0/06/MQTT_Forward_4.png/600px-MQTT_Forward_4.png~|~|height="201" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Forward_4.png]] 277 277 278 278 Connect to MQTT Broker 279 279 280 280 After connected, use publish to public some thing to MQTT server. This to simulate upsteam 281 281 282 -[[image:https://wiki.dragino.com/images/thumb/b/bd/MQTT_Forward_5.png/600px-MQTT_Forward_5.png||height="149" width="600"]] 261 +[[~[~[image:https://wiki.dragino.com/images/thumb/b/bd/MQTT_Forward_5.png/600px-MQTT_Forward_5.png~|~|height="149" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Forward_5.png]] 283 283 284 284 Upstream: Publish message to MQTT Broker 285 285 286 286 To simulate a downstream, use MQTT.fx to subscribe a topic, and publish something to this topic. as Below: 287 287 288 -[[image:https://wiki.dragino.com/images/thumb/3/3d/MQTT_Forward_6.png/600px-MQTT_Forward_6.png||height="279" width="600"]] 267 +[[~[~[image:https://wiki.dragino.com/images/thumb/3/3d/MQTT_Forward_6.png/600px-MQTT_Forward_6.png~|~|height="279" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Forward_6.png]] 289 289 290 290 Downstream: Subscribe a topic to get downstream 291 291 292 292 293 -== 4.3Simulate via Dragino Command Line ==272 +== Simulate via Dragino Command Line == 294 294 295 295 For first try of MQTT connection, simulate via command line is recommend, there are many servers / connection type for MQTT. They are using different connection parameters. Simulating the connection via command line will help us rapidly connect to server and debug. 296 296 ... ... @@ -297,7 +297,7 @@ 297 297 In the Dragino Gateway, we use [[mosquitto client>>url:https://mosquitto.org/]] for MQTT connection. 298 298 299 299 300 - (% class="mark" %)**For Upstream**279 +For Upstream 301 301 302 302 command is [[mosquitto_pub>>url:https://mosquitto.org/man/mosquitto_pub-1.html]] 303 303 ... ... @@ -305,105 +305,84 @@ 305 305 306 306 Note: 192.168.199.148 is MQTT broker address, the gateway and the MQTT broker PC are in the same network. 307 307 308 -[[image:https://wiki.dragino.com/images/thumb/d/d0/MQTT_Command_6.png/600px-MQTT_Command_6.png||height="188" width="600"]] 287 +[[~[~[image:https://wiki.dragino.com/images/thumb/d/d0/MQTT_Command_6.png/600px-MQTT_Command_6.png~|~|height="188" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_6.png]] 309 309 310 310 mosquitto_pub 311 311 312 312 313 - (% class="mark" %)**For Downstream**292 +For Downstream 314 314 315 315 Use [[mosquitto_sub>>url:https://mosquitto.org/man/mosquitto_sub-1.html]] to subscribe the change on the topic. 316 316 317 -[[image:https://wiki.dragino.com/images/thumb/8/89/MQTT_Command_7.png/600px-MQTT_Command_7.png||height="267" width="600"]] 296 +[[~[~[image:https://wiki.dragino.com/images/thumb/8/89/MQTT_Command_7.png/600px-MQTT_Command_7.png~|~|height="267" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_7.png]] 318 318 319 319 mosquitto_sub 320 320 300 +== Configure Dragino UI for MQTT connection == 321 321 322 -== 4.4 Configure Dragino UI for MQTT connection == 323 - 324 324 This chapter are step by step to show to configure the Dragino Menu for MQTT auto connection. 325 325 326 -((( 327 -Go to (% class="mark" %)**Dragino Menu ~-~-> MQTT Client** 328 -))) 304 +Go to Dragino Menu ~-~-> MQTT Client 329 329 330 -[[image:https://wiki.dragino.com/images/thumb/b/bc/MQTT_Command_8.png/600px-MQTT_Command_8.png||height="249" width="600"]] 306 +[[~[~[image:https://wiki.dragino.com/images/thumb/b/bc/MQTT_Command_8.png/600px-MQTT_Command_8.png~|~|height="249" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_8.png]] 331 331 332 332 go to mqtt configure menu 333 333 334 -((( 335 -Select **Forward to MQTT server**. (% class="mark" %)**Notice**(%%): This option is removed from the latest firmware, in the latest firmware, if user submit "SAVE & APPLY" in MQTT page, the gateway will use MQTT service. 336 -))) 310 +Select Forward to MQTT server. Notice: This option is removed from the latest firmware, in the latest firmware, if user submit "SAVE & APPLY" in MQTT page, the gateway will use MQTT service. 337 337 338 -[[image:https://wiki.dragino.com/images/thumb/1/14/MQTT_Commands_8.png/600px-MQTT_Commands_8.png||height="240" width="600"]] 312 +[[~[~[image:https://wiki.dragino.com/images/thumb/1/14/MQTT_Commands_8.png/600px-MQTT_Commands_8.png~|~|height="240" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Commands_8.png]] 339 339 340 340 forward to MQTT 341 341 316 +=== Configure the MQTT Client for Upstream === 342 342 343 -=== 4.4.1 Configure the MQTT Client for Upstream === 344 - 345 345 Below screenshot is same as the publish command: 346 346 347 -(% class="box" %) 348 -((( 349 -mosquitto_pub -h 192.168.199.148 -p 1883 -i dragino-1b7060 -t CLIENTID/CHANNEL/data -m DATA 350 -~/~/where the CLIENTID, CHANNEL & DATA are macro. represent for 351 -~/~/CLIENTID: dragino-1b7060 352 -~/~/CHANNEL: Remote ID in Channel settings; here is 78901 or 567456 353 -~/~/DATA: The data stores in /var/iot/channels/ 354 -))) 320 +{{{mosquitto_pub -h 192.168.199.148 -p 1883 -i dragino-1b7060 -t CLIENTID/CHANNEL/data -m DATA 321 +//where the CLIENTID, CHANNEL & DATA are macro. represent for 322 +//CLIENTID: dragino-1b7060 323 +//CHANNEL: Remote ID in Channel settings; here is 78901 or 567456 324 +//DATA: The data stores in /var/iot/channels/ 325 +}}} 355 355 356 -[[image:https://wiki.dragino.com/images/thumb/c/c7/MQTT_Command_9.png/600px-MQTT_Command_9.png||height="385" width="600"]] 327 +[[~[~[image:https://wiki.dragino.com/images/thumb/c/c7/MQTT_Command_9.png/600px-MQTT_Command_9.png~|~|height="385" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_9.png]] 357 357 358 358 MQTT Publish configure 359 359 331 +[[~[~[image:https://wiki.dragino.com/images/thumb/b/b7/MQTT_Command_10.png/600px-MQTT_Command_10.png~|~|height="544" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_10.png]] 360 360 361 -[[image:https://wiki.dragino.com/images/thumb/b/b7/MQTT_Command_10.png/600px-MQTT_Command_10.png||height="544" width="600"]] 362 - 363 363 MQTT Channel settings 364 364 365 -((( 366 366 For example, if we put a data(temp=46) on the file /var/iot/channels/4567, because 4567 match the remote channel 78901. the gateway will run this command: 367 -))) 368 368 369 -(% class="box" %) 370 -((( 371 -mosquitto_pub -h 192.168.199.148 -p 1883 -i dragino-1b7060 -t dragino-1b7060/78901/data -m temp=46 372 -))) 337 +{{{mosquitto_pub -h 192.168.199.148 -p 1883 -i dragino-1b7060 -t dragino-1b7060/78901/data -m temp=46 338 +}}} 373 373 374 -((( 375 375 to MQTT broker. 376 -))) 377 377 378 378 379 -((( 380 380 Below is a simulation to put this data to active the MQTT publish. 381 -))) 382 382 383 -[[image:https://wiki.dragino.com/images/thumb/3/30/MQTT_Command_11.png/600px-MQTT_Command_11.png||height="308" width="600"]] 345 +[[~[~[image:https://wiki.dragino.com/images/thumb/3/30/MQTT_Command_11.png/600px-MQTT_Command_11.png~|~|height="308" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_11.png]] 384 384 385 385 MQTT Publish 386 386 387 387 388 -=== 4.4.2Configure the MQTT Client for Downstream ===350 +=== Configure the MQTT Client for Downstream === 389 389 390 390 Below screen shot equal to this subscribe command: 391 391 392 -(% class="box" %) 393 -((( 394 -mosquitto_sub -h 192.168.199.148 -p 1883 -i dragino-1b7060 -t command. 395 -))) 354 +{{{ mosquitto_sub -h 192.168.199.148 -p 1883 -i dragino-1b7060 -t command. 355 +}}} 396 396 397 -[[image:https://wiki.dragino.com/images/3/36/MQTT_Command_12.png||height="173" width="579"]] 357 +[[~[~[image:https://wiki.dragino.com/images/3/36/MQTT_Command_12.png~|~|height="173" width="579"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_12.png]] 398 398 399 399 MQTT Subscribe 400 400 401 401 402 -((( 403 403 When MQTT broker receive a update on this topic, the gateway will get the update and use LoRa radio to broadcast this message. The LoRa parameters used for update is: 404 -))) 405 405 406 -[[image:https://wiki.dragino.com/images/thumb/b/b8/MQTT_Command_13.png/600px-MQTT_Command_13.png||height="300" width="600"]] 364 +[[~[~[image:https://wiki.dragino.com/images/thumb/b/b8/MQTT_Command_13.png/600px-MQTT_Command_13.png~|~|height="300" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_13.png]] 407 407 408 408 LoRa Broadcast parameters. 409 409 ... ... @@ -410,38 +410,32 @@ 410 410 411 411 And below is the subscribe simulation: 412 412 413 -[[image:https://wiki.dragino.com/images/thumb/6/60/MQTT_Command_14.png/600px-MQTT_Command_14.png||height="255" width="600"]] 371 +[[~[~[image:https://wiki.dragino.com/images/thumb/6/60/MQTT_Command_14.png/600px-MQTT_Command_14.png~|~|height="255" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_14.png]] 414 414 415 415 downstream simulation 416 416 417 417 418 - ==4.5 Add LoRa support to communicate with remote sensor ==376 +\\ 419 419 378 +== Add LoRa support to communicate with remote sensor == 379 + 420 420 In above section, we have configured the UI to support MQTT upstream and downstream. We can simulate via Linux command. In this section, we will guide how to communicate with remote LoRa End Node for upstream and downstream. 421 421 422 -=== 4.5.1Use LoRa Raw protocol for communication ~-~- For LG01/LG02 ===382 +=== Use LoRa Raw protocol for communication ~-~- For LG01/LG02 === 423 423 424 -((( 425 425 We can use [[LoRa Shield>>url:http://www.dragino.com/products/lora/item/102-lora-shield.html]] to send LoRa Raw data to Gateway and receive data from gateway. 426 -))) 427 427 428 -((( 429 429 The example Sketch for LoRa Shield +Arduino is here: [[LoRa_Shield_Sketch_For_MQTT>>url:http://www.dragino.com/downloads/index.php?dir=LoraShield/]] 430 -))) 431 431 432 -((( 433 433 And this link is the required library: [[arduino-LoRa-master>>url:http://www.dragino.com/downloads/index.php?dir=LoraShield/]]. Unzip this library and put in Arduino library location. 434 -))) 435 435 436 -((( 437 437 What does the Arduino Sketch do? The Arduino Sketch will: 438 -))) 439 439 440 440 * Upstream: Keep sending a LoRa Message every minutes with this payload : <4567>tem=xx&hum=yy (Where xx and yy are temperature and humidity value generated randomly). 441 441 * Downstream: Listening broadcast message from gateway, and print it in console. 442 442 * The LoRa parameter settings in Arduino should match the LoRa settings in gateway, as below: 443 443 444 -[[image:https://wiki.dragino.com/images/thumb/3/3b/MQTT_Command_17.png/600px-MQTT_Command_17.png||height="197" width="600"]] 396 +[[~[~[image:https://wiki.dragino.com/images/thumb/3/3b/MQTT_Command_17.png/600px-MQTT_Command_17.png~|~|height="197" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_17.png]] 445 445 446 446 LoRa Parameter should match 447 447 ... ... @@ -448,121 +448,110 @@ 448 448 449 449 Below is the test result after the Arduino Sketch is running. 450 450 451 -[[image:https://wiki.dragino.com/images/thumb/6/63/MQTT_Command_18.png/600px-MQTT_Command_18.png||height="319" width="600"]] 403 +[[~[~[image:https://wiki.dragino.com/images/thumb/6/63/MQTT_Command_18.png/600px-MQTT_Command_18.png~|~|height="319" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_18.png]] 452 452 453 453 Upstream Data Flow 454 454 455 -[[image:https://wiki.dragino.com/images/thumb/1/18/MQTT_Command_19.png/600px-MQTT_Command_19.png||height="309" width="600"]] 407 +[[~[~[image:https://wiki.dragino.com/images/thumb/1/18/MQTT_Command_19.png/600px-MQTT_Command_19.png~|~|height="309" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:MQTT_Command_19.png]] 456 456 457 457 Downstream Data Flow 458 458 459 459 460 -=== 4.5.2Use LoRaWAN Protocol for communication ~-~- For LG308/LPS8/DLOS8 ===412 +=== Use LoRaWAN Protocol for communication ~-~- For LG308/LPS8/DLOS8 === 461 461 462 -((( 463 -Since firmware (% class="mark" %)**LG02_LG08~-~-build-v5.3.1585192026-20200326-1109,**(%%) Dragino LoRaWAN gateways support the communication to LoRaWAN (% class="mark" %)**ABP end node**(%%) locally without the need of LoRaWAN server. This feature allow us to integrate MQTT in the gateway to support LoRaWAN to MQTT forwarding or visa verse. 464 -))) 414 +Since firmware LG02_LG08~-~-build-v5.3.1585192026-20200326-1109, Dragino LoRaWAN gateways support the communication to LoRaWAN ABP end node locally without the need of LoRaWAN server. This feature allow us to integrate MQTT in the gateway to support LoRaWAN to MQTT forwarding or visa verse. 465 465 466 -((( 467 -When use test this feature, please use the version higher then : (% class="mark" %)**LG02_LG08~-~-build-v5.4.1593400722-20200629-1120**(%%), in this version, the upload format is changed and readable, which is easier for integration. 468 -(% class="mark" %)**Video Instruction**(%%):[[https:~~/~~/youtu.be/qJTY441-t90>>url:https://youtu.be/qJTY441-t90]] 469 -))) 416 +When use test this feature, please use the version higher then : LG02_LG08~-~-build-v5.4.1593400722-20200629-1120, in this version, the upload format is changed and readable, which is easier for integration. 470 470 471 -((( 472 -**Step 1**: Refer [[Communicate with ABP End Node>>url:https://wiki.dragino.com/index.php/Communication_with_ABP_End_Node]] to know how to set up LG308 to work with LoRaWAN End node. 473 -))) 474 474 475 -((( 476 -**Step 2**: Make sure your Radio settings match the End Node settings. 477 -))) 419 +\\Video Instruction:[[https:~~/~~/youtu.be/qJTY441-t90>>url:https://youtu.be/qJTY441-t90]] 420 + 478 478 479 -[[ image:https://wiki.dragino.com/images/thumb/f/f7/LG308_MQTT_5.png/600px-LG308_MQTT_5.png||height="387"width="600"]]422 +Step 1: Refer [[Communicate with ABP End Node>>url:https://wiki.dragino.com/index.php/Communication_with_ABP_End_Node]] to know how to set up LG308 to work with LoRaWAN End node. 480 480 424 +Step 2: Make sure your Radio settings match the End Node settings. 425 + 426 +[[~[~[image:https://wiki.dragino.com/images/thumb/f/f7/LG308_MQTT_5.png/600px-LG308_MQTT_5.png~|~|height="387" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:LG308_MQTT_5.png]] 427 + 481 481 Use Same Frequency Band as End Node 482 482 483 483 484 -((( 485 -((( 486 -**Step 3**: Set up publish format and MQTT channel. The LG308 will store the Data from End node in HEX format in the file. And we need to config the format to META 487 -))) 488 -))) 431 +Step 3: Set up publish format and MQTT channel. The LG308 will store the Data from End node in HEX format in the file. And we need to config the format to META 489 489 490 -[[image:https://wiki.dragino.com/images/thumb/8/8d/LG308_MQTT_3.png/600px-LG308_MQTT_3.png||height="385" width="600"]] 433 +[[~[~[image:https://wiki.dragino.com/images/thumb/8/8d/LG308_MQTT_3.png/600px-LG308_MQTT_3.png~|~|height="385" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:LG308_MQTT_3.png]] 491 491 492 492 Publish mush use META as data format for LG308 493 493 494 494 495 - **Step 4**: Map the Device Address to Remote ID in MQTT server.438 +Step 4: Map the Device Address to Remote ID in MQTT server. 496 496 497 -[[image:https://wiki.dragino.com/images/thumb/7/7f/LG308_MQTT_4.png/600px-LG308_MQTT_4.png||height="335" width="600"]] 440 +[[~[~[image:https://wiki.dragino.com/images/thumb/7/7f/LG308_MQTT_4.png/600px-LG308_MQTT_4.png~|~|height="335" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:LG308_MQTT_4.png]] 498 498 499 499 Map Dev Addr to remote ID 500 500 501 501 502 - **Step 5: Upstream**: Save the change, we can see the log info via "sytem log", End Node and MQTT Server445 +Step 5: Upstream: Save the change, we can see the log info via "sytem log", End Node and MQTT Server 503 503 504 -[[image:https://wiki.dragino.com/images/thumb/b/be/LG308_MQTT_6.png/600px-LG308_MQTT_6.png||height="279" width="600"]] 447 +[[~[~[image:https://wiki.dragino.com/images/thumb/b/be/LG308_MQTT_6.png/600px-LG308_MQTT_6.png~|~|height="279" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:LG308_MQTT_6.png]] 505 505 506 506 Upstream Process 507 507 508 -[[image:https://wiki.dragino.com/images/thumb/0/07/LG308_MQTT_6_1.png/600px-LG308_MQTT_6_1.png||height="246" width="600"]] 451 +[[~[~[image:https://wiki.dragino.com/images/thumb/0/07/LG308_MQTT_6_1.png/600px-LG308_MQTT_6_1.png~|~|height="246" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:LG308_MQTT_6_1.png]] 509 509 510 510 Choose ASCII Format 511 511 512 -[[image:https://wiki.dragino.com/images/thumb/a/a3/LG308_MQTT_6_2.png/600px-LG308_MQTT_6_2.png||height="248" width="600"]] 455 +[[~[~[image:https://wiki.dragino.com/images/thumb/a/a3/LG308_MQTT_6_2.png/600px-LG308_MQTT_6_2.png~|~|height="248" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:LG308_MQTT_6_2.png]] 513 513 514 514 LHT65 Decoder 515 515 459 +Step 6: Set up subscribe: Subscribe a topci for downstream. 516 516 517 - **Step 6:Setupubscribe:** Subscribeatopcifordownstream.461 +[[~[~[image:https://wiki.dragino.com/images/thumb/b/b9/LG308_MQTT_7.png/600px-LG308_MQTT_7.png~|~|height="176" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:LG308_MQTT_7.png]] 518 518 519 -[[image:https://wiki.dragino.com/images/thumb/b/b9/LG308_MQTT_7.png/600px-LG308_MQTT_7.png||height="176" width="600"]] 520 - 521 521 Subscribe to a topic 522 522 523 523 524 - **Step 7**: Downstream: Save the change, we can see the log info via "sytem log", End Node and MQTT Server.466 +Step 7: Downstream: Save the change, we can see the log info via "sytem log", End Node and MQTT Server. 525 525 526 -[[image:https://wiki.dragino.com/images/thumb/9/97/LG308_MQTT_8.png/600px-LG308_MQTT_8.png||height="298" width="600"]] 468 +[[~[~[image:https://wiki.dragino.com/images/thumb/9/97/LG308_MQTT_8.png/600px-LG308_MQTT_8.png~|~|height="298" width="600"~]~]>>url:https://wiki.dragino.com/index.php/File:LG308_MQTT_8.png]] 527 527 528 528 Downstream Flow 529 529 530 - (% class="mark" %)**Notice: The text use for Downstream must meet the requirement from [[LG308 Downstream Payload>>url:https://wiki.dragino.com/index.php/Communication_with_ABP_End_Node#Downstream]]**472 +Notice: The text use for Downstream must meet the requirement from [[LG308 Downstream Payload>>url:https://wiki.dragino.com/index.php/Communication_with_ABP_End_Node#Downstream]] 531 531 532 532 533 -= 5.Example For Different MQTT Servers =475 += Example For Different MQTT Servers = 534 534 535 -(% style="width:731.222px" %) 536 -|=(% style="width: 270px;" %)((( 537 -[[image:https://wiki.dragino.com/images/thumb/7/73/ThingSpeak1.png/200px-ThingSpeak1.png||alt="ThingSpeak1.png" height="114" width="233"]] 477 +|=((( 478 +[[~[~[image:https://wiki.dragino.com/images/thumb/7/73/ThingSpeak1.png/200px-ThingSpeak1.png~|~|alt="ThingSpeak1.png" height="98" width="200"~]~]>>url:https://wiki.dragino.com/index.php/File:ThingSpeak1.png]] 538 538 539 -== [[ThingSpeak Server>>url:http://www.thingspeak.com/]] == 480 +=== [[ThingSpeak Server>>url:http://www.thingspeak.com/]] === 540 540 541 541 542 542 [[Examples>>url:https://wiki.dragino.com/index.php/ThingSpeak_Examples]] 543 -)))|=( % style="width: 242px;" %)(((544 -[[image:https://wiki.dragino.com/images/thumb/3/3b/Lewei50.png/200px-Lewei50.png||alt="Lewei50.png" height=" 65" width="223"]]484 +)))|=((( 485 +[[~[~[image:https://wiki.dragino.com/images/thumb/3/3b/Lewei50.png/200px-Lewei50.png~|~|alt="Lewei50.png" height="58" width="200"~]~]>>url:https://wiki.dragino.com/index.php/File:Lewei50.png]] 545 545 487 +=== [[乐联网平台>>url:https://www.lewei50.com/]] === 546 546 547 -== [[乐联网平台>>url:https://www.lewei50.com/]] == 548 548 490 +[[lewei Example>>url:https://wiki.dragino.com/index.php/Lewei_Example_mqtt]] 491 +)))|=((( 492 +[[~[~[image:https://wiki.dragino.com/images/thumb/a/aa/AWS-IOT.png/200px-AWS-IOT.png~|~|alt="AWS-IOT.png" height="122" width="200"~]~]>>url:https://wiki.dragino.com/index.php/File:AWS-IOT.png]] 549 549 550 -[[lewei Example>>url:https://wiki.dragino.com/index.php/Lewei_Example_mqtt]] 551 -)))|=(% style="width: 214px;" %)((( 552 -[[image:https://wiki.dragino.com/images/thumb/a/aa/AWS-IOT.png/200px-AWS-IOT.png||alt="AWS-IOT.png" height="112" width="183"]] 494 +=== [[AWS-IOT>>url:https://aws.amazon.com/cn/iot-platform/how-it-works/]] === 553 553 554 -== [[AWS-IOT>>url:https://aws.amazon.com/cn/iot-platform/how-it-works/]] == 555 555 556 - 557 557 [[AWS Examples>>url:https://wiki.dragino.com/index.php/MQTT_Forward_to_Amazon_AWS-IOT]] 558 558 ))) 559 559 560 -= 6. How to Debug = 561 561 562 - User can login the gateway's console and run (% class="mark"%)**logread -f**(%%). Itwillshowstheoutputwhen there is packet arrive.User can see if it is correct.501 += How to Debug = 563 563 564 - =7.HowtoaskforSupport=503 +User can login the gateway's console and run **logread -f**. It will shows the output when there is packet arrive.User can see if it is correct. 565 565 505 += How to ask for Support = 506 + 566 566 If a user still not have trouble making it works. please send a mail to support@dragino.com with the below info: 567 567 568 568 * Detail of your LoRaWAN end node.
- image-20220527133547-1.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Xiaoling - Size
-
... ... @@ -1,1 +1,0 @@ 1 -199.3 KB - Content
- image-20220527134000-2.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Xiaoling - Size
-
... ... @@ -1,1 +1,0 @@ 1 -115.8 KB - Content
- image-20220527134038-3.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Xiaoling - Size
-
... ... @@ -1,1 +1,0 @@ 1 -94.2 KB - Content
- image-20220527134251-4.png
-
- Author
-
... ... @@ -1,1 +1,0 @@ 1 -XWiki.Xiaoling - Size
-
... ... @@ -1,1 +1,0 @@ 1 -35.1 KB - Content