Merge pull request #788 from geeksville/rak

Add beginnings of RAK4600 and update to latest nrf52 arduino sources
1.2.28
2026-01-12 04:47:23 +00:00 · 2021-04-15 12:31:25 +08:00 · 2021-04-15 12:30:46 +08:00 · 2021-04-15 11:46:36 +08:00 · 2021-04-15 11:45:58 +08:00 · 2021-04-12 13:46:56 +08:00
52 changed files with 1832 additions and 701 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,8 +26,8 @@ jobs:
        run: platformio run -e tbeam
      - name: Build for heltec
        run: platformio run -e heltec
-      - name: Build for lora-relay-v1
-        run: platformio run -e lora-relay-v1 
+      - name: Build for wisblock RAK4631
+        run: platformio run -e rak4631
      - name: Build for native
        run: platformio run -e native
      - name: Integration test
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -15,7 +15,9 @@
  <component name="ChangeListManager">
    <list default="true" id="58922733-b05b-4b90-9655-b9b18914977a" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/platformio.ini" beforeDir="false" afterPath="$PROJECT_DIR$/platformio.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/proto" beforeDir="false" afterPath="$PROJECT_DIR$/proto" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/proto/docs/docs.md" beforeDir="false" afterPath="$PROJECT_DIR$/proto/docs/docs.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/mqtt/MQTT.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/mqtt/MQTT.h" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -65,6 +67,11 @@
        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
      </method>
    </configuration>
+    <configuration default="true" type="GradleAppRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" PASS_PARENT_ENVS_2="true">
+      <method v="2">
+        <option name="com.jetbrains.cidr.cpp.gradle.execution.GradleNativeBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
    <configuration name="PlatformIO Debug" type="platformio" factoryName="PlatformIO Debug" REDIRECT_INPUT="false" ELEVATE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="meshtastic-esp32" TARGET_NAME="Debug" CONFIG_NAME="native" RUN_TARGET_PROJECT_NAME="meshtastic-esp32" RUN_TARGET_NAME="Debug">
      <method v="2">
        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
@@ -97,6 +104,9 @@
      <workItem from="1617115747078" duration="1391000" />
      <workItem from="1617117632667" duration="307000" />
      <workItem from="1617160691713" duration="1016000" />
+      <workItem from="1617279002260" duration="1626000" />
+      <workItem from="1617425689081" duration="1896000" />
+      <workItem from="1617437366919" duration="1182000" />
    </task>
    <servers />
  </component>
@@ -128,6 +138,16 @@
          <line>37</line>
          <option name="timeStamp" value="7" />
        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/src/mqtt/MQTT.cpp</url>
+          <line>84</line>
+          <option name="timeStamp" value="10" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/.pio/libdeps/native/PubSubClient/src/PubSubClient.cpp</url>
+          <line>468</line>
+          <option name="timeStamp" value="11" />
+        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <watches-manager>
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -8,7 +8,7 @@ BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec tbeam0.7"
 #BOARDS_ESP32=tbeam

 # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine
-BOARDS_NRF52="lora-relay-v1"
+BOARDS_NRF52="rak4631"

 OUTDIR=release/latest

--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -1,13 +1,13 @@
 #!/bin/sh

-PYTHON=${PYTHON:-python3}
+PYTHON=${PYTHON:-$(which python3 python|head -n 1)}

 set -e

 # Usage info
 show_help() {
 cat << EOF
-Usage: ${0##*/} [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME]
+Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME]
 Flash image file to device, but first erasing and writing system information"

    -h               Display this help and exit
@@ -39,6 +39,11 @@ while getopts ":hp:P:f:" opt; do
 done
 shift "$((OPTIND-1))"

+[ -z "$FILENAME" -a -n "$1" ] && {
+    FILENAME=$1
+    shift
+}
+
 if [ -f "${FILENAME}" ]; then
 	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
 	$PYTHON -m esptool --baud 921600 erase_flash
--- a/bin/device-update.sh
+++ b/bin/device-update.sh
@@ -1,11 +1,11 @@
 #!/bin/sh

-PYTHON=${PYTHON:-python3}
+PYTHON=${PYTHON:-$(which python3 python|head -n 1)}

 # Usage info
 show_help() {
 cat << EOF
-Usage: ${0##*/} [-h] [-p ESPTOOL_PORT] [-P PYTHON] -f FILENAME
+Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME]
 Flash image file to device, leave existing system intact."

    -h               Display this help and exit
@@ -37,6 +37,11 @@ while getopts ":hp:P:f:" opt; do
 done
 shift "$((OPTIND-1))"

+[ -z "$FILENAME" -a -n "$1" ] && {
+    FILENAME=$1
+    shift
+}
+
 if [ -f "${FILENAME}" ]; then
 	echo "Trying to flash update ${FILENAME}."
 	$PYTHON -m esptool --baud 921600 write_flash 0x10000 ${FILENAME}
--- a/bin/mqtt-listen.sh
+++ b/bin/mqtt-listen.sh
@@ -0,0 +1,3 @@
+
+mosquitto_sub -h mqtt.meshtastic.org -v -t \$SYS/\# -t msh/+/stat/\# -t msh/+/json/\#
+# mosquitto_sub -h test.mosquitto.org -v -t mesh/\# -F "%j"
--- a/bin/mqtt-send-status.sh
+++ b/bin/mqtt-send-status.sh
@@ -0,0 +1 @@
+mosquitto_pub -h mqtt.meshtastic.org -u meshdev -P large4cats -t msh/1/stat/FakeNode -m online -d
--- a/bin/run-both.sh
+++ b/bin/run-both.sh
@@ -1,11 +1,13 @@
 set -e 

-pio run
+TARG=tbeam
+
+pio run -e $TARG

 echo uploading to usb1
-pio run --upload-port /dev/ttyUSB1 -t upload &
+pio run --upload-port /dev/ttyUSB1 -t upload -e $TARG &

 echo uploading to usb0
-pio run --upload-port /dev/ttyUSB0 -t upload &
+pio run --upload-port /dev/ttyUSB0 -t upload -e $TARG &

-wait
+wait
--- a/bin/upload-to-bootloader.sh
+++ b/bin/upload-to-bootloader.sh
@@ -1,4 +1,5 @@
+set -e

 echo "Converting to uf2 for NRF52 Adafruit bootloader"
-bin/uf2conv.py .pio/build/lora-relay-v2/firmware.hex -f 0xADA52840
-# cp flash.uf2 /media/kevinh/FTH*BOOT/
+bin/uf2conv.py .pio/build/rak4631/firmware.hex -f 0xADA52840
+cp flash.uf2 /media/kevinh/FTH*BOOT/
--- a/boards/wiscore_rak4631.json
+++ b/boards/wiscore_rak4631.json
@@ -0,0 +1,72 @@
+{
+    "build": {
+        "arduino": {
+            "ldscript": "nrf52840_s140_v6.ld"
+        },
+        "core": "nRF5",
+        "cpu": "cortex-m4",
+        "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+        "f_cpu": "64000000L",
+        "hwids": [
+            [
+                "0x239A",
+                "0x8029"
+            ],
+            [
+                "0x239A",
+                "0x0029"
+            ],
+            [
+                "0x239A",
+                "0x002A"
+            ],
+            [
+                "0x239A",
+                "0x802A"
+            ]
+        ],
+        "usb_product": "WisCore RAK4631 Board",
+        "mcu": "nrf52840",
+        "variant": "WisCore_RAK4631_Board",
+        "bsp": {
+            "name": "adafruit"
+        },
+        "softdevice": {
+            "sd_flags": "-DS140",
+            "sd_name": "s140",
+            "sd_version": "6.1.1",
+            "sd_fwid": "0x00B6"
+        },
+        "bootloader": {
+            "settings_addr": "0xFF000"
+        }
+    },
+    "connectivity": [
+        "bluetooth"
+    ],
+    "debug": {
+        "jlink_device": "nRF52840_xxAA",
+        "svd_path": "nrf52840.svd"
+    },
+    "frameworks": [
+        "arduino"
+    ],
+    "name": "WisCore RAK4631 Board",
+    "upload": {
+        "maximum_ram_size": 248832,
+        "maximum_size": 815104,
+        "speed": 115200,
+        "protocol": "nrfutil",
+        "protocols": [
+            "jlink",
+            "nrfjprog",
+            "nrfutil",
+            "stlink"
+        ],
+        "use_1200bps_touch": true,
+        "require_upload_port": true,
+        "wait_for_upload_port": true
+    },
+    "url": "https://www.rakwireless.com",
+    "vendor": "RAKwireless"
+}
--- a/docs/software/TODO.md
+++ b/docs/software/TODO.md
@@ -4,7 +4,19 @@ You probably don't care about this section - skip to the next one.

 ## before next release

+* DONE @vfurman fixed android nrf52 problem
+* probably fixed (stack overflow generating qr code) meshm reported a crash
+* DONE @havealoha reported android overrides fixed positions
+* @luxonn reports that after a while the android app stops showing new messages
+* DONE android speed settings https://github.com/meshtastic/Meshtastic-Android/issues/271
+* add cloudflare
 * fix heltec battery scaling
+* check android 1.2.20 usage, possibly release to general
+* release android APK
+
+* add rak4600 support (with rf95 radio and limited ram)
+
+* Switch to use https://github.com/adafruit/Adafruit_nRF52_Arduino.git when available (see arduino code for examples)
 * DONE remote admin busted? 
 * DONE check android code - @havealoha comments about odd sleep behavior
 * ABANDONED test github actions locally on linux
@@ -14,7 +26,7 @@ You probably don't care about this section - skip to the next one.
 * remove linux dependency in native build
 * DONE tcp stream problem in python+pordtuino, server thinks client dropped when client DID NOT DROP
 * DONE TCP mode for android, localhost is at 10.0.2.2
-* make sure USB still works in android
+* DONE make sure USB still works in android
 * add portduino builds to zip
 * add license to portduino and make announcement
 * DONE naks are being dropped (though enqueuedLocal) sometimes before phone/PC gets them
@@ -42,7 +54,7 @@ You probably don't care about this section - skip to the next one.
 * DONE before next relase: test empty channel sets on android
 * DONE channel sharing in android
 * DONE test 1.0 firmware update on android
-* DONE test 1.1 firmware update on android
+* DONE test 1.1 firmwhttps://github.com/meshtastic/Meshtastic-Android/issues/271are update on android
 * DONE test 1.2.10 firmware update on android
 * DONE test link sharing on android
 * FIXED? luxon bug report - seeing rx acks for nodes that are not on the network
@@ -50,14 +62,6 @@ You probably don't care about this section - skip to the next one.
 * DONE show GPS time only if we know what global time is
 * DONE android should always provide time to nodes - so that it is easier for the mesh to learn the current time

-## MQTT
-
-* mqtt.meshtastic.org should have VERY basic auth at launch (to prevent abuse)
-* use MQTT for simulator mesh network
-* do initial development inside of portduino
-* do as much possible on the device side (so we can eventually just have ESP32 talk directly to server)
-* eventually add a MQTTPacket on the ToRadio & FromRadio links
-
 ## Multichannel support

 * DONE cleanup the external notification and serial plugins
--- a/docs/software/crypto.md
+++ b/docs/software/crypto.md
@@ -36,6 +36,14 @@ If you are reviewing our implementation, this is a brief statement of our method
 - Each 16 byte BLOCK for a packet has an incrementing COUNTER. COUNTER starts at zero for the first block of each packet.
 - The IV for each block is constructed by concatenating the NONCE as the upper 96 bits of the IV and the COUNTER as the bottom 32 bits. Since our packets are small counter portion will really never be higher than 32 (five bits).

+### Details on the nonce encoding
+
+(For those porting to other architectures)
+Bytes 0-3 of the nonce are the "packet number" in little-endian order
+Bytes 4-7 are currently zero
+Bytes 8-11 are the sending node ID in little-endian order
+Bytes 12-15 are currently zero
+
 ## Comments from reviewer #1

 This reviewer is a cryptography professional, but would like to remain anonymous. We thank them for their comments ;-):
--- a/docs/software/device-api.md
+++ b/docs/software/device-api.md
@@ -33,6 +33,7 @@ Typical flow when a phone connects to the device should be the following (if you
 - There are only three relevant endpoints (and they have built in BLE documentation - so use a BLE tool of your choice to watch them): FromRadio, FromNum (sends notifies when new data is available in FromRadio) and ToRadio
 - SetMTU size to 512
 - Write a ToRadio.startConfig protobuf to the "ToRadio" endpoint" - this tells the radio you are a new connection and you need the entire NodeDB sent down.
+- Wrote a ToRadio.peerInfo protobuf to the endpoint - this tells the radio important information about your application version and if you are able to forward MQTT packets (see below).  Sending this protobuf is optional but highly recommended.
 - Read repeatedly from the "FromRadio" endpoint. Each time you read you will get back a FromRadio protobuf (see Meshtatastic-protobuf). Keep reading from this endpoint until you get back and empty buffer.
 - See below for the expected sequence for your initial download.
 - After the initial download, you should subscribe for BLE "notify" on the "FromNum" endpoint. If a notification arrives, that means there are now one or more FromRadio packets waiting inside FromRadio. Read from FromRadio until you get back an empty packet.
@@ -113,7 +114,7 @@ Characteristics
 | e272ebac-d463-4b98-bc84-5cc1a39ee517 | write       | data, variable sized, recommended 512 bytes, write one for each block of file                                     |
 | 4826129c-c22a-43a3-b066-ce8f0d5bacc6 | write       | crc32, write last - writing this will complete the OTA operation, now you can read result                         |
 | 5e134862-7411-4424-ac4a-210937432c77 | read,notify | result code, readable but will notify when the OTA operation completes                                            |
-| 5e134862-7411-4424-ac4a-210937432c67 | write | sets the region for programming, currently only 0 (app) or 100 (spiffs) are defined, if not set app is assumed |
+| 5e134862-7411-4424-ac4a-210937432c67 | write       | sets the region for programming, currently only 0 (app) or 100 (spiffs) are defined, if not set app is assumed    |
 | GATT_UUID_SW_VERSION_STR/0x2a28      | read        | We also implement these standard GATT entries because SW update probably needs them:                              |
 | GATT_UUID_MANU_NAME/0x2a29           | read        |                                                                                                                   |
 | GATT_UUID_HW_VERSION_STR/0x2a27      | read        |                                                                                                                   |
--- a/docs/software/mqtt.md
+++ b/docs/software/mqtt.md
@@ -12,14 +12,18 @@
      - [NODEID](#nodeid)
      - [USERID](#userid)
      - [CHANNELID](#channelid)
+      - [PORTID](#portid)
    - [Gateway nodes](#gateway-nodes)
-    - [Optional web services](#optional-web-services)
-      - [Public MQTT broker service](#public-mqtt-broker-service)
-      - [Riot.im messaging bridge](#riotim-messaging-bridge)
-    - [Deprecated concepts](#deprecated-concepts)
-      - [MESHID (deprecated)](#meshid-deprecated)
-      - [DESTCLASS (deprecated)](#destclass-deprecated)
-      - [DESTID (deprecated)](#destid-deprecated)
+    - [MQTTSimInterface](#mqttsiminterface)
+  - [Web services](#web-services)
+    - [Public MQTT broker service](#public-mqtt-broker-service)
+      - [Broker selection](#broker-selection)
+    - [Admin service](#admin-service)
+    - [Riot.im messaging bridge](#riotim-messaging-bridge)
+  - [Deprecated concepts](#deprecated-concepts)
+    - [MESHID (deprecated)](#meshid-deprecated)
+    - [DESTCLASS (deprecated)](#destclass-deprecated)
+    - [DESTID (deprecated)](#destid-deprecated)
  - [Rejected idea: RAW UDP](#rejected-idea-raw-udp)
  - [Development plan](#development-plan)
    - [Work items](#work-items)
@@ -68,17 +72,23 @@ Any gateway-device will contact the MQTT broker.

 ### Topics

-The "mesh/crypt/CHANNELID/NODEID/PORTID" [topic](https://www.hivemq.com/blog/mqtt-essentials-part-5-mqtt-topics-best-practices/) will be used for messages sent from/to a mesh.
+* The "/msh/1/c/CHANNELID/NODEID" [topic](https://www.hivemq.com/blog/mqtt-essentials-part-5-mqtt-topics-best-practices/) will be used for (encrypted) messages sent from/to a mesh. (The "1" in this path is for protocol version 1, other values are reserved. "c" is for "enCrypted")

 Gateway nodes will foward any MeshPacket from a local mesh channel with uplink_enabled.  The packet (encapsulated in a ServiceEnvelope) will remain encrypted with the key for the specified channel.  

-For any channels in the local node with downlink_enabled, the gateway node will forward packets from MQTT to the local mesh.  It will do this by subscribing to mesh/crypt/CHANNELID/# and forwarding relevant packets.
+For any channels in the gateway node with downlink_enabled, the gateway node will forward packets from MQTT to the local mesh.  It will do this by subscribing to msh/1/c/CHANNELID/# and forwarding relevant packets.

-If the channelid 'well known'/public it could be decrypted by a web service (if the web service was provided with the associated channel key), in which case it will be decrypted by a web service and appear at "mesh/clear/CHANNELID/NODEID/PORTID". Note: This is not in the initial deliverable. 
+* If the channelid 'well known'/public it could be decrypted by a web service (if the web service was provided with the associated channel key), in which case it will be decrypted by a web service and appear at "msh/1/CLEAR/CHANNELID/NODEID/PORTID". 

-FIXME, discuss how text message global mirroring could scale (or not)
+* If it was possible to republish on msh/1/CLEAR/... and the PORTID is wellknown (i.e. the protobufs needed for decoding it are in the master github), it will be decoded and republished as JSON on msh/1/JSON/CHANNELID/NODEID/PortName.  This is to facilitate the development of third party apps to visualize 'live' node positions and 'texts' (for users that have opted to send on those explicitly public channels).
+
+Note: Normally "CLEAR" is simply "clear" (for cleartext), but during development we might run **multiple** testing services, and in that case those service might appear using a different string here (i.e. "cleardev" etc...).  Similarly normally "JSON" is "json", but other values might be used.
+
+FIXME, consider how text message global mirroring could scale (or not)
 FIXME, possibly don't global mirror text messages - instead rely on matrix/riot? 
-FIXME, discuss possible attacks by griefers and how they can be prvented
+FIXME, consider possible attacks by griefers and how they can be prvented
+
+* The "/mesh/stat/NODEID" topic contains a simple string showing connection status of nodes.  We rely on the MQTT feature for automatically publishing special failrue messages to this topic when the device disconnects.

 #### Service Envelope

@@ -88,7 +98,7 @@ ServiceEnvelope will include the message, and full information about arrival tim

 #### NODEID

-The unique ID for a node. A hex string that starts with a ! symbol.
+The unique ID for a node. A 8 byte (16 character) hex string that starts with a ! symbol.

 #### USERID

@@ -96,7 +106,15 @@ A user ID string. This string is either a user ID if known or a nodeid to simply

 #### CHANNELID

-FIXME, figure out how channelids work
+For the time being we simply use the local "channel name" - which is not quite good enough.
+
+FIXME, figure out how channelids work in more detail.  They should generally be globally unique, but this is not a requirement.  If someone accidentially (or maliciously) sends data using a channel ID they do not 'own' they will still lacking a valid AES256 encryption, so it will be ignored by others.
+
+idea to be pondered: When the user clicks to enable uplink/downlink check the name they entered and 'claim' it on the server?
+
+#### PORTID
+
+Portid is used to descriminated between different packet types which are sent over a channel.  As used here it is an integer typically (but not necessarily) chosen from portnums.proto.

 ### Gateway nodes

@@ -107,31 +125,74 @@ Gateway nodes (via code running in the phone) will contain two tables to whiteli
 Since multiple gateway nodes might be connected to a single mesh, it is possible that duplicate messages will be published on any particular topic.  Therefore subscribers to these topics should
 deduplicate if needed by using the packet ID of each message.

-### Optional web services

-#### Public MQTT broker service
+### MQTTSimInterface
+
+This is a bit orthogonal from the main MQTT feature set, but a special simulated LoRa interface called MQTTSimInterface uses the
+MQTT messaging infrastructure to send "LoRa" packets between simulated nodes running on Linux.  This allows us to test radio topologies and code without having to use real hardware.
+
+This service uses the standard mesh/crypt/... topic, but it picks a special CHANNEL_ID.  That CHANNEL_ID is typcially of the form "simmesh_xxx".  
+
+FIXME: Figure out how to secure the creation and use of well known CHANNEL_IDs.
+
+
+## Web services
+
+### Public MQTT broker service

 An existing public [MQTT broker](https://mosquitto.org/) will be the default for this service, but clients can use any MQTT broker they choose. 

 FIXME - figure out how to avoid impersonation (because we are initially using a public mqtt server with no special security options).  FIXME, include some ideas on this in the ServiceEnvelope documentation.

-#### Riot.im messaging bridge
+#### Broker selection
+
+On a previous project I used mosqitto, which I liked, but the admin interface for programmatically managing access was ugly.  [This](https://www.openlogic.com/blog/activemq-vs-rabbitmq) article makes me think RabbitMQ might be best for us.
+
+Initially I will try to avoid using any non MQTT broker/library/API
+
+### Admin service
+
+(This is a WIP draft collection of not complete ideas)
+
+The admin service deals with misc global arbibration/access tasks.  It is actually reached **through** the MQTT broker, though for security we depend on that broker having a few specialized rules about who can post to or see particular topics (see below).
+
+Topics:
+
+* mesh/ta/# - all requests going towards the admin server (only the admin server can see this topic)
+* mesh/tn/NODEID/# - all responses/requests going towards a particlar gateway node (only this particular gateway node is allowed to see this topic)
+* mesh/to/NODEID/# - unsecured messages sent to a gateway node (any attacker can see this topic) - used only for "request gateway id" responses
+* mesh/ta/toadmin - a request to the admin server, payload is a ToAdmin protobuf
+* mesh/tn/NODEID/tonode - a request/response to a particular gateway node.  payload is a ToNode protobuf
+
+Operations provided via the ToAdmin/ToNode protocol:
+
+* Register a global channel ID (request a new channel ID).  Optionally include the AES key if you would like the web service to automatically decrypt in the cloud
+* Request gateway ID - the response is used to re-sign in to the broker.  
+
+Possibly might need public key encryption for the gateway request?  Since the response is sent to the mesh/to endpoint?  I would really like to use MQTT for all comms so I don't need yet another protocol/port from the device.
+
+Idea 1: A gateway ID/signin can only be assigned once per node ID.  If a user loses their signin info, they'll need to change their node number.  yucky.
+Idea 2: Instead gateway signins are assigned at "manufacture" time (and if lost, yes the user would need to "remanufacture" their node).  Possibly a simple web service (which can be accessed via the python install script?) that goes to an https endpoint, gets signin info (and server keeps a copy) and stores it in the device.  Hardware manufacturers could ask for N gateway IDs via the same API and get back a bunch of small files that could be programmed on each device.  Would include node id, etc...  Investigate alternatives like storing a particular private key to allow each device to generate their own signin key and the server would trust it by checking against a public key?
+
+TODO/FIXME: look into mqtt broker options, possibly find one with better API support than mosquitto?
+
+### Riot.im messaging bridge

@Geeksville will run a riot.im bridge that talks to the public MQTT broker and sends/receives into the riot.im network.

 There is apparently [already](https://github.com/derEisele/tuple) a riot.im [bridge](https://matrix.org/bridges/) for MQTT. That will possibly need to be customized a bit. But by doing this, we should be able to let random riot.im users send/receive messages to/from any meshtastic device. (FIXME ponder security).  See this [issue](https://github.com/meshtastic/Meshtastic-Android/issues/2#issuecomment-645660990) with discussion with the dev.

-### Deprecated concepts
+## Deprecated concepts

 You can ignore these for now...

-#### MESHID (deprecated)
+### MESHID (deprecated)

 Earlier drafts of this document included the concept of a MESHID.  That concept has been removed for now, but might be useful in the future.  The old idea is listed below:

 A unique ID for this mesh. There will be some sort of key exchange process so that the mesh ID can not be impersonated by other meshes. 

-#### DESTCLASS (deprecated)
+### DESTCLASS (deprecated)

 Earlier drafts of this document included the concept of a DESTCLASS.  That concept has been removed for now, but might be useful in the future.  The old idea is listed below:

@@ -145,7 +206,7 @@ The type of DESTID this message should be delivered to. A short one letter seque
 | S      | SMS gateway, DESTID is a phone number to reach via Twilio.com |
 | E      | Emergency message, see bug #fixme for more context            |

-#### DESTID (deprecated)
+### DESTID (deprecated)

 Earlier drafts of this document included the concept of a DESTCLASS.  That concept has been removed for now, but might be useful in the future.  The old idea is listed below:

--- a/docs/software/plugins/RangeTestPlugin.md
+++ b/docs/software/plugins/RangeTestPlugin.md
@@ -26,7 +26,7 @@ These are the settings that can be configured.

 For basic usage, you will need two devices both with a GPS. A device with a paired phone with GPS may work, I have not tried it. 

-The first thing to do is to turn on the plugin. With the plugin turned on, the other settings will be available:
+The first thing to do is to turn on the plugin. The device will need to be restarted after appling the settings. With the plugin turned on, the other settings will be available:

 	range_test_plugin_enabled = 1

--- a/docs/software/rak-wizblock.md
+++ b/docs/software/rak-wizblock.md
@@ -0,0 +1,67 @@
+# RAK Wireless RisBlock / RAK 4631 / RAK 4630
+
+This is early documentation on how to install/run Meshtastic on the (very slick!) RAK 4631/4630 boards.
+
+## How to install our binary releases
+
+### Installing over USB
+
+You can install our release binaries by "drag-and-drop" onto a special simulated "USB disk" that appears on your computer while the device is in the bootloader.  To install:
+
+1. Enter the bootloader by removing all power (including the battery), then connect the device to USB.  For the first 30ish seconds after connection the device will wait in the bootloader (before starting any application that might be loaded)
+2. From our relase zip file, drag and drop "firmware-rak4631-xxx.uf2" onto the bootloader "USB drive".  The drive will be named "FTH...BOOT"
+3. That's it.  The device should reboot and start running meshtastic.
+
+You'll know meshtastic is running because the GREEN LED will flash briefly twice a second.  You can now connect to meshtastic via the USB port from the python app or bluetooth to any of the other applications.
+
+### Installing over Bluetooth
+
+It is also possible to install/upgrade these boards using bluetooth (using either Android/iOS or Linux).  A future version of this document will describe how to do that.
+
+## TODO
+
+Some work items still remain...
+
+* Turn off external 3V3 supply when not using GPS to save power!
+> 3V3_S is another 3.3 V power supply, it can be controlled by the MCU in order to disconnect the power sensors during idle periods to save power. 3V3_S is controlled by IO2 pin on the WisBlock Core board.
+Set IO2=1, 3V3_S is on.
+Set IO2=0, 3V3_S is off.
+
+* Fix android bug with detecting nrf52 BLE devices
+* Make this doc into a nice HOWTO: what to order, how to connect (which device in which slots), how to install software
+* Setup battery voltage sensing, Vbatt seems direct connected to AIN0 on RAK4631 carrier which is apparently  P0.5/AIN3 on the RAK4630 module, per this schematic.  https://docs.rakwireless.com/Product-Categories/WisBlock/RAK4631/Datasheet/#description But no voltage divider to be found, so ask them.
+* Set bluetooth PIN support
+* Confirm low power draw
+* Confirm that OLED works
+* add purchash links
+* send in PR to https://github.com/geeksville/WisBlock for boards define
+
+## Docs
+
+Quickstart
+https://docs.rakwireless.com/Product-Categories/WisBlock/Quickstart/#wisblock-base-2
+
+FIXME - list required, recommended and optional components
+
+GPS module:
+Must be installed in "Slot A"
+https://docs.rakwireless.com/Product-Categories/WisBlock/RAK1910/Overview/#product-description
+
+ST LPS22HB 
+baro & temp sensor, i2c address 0x5c
+https://docs.rakwireless.com/Product-Categories/WisBlock/RAK1902/Overview/#product-description
+https://www.st.com/en/mems-and-sensors/lps22hb.html
+https://www.st.com/resource/en/datasheet/lps22hb.pdf
+
+OLED
+https://docs.rakwireless.com/Product-Categories/WisBlock/RAK1921/Overview/#product-features
+Must be installed on the front for the I2C wires to lineup
+
+Solar enclosure
+https://docs.rakwireless.com/Product-Categories/Accessories/RAKBox-B2/Overview/#product-description
+
+Base datasheet (for GPIO mapping)
+https://docs.rakwireless.com/Product-Categories/WisBlock/RAK5005-O/Datasheet/#specifications
+
+CPU module carrier (rak4631)
+https://docs.rakwireless.com/Product-Categories/WisBlock/RAK4631/Datasheet/#specifications
--- a/docs/software/remote-hardware-service.md
+++ b/docs/software/remote-hardware-service.md
@@ -1,23 +1,60 @@
 # Remote Hardware Service

-FIXME - the following are a collection of notes moved from elsewhere.  We need to refactor these notes into actual documentation on the remote-hardware/gpio service.
+These are 'programmer focused' notes on using the "remote hardware" feature.  

-### 1.7.2. New 'no-code-IOT' mini-app
+Note: This feature uses a preinstalled plugin in the device code and associated commandline flags/classes in the python code.  You'll need to be running at least version 1.2.23 (or later) of the python and device code to use this feature.

-Add a new 'remote GPIO/serial port/SPI/I2C access' mini-app. This new standard app would use the MQTT messaging layer to let users (developers that don't need to write device code) do basic (potentially dangerous) operations remotely.
+You can get the latest python tool/library with "pip3 install --upgrade meshtastic" on Windows/Linux/OS-X.

-#### 1.7.2.1. Supported operations in the initial release
-
-Initially supported features for no-code-IOT.
+## Supported operations in the initial release

 - Set any GPIO
 - Read any GPIO
+- Receive notification of changes in any GPIO.

-#### 1.7.2.2. Supported operations eventually
+## Setup

-General ideas for no-code IOT.
+GPIO access is fundamentally 'dangerous' because invalid options can physically burn-up hardware.  To prevent access from untrusted users you must first make a "gpio" channel that is used for authenticated access to this feature.  You'll need to install this channel on both the local and remote node.

- Subscribe for notification of GPIO input status change (i.e. when pin goes low, send my app a message)
- Write/read N bytes over I2C/SPI bus Y (as one atomic I2C/SPI transaction)
- Send N bytes out serial port Z
- Subscribe for notification for when regex X matches the bytes that were received on serial port Z
+The procedure using the python command line tool is:
+
+1. Connect local device via USB
+2. "meshtastic --ch-add admin; meshtastic --info" thn copy the (long) "Complete URL" that info printed
+3. Connect remote device via USB (or use the remote admin feature to reach it through the mesh, but that's beyond the scope of this tutorial)
+4. "meshtastic --seturl theurlyoucopiedinstep2"
+
+Now both devices can talk over the "gpio" channel.
+
+## Doing GPIO operations
+
+Here's some examples using the command line tool.  
+
+## Using GPIOs from python
+
+You can programmatically do operations from your own python code by using the meshtastic "RemoteHardwareClient" class - see the python documentation for more details.
+
+Writing a GPIO
+```
+meshtastic  --port /dev/ttyUSB0 --gpio-wrb 4 1 --dest \!28979058 
+Connected to radio
+Writing GPIO mask 0x10 with value 0x10 to !28979058
+```
+
+Reading a GPIO
+```
+meshtastic --port /dev/ttyUSB0 --gpio-rd 0x10 --dest \!28979058 
+Connected to radio
+Reading GPIO mask 0x10 from !28979058
+GPIO read response gpio_value=16
+```
+
+Watching for GPIO changes:
+```
+meshtastic --port /dev/ttyUSB0 --gpio-watch 0x10 --dest \!28979058 
+Connected to radio
+Watching GPIO mask 0x10 from !28979058
+Received RemoteHardware typ=GPIOS_CHANGED, gpio_value=16
+Received RemoteHardware typ=GPIOS_CHANGED, gpio_value=0
+Received RemoteHardware typ=GPIOS_CHANGED, gpio_value=16
+< press ctrl-c to exit >
+```
--- a/lib/nanopb/include/pb.h
+++ b/lib/nanopb/include/pb.h
@@ -11,7 +11,7 @@
 *****************************************************************/

 /* Enable support for dynamically allocated fields */
-/* #define PB_ENABLE_MALLOC 1 */
+#define PB_ENABLE_MALLOC 1

 /* Define this if your CPU / compiler combination does not support
 * unaligned memory access to packed structures. */
@@ -52,10 +52,9 @@
 * Feel free to look around and use the defined macros, though.   *
 ******************************************************************/

-
 /* Version of the nanopb library. Just in case you want to check it in
 * your own program. */
-#define NANOPB_VERSION nanopb-0.4.4
+#define NANOPB_VERSION nanopb - 0.4.4

 /* Include all the system headers needed by nanopb. You will need the
 * definitions of the following:
@@ -71,11 +70,11 @@
 #ifdef PB_SYSTEM_HEADER
 #include PB_SYSTEM_HEADER
 #else
-#include <stdint.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include <string.h>
 #include <limits.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>

 #ifdef PB_ENABLE_MALLOC
 #include <stdlib.h>
@@ -90,30 +89,30 @@ extern "C" {
 * This just reduces memory requirements, but is not required.
 */
 #if defined(PB_NO_PACKED_STRUCTS)
-    /* Disable struct packing */
-#   define PB_PACKED_STRUCT_START
-#   define PB_PACKED_STRUCT_END
-#   define pb_packed
+/* Disable struct packing */
+#define PB_PACKED_STRUCT_START
+#define PB_PACKED_STRUCT_END
+#define pb_packed
 #elif defined(__GNUC__) || defined(__clang__)
-    /* For GCC and clang */
-#   define PB_PACKED_STRUCT_START
-#   define PB_PACKED_STRUCT_END
-#   define pb_packed __attribute__((packed))
+/* For GCC and clang */
+#define PB_PACKED_STRUCT_START
+#define PB_PACKED_STRUCT_END
+#define pb_packed __attribute__((packed))
 #elif defined(__ICCARM__) || defined(__CC_ARM)
-    /* For IAR ARM and Keil MDK-ARM compilers */
-#   define PB_PACKED_STRUCT_START _Pragma("pack(push, 1)")
-#   define PB_PACKED_STRUCT_END _Pragma("pack(pop)")
-#   define pb_packed
+/* For IAR ARM and Keil MDK-ARM compilers */
+#define PB_PACKED_STRUCT_START _Pragma("pack(push, 1)")
+#define PB_PACKED_STRUCT_END _Pragma("pack(pop)")
+#define pb_packed
 #elif defined(_MSC_VER) && (_MSC_VER >= 1500)
-    /* For Microsoft Visual C++ */
-#   define PB_PACKED_STRUCT_START __pragma(pack(push, 1))
-#   define PB_PACKED_STRUCT_END __pragma(pack(pop))
-#   define pb_packed
+/* For Microsoft Visual C++ */
+#define PB_PACKED_STRUCT_START __pragma(pack(push, 1))
+#define PB_PACKED_STRUCT_END __pragma(pack(pop))
+#define pb_packed
 #else
-    /* Unknown compiler */
-#   define PB_PACKED_STRUCT_START
-#   define PB_PACKED_STRUCT_END
-#   define pb_packed
+/* Unknown compiler */
+#define PB_PACKED_STRUCT_START
+#define PB_PACKED_STRUCT_END
+#define pb_packed
 #endif

 /* Handly macro for suppressing unreferenced-parameter compiler warnings. */
@@ -126,11 +125,11 @@ extern "C" {
 #ifndef PB_PROGMEM
 #ifdef __AVR__
 #include <avr/pgmspace.h>
-#define PB_PROGMEM             PROGMEM
-#define PB_PROGMEM_READU32(x)  pgm_read_dword(&x)
+#define PB_PROGMEM PROGMEM
+#define PB_PROGMEM_READU32(x) pgm_read_dword(&x)
 #else
 #define PB_PROGMEM
-#define PB_PROGMEM_READU32(x)  (x)
+#define PB_PROGMEM_READU32(x) (x)
 #endif
 #endif

@@ -144,20 +143,20 @@ extern "C" {
 * in the place where the PB_STATIC_ASSERT macro was called.
 */
 #ifndef PB_NO_STATIC_ASSERT
-#  ifndef PB_STATIC_ASSERT
-#    if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-       /* C11 standard _Static_assert mechanism */
-#      define PB_STATIC_ASSERT(COND,MSG) _Static_assert(COND,#MSG);
-#    else
-       /* Classic negative-size-array static assert mechanism */
-#      define PB_STATIC_ASSERT(COND,MSG) typedef char PB_STATIC_ASSERT_MSG(MSG, __LINE__, __COUNTER__)[(COND)?1:-1];
-#      define PB_STATIC_ASSERT_MSG(MSG, LINE, COUNTER) PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER)
-#      define PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) pb_static_assertion_##MSG##_##LINE##_##COUNTER
-#    endif
-#  endif
+#ifndef PB_STATIC_ASSERT
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+/* C11 standard _Static_assert mechanism */
+#define PB_STATIC_ASSERT(COND, MSG) _Static_assert(COND, #MSG);
 #else
-   /* Static asserts disabled by PB_NO_STATIC_ASSERT */
-#  define PB_STATIC_ASSERT(COND,MSG)
+/* Classic negative-size-array static assert mechanism */
+#define PB_STATIC_ASSERT(COND, MSG) typedef char PB_STATIC_ASSERT_MSG(MSG, __LINE__, __COUNTER__)[(COND) ? 1 : -1];
+#define PB_STATIC_ASSERT_MSG(MSG, LINE, COUNTER) PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER)
+#define PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) pb_static_assertion_##MSG##_##LINE##_##COUNTER
+#endif
+#endif
+#else
+/* Static asserts disabled by PB_NO_STATIC_ASSERT */
+#define PB_STATIC_ASSERT(COND, MSG)
 #endif

 /* Number of required fields to keep track of. */
@@ -186,8 +185,8 @@ typedef uint_least8_t pb_type_t;
 /**** Field data types ****/

 /* Numeric types */
-#define PB_LTYPE_BOOL    0x00U /* bool */
-#define PB_LTYPE_VARINT  0x01U /* int32, int64, enum, bool */
+#define PB_LTYPE_BOOL 0x00U    /* bool */
+#define PB_LTYPE_VARINT 0x01U  /* int32, int64, enum, bool */
 #define PB_LTYPE_UVARINT 0x02U /* uint32, uint64 */
 #define PB_LTYPE_SVARINT 0x03U /* sint32, sint64 */
 #define PB_LTYPE_FIXED32 0x04U /* fixed32, sfixed32, float */
@@ -234,31 +233,30 @@ typedef uint_least8_t pb_type_t;
 #define PB_HTYPE_SINGULAR 0x10U
 #define PB_HTYPE_REPEATED 0x20U
 #define PB_HTYPE_FIXARRAY 0x20U
-#define PB_HTYPE_ONEOF    0x30U
-#define PB_HTYPE_MASK     0x30U
+#define PB_HTYPE_ONEOF 0x30U
+#define PB_HTYPE_MASK 0x30U

 /**** Field allocation types ****/
- 
-#define PB_ATYPE_STATIC   0x00U
-#define PB_ATYPE_POINTER  0x80U
-#define PB_ATYPE_CALLBACK 0x40U
-#define PB_ATYPE_MASK     0xC0U

-#define PB_ATYPE(x) ((x) & PB_ATYPE_MASK)
-#define PB_HTYPE(x) ((x) & PB_HTYPE_MASK)
-#define PB_LTYPE(x) ((x) & PB_LTYPE_MASK)
-#define PB_LTYPE_IS_SUBMSG(x) (PB_LTYPE(x) == PB_LTYPE_SUBMESSAGE || \
-                               PB_LTYPE(x) == PB_LTYPE_SUBMSG_W_CB)
+#define PB_ATYPE_STATIC 0x00U
+#define PB_ATYPE_POINTER 0x80U
+#define PB_ATYPE_CALLBACK 0x40U
+#define PB_ATYPE_MASK 0xC0U
+
+#define PB_ATYPE(x) ((x)&PB_ATYPE_MASK)
+#define PB_HTYPE(x) ((x)&PB_HTYPE_MASK)
+#define PB_LTYPE(x) ((x)&PB_LTYPE_MASK)
+#define PB_LTYPE_IS_SUBMSG(x) (PB_LTYPE(x) == PB_LTYPE_SUBMESSAGE || PB_LTYPE(x) == PB_LTYPE_SUBMSG_W_CB)

 /* Data type used for storing sizes of struct fields
 * and array counts.
 */
 #if defined(PB_FIELD_32BIT)
-    typedef uint32_t pb_size_t;
-    typedef int32_t pb_ssize_t;
+typedef uint32_t pb_size_t;
+typedef int32_t pb_ssize_t;
 #else
-    typedef uint_least16_t pb_size_t;
-    typedef int_least16_t pb_ssize_t;
+typedef uint_least16_t pb_size_t;
+typedef int_least16_t pb_ssize_t;
 #endif
 #define PB_SIZE_MAX ((pb_size_t)-1)

@@ -279,7 +277,7 @@ typedef struct pb_field_iter_s pb_field_iter_t;
 typedef struct pb_msgdesc_s pb_msgdesc_t;
 struct pb_msgdesc_s {
    const uint32_t *field_info;
-    const pb_msgdesc_t * const * submsg_info;
+    const pb_msgdesc_t *const *submsg_info;
    const pb_byte_t *default_value;

    bool (*field_callback)(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_iter_t *field);
@@ -291,22 +289,22 @@ struct pb_msgdesc_s {

 /* Iterator for message descriptor */
 struct pb_field_iter_s {
-    const pb_msgdesc_t *descriptor;  /* Pointer to message descriptor constant */
-    void *message;                   /* Pointer to start of the structure */
+    const pb_msgdesc_t *descriptor; /* Pointer to message descriptor constant */
+    void *message;                  /* Pointer to start of the structure */

-    pb_size_t index;                 /* Index of the field */
-    pb_size_t field_info_index;      /* Index to descriptor->field_info array */
-    pb_size_t required_field_index;  /* Index that counts only the required fields */
-    pb_size_t submessage_index;      /* Index that counts only submessages */
+    pb_size_t index;                /* Index of the field */
+    pb_size_t field_info_index;     /* Index to descriptor->field_info array */
+    pb_size_t required_field_index; /* Index that counts only the required fields */
+    pb_size_t submessage_index;     /* Index that counts only submessages */

-    pb_size_t tag;                   /* Tag of current field */
-    pb_size_t data_size;             /* sizeof() of a single item */
-    pb_size_t array_size;            /* Number of array entries */
-    pb_type_t type;                  /* Type of current field */
+    pb_size_t tag;        /* Tag of current field */
+    pb_size_t data_size;  /* sizeof() of a single item */
+    pb_size_t array_size; /* Number of array entries */
+    pb_type_t type;       /* Type of current field */

-    void *pField;                    /* Pointer to current field in struct */
-    void *pData;                     /* Pointer to current data contents. Different than pField for arrays and pointers. */
-    void *pSize;                     /* Pointer to count/has field */
+    void *pField; /* Pointer to current field in struct */
+    void *pData;  /* Pointer to current data contents. Different than pField for arrays and pointers. */
+    void *pSize;  /* Pointer to count/has field */

    const pb_msgdesc_t *submsg_desc; /* For submessage fields, pointer to field descriptor for the submessage. */
 };
@@ -329,7 +327,11 @@ PB_STATIC_ASSERT(sizeof(uint64_t) == 2 * sizeof(uint32_t), UINT64_T_WRONG_SIZE)
 * It has the number of bytes in the beginning, and after that an array.
 * Note that actual structs used will have a different length of bytes array.
 */
-#define PB_BYTES_ARRAY_T(n) struct { pb_size_t size; pb_byte_t bytes[n]; }
+#define PB_BYTES_ARRAY_T(n)                                                                                                      \
+    struct {                                                                                                                     \
+        pb_size_t size;                                                                                                          \
+        pb_byte_t bytes[n];                                                                                                      \
+    }
 #define PB_BYTES_ARRAY_T_ALLOCSIZE(n) ((size_t)n + offsetof(pb_bytes_array_t, bytes))

 struct pb_bytes_array_s {
@@ -363,9 +365,9 @@ struct pb_callback_s {
     */
    union {
        bool (*decode)(pb_istream_t *stream, const pb_field_t *field, void **arg);
-        bool (*encode)(pb_ostream_t *stream, const pb_field_t *field, void * const *arg);
+        bool (*encode)(pb_ostream_t *stream, const pb_field_t *field, void *const *arg);
    } funcs;
-    
+
    /* Free arg for use by callback */
    void *arg;
 };
@@ -373,12 +375,7 @@ struct pb_callback_s {
 extern bool pb_default_field_callback(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_t *field);

 /* Wire types. Library user needs these only in encoder callbacks. */
-typedef enum {
-    PB_WT_VARINT = 0,
-    PB_WT_64BIT  = 1,
-    PB_WT_STRING = 2,
-    PB_WT_32BIT  = 5
-} pb_wire_type_t;
+typedef enum { PB_WT_VARINT = 0, PB_WT_64BIT = 1, PB_WT_STRING = 2, PB_WT_32BIT = 5 } pb_wire_type_t;

 /* Structure for defining the handling of unknown/extension fields.
 * Usually the pb_extension_type_t structure is automatically generated,
@@ -395,9 +392,8 @@ struct pb_extension_type_s {
     * If you run into an error, return false.
     * Set to NULL for default handler.
     */
-    bool (*decode)(pb_istream_t *stream, pb_extension_t *extension,
-                   uint32_t tag, pb_wire_type_t wire_type);
-    
+    bool (*decode)(pb_istream_t *stream, pb_extension_t *extension, uint32_t tag, pb_wire_type_t wire_type);
+
    /* Called once after all regular fields have been encoded.
     * If you have something to write, do so and return true.
     * If you do not have anything to write, just return true.
@@ -405,7 +401,7 @@ struct pb_extension_type_s {
     * Set to NULL for default handler.
     */
    bool (*encode)(pb_ostream_t *stream, const pb_extension_t *extension);
-    
+
    /* Free field for use by the callback. */
    const void *arg;
 };
@@ -414,11 +410,11 @@ struct pb_extension_s {
    /* Type describing the extension field. Usually you'll initialize
     * this to a pointer to the automatically generated structure. */
    const pb_extension_type_t *type;
-    
+
    /* Destination for the decoded data. This must match the datatype
     * of the extension field. */
    void *dest;
-    
+
    /* Pointer to the next extension handler, or NULL.
     * If this extension does not match a field, the next handler is
     * automatically called. */
@@ -429,17 +425,20 @@ struct pb_extension_s {
    bool found;
 };

-#define pb_extension_init_zero {NULL,NULL,NULL,false}
+#define pb_extension_init_zero                                                                                                   \
+    {                                                                                                                            \
+        NULL, NULL, NULL, false                                                                                                  \
+    }

 /* Memory allocation functions to use. You can define pb_realloc and
 * pb_free to custom functions if you want. */
 #ifdef PB_ENABLE_MALLOC
-#   ifndef pb_realloc
-#       define pb_realloc(ptr, size) realloc(ptr, size)
-#   endif
-#   ifndef pb_free
-#       define pb_free(ptr) free(ptr)
-#   endif
+#ifndef pb_realloc
+#define pb_realloc(ptr, size) realloc(ptr, size)
+#endif
+#ifndef pb_free
+#define pb_free(ptr) free(ptr)
+#endif
 #endif

 /* This is used to inform about need to regenerate .pb.h/.pb.c files. */
@@ -447,7 +446,7 @@ struct pb_extension_s {

 /* These macros are used to declare pb_field_t's in the constant array. */
 /* Size of a structure member, in bytes. */
-#define pb_membersize(st, m) (sizeof ((st*)0)->m)
+#define pb_membersize(st, m) (sizeof((st *)0)->m)
 /* Number of entries in an array. */
 #define pb_arraysize(st, m) (pb_membersize(st, m) / pb_membersize(st, m[0]))
 /* Delta from start of one member to the start of another member. */
@@ -457,126 +456,115 @@ struct pb_extension_s {
 #define PB_EXPAND(x) x

 /* Binding of a message field set into a specific structure */
-#define PB_BIND(msgname, structname, width) \
-    const uint32_t structname ## _field_info[] PB_PROGMEM = \
-    { \
-        msgname ## _FIELDLIST(PB_GEN_FIELD_INFO_ ## width, structname) \
-        0 \
-    }; \
-    const pb_msgdesc_t* const structname ## _submsg_info[] = \
-    { \
-        msgname ## _FIELDLIST(PB_GEN_SUBMSG_INFO, structname) \
-        NULL \
-    }; \
-    const pb_msgdesc_t structname ## _msg = \
-    { \
-       structname ## _field_info, \
-       structname ## _submsg_info, \
-       msgname ## _DEFAULT, \
-       msgname ## _CALLBACK, \
-       0 msgname ## _FIELDLIST(PB_GEN_FIELD_COUNT, structname), \
-       0 msgname ## _FIELDLIST(PB_GEN_REQ_FIELD_COUNT, structname), \
-       0 msgname ## _FIELDLIST(PB_GEN_LARGEST_TAG, structname), \
-    }; \
-    msgname ## _FIELDLIST(PB_GEN_FIELD_INFO_ASSERT_ ## width, structname)
+#define PB_BIND(msgname, structname, width)                                                                                      \
+    const uint32_t structname##_field_info[] PB_PROGMEM = {msgname##_FIELDLIST(PB_GEN_FIELD_INFO_##width, structname) 0};        \
+    const pb_msgdesc_t *const structname##_submsg_info[] = {msgname##_FIELDLIST(PB_GEN_SUBMSG_INFO, structname) NULL};           \
+    const pb_msgdesc_t structname##_msg = {                                                                                      \
+        structname##_field_info,                                                                                                 \
+        structname##_submsg_info,                                                                                                \
+        msgname##_DEFAULT,                                                                                                       \
+        msgname##_CALLBACK,                                                                                                      \
+        0 msgname##_FIELDLIST(PB_GEN_FIELD_COUNT, structname),                                                                   \
+        0 msgname##_FIELDLIST(PB_GEN_REQ_FIELD_COUNT, structname),                                                               \
+        0 msgname##_FIELDLIST(PB_GEN_LARGEST_TAG, structname),                                                                   \
+    };                                                                                                                           \
+    msgname##_FIELDLIST(PB_GEN_FIELD_INFO_ASSERT_##width, structname)

 #define PB_GEN_FIELD_COUNT(structname, atype, htype, ltype, fieldname, tag) +1
-#define PB_GEN_REQ_FIELD_COUNT(structname, atype, htype, ltype, fieldname, tag) \
-    + (PB_HTYPE_ ## htype == PB_HTYPE_REQUIRED)
-#define PB_GEN_LARGEST_TAG(structname, atype, htype, ltype, fieldname, tag) \
-    * 0 + tag
+#define PB_GEN_REQ_FIELD_COUNT(structname, atype, htype, ltype, fieldname, tag) +(PB_HTYPE_##htype == PB_HTYPE_REQUIRED)
+#define PB_GEN_LARGEST_TAG(structname, atype, htype, ltype, fieldname, tag) *0 + tag

 /* X-macro for generating the entries in struct_field_info[] array. */
-#define PB_GEN_FIELD_INFO_1(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_1(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_1(structname, atype, htype, ltype, fieldname, tag)                                                     \
+    PB_FIELDINFO_1(tag, PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                              \
+                   PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                             \
+                   PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                               \
+                   PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                             \
+                   PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_GEN_FIELD_INFO_2(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_2(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_2(structname, atype, htype, ltype, fieldname, tag)                                                     \
+    PB_FIELDINFO_2(tag, PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                              \
+                   PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                             \
+                   PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                               \
+                   PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                             \
+                   PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_GEN_FIELD_INFO_4(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_4(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_4(structname, atype, htype, ltype, fieldname, tag)                                                     \
+    PB_FIELDINFO_4(tag, PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                              \
+                   PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                             \
+                   PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                               \
+                   PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                             \
+                   PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_GEN_FIELD_INFO_8(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_8(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_8(structname, atype, htype, ltype, fieldname, tag)                                                     \
+    PB_FIELDINFO_8(tag, PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                              \
+                   PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                             \
+                   PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                               \
+                   PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                             \
+                   PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_GEN_FIELD_INFO_AUTO(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_AUTO2(PB_FIELDINFO_WIDTH_AUTO(_PB_ATYPE_ ## atype, _PB_HTYPE_ ## htype, _PB_LTYPE_ ## ltype), \
-                   tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_AUTO(structname, atype, htype, ltype, fieldname, tag)                                                  \
+    PB_FIELDINFO_AUTO2(PB_FIELDINFO_WIDTH_AUTO(_PB_ATYPE_##atype, _PB_HTYPE_##htype, _PB_LTYPE_##ltype), tag,                    \
+                       PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                               \
+                       PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                         \
+                       PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                           \
+                       PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                         \
+                       PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_FIELDINFO_AUTO2(width, tag, type, data_offset, data_size, size_offset, array_size) \
+#define PB_FIELDINFO_AUTO2(width, tag, type, data_offset, data_size, size_offset, array_size)                                    \
    PB_FIELDINFO_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size)

-#define PB_FIELDINFO_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size) \
-    PB_FIELDINFO_ ## width(tag, type, data_offset, data_size, size_offset, array_size)
+#define PB_FIELDINFO_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size)                                    \
+    PB_FIELDINFO_##width(tag, type, data_offset, data_size, size_offset, array_size)

 /* X-macro for generating asserts that entries fit in struct_field_info[] array.
 * The structure of macros here must match the structure above in PB_GEN_FIELD_INFO_x(),
 * but it is not easily reused because of how macro substitutions work. */
-#define PB_GEN_FIELD_INFO_ASSERT_1(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_ASSERT_1(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_ASSERT_1(structname, atype, htype, ltype, fieldname, tag)                                              \
+    PB_FIELDINFO_ASSERT_1(tag, PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                       \
+                          PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                      \
+                          PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                        \
+                          PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                      \
+                          PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_GEN_FIELD_INFO_ASSERT_2(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_ASSERT_2(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_ASSERT_2(structname, atype, htype, ltype, fieldname, tag)                                              \
+    PB_FIELDINFO_ASSERT_2(tag, PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                       \
+                          PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                      \
+                          PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                        \
+                          PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                      \
+                          PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_GEN_FIELD_INFO_ASSERT_4(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_ASSERT_4(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_ASSERT_4(structname, atype, htype, ltype, fieldname, tag)                                              \
+    PB_FIELDINFO_ASSERT_4(tag, PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                       \
+                          PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                      \
+                          PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                        \
+                          PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                      \
+                          PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_GEN_FIELD_INFO_ASSERT_8(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_ASSERT_8(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_ASSERT_8(structname, atype, htype, ltype, fieldname, tag)                                              \
+    PB_FIELDINFO_ASSERT_8(tag, PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                       \
+                          PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                      \
+                          PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                        \
+                          PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                      \
+                          PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_GEN_FIELD_INFO_ASSERT_AUTO(structname, atype, htype, ltype, fieldname, tag) \
-    PB_FIELDINFO_ASSERT_AUTO2(PB_FIELDINFO_WIDTH_AUTO(_PB_ATYPE_ ## atype, _PB_HTYPE_ ## htype, _PB_LTYPE_ ## ltype), \
-                   tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
-                   PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
-                   PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
+#define PB_GEN_FIELD_INFO_ASSERT_AUTO(structname, atype, htype, ltype, fieldname, tag)                                           \
+    PB_FIELDINFO_ASSERT_AUTO2(PB_FIELDINFO_WIDTH_AUTO(_PB_ATYPE_##atype, _PB_HTYPE_##htype, _PB_LTYPE_##ltype), tag,             \
+                              PB_ATYPE_##atype | PB_HTYPE_##htype | PB_LTYPE_MAP_##ltype,                                        \
+                              PB_DATA_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                  \
+                              PB_DATA_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname),                                    \
+                              PB_SIZE_OFFSET_##atype(_PB_HTYPE_##htype, structname, fieldname),                                  \
+                              PB_ARRAY_SIZE_##atype(_PB_HTYPE_##htype, structname, fieldname))

-#define PB_FIELDINFO_ASSERT_AUTO2(width, tag, type, data_offset, data_size, size_offset, array_size) \
+#define PB_FIELDINFO_ASSERT_AUTO2(width, tag, type, data_offset, data_size, size_offset, array_size)                             \
    PB_FIELDINFO_ASSERT_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size)

-#define PB_FIELDINFO_ASSERT_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size) \
-    PB_FIELDINFO_ASSERT_ ## width(tag, type, data_offset, data_size, size_offset, array_size)
+#define PB_FIELDINFO_ASSERT_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size)                             \
+    PB_FIELDINFO_ASSERT_##width(tag, type, data_offset, data_size, size_offset, array_size)

-#define PB_DATA_OFFSET_STATIC(htype, structname, fieldname) PB_DO ## htype(structname, fieldname)
-#define PB_DATA_OFFSET_POINTER(htype, structname, fieldname) PB_DO ## htype(structname, fieldname)
-#define PB_DATA_OFFSET_CALLBACK(htype, structname, fieldname) PB_DO ## htype(structname, fieldname)
+#define PB_DATA_OFFSET_STATIC(htype, structname, fieldname) PB_DO##htype(structname, fieldname)
+#define PB_DATA_OFFSET_POINTER(htype, structname, fieldname) PB_DO##htype(structname, fieldname)
+#define PB_DATA_OFFSET_CALLBACK(htype, structname, fieldname) PB_DO##htype(structname, fieldname)
 #define PB_DO_PB_HTYPE_REQUIRED(structname, fieldname) offsetof(structname, fieldname)
 #define PB_DO_PB_HTYPE_SINGULAR(structname, fieldname) offsetof(structname, fieldname)
 #define PB_DO_PB_HTYPE_ONEOF(structname, fieldname) offsetof(structname, PB_ONEOF_NAME(FULL, fieldname))
@@ -584,16 +572,17 @@ struct pb_extension_s {
 #define PB_DO_PB_HTYPE_REPEATED(structname, fieldname) offsetof(structname, fieldname)
 #define PB_DO_PB_HTYPE_FIXARRAY(structname, fieldname) offsetof(structname, fieldname)

-#define PB_SIZE_OFFSET_STATIC(htype, structname, fieldname) PB_SO ## htype(structname, fieldname)
-#define PB_SIZE_OFFSET_POINTER(htype, structname, fieldname) PB_SO_PTR ## htype(structname, fieldname)
-#define PB_SIZE_OFFSET_CALLBACK(htype, structname, fieldname) PB_SO_CB ## htype(structname, fieldname)
+#define PB_SIZE_OFFSET_STATIC(htype, structname, fieldname) PB_SO##htype(structname, fieldname)
+#define PB_SIZE_OFFSET_POINTER(htype, structname, fieldname) PB_SO_PTR##htype(structname, fieldname)
+#define PB_SIZE_OFFSET_CALLBACK(htype, structname, fieldname) PB_SO_CB##htype(structname, fieldname)
 #define PB_SO_PB_HTYPE_REQUIRED(structname, fieldname) 0
 #define PB_SO_PB_HTYPE_SINGULAR(structname, fieldname) 0
-#define PB_SO_PB_HTYPE_ONEOF(structname, fieldname) PB_SO_PB_HTYPE_ONEOF2(structname, PB_ONEOF_NAME(FULL, fieldname), PB_ONEOF_NAME(UNION, fieldname))
+#define PB_SO_PB_HTYPE_ONEOF(structname, fieldname)                                                                              \
+    PB_SO_PB_HTYPE_ONEOF2(structname, PB_ONEOF_NAME(FULL, fieldname), PB_ONEOF_NAME(UNION, fieldname))
 #define PB_SO_PB_HTYPE_ONEOF2(structname, fullname, unionname) PB_SO_PB_HTYPE_ONEOF3(structname, fullname, unionname)
-#define PB_SO_PB_HTYPE_ONEOF3(structname, fullname, unionname) pb_delta(structname, fullname, which_ ## unionname)
-#define PB_SO_PB_HTYPE_OPTIONAL(structname, fieldname) pb_delta(structname, fieldname, has_ ## fieldname)
-#define PB_SO_PB_HTYPE_REPEATED(structname, fieldname) pb_delta(structname, fieldname, fieldname ## _count)
+#define PB_SO_PB_HTYPE_ONEOF3(structname, fullname, unionname) pb_delta(structname, fullname, which_##unionname)
+#define PB_SO_PB_HTYPE_OPTIONAL(structname, fieldname) pb_delta(structname, fieldname, has_##fieldname)
+#define PB_SO_PB_HTYPE_REPEATED(structname, fieldname) pb_delta(structname, fieldname, fieldname##_count)
 #define PB_SO_PB_HTYPE_FIXARRAY(structname, fieldname) 0
 #define PB_SO_PTR_PB_HTYPE_REQUIRED(structname, fieldname) 0
 #define PB_SO_PTR_PB_HTYPE_SINGULAR(structname, fieldname) 0
@@ -608,8 +597,8 @@ struct pb_extension_s {
 #define PB_SO_CB_PB_HTYPE_REPEATED(structname, fieldname) 0
 #define PB_SO_CB_PB_HTYPE_FIXARRAY(structname, fieldname) 0

-#define PB_ARRAY_SIZE_STATIC(htype, structname, fieldname) PB_AS ## htype(structname, fieldname)
-#define PB_ARRAY_SIZE_POINTER(htype, structname, fieldname) PB_AS_PTR ## htype(structname, fieldname)
+#define PB_ARRAY_SIZE_STATIC(htype, structname, fieldname) PB_AS##htype(structname, fieldname)
+#define PB_ARRAY_SIZE_POINTER(htype, structname, fieldname) PB_AS_PTR##htype(structname, fieldname)
 #define PB_ARRAY_SIZE_CALLBACK(htype, structname, fieldname) 1
 #define PB_AS_PB_HTYPE_REQUIRED(structname, fieldname) 1
 #define PB_AS_PB_HTYPE_SINGULAR(structname, fieldname) 1
@@ -624,9 +613,9 @@ struct pb_extension_s {
 #define PB_AS_PTR_PB_HTYPE_REPEATED(structname, fieldname) 1
 #define PB_AS_PTR_PB_HTYPE_FIXARRAY(structname, fieldname) pb_arraysize(structname, fieldname[0])

-#define PB_DATA_SIZE_STATIC(htype, structname, fieldname) PB_DS ## htype(structname, fieldname)
-#define PB_DATA_SIZE_POINTER(htype, structname, fieldname) PB_DS_PTR ## htype(structname, fieldname)
-#define PB_DATA_SIZE_CALLBACK(htype, structname, fieldname) PB_DS_CB ## htype(structname, fieldname)
+#define PB_DATA_SIZE_STATIC(htype, structname, fieldname) PB_DS##htype(structname, fieldname)
+#define PB_DATA_SIZE_POINTER(htype, structname, fieldname) PB_DS_PTR##htype(structname, fieldname)
+#define PB_DATA_SIZE_CALLBACK(htype, structname, fieldname) PB_DS_CB##htype(structname, fieldname)
 #define PB_DS_PB_HTYPE_REQUIRED(structname, fieldname) pb_membersize(structname, fieldname)
 #define PB_DS_PB_HTYPE_SINGULAR(structname, fieldname) pb_membersize(structname, fieldname)
 #define PB_DS_PB_HTYPE_OPTIONAL(structname, fieldname) pb_membersize(structname, fieldname)
@@ -646,22 +635,25 @@ struct pb_extension_s {
 #define PB_DS_CB_PB_HTYPE_REPEATED(structname, fieldname) pb_membersize(structname, fieldname)
 #define PB_DS_CB_PB_HTYPE_FIXARRAY(structname, fieldname) pb_membersize(structname, fieldname)

-#define PB_ONEOF_NAME(type, tuple) PB_EXPAND(PB_ONEOF_NAME_ ## type tuple)
-#define PB_ONEOF_NAME_UNION(unionname,membername,fullname) unionname
-#define PB_ONEOF_NAME_MEMBER(unionname,membername,fullname) membername
-#define PB_ONEOF_NAME_FULL(unionname,membername,fullname) fullname
+#define PB_ONEOF_NAME(type, tuple) PB_EXPAND(PB_ONEOF_NAME_##type tuple)
+#define PB_ONEOF_NAME_UNION(unionname, membername, fullname) unionname
+#define PB_ONEOF_NAME_MEMBER(unionname, membername, fullname) membername
+#define PB_ONEOF_NAME_FULL(unionname, membername, fullname) fullname

-#define PB_GEN_SUBMSG_INFO(structname, atype, htype, ltype, fieldname, tag) \
-    PB_SUBMSG_INFO_ ## htype(_PB_LTYPE_ ## ltype, structname, fieldname)
+#define PB_GEN_SUBMSG_INFO(structname, atype, htype, ltype, fieldname, tag)                                                      \
+    PB_SUBMSG_INFO_##htype(_PB_LTYPE_##ltype, structname, fieldname)

-#define PB_SUBMSG_INFO_REQUIRED(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
-#define PB_SUBMSG_INFO_SINGULAR(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
-#define PB_SUBMSG_INFO_OPTIONAL(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
-#define PB_SUBMSG_INFO_ONEOF(ltype, structname, fieldname) PB_SUBMSG_INFO_ONEOF2(ltype, structname, PB_ONEOF_NAME(UNION, fieldname), PB_ONEOF_NAME(MEMBER, fieldname))
-#define PB_SUBMSG_INFO_ONEOF2(ltype, structname, unionname, membername) PB_SUBMSG_INFO_ONEOF3(ltype, structname, unionname, membername)
-#define PB_SUBMSG_INFO_ONEOF3(ltype, structname, unionname, membername) PB_SI ## ltype(structname ## _ ## unionname ## _ ## membername ## _MSGTYPE)
-#define PB_SUBMSG_INFO_REPEATED(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
-#define PB_SUBMSG_INFO_FIXARRAY(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
+#define PB_SUBMSG_INFO_REQUIRED(ltype, structname, fieldname) PB_SI##ltype(structname##_##fieldname##_MSGTYPE)
+#define PB_SUBMSG_INFO_SINGULAR(ltype, structname, fieldname) PB_SI##ltype(structname##_##fieldname##_MSGTYPE)
+#define PB_SUBMSG_INFO_OPTIONAL(ltype, structname, fieldname) PB_SI##ltype(structname##_##fieldname##_MSGTYPE)
+#define PB_SUBMSG_INFO_ONEOF(ltype, structname, fieldname)                                                                       \
+    PB_SUBMSG_INFO_ONEOF2(ltype, structname, PB_ONEOF_NAME(UNION, fieldname), PB_ONEOF_NAME(MEMBER, fieldname))
+#define PB_SUBMSG_INFO_ONEOF2(ltype, structname, unionname, membername)                                                          \
+    PB_SUBMSG_INFO_ONEOF3(ltype, structname, unionname, membername)
+#define PB_SUBMSG_INFO_ONEOF3(ltype, structname, unionname, membername)                                                          \
+    PB_SI##ltype(structname##_##unionname##_##membername##_MSGTYPE)
+#define PB_SUBMSG_INFO_REPEATED(ltype, structname, fieldname) PB_SI##ltype(structname##_##fieldname##_MSGTYPE)
+#define PB_SUBMSG_INFO_FIXARRAY(ltype, structname, fieldname) PB_SI##ltype(structname##_##fieldname##_MSGTYPE)
 #define PB_SI_PB_LTYPE_BOOL(t)
 #define PB_SI_PB_LTYPE_BYTES(t)
 #define PB_SI_PB_LTYPE_DOUBLE(t)
@@ -672,7 +664,7 @@ struct pb_extension_s {
 #define PB_SI_PB_LTYPE_FLOAT(t)
 #define PB_SI_PB_LTYPE_INT32(t)
 #define PB_SI_PB_LTYPE_INT64(t)
-#define PB_SI_PB_LTYPE_MESSAGE(t)  PB_SUBMSG_DESCRIPTOR(t)
+#define PB_SI_PB_LTYPE_MESSAGE(t) PB_SUBMSG_DESCRIPTOR(t)
 #define PB_SI_PB_LTYPE_MSG_W_CB(t) PB_SUBMSG_DESCRIPTOR(t)
 #define PB_SI_PB_LTYPE_SFIXED32(t)
 #define PB_SI_PB_LTYPE_SFIXED64(t)
@@ -683,7 +675,7 @@ struct pb_extension_s {
 #define PB_SI_PB_LTYPE_UINT64(t)
 #define PB_SI_PB_LTYPE_EXTENSION(t)
 #define PB_SI_PB_LTYPE_FIXED_LENGTH_BYTES(t)
-#define PB_SUBMSG_DESCRIPTOR(t)    &(t ## _msg),
+#define PB_SUBMSG_DESCRIPTOR(t) &(t##_msg),

 /* The field descriptors use a variable width format, with width of either
 * 1, 2, 4 or 8 of 32-bit words. The two lowest bytes of the first byte always
@@ -713,23 +705,23 @@ struct pb_extension_s {
 *          [32-bit reserved]
 */

-#define PB_FIELDINFO_1(tag, type, data_offset, data_size, size_offset, array_size) \
-    (0 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(data_offset) & 0xFF) << 16) | \
-     (((uint32_t)(size_offset) & 0x0F) << 24) | (((uint32_t)(data_size) & 0x0F) << 28)),
+#define PB_FIELDINFO_1(tag, type, data_offset, data_size, size_offset, array_size)                                               \
+    (0 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(data_offset)&0xFF) << 16) |                                        \
+     (((uint32_t)(size_offset)&0x0F) << 24) | (((uint32_t)(data_size)&0x0F) << 28)),

-#define PB_FIELDINFO_2(tag, type, data_offset, data_size, size_offset, array_size) \
-    (1 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(array_size) & 0xFFF) << 16) | (((uint32_t)(size_offset) & 0x0F) << 28)), \
-    (((uint32_t)(data_offset) & 0xFFFF) | (((uint32_t)(data_size) & 0xFFF) << 16) | (((uint32_t)(tag) & 0x3c0) << 22)),
+#define PB_FIELDINFO_2(tag, type, data_offset, data_size, size_offset, array_size)                                               \
+    (1 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(array_size)&0xFFF) << 16) |                                        \
+     (((uint32_t)(size_offset)&0x0F) << 28)),                                                                                    \
+        (((uint32_t)(data_offset)&0xFFFF) | (((uint32_t)(data_size)&0xFFF) << 16) | (((uint32_t)(tag)&0x3c0) << 22)),

-#define PB_FIELDINFO_4(tag, type, data_offset, data_size, size_offset, array_size) \
-    (2 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(array_size) & 0xFFFF) << 16)), \
-    ((uint32_t)(int_least8_t)(size_offset) | (((uint32_t)(tag) << 2) & 0xFFFFFF00)), \
-    (data_offset), (data_size),
+#define PB_FIELDINFO_4(tag, type, data_offset, data_size, size_offset, array_size)                                               \
+    (2 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(array_size)&0xFFFF) << 16)),                                       \
+        ((uint32_t)(int_least8_t)(size_offset) | (((uint32_t)(tag) << 2) & 0xFFFFFF00)), (data_offset), (data_size),

-#define PB_FIELDINFO_8(tag, type, data_offset, data_size, size_offset, array_size) \
-    (3 | (((tag) << 2) & 0xFF) | ((type) << 8)), \
-    ((uint32_t)(int_least8_t)(size_offset) | (((uint32_t)(tag) << 2) & 0xFFFFFF00)), \
-    (data_offset), (data_size), (array_size), 0, 0, 0,
+#define PB_FIELDINFO_8(tag, type, data_offset, data_size, size_offset, array_size)                                               \
+    (3 | (((tag) << 2) & 0xFF) | ((type) << 8)),                                                                                 \
+        ((uint32_t)(int_least8_t)(size_offset) | (((uint32_t)(tag) << 2) & 0xFFFFFF00)), (data_offset), (data_size),             \
+        (array_size), 0, 0, 0,

 /* These assertions verify that the field information fits in the allocated space.
 * The generator tries to automatically determine the correct width that can fit all
@@ -738,92 +730,103 @@ struct pb_extension_s {
 * you can increase the descriptor width by defining PB_FIELDINFO_WIDTH or by setting
 * descriptorsize option in .options file.
 */
-#define PB_FITS(value,bits) ((uint32_t)(value) < ((uint32_t)1<<bits))
-#define PB_FIELDINFO_ASSERT_1(tag, type, data_offset, data_size, size_offset, array_size) \
-    PB_STATIC_ASSERT(PB_FITS(tag,6) && PB_FITS(data_offset,8) && PB_FITS(size_offset,4) && PB_FITS(data_size,4) && PB_FITS(array_size,1), FIELDINFO_DOES_NOT_FIT_width1_field ## tag)
+#define PB_FITS(value, bits) ((uint32_t)(value) < ((uint32_t)1 << bits))
+#define PB_FIELDINFO_ASSERT_1(tag, type, data_offset, data_size, size_offset, array_size)                                        \
+    PB_STATIC_ASSERT(PB_FITS(tag, 6) && PB_FITS(data_offset, 8) && PB_FITS(size_offset, 4) && PB_FITS(data_size, 4) &&           \
+                         PB_FITS(array_size, 1),                                                                                 \
+                     FIELDINFO_DOES_NOT_FIT_width1_field##tag)

-#define PB_FIELDINFO_ASSERT_2(tag, type, data_offset, data_size, size_offset, array_size) \
-    PB_STATIC_ASSERT(PB_FITS(tag,10) && PB_FITS(data_offset,16) && PB_FITS(size_offset,4) && PB_FITS(data_size,12) && PB_FITS(array_size,12), FIELDINFO_DOES_NOT_FIT_width2_field ## tag)
+#define PB_FIELDINFO_ASSERT_2(tag, type, data_offset, data_size, size_offset, array_size)                                        \
+    PB_STATIC_ASSERT(PB_FITS(tag, 10) && PB_FITS(data_offset, 16) && PB_FITS(size_offset, 4) && PB_FITS(data_size, 12) &&        \
+                         PB_FITS(array_size, 12),                                                                                \
+                     FIELDINFO_DOES_NOT_FIT_width2_field##tag)

 #ifndef PB_FIELD_32BIT
 /* Maximum field sizes are still 16-bit if pb_size_t is 16-bit */
-#define PB_FIELDINFO_ASSERT_4(tag, type, data_offset, data_size, size_offset, array_size) \
-    PB_STATIC_ASSERT(PB_FITS(tag,16) && PB_FITS(data_offset,16) && PB_FITS((int_least8_t)size_offset,8) && PB_FITS(data_size,16) && PB_FITS(array_size,16), FIELDINFO_DOES_NOT_FIT_width4_field ## tag)
+#define PB_FIELDINFO_ASSERT_4(tag, type, data_offset, data_size, size_offset, array_size)                                        \
+    PB_STATIC_ASSERT(PB_FITS(tag, 16) && PB_FITS(data_offset, 16) && PB_FITS((int_least8_t)size_offset, 8) &&                    \
+                         PB_FITS(data_size, 16) && PB_FITS(array_size, 16),                                                      \
+                     FIELDINFO_DOES_NOT_FIT_width4_field##tag)

-#define PB_FIELDINFO_ASSERT_8(tag, type, data_offset, data_size, size_offset, array_size) \
-    PB_STATIC_ASSERT(PB_FITS(tag,16) && PB_FITS(data_offset,16) && PB_FITS((int_least8_t)size_offset,8) && PB_FITS(data_size,16) && PB_FITS(array_size,16), FIELDINFO_DOES_NOT_FIT_width8_field ## tag)
+#define PB_FIELDINFO_ASSERT_8(tag, type, data_offset, data_size, size_offset, array_size)                                        \
+    PB_STATIC_ASSERT(PB_FITS(tag, 16) && PB_FITS(data_offset, 16) && PB_FITS((int_least8_t)size_offset, 8) &&                    \
+                         PB_FITS(data_size, 16) && PB_FITS(array_size, 16),                                                      \
+                     FIELDINFO_DOES_NOT_FIT_width8_field##tag)
 #else
 /* Up to 32-bit fields supported.
 * Note that the checks are against 31 bits to avoid compiler warnings about shift wider than type in the test.
 * I expect that there is no reasonable use for >2GB messages with nanopb anyway.
 */
-#define PB_FIELDINFO_ASSERT_4(tag, type, data_offset, data_size, size_offset, array_size) \
-    PB_STATIC_ASSERT(PB_FITS(tag,30) && PB_FITS(data_offset,31) && PB_FITS(size_offset,8) && PB_FITS(data_size,31) && PB_FITS(array_size,16), FIELDINFO_DOES_NOT_FIT_width4_field ## tag)
+#define PB_FIELDINFO_ASSERT_4(tag, type, data_offset, data_size, size_offset, array_size)                                        \
+    PB_STATIC_ASSERT(PB_FITS(tag, 30) && PB_FITS(data_offset, 31) && PB_FITS(size_offset, 8) && PB_FITS(data_size, 31) &&        \
+                         PB_FITS(array_size, 16),                                                                                \
+                     FIELDINFO_DOES_NOT_FIT_width4_field##tag)

-#define PB_FIELDINFO_ASSERT_8(tag, type, data_offset, data_size, size_offset, array_size) \
-    PB_STATIC_ASSERT(PB_FITS(tag,30) && PB_FITS(data_offset,31) && PB_FITS(size_offset,8) && PB_FITS(data_size,31) && PB_FITS(array_size,31), FIELDINFO_DOES_NOT_FIT_width8_field ## tag)
+#define PB_FIELDINFO_ASSERT_8(tag, type, data_offset, data_size, size_offset, array_size)                                        \
+    PB_STATIC_ASSERT(PB_FITS(tag, 30) && PB_FITS(data_offset, 31) && PB_FITS(size_offset, 8) && PB_FITS(data_size, 31) &&        \
+                         PB_FITS(array_size, 31),                                                                                \
+                     FIELDINFO_DOES_NOT_FIT_width8_field##tag)
 #endif

-
 /* Automatic picking of FIELDINFO width:
 * Uses width 1 when possible, otherwise resorts to width 2.
 * This is used when PB_BIND() is called with "AUTO" as the argument.
 * The generator will give explicit size argument when it knows that a message
 * structure grows beyond 1-word format limits.
 */
-#define PB_FIELDINFO_WIDTH_AUTO(atype, htype, ltype) PB_FI_WIDTH ## atype(htype, ltype)
-#define PB_FI_WIDTH_PB_ATYPE_STATIC(htype, ltype) PB_FI_WIDTH ## htype(ltype)
-#define PB_FI_WIDTH_PB_ATYPE_POINTER(htype, ltype) PB_FI_WIDTH ## htype(ltype)
+#define PB_FIELDINFO_WIDTH_AUTO(atype, htype, ltype) PB_FI_WIDTH##atype(htype, ltype)
+#define PB_FI_WIDTH_PB_ATYPE_STATIC(htype, ltype) PB_FI_WIDTH##htype(ltype)
+#define PB_FI_WIDTH_PB_ATYPE_POINTER(htype, ltype) PB_FI_WIDTH##htype(ltype)
 #define PB_FI_WIDTH_PB_ATYPE_CALLBACK(htype, ltype) 2
-#define PB_FI_WIDTH_PB_HTYPE_REQUIRED(ltype) PB_FI_WIDTH ## ltype
-#define PB_FI_WIDTH_PB_HTYPE_SINGULAR(ltype) PB_FI_WIDTH ## ltype
-#define PB_FI_WIDTH_PB_HTYPE_OPTIONAL(ltype) PB_FI_WIDTH ## ltype
-#define PB_FI_WIDTH_PB_HTYPE_ONEOF(ltype) PB_FI_WIDTH ## ltype
+#define PB_FI_WIDTH_PB_HTYPE_REQUIRED(ltype) PB_FI_WIDTH##ltype
+#define PB_FI_WIDTH_PB_HTYPE_SINGULAR(ltype) PB_FI_WIDTH##ltype
+#define PB_FI_WIDTH_PB_HTYPE_OPTIONAL(ltype) PB_FI_WIDTH##ltype
+#define PB_FI_WIDTH_PB_HTYPE_ONEOF(ltype) PB_FI_WIDTH##ltype
 #define PB_FI_WIDTH_PB_HTYPE_REPEATED(ltype) 2
 #define PB_FI_WIDTH_PB_HTYPE_FIXARRAY(ltype) 2
-#define PB_FI_WIDTH_PB_LTYPE_BOOL      1
-#define PB_FI_WIDTH_PB_LTYPE_BYTES     2
-#define PB_FI_WIDTH_PB_LTYPE_DOUBLE    1
-#define PB_FI_WIDTH_PB_LTYPE_ENUM      1
-#define PB_FI_WIDTH_PB_LTYPE_UENUM     1
-#define PB_FI_WIDTH_PB_LTYPE_FIXED32   1
-#define PB_FI_WIDTH_PB_LTYPE_FIXED64   1
-#define PB_FI_WIDTH_PB_LTYPE_FLOAT     1
-#define PB_FI_WIDTH_PB_LTYPE_INT32     1
-#define PB_FI_WIDTH_PB_LTYPE_INT64     1
-#define PB_FI_WIDTH_PB_LTYPE_MESSAGE   2
-#define PB_FI_WIDTH_PB_LTYPE_MSG_W_CB  2
-#define PB_FI_WIDTH_PB_LTYPE_SFIXED32  1
-#define PB_FI_WIDTH_PB_LTYPE_SFIXED64  1
-#define PB_FI_WIDTH_PB_LTYPE_SINT32    1
-#define PB_FI_WIDTH_PB_LTYPE_SINT64    1
-#define PB_FI_WIDTH_PB_LTYPE_STRING    2
-#define PB_FI_WIDTH_PB_LTYPE_UINT32    1
-#define PB_FI_WIDTH_PB_LTYPE_UINT64    1
+#define PB_FI_WIDTH_PB_LTYPE_BOOL 1
+#define PB_FI_WIDTH_PB_LTYPE_BYTES 2
+#define PB_FI_WIDTH_PB_LTYPE_DOUBLE 1
+#define PB_FI_WIDTH_PB_LTYPE_ENUM 1
+#define PB_FI_WIDTH_PB_LTYPE_UENUM 1
+#define PB_FI_WIDTH_PB_LTYPE_FIXED32 1
+#define PB_FI_WIDTH_PB_LTYPE_FIXED64 1
+#define PB_FI_WIDTH_PB_LTYPE_FLOAT 1
+#define PB_FI_WIDTH_PB_LTYPE_INT32 1
+#define PB_FI_WIDTH_PB_LTYPE_INT64 1
+#define PB_FI_WIDTH_PB_LTYPE_MESSAGE 2
+#define PB_FI_WIDTH_PB_LTYPE_MSG_W_CB 2
+#define PB_FI_WIDTH_PB_LTYPE_SFIXED32 1
+#define PB_FI_WIDTH_PB_LTYPE_SFIXED64 1
+#define PB_FI_WIDTH_PB_LTYPE_SINT32 1
+#define PB_FI_WIDTH_PB_LTYPE_SINT64 1
+#define PB_FI_WIDTH_PB_LTYPE_STRING 2
+#define PB_FI_WIDTH_PB_LTYPE_UINT32 1
+#define PB_FI_WIDTH_PB_LTYPE_UINT64 1
 #define PB_FI_WIDTH_PB_LTYPE_EXTENSION 1
 #define PB_FI_WIDTH_PB_LTYPE_FIXED_LENGTH_BYTES 2

 /* The mapping from protobuf types to LTYPEs is done using these macros. */
-#define PB_LTYPE_MAP_BOOL               PB_LTYPE_BOOL
-#define PB_LTYPE_MAP_BYTES              PB_LTYPE_BYTES
-#define PB_LTYPE_MAP_DOUBLE             PB_LTYPE_FIXED64
-#define PB_LTYPE_MAP_ENUM               PB_LTYPE_VARINT
-#define PB_LTYPE_MAP_UENUM              PB_LTYPE_UVARINT
-#define PB_LTYPE_MAP_FIXED32            PB_LTYPE_FIXED32
-#define PB_LTYPE_MAP_FIXED64            PB_LTYPE_FIXED64
-#define PB_LTYPE_MAP_FLOAT              PB_LTYPE_FIXED32
-#define PB_LTYPE_MAP_INT32              PB_LTYPE_VARINT
-#define PB_LTYPE_MAP_INT64              PB_LTYPE_VARINT
-#define PB_LTYPE_MAP_MESSAGE            PB_LTYPE_SUBMESSAGE
-#define PB_LTYPE_MAP_MSG_W_CB           PB_LTYPE_SUBMSG_W_CB
-#define PB_LTYPE_MAP_SFIXED32           PB_LTYPE_FIXED32
-#define PB_LTYPE_MAP_SFIXED64           PB_LTYPE_FIXED64
-#define PB_LTYPE_MAP_SINT32             PB_LTYPE_SVARINT
-#define PB_LTYPE_MAP_SINT64             PB_LTYPE_SVARINT
-#define PB_LTYPE_MAP_STRING             PB_LTYPE_STRING
-#define PB_LTYPE_MAP_UINT32             PB_LTYPE_UVARINT
-#define PB_LTYPE_MAP_UINT64             PB_LTYPE_UVARINT
-#define PB_LTYPE_MAP_EXTENSION          PB_LTYPE_EXTENSION
+#define PB_LTYPE_MAP_BOOL PB_LTYPE_BOOL
+#define PB_LTYPE_MAP_BYTES PB_LTYPE_BYTES
+#define PB_LTYPE_MAP_DOUBLE PB_LTYPE_FIXED64
+#define PB_LTYPE_MAP_ENUM PB_LTYPE_VARINT
+#define PB_LTYPE_MAP_UENUM PB_LTYPE_UVARINT
+#define PB_LTYPE_MAP_FIXED32 PB_LTYPE_FIXED32
+#define PB_LTYPE_MAP_FIXED64 PB_LTYPE_FIXED64
+#define PB_LTYPE_MAP_FLOAT PB_LTYPE_FIXED32
+#define PB_LTYPE_MAP_INT32 PB_LTYPE_VARINT
+#define PB_LTYPE_MAP_INT64 PB_LTYPE_VARINT
+#define PB_LTYPE_MAP_MESSAGE PB_LTYPE_SUBMESSAGE
+#define PB_LTYPE_MAP_MSG_W_CB PB_LTYPE_SUBMSG_W_CB
+#define PB_LTYPE_MAP_SFIXED32 PB_LTYPE_FIXED32
+#define PB_LTYPE_MAP_SFIXED64 PB_LTYPE_FIXED64
+#define PB_LTYPE_MAP_SINT32 PB_LTYPE_SVARINT
+#define PB_LTYPE_MAP_SINT64 PB_LTYPE_SVARINT
+#define PB_LTYPE_MAP_STRING PB_LTYPE_STRING
+#define PB_LTYPE_MAP_UINT32 PB_LTYPE_UVARINT
+#define PB_LTYPE_MAP_UINT64 PB_LTYPE_UVARINT
+#define PB_LTYPE_MAP_EXTENSION PB_LTYPE_EXTENSION
 #define PB_LTYPE_MAP_FIXED_LENGTH_BYTES PB_LTYPE_FIXED_LENGTH_BYTES

 /* These macros are used for giving out error messages.
@@ -855,21 +858,21 @@ struct pb_extension_s {
 #ifdef __cplusplus
 #if __cplusplus >= 201103L
 #define PB_CONSTEXPR constexpr
-#else  // __cplusplus >= 201103L
+#else // __cplusplus >= 201103L
 #define PB_CONSTEXPR
-#endif  // __cplusplus >= 201103L
+#endif // __cplusplus >= 201103L

 #if __cplusplus >= 201703L
 #define PB_INLINE_CONSTEXPR inline constexpr
-#else  // __cplusplus >= 201703L
+#else // __cplusplus >= 201703L
 #define PB_INLINE_CONSTEXPR PB_CONSTEXPR
-#endif  // __cplusplus >= 201703L
+#endif // __cplusplus >= 201703L

-namespace nanopb {
+namespace nanopb
+{
 // Each type will be partially specialized by the generator.
 template <typename GenMessageT> struct MessageDescriptor;
-}  // namespace nanopb
-#endif  /* __cplusplus */
+} // namespace nanopb
+#endif /* __cplusplus */

 #endif
-
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,6 +19,8 @@ default_envs = tbeam
 ;default_envs = eink
 ;default_envs = nrf52840dk-geeksville
 ;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
+;default_envs = rak4631
+;default_envs = rak4630

 [common]
 ; common is not currently used
@@ -76,6 +78,7 @@ lib_deps =
  Wire ; explicitly needed here because the AXP202 library forgets to add it
  SPI
  https://github.com/geeksville/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
+  PubSubClient
  
 ; Common settings for conventional (non Portduino) Ardino targets
 [arduino_base]
@@ -192,7 +195,7 @@ src_filter =
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
 ; platform = nordicnrf52
-platform = https://github.com/meshtastic/platform-nordicnrf52.git#1a2639a6b0f79b5df66bea3e3089f0d5285fdc63
+platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge
 extends = arduino_base
 build_type = debug ; I'm debugging with ICE a lot now
 ; note: liboberon provides the AES256 implementation for NRF52 (though not using the hardware acceleration of the NRF52840 - FIXME)
@@ -202,7 +205,7 @@ build_flags =
  -Isdk-nrfxlib/crypto/nrf_oberon/include -Lsdk-nrfxlib/crypto/nrf_oberon/lib/cortex-m4/hard-float/ -lliboberon_3.0.7 
 ;-DCFG_DEBUG=3
 src_filter = 
-  ${arduino_base.src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<plugins/esp32>
+  ${arduino_base.src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<plugins/esp32> -<mqtt/>
 lib_ignore =
  BluetoothOTA
 monitor_port = /dev/ttyACM1
@@ -239,6 +242,14 @@ debug_init_break =
 ;debug_init_break = tbreak loop
 ;debug_init_break = tbreak Reset_Handler

+[nrf52840_base]
+; Common base class for all nrf52840 based targets
+extends = nrf52_base
+lib_deps =
+  ${arduino_base.lib_deps}
+  Adafruit nRFCrypto 
+  # add Adafruit nRFCrypto platform IO automated scan is broken
+
 [env:lora_isp4520]
 extends = nrf52_base
 board = lora_isp4520
@@ -260,12 +271,12 @@ monitor_port = /dev/ttyUSB0
 ; The NRF52840-dk development board
 ; Note: By default no lora device is created for this build - it uses a simulated interface
 [env:nrf52840dk]
-extends = nrf52_base
+extends = nrf52840_base
 board = nrf52840_dk

 ; The NRF52840-dk development board, but @geeksville's board - which has a busted oscilliator 
 [env:nrf52840dk-geeksville]
-extends = nrf52_base
+extends = nrf52840_base
 board = nrf52840_dk_modified
 # add our variants files to the include and src paths
 build_flags = ${nrf52_base.build_flags} -Ivariants/pca10056-rc-clock
@@ -288,6 +299,29 @@ monitor_speed = 115200
 # For experimenting with RAM sizes
 # board_build.ldscript = linker/nrf52840_s140_sim832.ld

+; The very slick RAK wireless RAK 4631 / 4630 board
+[env:rak4631]
+extends = nrf52840_base
+board = wiscore_rak4631
+# add our variants files to the include and src paths
+# define build flags for the TFT_eSPI library
+build_flags = ${nrf52_base.build_flags} -Ivariants/WisCore_RAK4631_Board
+src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board>
+debug_tool = jlink
+; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
+;upload_protocol = jlink
+
+; THIS IS UNTESTED (I don't have this board), but other developers can use it as a starting point
+[env:rak4600]
+extends = nrf52_base
+board = wiscore_rak4600
+# add our variants files to the include and src paths
+# define build flags for the TFT_eSPI library
+build_flags = ${nrf52_base.build_flags} -Ivariants/WisCore_RAK4600_Board
+src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4600_Board>
+lib_deps = 
+  ${arduino_base.lib_deps}
+
 ; The PPR board
 [env:ppr]
 extends = nrf52_base
@@ -307,7 +341,7 @@ lib_deps =

 ; First prototype eink/nrf52840/sx1262 device
 [env:eink]
-extends = nrf52_base
+extends = nrf52840_base
 board = eink
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
@@ -315,13 +349,13 @@ build_flags = ${nrf52_base.build_flags} -Ivariants/eink
  -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 src_filter = ${nrf52_base.src_filter} +<../variants/eink>
 lib_deps = 
-  ${arduino_base.lib_deps}
+  ${nrf52840_base.lib_deps}
  https://github.com/geeksville/EPD_Libraries.git
  TFT_eSPI

 ; First prototype eink/nrf52840/sx1262 device
 [env:eink0.1]
-extends = nrf52_base
+extends = nrf52840_base
 board = eink0.1
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
@@ -329,13 +363,13 @@ build_flags = ${nrf52_base.build_flags} -Ivariants/eink0.1
  -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 src_filter = ${nrf52_base.src_filter} +<../variants/eink0.1>
 lib_deps = 
-  ${arduino_base.lib_deps}
+  ${nrf52840_base.lib_deps}
  https://github.com/geeksville/EPD_Libraries.git
  TFT_eSPI

 ; The https://github.com/BigCorvus/SX1262-LoRa-BLE-Relay board by @BigCorvus
 [env:lora-relay-v1]
-extends = nrf52_base
+extends = nrf52840_base
 board = lora-relay-v1
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
@@ -351,13 +385,13 @@ build_flags = ${nrf52_base.build_flags} -Ivariants/lora_relay_v1
  -DSPI_FREQUENCY=27000000
 src_filter = ${nrf52_base.src_filter} +<../variants/lora_relay_v1>
 lib_deps = 
-  ${arduino_base.lib_deps}
+  ${nrf52840_base.lib_deps}
  SparkFun BQ27441 LiPo Fuel Gauge Arduino Library
  TFT_eSPI

 ; The https://github.com/BigCorvus/LoRa-BLE-Relay-v2 board by @BigCorvus
 [env:lora-relay-v2]
-extends = nrf52_base
+extends = nrf52840_base
 board = lora-relay-v2
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
@@ -375,7 +409,7 @@ build_flags = ${nrf52_base.build_flags} -Ivariants/lora_relay_v2
  -DTFT_SCLK=ST7735_SCK
 src_filter = ${nrf52_base.src_filter} +<../variants/lora_relay_v2>
 lib_deps = 
-  ${arduino_base.lib_deps}
+  ${nrf52840_base.lib_deps}
  SparkFun BQ27441 LiPo Fuel Gauge Arduino Library
  TFT_eSPI

@@ -396,4 +430,4 @@ lib_deps =
 ;extends = esp32_base
 ;board = genieblocks_lora
 ;build_flags = 
-;  ${esp32_base.build_flags} -D GENIEBLOCKS
+;  ${esp32_base.build_flags} -D GENIEBLOCKS
--- a/2
+++ b/2
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -409,6 +409,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define HW_VENDOR HardwareModel_PPR

+#elif defined(RAK4630)
+
+#define HW_VENDOR HardwareModel_RAK4631
+
 #elif NRF52_SERIES

 #define HW_VENDOR HardwareModel_NRF52_UNKNOWN
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -7,7 +7,7 @@
 #include <assert.h>

 // If we have a serial GPS port it will not be null
-#ifdef GPS_RX_PIN
+#ifdef GPS_SERIAL_NUM
 HardwareSerial _serial_gps_real(GPS_SERIAL_NUM);
 HardwareSerial *GPS::_serial_gps = &_serial_gps_real;
 #elif defined(NRF52840_XXAA) || defined(NRF52833_XXAA)
@@ -34,7 +34,8 @@ bool GPS::setupGPS()
    if (_serial_gps && !didSerialInit) {
        didSerialInit = true;

-#ifdef GPS_RX_PIN
+// ESP32 has a special set of parameters vs other arduino ports
+#if defined(GPS_RX_PIN) && !defined(NO_ESP32)
        _serial_gps->begin(GPS_BAUDRATE, SERIAL_8N1, GPS_RX_PIN, GPS_TX_PIN);
 #else
        _serial_gps->begin(GPS_BAUDRATE);
@@ -319,8 +320,8 @@ int GPS::prepareDeepSleep(void *unused)
 #include "NMEAGPS.h"
 #endif

-
-GPS* createGps() {
+GPS *createGps()
+{

 #ifdef NO_GPS
    return nullptr;
@@ -329,7 +330,7 @@ GPS* createGps() {
 #ifdef GPS_TX_PIN
    // Init GPS - first try ublox
    UBloxGPS *ublox = new UBloxGPS();
-    
+
    if (!ublox->setup()) {
        DEBUG_MSG("ERROR: No UBLOX GPS found\n");
        delete ublox;
@@ -344,9 +345,9 @@ GPS* createGps() {
        // assume NMEA at 9600 baud.
        DEBUG_MSG("Hoping that NMEA might work\n");
 #ifdef HAS_AIR530_GPS
-        GPS* new_gps = new Air530GPS();
+        GPS *new_gps = new Air530GPS();
 #else
-        GPS* new_gps = new NMEAGPS();
+        GPS *new_gps = new NMEAGPS();
 #endif
        new_gps->setup();
        return new_gps;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,8 +32,9 @@
 #include "nimble/BluetoothUtil.h"
 #endif

-#ifdef PORTDUINO
+#if defined(HAS_WIFI) || defined(PORTDUINO)
 #include "mesh/wifi/WiFiServerAPI.h"
+#include "mqtt/MQTT.h"
 #endif

 #include "RF95Interface.h"
@@ -312,10 +313,6 @@ void setup()
    SEGGER_RTT_ConfigUpBuffer(SEGGER_STDOUT_CH, NULL, NULL, buflen, mode);
 #endif

-#ifdef USE_SEGGER
-    SEGGER_RTT_ConfigUpBuffer(0, NULL, NULL, 0, SEGGER_RTT_MODE_NO_BLOCK_TRIM);
-#endif
-
 #ifdef DEBUG_PORT
    if (!radioConfig.preferences.serial_disabled) {
        consoleInit(); // Set serial baud rate and init our mesh console
@@ -430,8 +427,12 @@ void setup()
    readFromRTC(); // read the main CPU RTC at first (in case we can't get GPS time)

 #ifdef GENIEBLOCKS
-    // gps setup
-    pinMode(GPS_RESET_N, OUTPUT);
+    Im intentionally breaking your build so you see this note.Feel free to revert if not correct.I think you can
+            remove this GPS_RESET_N code by instead defining PIN_GPS_RESET and
+        use the shared code in GPS.cpp instead.- geeksville
+
+                                                     // gps setup
+                                                     pinMode(GPS_RESET_N, OUTPUT);
    pinMode(GPS_EXTINT, OUTPUT);
    digitalWrite(GPS_RESET_N, HIGH);
    digitalWrite(GPS_EXTINT, LOW);
@@ -541,6 +542,10 @@ void setup()
    initApiServer();
 #endif

+#if defined(PORTDUINO) || defined(HAS_WIFI)
+    mqttInit();
+#endif
+
    // Start airtime logger thread.
    airTime = new AirTime();

--- a/src/mesh/Channels.h
+++ b/src/mesh/Channels.h
@@ -29,7 +29,6 @@ class Channels
    int16_t hashes[MAX_NUM_CHANNELS];

  public:
-
    /// Well known channel names
    static const char *adminChannel, *gpioChannel, *serialChannel;

@@ -43,8 +42,15 @@ class Channels
     */
    void setChannel(const Channel &c);

+    /** Return a human friendly name for this channel (and expand any short strings as needed)
+     */
    const char *getName(size_t chIndex);

+    /**
+     * Return a globally unique channel ID usable with MQTT.
+     */
+    const char *getGlobalId(size_t chIndex) { return getName(chIndex); } // FIXME, not correct
+
    /** The index of the primary channel */
    ChannelIndex getPrimaryIndex() const { return primaryIndex; }

--- a/src/mesh/MeshPlugin.cpp
+++ b/src/mesh/MeshPlugin.cpp
@@ -70,7 +70,8 @@ void MeshPlugin::callPlugins(const MeshPacket &mp)
    // DEBUG_MSG("In call plugins\n");
    bool pluginFound = false;

-    assert(mp.which_payloadVariant == MeshPacket_decoded_tag); // I think we are guarnteed the packet is decoded by this point?
+    // We now allow **encrypted** packets to pass through the plugins
+    bool isDecoded = mp.which_payloadVariant == MeshPacket_decoded_tag;

    currentReply = NULL; // No reply yet

@@ -82,19 +83,21 @@ void MeshPlugin::callPlugins(const MeshPacket &mp)

        pi.currentRequest = &mp;

-        /// received channel
-        auto ch = channels.getByIndex(mp.channel);
-        assert(ch.has_settings);
-
        /// We only call plugins that are interested in the packet (and the message is destined to us or we are promiscious)
-        bool wantsPacket = (pi.isPromiscuous || toUs) && pi.wantPacket(&mp);
+        bool wantsPacket = (isDecoded || pi.encryptedOk) && (pi.isPromiscuous || toUs) && pi.wantPacket(&mp);
+
+        DEBUG_MSG("Plugin %s wantsPacket=%d\n", pi.name, wantsPacket);
+        assert(!pi.myReply); // If it is !null it means we have a bug, because it should have been sent the previous time

        if (wantsPacket) {
-            // DEBUG_MSG("Plugin %s wantsPacket=%d\n", pi.name, wantsPacket);
            pluginFound = true;

+            /// received channel (or NULL if not decoded)
+            Channel *ch = isDecoded ? &channels.getByIndex(mp.channel) : NULL;
+
            /// Is the channel this packet arrived on acceptable? (security check)
-            bool rxChannelOk = !pi.boundChannel || (mp.from == 0) || (strcmp(ch.settings.name, pi.boundChannel) == 0);
+            /// Note: we can't know channel names for encrypted packets, so those are NEVER sent to boundChannel plugins
+            bool rxChannelOk = !pi.boundChannel || (ch && ((mp.from == 0) || (strcmp(ch->settings.name, pi.boundChannel) == 0)));

            if (!rxChannelOk) {
                // no one should have already replied!
@@ -123,6 +126,14 @@ void MeshPlugin::callPlugins(const MeshPacket &mp)
                } else {
                    DEBUG_MSG("Plugin %s considered\n", pi.name);
                }
+
+                // If the requester didn't ask for a response we might need to discard unused replies to prevent memory leaks
+                if (pi.myReply) {
+                    DEBUG_MSG("Discarding an unneeded response\n");
+                    packetPool.release(pi.myReply);
+                    pi.myReply = NULL;
+                }
+
                if (handled) {
                    DEBUG_MSG("Plugin %s handled and skipped other processing\n", pi.name);
                    break;
@@ -135,12 +146,16 @@ void MeshPlugin::callPlugins(const MeshPacket &mp)

    if (mp.decoded.want_response && toUs) {
        if (currentReply) {
-            DEBUG_MSG("Sending response\n");
+            printPacket("Sending response", currentReply);
            service.sendToMesh(currentReply);
            currentReply = NULL;
        } else {
            // No one wanted to reply to this requst, tell the requster that happened
            DEBUG_MSG("No one responded, send a nak\n");
+
+            // SECURITY NOTE! I considered sending back a different error code if we didn't find the psk (i.e. !isDecoded)
+            // but opted NOT TO.  Because it is not a good idea to let remote nodes 'probe' to find out which PSKs were "good" vs
+            // bad.
            routingPlugin->sendAckNak(Routing_Error_NO_RESPONSE, getFrom(&mp), mp.id, mp.channel);
        }
    }
@@ -149,6 +164,13 @@ void MeshPlugin::callPlugins(const MeshPacket &mp)
        DEBUG_MSG("No plugins interested in portnum=%d\n", mp.decoded.portnum);
 }

+MeshPacket *MeshPlugin::allocReply()
+{
+    auto r = myReply;
+    myReply = NULL; // Only use each reply once
+    return r;
+}
+
 /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
 * so that subclasses can (optionally) send a response back to the original sender.  Implementing this method
 * is optional
@@ -171,7 +193,7 @@ void MeshPlugin::sendResponse(const MeshPacket &req)
 void setReplyTo(MeshPacket *p, const MeshPacket &to)
 {
    assert(p->which_payloadVariant == MeshPacket_decoded_tag); // Should already be set by now
-    p->to = getFrom(&to);
+    p->to = getFrom(&to);    // Make sure that if we are sending to the local node, we use our local node addr, not 0
    p->channel = to.channel; // Use the same channel that the request came in on

    // No need for an ack if we are just delivering locally (it just generates an ignored ack)
--- a/src/mesh/MeshPlugin.h
+++ b/src/mesh/MeshPlugin.h
@@ -42,12 +42,16 @@ class MeshPlugin
  protected:
    const char *name;

-    /* Most plugins only care about packets that are destined for their node (i.e. broadcasts or has their node as the specific
+    /** Most plugins only care about packets that are destined for their node (i.e. broadcasts or has their node as the specific
    recipient) But some plugs might want to 'sniff' packets that are merely being routed (passing through the current node). Those
    plugins can set this to true and their handleReceived() will be called for every packet.
    */
    bool isPromiscuous = false;

+    /** Most plugins only understand decrypted packets.  For plugins that also want to see encrypted packets, they should set this
+     * flag */
+    bool encryptedOk = false;
+
    /** If a bound channel name is set, we will only accept received packets that come in on that channel.
     * A special exception (FIXME, not sure if this is a good idea) - packets that arrive on the local interface
     * are allowed on any channel (this lets the local user do anything).
@@ -65,6 +69,11 @@ class MeshPlugin
     */
    static const MeshPacket *currentRequest;

+    /**
+     * If your handler wants to send a response, simply set currentReply and it will be sent at the end of response handling.
+     */
+    MeshPacket *myReply = NULL;
+
    /**
     * Initialize your plugin.  This setup function is called once after all hardware and mesh protocol layers have
     * been initialized
@@ -83,8 +92,12 @@ class MeshPlugin
    virtual bool handleReceived(const MeshPacket &mp) { return false; }

    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
-     * so that subclasses can (optionally) send a response back to the original sender.  */
-    virtual MeshPacket *allocReply() { return NULL; }
+     * so that subclasses can (optionally) send a response back to the original sender.
+     *
+     * Note: most implementers don't need to override this, instead: If while handling a request you have a reply, just set
+     * the protected reply field in this instance.
+     * */
+    virtual MeshPacket *allocReply();

    /***
     * @return true if you want to be alloced a UI screen frame
@@ -102,6 +115,7 @@ class MeshPlugin
     * the RoutingPlugin to avoid sending redundant acks
     */
    static MeshPacket *currentReply;
+
    friend class ReliableRouter;

    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
--- a/src/mesh/MeshTypes.h
+++ b/src/mesh/MeshTypes.h
@@ -12,10 +12,8 @@ typedef uint32_t PacketId; // A packet sequence number
 #define NODENUM_BROADCAST UINT32_MAX
 #define ERRNO_OK 0
 #define ERRNO_NO_INTERFACES 33
-#define ERRNO_UNKNOWN 32 // pick something that doesn't conflict with RH_ROUTER_ERROR_UNABLE_TO_DELIVER
+#define ERRNO_UNKNOWN 32  // pick something that doesn't conflict with RH_ROUTER_ERROR_UNABLE_TO_DELIVER
 #define ERRNO_DISABLED 34 // the itnerface is disabled
-#define ERRNO_TOO_LARGE 35
-#define ERRNO_NO_CHANNEL 36

 /**
 * the max number of hops a message can pass through, used as the default max for hop_limit in MeshPacket.
@@ -35,7 +33,7 @@ typedef int ErrorCode;
 extern Allocator<MeshPacket> &packetPool;

 /**
- * Most (but not always) of the time we want to treat packets 'from' the local phone (where from == 0), as if they originated on the local node.
- * If from is zero this function returns our node number instead
+ * Most (but not always) of the time we want to treat packets 'from' the local phone (where from == 0), as if they originated on
+ * the local node. If from is zero this function returns our node number instead
 */
 NodeNum getFrom(const MeshPacket *p);
--- a/src/mesh/ProtobufPlugin.h
+++ b/src/mesh/ProtobufPlugin.h
@@ -22,10 +22,9 @@ template <class T> class ProtobufPlugin : protected SinglePortPlugin
    }

  protected:
-
    /**
     * Handle a received message, the data field in the message is already decoded and is provided
-     * 
+     *
     * In general decoded will always be !NULL.  But in some special applications (where you have handling packets
     * for multiple port numbers, decoding will ONLY be attempted for packets where the portnum matches our expected ourPortNum.
     */
@@ -58,11 +57,12 @@ template <class T> class ProtobufPlugin : protected SinglePortPlugin
        // it would be better to update even if the message was destined to others.

        auto &p = mp.decoded;
-        DEBUG_MSG("Received %s from=0x%0x, id=0x%x, portnum=%d, payloadlen=%d\n", name, mp.from, mp.id, p.portnum, p.payload.size);
+        DEBUG_MSG("Received %s from=0x%0x, id=0x%x, portnum=%d, payloadlen=%d\n", name, mp.from, mp.id, p.portnum,
+                  p.payload.size);

        T scratch;
-        T *decoded = NULL; 
-        if(mp.decoded.portnum == ourPortNum) {
+        T *decoded = NULL;
+        if (mp.which_payloadVariant == MeshPacket_decoded_tag && mp.decoded.portnum == ourPortNum) {
            memset(&scratch, 0, sizeof(scratch));
            if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, fields, &scratch))
                decoded = &scratch;
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -361,12 +361,8 @@ ErrorCode SimRadio::send(MeshPacket *p)

 void RadioInterface::deliverToReceiver(MeshPacket *p)
 {
-    assert(rxDest);
-    assert(rxDest->enqueue(p, 0)); // NOWAIT - fixme, if queue is full, delete older messages
-
-    // Nasty hack because our threading is primitive.  interfaces shouldn't need to know about routers FIXME
    if (router)
-        router->setReceivedMessage();
+        router->enqueueReceivedMessage(p);
 }

 /***
--- a/src/mesh/RadioInterface.h
+++ b/src/mesh/RadioInterface.h
@@ -42,7 +42,6 @@ typedef struct {
 class RadioInterface
 {
    friend class MeshRadio; // for debugging we let that class touch pool
-    PointerQueue<MeshPacket> *rxDest = NULL;

    CallbackObserver<RadioInterface, void *> configChangedObserver =
        CallbackObserver<RadioInterface, void *>(this, &RadioInterface::reloadConfig);
@@ -82,17 +81,11 @@ class RadioInterface
    float freq = 915.0;

    /** pool is the pool we will alloc our rx packets from
-     * rxDest is where we will send any rx packets, it becomes receivers responsibility to return packet to the pool
     */
    RadioInterface();

    virtual ~RadioInterface() {}

-    /**
-     * Set where to deliver received packets.  This method should only be used by the Router class
-     */
-    void setReceiver(PointerQueue<MeshPacket> *_rxDest) { rxDest = _rxDest; }
-
    /**
     * Return true if we think the board can go to sleep (i.e. our tx queue is empty, we are not sending or receiving)
     *
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -8,6 +8,10 @@
 #include "mesh-pb-constants.h"
 #include "plugins/RoutingPlugin.h"

+#if defined(HAS_WIFI) || defined(PORTDUINO)
+#include "mqtt/MQTT.h"
+#endif
+
 /**
 * Router todo
 *
@@ -64,6 +68,22 @@ int32_t Router::runOnce()
    return INT32_MAX; // Wait a long time - until we get woken for the message queue
 }

+/**
+ * RadioInterface calls this to queue up packets that have been received from the radio.  The router is now responsible for
+ * freeing the packet
+ */
+void Router::enqueueReceivedMessage(MeshPacket *p)
+{
+    if (fromRadioQueue.enqueue(p, 0)) { // NOWAIT - fixme, if queue is full, delete older messages
+
+        // Nasty hack because our threading is primitive.  interfaces shouldn't need to know about routers FIXME
+        setReceivedMessage();
+    } else {
+        printPacket("BUG! fromRadioQueue is full! Discarding!", p);
+        packetPool.release(p);
+    }
+}
+
 /// Generate a unique packet id
 // FIXME, move this someplace better
 PacketId generatePacketId()
@@ -129,13 +149,8 @@ ErrorCode Router::sendLocal(MeshPacket *p)
 {
    // No need to deliver externally if the destination is the local node
    if (p->to == nodeDB.getNodeNum()) {
-        if (fromRadioQueue.enqueue(p, 0)) {
-            printPacket("Enqueued local", p);
-            setReceivedMessage();
-        } else {
-            printPacket("BUG! fromRadioQueue is full! Discarding!", p);
-            packetPool.release(p);
-        }
+        printPacket("Enqueued local", p);
+        enqueueReceivedMessage(p);
        return ERRNO_OK;
    } else if (!iface) {
        // We must be sending to remote nodes also, fail if no interface found
@@ -187,36 +202,20 @@ ErrorCode Router::send(MeshPacket *p)
    assert(p->which_payloadVariant == MeshPacket_encrypted_tag ||
           p->which_payloadVariant == MeshPacket_decoded_tag); // I _think_ all packets should have a payload by now

-    // First convert from protobufs to raw bytes
+    // If the packet is not yet encrypted, do so now
    if (p->which_payloadVariant == MeshPacket_decoded_tag) {
-        static uint8_t bytes[MAX_RHPACKETLEN]; // we have to use a scratch buffer because a union
+        ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it

-        // printPacket("pre encrypt", p); // portnum valid here
-
-        size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), Data_fields, &p->decoded);
-
-        if (numbytes > MAX_RHPACKETLEN) {
-            abortSendAndNak(Routing_Error_TOO_LARGE, p);
-            return ERRNO_TOO_LARGE;
+        auto encodeResult = perhapsEncode(p);
+        if (encodeResult != Routing_Error_NONE) {
+            abortSendAndNak(encodeResult, p);
+            return encodeResult; // FIXME - this isn't a valid ErrorCode
        }

-        // printBytes("plaintext", bytes, numbytes);
-
-        auto hash = channels.setActiveByIndex(p->channel);
-        if (hash < 0) {
-            // No suitable channel could be found for sending
-            abortSendAndNak(Routing_Error_NO_CHANNEL, p);
-            return ERRNO_NO_CHANNEL;
-        }
-
-        // Now that we are encrypting the packet channel should be the hash (no longer the index)
-        p->channel = hash;
-        crypto->encrypt(getFrom(p), p->id, numbytes, bytes);
-
-        // Copy back into the packet and set the variant type
-        memcpy(p->encrypted.bytes, bytes, numbytes);
-        p->encrypted.size = numbytes;
-        p->which_payloadVariant = MeshPacket_encrypted_tag;
+#if defined(HAS_WIFI) || defined(PORTDUINO)
+        if (mqtt)
+            mqtt->onSend(*p, chIndex);
+#endif
    }

    assert(iface); // This should have been detected already in sendLocal (or we just received a packet from outside)
@@ -239,7 +238,7 @@ void Router::sniffReceived(const MeshPacket *p, const Routing *c)
    // FIXME, update nodedb here for any packet that passes through us
 }

-bool Router::perhapsDecode(MeshPacket *p)
+bool perhapsDecode(MeshPacket *p)
 {
    if (p->which_payloadVariant == MeshPacket_decoded_tag)
        return true; // If packet was already decoded just return
@@ -280,6 +279,42 @@ bool Router::perhapsDecode(MeshPacket *p)
    return false;
 }

+/** Return 0 for success or a Routing_Errror code for failure
+ */
+Routing_Error perhapsEncode(MeshPacket *p)
+{
+    // If the packet is not yet encrypted, do so now
+    if (p->which_payloadVariant == MeshPacket_decoded_tag) {
+        static uint8_t bytes[MAX_RHPACKETLEN]; // we have to use a scratch buffer because a union
+
+        // printPacket("pre encrypt", p); // portnum valid here
+
+        size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), Data_fields, &p->decoded);
+
+        if (numbytes > MAX_RHPACKETLEN)
+            return Routing_Error_TOO_LARGE;
+
+        // printBytes("plaintext", bytes, numbytes);
+
+        ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
+        auto hash = channels.setActiveByIndex(chIndex);
+        if (hash < 0)
+            // No suitable channel could be found for sending
+            return Routing_Error_NO_CHANNEL;
+
+        // Now that we are encrypting the packet channel should be the hash (no longer the index)
+        p->channel = hash;
+        crypto->encrypt(getFrom(p), p->id, numbytes, bytes);
+
+        // Copy back into the packet and set the variant type
+        memcpy(p->encrypted.bytes, bytes, numbytes);
+        p->encrypted.size = numbytes;
+        p->which_payloadVariant = MeshPacket_encrypted_tag;
+    }
+
+    return Routing_Error_NONE;
+}
+
 NodeNum Router::getNodeNum()
 {
    return nodeDB.getNodeNum();
@@ -299,13 +334,12 @@ void Router::handleReceived(MeshPacket *p)
    if (decoded) {
        // parsing was successful, queue for our recipient
        printPacket("handleReceived", p);
-
-        // call any promiscious plugins here, make a (non promisiocous) plugin for forwarding messages to phone api
-        // sniffReceived(p);
-        MeshPlugin::callPlugins(*p);
    } else {
-        DEBUG_MSG("packet decoding failed\n");
+        printPacket("packet decoding failed (no PSK?)", p);
    }
+
+    // call plugins here
+    MeshPlugin::callPlugins(*p);
 }

 void Router::perhapsHandleReceived(MeshPacket *p)
--- a/src/mesh/Router.h
+++ b/src/mesh/Router.h
@@ -1,12 +1,12 @@
 #pragma once

+#include "Channels.h"
 #include "MemoryPool.h"
 #include "MeshTypes.h"
 #include "Observer.h"
 #include "PointerQueue.h"
 #include "RadioInterface.h"
 #include "concurrency/OSThread.h"
-#include "Channels.h"

 /**
 * A mesh aware router that supports multiple interfaces.
@@ -22,7 +22,6 @@ class Router : protected concurrency::OSThread
    RadioInterface *iface = NULL;

  public:
-
    /**
     * Constructor
     *
@@ -32,11 +31,7 @@ class Router : protected concurrency::OSThread
    /**
     * Currently we only allow one interface, that may change in the future
     */
-    void addInterface(RadioInterface *_iface)
-    {
-        iface = _iface;
-        iface->setReceiver(&fromRadioQueue);
-    }
+    void addInterface(RadioInterface *_iface) { iface = _iface; }

    /**
     * do idle processing
@@ -53,7 +48,7 @@ class Router : protected concurrency::OSThread
    ErrorCode sendLocal(MeshPacket *p);

    /** Attempt to cancel a previously sent packet.  Returns true if a packet was found we could cancel */
-    bool cancelSending(NodeNum from, PacketId id);    
+    bool cancelSending(NodeNum from, PacketId id);

    /** Allocate and return a meshpacket which defaults as send to broadcast from the current node.
     * The returned packet is guaranteed to have a unique packet ID already assigned
@@ -69,6 +64,12 @@ class Router : protected concurrency::OSThread
     */
    void setReceivedMessage();

+    /**
+     * RadioInterface calls this to queue up packets that have been received from the radio.  The router is now responsible for
+     * freeing the packet
+     */
+    void enqueueReceivedMessage(MeshPacket *p);
+
  protected:
    friend class RoutingPlugin;

@@ -83,7 +84,7 @@ class Router : protected concurrency::OSThread

    /**
     * Should this incoming filter be dropped?
-     * 
+     *
     * FIXME, move this into the new RoutingPlugin and do the filtering there using the regular plugin logic
     *
     * Called immedately on receiption, before any further processing.
@@ -97,18 +98,11 @@ class Router : protected concurrency::OSThread
     */
    virtual void sniffReceived(const MeshPacket *p, const Routing *c);

-    /**
-     * Remove any encryption and decode the protobufs inside this packet (if necessary).
-     *
-     * @return true for success, false for corrupt packet.
-     */
-    bool perhapsDecode(MeshPacket *p);
-
    /**
     * Send an ack or a nak packet back towards whoever sent idFrom
     */
    void sendAckNak(Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex);
-    
+
  private:
    /**
     * Called from loop()
@@ -134,6 +128,17 @@ class Router : protected concurrency::OSThread
    void abortSendAndNak(Routing_Error err, MeshPacket *p);
 };

+/** FIXME - move this into a mesh packet class
+ * Remove any encryption and decode the protobufs inside this packet (if necessary).
+ *
+ * @return true for success, false for corrupt packet.
+ */
+bool perhapsDecode(MeshPacket *p);
+
+/** Return 0 for success or a Routing_Errror code for failure
+ */
+Routing_Error perhapsEncode(MeshPacket *p);
+
 extern Router *router;

 /// Generate a unique packet id
--- a/src/mesh/generated/admin.pb.h
+++ b/src/mesh/generated/admin.pb.h
@@ -79,7 +79,7 @@ extern const pb_msgdesc_t AdminMessage_msg;
 #define AdminMessage_fields &AdminMessage_msg

 /* Maximum encoded size of messages (where known) */
-#define AdminMessage_size                        360
+#define AdminMessage_size                        397

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/apponly.pb.c
+++ b/src/mesh/generated/apponly.pb.c
@@ -6,9 +6,6 @@
 #error Regenerate this file with the current version of nanopb generator.
 #endif

-PB_BIND(ServiceEnvelope, ServiceEnvelope, 2)
-
-
 PB_BIND(ChannelSet, ChannelSet, AUTO)


--- a/src/mesh/generated/apponly.pb.h
+++ b/src/mesh/generated/apponly.pb.h
@@ -4,7 +4,6 @@
 #ifndef PB_APPONLY_PB_H_INCLUDED
 #define PB_APPONLY_PB_H_INCLUDED
 #include <pb.h>
-#include "mesh.pb.h"
 #include "channel.pb.h"

 #if PB_PROTO_HEADER_VERSION != 40
@@ -16,54 +15,31 @@ typedef struct _ChannelSet {
    pb_callback_t settings;
 } ChannelSet;

-typedef struct _ServiceEnvelope {
-    bool has_packet;
-    MeshPacket packet;
-    pb_callback_t channel_id;
-    pb_callback_t gateway_id;
-} ServiceEnvelope;
-

 #ifdef __cplusplus
 extern "C" {
 #endif

 /* Initializer values for message structs */
-#define ServiceEnvelope_init_default             {false, MeshPacket_init_default, {{NULL}, NULL}, {{NULL}, NULL}}
 #define ChannelSet_init_default                  {{{NULL}, NULL}}
-#define ServiceEnvelope_init_zero                {false, MeshPacket_init_zero, {{NULL}, NULL}, {{NULL}, NULL}}
 #define ChannelSet_init_zero                     {{{NULL}, NULL}}

 /* Field tags (for use in manual encoding/decoding) */
 #define ChannelSet_settings_tag                  1
-#define ServiceEnvelope_packet_tag               1
-#define ServiceEnvelope_channel_id_tag           2
-#define ServiceEnvelope_gateway_id_tag           3

 /* Struct field encoding specification for nanopb */
-#define ServiceEnvelope_FIELDLIST(X, a) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  packet,            1) \
-X(a, CALLBACK, SINGULAR, STRING,   channel_id,        2) \
-X(a, CALLBACK, SINGULAR, STRING,   gateway_id,        3)
-#define ServiceEnvelope_CALLBACK pb_default_field_callback
-#define ServiceEnvelope_DEFAULT NULL
-#define ServiceEnvelope_packet_MSGTYPE MeshPacket
-
 #define ChannelSet_FIELDLIST(X, a) \
 X(a, CALLBACK, REPEATED, MESSAGE,  settings,          1)
 #define ChannelSet_CALLBACK pb_default_field_callback
 #define ChannelSet_DEFAULT NULL
 #define ChannelSet_settings_MSGTYPE ChannelSettings

-extern const pb_msgdesc_t ServiceEnvelope_msg;
 extern const pb_msgdesc_t ChannelSet_msg;

 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
-#define ServiceEnvelope_fields &ServiceEnvelope_msg
 #define ChannelSet_fields &ChannelSet_msg

 /* Maximum encoded size of messages (where known) */
-/* ServiceEnvelope_size depends on runtime parameters */
 /* ChannelSet_size depends on runtime parameters */

 #ifdef __cplusplus
--- a/src/mesh/generated/deviceonly.pb.h
+++ b/src/mesh/generated/deviceonly.pb.h
@@ -125,7 +125,7 @@ extern const pb_msgdesc_t ChannelFile_msg;
 /* Maximum encoded size of messages (where known) */
 #define LegacyRadioConfig_size                   4
 #define LegacyRadioConfig_LegacyPreferences_size 2
-#define DeviceState_size                         5118
+#define DeviceState_size                         5184
 #define ChannelFile_size                         832

 #ifdef __cplusplus
--- a/src/mesh/generated/mesh.pb.c
+++ b/src/mesh/generated/mesh.pb.c
@@ -39,6 +39,9 @@ PB_BIND(FromRadio, FromRadio, 2)
 PB_BIND(ToRadio, ToRadio, 2)


+PB_BIND(ToRadio_PeerInfo, ToRadio_PeerInfo, AUTO)
+
+



--- a/src/mesh/generated/mesh.pb.h
+++ b/src/mesh/generated/mesh.pb.h
@@ -21,6 +21,7 @@ typedef enum _HardwareModel {
    HardwareModel_TBEAM0p7 = 6,
    HardwareModel_T_ECHO = 7,
    HardwareModel_TLORA_V1_1p3 = 8,
+    HardwareModel_RAK4631 = 9,
    HardwareModel_LORA_RELAY_V1 = 32,
    HardwareModel_NRF52840DK = 33,
    HardwareModel_PPR = 34,
@@ -129,12 +130,18 @@ typedef struct _RouteDiscovery {
    uint32_t route[8];
 } RouteDiscovery;

+typedef struct _ToRadio_PeerInfo {
+    uint32_t app_version;
+    bool mqtt_gateway;
+} ToRadio_PeerInfo;
+
 typedef struct _User {
    char id[16];
    char long_name[40];
    char short_name[5];
    pb_byte_t macaddr[6];
    HardwareModel hw_model;
+    bool is_licensed;
 } User;

 typedef PB_BYTES_ARRAY_T(256) MeshPacket_encrypted_t;
@@ -192,6 +199,7 @@ typedef struct _ToRadio {
    pb_size_t which_payloadVariant;
    union {
        MeshPacket packet;
+        ToRadio_PeerInfo peer_info;
        uint32_t want_config_id;
        bool disconnect;
    };
@@ -230,7 +238,7 @@ extern "C" {

 /* Initializer values for message structs */
 #define Position_init_default                    {0, 0, 0, 0, 0}
-#define User_init_default                        {"", "", "", {0}, _HardwareModel_MIN}
+#define User_init_default                        {"", "", "", {0}, _HardwareModel_MIN, 0}
 #define RouteDiscovery_init_default              {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_default                     {0, {RouteDiscovery_init_default}}
 #define Data_init_default                        {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0}
@@ -240,8 +248,9 @@ extern "C" {
 #define LogRecord_init_default                   {"", 0, "", _LogRecord_Level_MIN}
 #define FromRadio_init_default                   {0, 0, {MyNodeInfo_init_default}}
 #define ToRadio_init_default                     {0, {MeshPacket_init_default}}
+#define ToRadio_PeerInfo_init_default            {0, 0}
 #define Position_init_zero                       {0, 0, 0, 0, 0}
-#define User_init_zero                           {"", "", "", {0}, _HardwareModel_MIN}
+#define User_init_zero                           {"", "", "", {0}, _HardwareModel_MIN, 0}
 #define RouteDiscovery_init_zero                 {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_zero                        {0, {RouteDiscovery_init_zero}}
 #define Data_init_zero                           {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0}
@@ -251,6 +260,7 @@ extern "C" {
 #define LogRecord_init_zero                      {"", 0, "", _LogRecord_Level_MIN}
 #define FromRadio_init_zero                      {0, 0, {MyNodeInfo_init_zero}}
 #define ToRadio_init_zero                        {0, {MeshPacket_init_zero}}
+#define ToRadio_PeerInfo_init_zero               {0, 0}

 /* Field tags (for use in manual encoding/decoding) */
 #define Data_portnum_tag                         1
@@ -282,11 +292,14 @@ extern "C" {
 #define Position_battery_level_tag               4
 #define Position_time_tag                        9
 #define RouteDiscovery_route_tag                 2
+#define ToRadio_PeerInfo_app_version_tag         1
+#define ToRadio_PeerInfo_mqtt_gateway_tag        2
 #define User_id_tag                              1
 #define User_long_name_tag                       2
 #define User_short_name_tag                      3
 #define User_macaddr_tag                         4
 #define User_hw_model_tag                        6
+#define User_is_licensed_tag                     7
 #define MeshPacket_from_tag                      1
 #define MeshPacket_to_tag                        2
 #define MeshPacket_channel_tag                   3
@@ -315,6 +328,7 @@ extern "C" {
 #define FromRadio_rebooted_tag                   9
 #define FromRadio_packet_tag                     11
 #define ToRadio_packet_tag                       2
+#define ToRadio_peer_info_tag                    3
 #define ToRadio_want_config_id_tag               100
 #define ToRadio_disconnect_tag                   104

@@ -333,7 +347,8 @@ X(a, STATIC,   SINGULAR, STRING,   id,                1) \
 X(a, STATIC,   SINGULAR, STRING,   long_name,         2) \
 X(a, STATIC,   SINGULAR, STRING,   short_name,        3) \
 X(a, STATIC,   SINGULAR, FIXED_LENGTH_BYTES, macaddr,           4) \
-X(a, STATIC,   SINGULAR, UENUM,    hw_model,          6)
+X(a, STATIC,   SINGULAR, UENUM,    hw_model,          6) \
+X(a, STATIC,   SINGULAR, BOOL,     is_licensed,       7)
 #define User_CALLBACK NULL
 #define User_DEFAULT NULL

@@ -431,11 +446,19 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,packet,packet),  11)

 #define ToRadio_FIELDLIST(X, a) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,packet,packet),   2) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,peer_info,peer_info),   3) \
 X(a, STATIC,   ONEOF,    UINT32,   (payloadVariant,want_config_id,want_config_id), 100) \
 X(a, STATIC,   ONEOF,    BOOL,     (payloadVariant,disconnect,disconnect), 104)
 #define ToRadio_CALLBACK NULL
 #define ToRadio_DEFAULT NULL
 #define ToRadio_payloadVariant_packet_MSGTYPE MeshPacket
+#define ToRadio_payloadVariant_peer_info_MSGTYPE ToRadio_PeerInfo
+
+#define ToRadio_PeerInfo_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   app_version,       1) \
+X(a, STATIC,   SINGULAR, BOOL,     mqtt_gateway,      2)
+#define ToRadio_PeerInfo_CALLBACK NULL
+#define ToRadio_PeerInfo_DEFAULT NULL

 extern const pb_msgdesc_t Position_msg;
 extern const pb_msgdesc_t User_msg;
@@ -448,6 +471,7 @@ extern const pb_msgdesc_t MyNodeInfo_msg;
 extern const pb_msgdesc_t LogRecord_msg;
 extern const pb_msgdesc_t FromRadio_msg;
 extern const pb_msgdesc_t ToRadio_msg;
+extern const pb_msgdesc_t ToRadio_PeerInfo_msg;

 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define Position_fields &Position_msg
@@ -461,19 +485,21 @@ extern const pb_msgdesc_t ToRadio_msg;
 #define LogRecord_fields &LogRecord_msg
 #define FromRadio_fields &FromRadio_msg
 #define ToRadio_fields &ToRadio_msg
+#define ToRadio_PeerInfo_fields &ToRadio_PeerInfo_msg

 /* Maximum encoded size of messages (where known) */
 #define Position_size                            37
-#define User_size                                74
+#define User_size                                76
 #define RouteDiscovery_size                      40
 #define Routing_size                             42
 #define Data_size                                260
 #define MeshPacket_size                          309
-#define NodeInfo_size                            131
+#define NodeInfo_size                            133
 #define MyNodeInfo_size                          95
 #define LogRecord_size                           81
 #define FromRadio_size                           318
 #define ToRadio_size                             312
+#define ToRadio_PeerInfo_size                    8

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mesh/generated/mqtt.pb.c
+++ b/src/mesh/generated/mqtt.pb.c
@@ -0,0 +1,12 @@
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.4.4 */
+
+#include "mqtt.pb.h"
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+PB_BIND(ServiceEnvelope, ServiceEnvelope, AUTO)
+
+
+
--- a/src/mesh/generated/mqtt.pb.h
+++ b/src/mesh/generated/mqtt.pb.h
@@ -0,0 +1,55 @@
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.4.4 */
+
+#ifndef PB_MQTT_PB_H_INCLUDED
+#define PB_MQTT_PB_H_INCLUDED
+#include <pb.h>
+#include "mesh.pb.h"
+
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+/* Struct definitions */
+typedef struct _ServiceEnvelope {
+    struct _MeshPacket *packet;
+    char *channel_id;
+    char *gateway_id;
+} ServiceEnvelope;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Initializer values for message structs */
+#define ServiceEnvelope_init_default             {NULL, NULL, NULL}
+#define ServiceEnvelope_init_zero                {NULL, NULL, NULL}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define ServiceEnvelope_packet_tag               1
+#define ServiceEnvelope_channel_id_tag           2
+#define ServiceEnvelope_gateway_id_tag           3
+
+/* Struct field encoding specification for nanopb */
+#define ServiceEnvelope_FIELDLIST(X, a) \
+X(a, POINTER,  OPTIONAL, MESSAGE,  packet,            1) \
+X(a, POINTER,  SINGULAR, STRING,   channel_id,        2) \
+X(a, POINTER,  SINGULAR, STRING,   gateway_id,        3)
+#define ServiceEnvelope_CALLBACK NULL
+#define ServiceEnvelope_DEFAULT NULL
+#define ServiceEnvelope_packet_MSGTYPE MeshPacket
+
+extern const pb_msgdesc_t ServiceEnvelope_msg;
+
+/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
+#define ServiceEnvelope_fields &ServiceEnvelope_msg
+
+/* Maximum encoded size of messages (where known) */
+/* ServiceEnvelope_size depends on runtime parameters */
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
--- a/src/mesh/generated/radioconfig.pb.h
+++ b/src/mesh/generated/radioconfig.pb.h
@@ -87,6 +87,8 @@ typedef struct _RadioConfig_UserPreferences {
    bool fixed_position;
    bool serial_disabled;
    float frequency_offset;
+    char mqtt_server[32];
+    bool mqtt_disabled;
    bool factory_reset;
    bool debug_log_enabled;
    pb_size_t ignore_incoming_count;
@@ -152,9 +154,9 @@ extern "C" {

 /* Initializer values for message structs */
 #define RadioConfig_init_default                 {false, RadioConfig_UserPreferences_init_default}
-#define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0}
+#define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0}
 #define RadioConfig_init_zero                    {false, RadioConfig_UserPreferences_init_zero}
-#define RadioConfig_UserPreferences_init_zero    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0}
+#define RadioConfig_UserPreferences_init_zero    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0}

 /* Field tags (for use in manual encoding/decoding) */
 #define RadioConfig_UserPreferences_position_broadcast_secs_tag 1
@@ -181,6 +183,8 @@ extern "C" {
 #define RadioConfig_UserPreferences_fixed_position_tag 39
 #define RadioConfig_UserPreferences_serial_disabled_tag 40
 #define RadioConfig_UserPreferences_frequency_offset_tag 41
+#define RadioConfig_UserPreferences_mqtt_server_tag 42
+#define RadioConfig_UserPreferences_mqtt_disabled_tag 43
 #define RadioConfig_UserPreferences_factory_reset_tag 100
 #define RadioConfig_UserPreferences_debug_log_enabled_tag 101
 #define RadioConfig_UserPreferences_ignore_incoming_tag 103
@@ -243,6 +247,8 @@ X(a, STATIC,   SINGULAR, BOOL,     is_low_power,     38) \
 X(a, STATIC,   SINGULAR, BOOL,     fixed_position,   39) \
 X(a, STATIC,   SINGULAR, BOOL,     serial_disabled,  40) \
 X(a, STATIC,   SINGULAR, FLOAT,    frequency_offset,  41) \
+X(a, STATIC,   SINGULAR, STRING,   mqtt_server,      42) \
+X(a, STATIC,   SINGULAR, BOOL,     mqtt_disabled,    43) \
 X(a, STATIC,   SINGULAR, BOOL,     factory_reset,   100) \
 X(a, STATIC,   SINGULAR, BOOL,     debug_log_enabled, 101) \
 X(a, STATIC,   REPEATED, UINT32,   ignore_incoming, 103) \
@@ -282,8 +288,8 @@ extern const pb_msgdesc_t RadioConfig_UserPreferences_msg;
 #define RadioConfig_UserPreferences_fields &RadioConfig_UserPreferences_msg

 /* Maximum encoded size of messages (where known) */
-#define RadioConfig_size                         357
-#define RadioConfig_UserPreferences_size         354
+#define RadioConfig_size                         394
+#define RadioConfig_UserPreferences_size         391

 #ifdef __cplusplus
 } /* extern "C" */
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -0,0 +1,169 @@
+#include "MQTT.h"
+#include "NodeDB.h"
+#include "main.h"
+#include "mesh/Channels.h"
+#include "mesh/Router.h"
+#include "mesh/generated/mqtt.pb.h"
+#include <WiFi.h>
+#include <assert.h>
+
+MQTT *mqtt;
+
+String statusTopic = "msh/1/stat/";
+String cryptTopic = "msh/1/c/"; // msh/1/c/CHANNELID/NODEID
+
+void MQTT::mqttCallback(char *topic, byte *payload, unsigned int length)
+{
+    mqtt->onPublish(topic, payload, length);
+}
+
+void MQTT::onPublish(char *topic, byte *payload, unsigned int length)
+{
+    // parsing ServiceEnvelope
+    ServiceEnvelope e = ServiceEnvelope_init_default;
+    if (!pb_decode_from_bytes(payload, length, ServiceEnvelope_fields, &e)) {
+        DEBUG_MSG("Invalid MQTT service envelope, topic %s, len %u!\n", topic, length);
+    } else {
+        if (strcmp(e.gateway_id, owner.id) == 0)
+            DEBUG_MSG("Ignoring downlink message we originally sent.\n");
+        else {
+            if (e.packet) {
+                DEBUG_MSG("Received MQTT topic %s, len=%u\n", topic, length);
+                MeshPacket *p = packetPool.allocCopy(*e.packet);
+
+                // ignore messages sent by us or if we don't have the channel key
+                if (router && p->from != nodeDB.getNodeNum() && perhapsDecode(p))
+                    router->enqueueReceivedMessage(p);
+                else
+                    packetPool.release(p);
+            }
+        }
+
+        // make sure to free both strings and the MeshPacket (passing in NULL is acceptable)
+        free(e.channel_id);
+        free(e.gateway_id);
+        free(e.packet);
+    }
+}
+
+void mqttInit()
+{
+    new MQTT();
+}
+
+MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient)
+{
+    assert(!mqtt);
+    mqtt = this;
+
+    pubSub.setCallback(mqttCallback);
+}
+
+void MQTT::reconnect()
+{
+    // pubSub.setServer("devsrv.ezdevice.net", 1883); or 192.168.10.188
+    const char *serverAddr = "mqtt.meshtastic.org"; // default hostname
+
+    if (*radioConfig.preferences.mqtt_server)
+        serverAddr = radioConfig.preferences.mqtt_server; // Override the default
+
+    pubSub.setServer(serverAddr, 1883);
+
+    DEBUG_MSG("Connecting to MQTT server\n", serverAddr);
+    auto myStatus = (statusTopic + owner.id);
+    bool connected = pubSub.connect(owner.id, "meshdev", "large4cats", myStatus.c_str(), 1, true, "offline");
+    if (connected) {
+        DEBUG_MSG("MQTT connected\n");
+        enabled = true; // Start running background process again
+        runASAP = true;
+
+        /// FIXME, include more information in the status text
+        bool ok = pubSub.publish(myStatus.c_str(), "online", true);
+        DEBUG_MSG("published %d\n", ok);
+
+        sendSubscriptions();
+    } else
+        DEBUG_MSG("Failed to contact MQTT server...\n");
+}
+
+void MQTT::sendSubscriptions()
+{
+    size_t numChan = channels.getNumChannels();
+    for (size_t i = 0; i < numChan; i++) {
+        auto &ch = channels.getByIndex(i);
+        if (ch.settings.downlink_enabled) {
+            String topic = cryptTopic + channels.getGlobalId(i) + "/#";
+            DEBUG_MSG("Subscribing to %s\n", topic.c_str());
+            pubSub.subscribe(topic.c_str(), 1); // FIXME, is QOS 1 right?
+        }
+    }
+}
+
+bool MQTT::wantsLink() const
+{
+    bool hasChannel = false;
+
+    if (radioConfig.preferences.mqtt_disabled) {
+        // DEBUG_MSG("MQTT disabled...\n");
+    } else {
+        // No need for link if no channel needed it
+        size_t numChan = channels.getNumChannels();
+        for (size_t i = 0; i < numChan; i++) {
+            auto &ch = channels.getByIndex(i);
+            if (ch.settings.uplink_enabled || ch.settings.downlink_enabled) {
+                hasChannel = true;
+                break;
+            }
+        }
+    }
+
+    return hasChannel && WiFi.isConnected();
+}
+
+int32_t MQTT::runOnce()
+{
+    bool wantConnection = wantsLink();
+
+    // If connected poll rapidly, otherwise only occasionally check for a wifi connection change and ability to contact server
+    if (!pubSub.loop()) {
+        if (wantConnection) {
+            reconnect();
+
+            // If we succeeded, start reading rapidly, else try again in 30 seconds (TCP connections are EXPENSIVE so try rarely)
+            return pubSub.connected() ? 20 : 30000;
+        } else
+            return 5000; // If we don't want connection now, check again in 5 secs
+    } else {
+        // we are connected to server, check often for new requests on the TCP port
+        if (!wantConnection) {
+            DEBUG_MSG("MQTT link not needed, dropping\n");
+            pubSub.disconnect();
+        }
+
+        return 20;
+    }
+}
+
+void MQTT::onSend(const MeshPacket &mp, ChannelIndex chIndex)
+{
+    auto &ch = channels.getByIndex(chIndex);
+
+    // don't bother sending if not connected...
+    if (pubSub.connected() && ch.settings.uplink_enabled) {
+        const char *channelId = channels.getGlobalId(chIndex); // FIXME, for now we just use the human name for the channel
+
+        ServiceEnvelope env = ServiceEnvelope_init_default;
+        env.channel_id = (char *)channelId;
+        env.gateway_id = owner.id;
+        env.packet = (MeshPacket *)&mp;
+
+        // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
+        static uint8_t bytes[MeshPacket_size + 64];
+        size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), ServiceEnvelope_fields, &env);
+
+        String topic = cryptTopic + channelId + "/" + owner.id;
+        DEBUG_MSG("publish %s, %u bytes\n", topic.c_str(), numBytes);
+
+        pubSub.publish(topic.c_str(), bytes, numBytes, false);
+    }
+}
--- a/src/mqtt/MQTT.h
+++ b/src/mqtt/MQTT.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include "configuration.h"
+
+#include "concurrency/OSThread.h"
+#include "mesh/Channels.h"
+#include <PubSubClient.h>
+#include <WiFiClient.h>
+
+/**
+ * Our wrapper/singleton for sending/receiving MQTT "udp" packets.  This object isolates the MQTT protocol implementation from
+ * the two components that use it: MQTTPlugin and MQTTSimInterface.
+ */
+class MQTT : private concurrency::OSThread
+{
+    // supposedly the current version is busted:
+    // http://www.iotsharing.com/2017/08/how-to-use-esp32-mqtts-with-mqtts-mosquitto-broker-tls-ssl.html
+    // WiFiClientSecure wifiClient;
+    WiFiClient mqttClient;
+    PubSubClient pubSub;
+
+  public:
+    MQTT();
+
+    /**
+     * Publish a packet on the glboal MQTT server.
+     * This hook must be called **after** the packet is encrypted (including the channel being changed to a hash).
+     * @param chIndex the index of the channel for this message
+     *
+     * Note: for messages we are forwarding on the mesh that we can't find the channel for (because we don't have the keys), we
+     * can not forward those messages to the cloud - becuase no way to find a global channel ID.
+     */
+    void onSend(const MeshPacket &mp, ChannelIndex chIndex);
+
+  protected:
+    virtual int32_t runOnce();
+
+  private:
+    /** return true if we have a channel that wants uplink/downlink
+     */
+    bool wantsLink() const;
+
+    /** Attempt to connect to server if necessary
+     */
+    void reconnect();
+
+    /** Tell the server what subscriptions we want (based on channels.downlink_enabled)
+     */
+    void sendSubscriptions();
+
+    /// Just C glue to call onPublish
+    static void mqttCallback(char *topic, byte *payload, unsigned int length);
+
+    /// Called when a new publish arrives from the MQTT server
+    void onPublish(char *topic, byte *payload, unsigned int length);
+};
+
+void mqttInit();
+
+extern MQTT *mqtt;
--- a/src/nrf52/main-nrf52.cpp
+++ b/src/nrf52/main-nrf52.cpp
@@ -13,174 +13,173 @@
 #include "BQ25713.h"
 #endif

-
-static inline void debugger_break(void) {
-  __asm volatile(
-      "bkpt #0x01\n\t"
-      "mov pc, lr\n\t");
+static inline void debugger_break(void)
+{
+    __asm volatile("bkpt #0x01\n\t"
+                   "mov pc, lr\n\t");
 }

 // handle standard gcc assert failures
-void __attribute__((noreturn))
-__assert_func(const char *file, int line, const char *func,
-              const char *failedexpr) {
-  DEBUG_MSG("assert failed %s: %d, %s, test=%s\n", file, line, func,
-            failedexpr);
-  // debugger_break(); FIXME doesn't work, possibly not for segger
-  while (1)
-    ;  // FIXME, reboot!
+void __attribute__((noreturn)) __assert_func(const char *file, int line, const char *func, const char *failedexpr)
+{
+    DEBUG_MSG("assert failed %s: %d, %s, test=%s\n", file, line, func, failedexpr);
+    // debugger_break(); FIXME doesn't work, possibly not for segger
+    while (1)
+        ; // FIXME, reboot!
 }

-void getMacAddr(uint8_t *dmac) {
-  ble_gap_addr_t addr;
-  if (sd_ble_gap_addr_get(&addr) == NRF_SUCCESS) {
-    memcpy(dmac, addr.addr, 6);
-  } else {
-    const uint8_t *src = (const uint8_t *)NRF_FICR->DEVICEADDR;
-    dmac[5] = src[0];
-    dmac[4] = src[1];
-    dmac[3] = src[2];
-    dmac[2] = src[3];
-    dmac[1] = src[4];
-    dmac[0] = src[5] |
-            0xc0;  // MSB high two bits get set elsewhere in the bluetooth stack
-  }
-}
-
-NRF52Bluetooth *nrf52Bluetooth;
-
-static bool bleOn = false;
-static const bool useSoftDevice = true;  // Set to false for easier debugging
-
-void setBluetoothEnable(bool on) {
-  if (on != bleOn) {
-    if (on) {
-      if (!nrf52Bluetooth) {
-        if (!useSoftDevice)
-          DEBUG_MSG("DISABLING NRF52 BLUETOOTH WHILE DEBUGGING\n");
-        else {
-          nrf52Bluetooth = new NRF52Bluetooth();
-          nrf52Bluetooth->setup();
-        }
-      }
+void getMacAddr(uint8_t *dmac)
+{
+    ble_gap_addr_t addr;
+    if (sd_ble_gap_addr_get(&addr) == NRF_SUCCESS) {
+        memcpy(dmac, addr.addr, 6);
    } else {
-      if (nrf52Bluetooth) nrf52Bluetooth->shutdown();
+        const uint8_t *src = (const uint8_t *)NRF_FICR->DEVICEADDR;
+        dmac[5] = src[0];
+        dmac[4] = src[1];
+        dmac[3] = src[2];
+        dmac[2] = src[3];
+        dmac[1] = src[4];
+        dmac[0] = src[5] | 0xc0; // MSB high two bits get set elsewhere in the bluetooth stack
    }
-    bleOn = on;
-  }
 }

-/**
- * Override printf to use the SEGGER output library
- */
-int printf(const char *fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-  auto res = SEGGER_RTT_vprintf(0, fmt, &args);
-  va_end(args);
-  return res;
-}
+static void initBrownout()
+{
+    auto vccthresh = POWER_POFCON_THRESHOLD_V17;

-void initBrownout() {
-  auto vccthresh = POWER_POFCON_THRESHOLD_V28;
-
-  if (useSoftDevice) {
    auto err_code = sd_power_pof_enable(POWER_POFCON_POF_Enabled);
    assert(err_code == NRF_SUCCESS);

    err_code = sd_power_pof_threshold_set(vccthresh);
    assert(err_code == NRF_SUCCESS);
-  } else {
-    uint32_t pof_flags = POWER_POFCON_POF_Enabled | (vccthresh << POWER_POFCON_THRESHOLD_Pos);
-    
-    #ifdef POWER_POFCON_THRESHOLDVDDH_Msk 
-    auto vcchthresh = POWER_POFCON_THRESHOLDVDDH_V27;
-    pof_flags |= (vcchthresh << POWER_POFCON_THRESHOLDVDDH_Pos);
-    #endif
-    
-    NRF_POWER->POFCON =  pof_flags;
-  }
+
+    // We don't bother with setting up brownout if soft device is disabled - because during production we always use softdevice
 }

-void checkSDEvents() {
-  if (useSoftDevice) {
-    uint32_t evt;
-    while (NRF_SUCCESS == sd_evt_get(&evt)) {
-      switch (evt) {
-        case NRF_EVT_POWER_FAILURE_WARNING:
-          recordCriticalError(CriticalErrorCode_Brownout);
-          break;
+NRF52Bluetooth *nrf52Bluetooth;

-        default:
-          DEBUG_MSG("Unexpected SDevt %d\n", evt);
-          break;
-      }
+static bool bleOn = false;
+static const bool useSoftDevice = true; // Set to false for easier debugging
+
+void setBluetoothEnable(bool on)
+{
+    if (on != bleOn) {
+        if (on) {
+            if (!nrf52Bluetooth) {
+                if (!useSoftDevice)
+                    DEBUG_MSG("DISABLING NRF52 BLUETOOTH WHILE DEBUGGING\n");
+                else {
+                    nrf52Bluetooth = new NRF52Bluetooth();
+                    nrf52Bluetooth->setup();
+
+                    // We delay brownout init until after BLE because BLE starts soft device
+                    initBrownout();
+                }
+            }
+        } else {
+            if (nrf52Bluetooth)
+                nrf52Bluetooth->shutdown();
+        }
+        bleOn = on;
    }
-  } else {
-    if (NRF_POWER->EVENTS_POFWARN)
-      recordCriticalError(CriticalErrorCode_Brownout);
-  }
 }

-void nrf52Loop() { checkSDEvents(); }
+/**
+ * Override printf to use the SEGGER output library
+ */
+int printf(const char *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    auto res = SEGGER_RTT_vprintf(0, fmt, &args);
+    va_end(args);
+    return res;
+}

-void nrf52Setup() {
-  auto why = NRF_POWER->RESETREAS;
-  // per
-  // https://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.nrf52832.ps.v1.1%2Fpower.html
-  DEBUG_MSG("Reset reason: 0x%x\n", why);
+void checkSDEvents()
+{
+    if (useSoftDevice) {
+        uint32_t evt;
+        while (NRF_SUCCESS == sd_evt_get(&evt)) {
+            switch (evt) {
+            case NRF_EVT_POWER_FAILURE_WARNING:
+                recordCriticalError(CriticalErrorCode_Brownout);
+                break;

-  // Per
-  // https://devzone.nordicsemi.com/nordic/nordic-blog/b/blog/posts/monitor-mode-debugging-with-j-link-and-gdbeclipse
-  // This is the recommended setting for Monitor Mode Debugging
-  NVIC_SetPriority(DebugMonitor_IRQn, 6UL);
+            default:
+                DEBUG_MSG("Unexpected SDevt %d\n", evt);
+                break;
+            }
+        }
+    } else {
+        if (NRF_POWER->EVENTS_POFWARN)
+            recordCriticalError(CriticalErrorCode_Brownout);
+    }
+}
+
+void nrf52Loop()
+{
+    checkSDEvents();
+}
+
+void nrf52Setup()
+{
+    auto why = NRF_POWER->RESETREAS;
+    // per
+    // https://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.nrf52832.ps.v1.1%2Fpower.html
+    DEBUG_MSG("Reset reason: 0x%x\n", why);
+
+    // Per
+    // https://devzone.nordicsemi.com/nordic/nordic-blog/b/blog/posts/monitor-mode-debugging-with-j-link-and-gdbeclipse
+    // This is the recommended setting for Monitor Mode Debugging
+    NVIC_SetPriority(DebugMonitor_IRQn, 6UL);

 #ifdef BQ25703A_ADDR
-  auto *bq = new BQ25713();
-  if (!bq->setup()) DEBUG_MSG("ERROR! Charge controller init failed\n");
+    auto *bq = new BQ25713();
+    if (!bq->setup())
+        DEBUG_MSG("ERROR! Charge controller init failed\n");
 #endif

-  // Init random seed
-  // FIXME - use this to get random numbers
-  // #include "nrf_rng.h"
-  // uint32_t r;
-  // ble_controller_rand_vector_get_blocking(&r, sizeof(r));
-  // randomSeed(r);
-  DEBUG_MSG("FIXME, call randomSeed\n");
-  // ::printf("TESTING PRINTF\n");
-
-  initBrownout();
+    // Init random seed
+    // FIXME - use this to get random numbers
+    // #include "nrf_rng.h"
+    // uint32_t r;
+    // ble_controller_rand_vector_get_blocking(&r, sizeof(r));
+    // randomSeed(r);
+    DEBUG_MSG("FIXME, call randomSeed\n");
+    // ::printf("TESTING PRINTF\n");
 }

-void cpuDeepSleep(uint64_t msecToWake) {
-  // FIXME, configure RTC or button press to wake us
-  // FIXME, power down SPI, I2C, RAMs
+void cpuDeepSleep(uint64_t msecToWake)
+{
+    // FIXME, configure RTC or button press to wake us
+    // FIXME, power down SPI, I2C, RAMs
 #ifndef NO_WIRE
-  Wire.end();
+    Wire.end();
 #endif
-  SPI.end();
-  // This may cause crashes as debug messages continue to flow.
-  Serial.end();
+    SPI.end();
+    // This may cause crashes as debug messages continue to flow.
+    Serial.end();

 #ifdef PIN_SERIAL_RX1
-  Serial1.end();
+    Serial1.end();
 #endif
-  setBluetoothEnable(false);
-  // FIXME, use system off mode with ram retention for key state?
-  // FIXME, use non-init RAM per
-  // https://devzone.nordicsemi.com/f/nordic-q-a/48919/ram-retention-settings-with-softdevice-enabled
+    setBluetoothEnable(false);
+    // FIXME, use system off mode with ram retention for key state?
+    // FIXME, use non-init RAM per
+    // https://devzone.nordicsemi.com/f/nordic-q-a/48919/ram-retention-settings-with-softdevice-enabled

-  auto ok = sd_power_system_off();
-  if (ok != NRF_SUCCESS) {
-    DEBUG_MSG(
-        "FIXME: Ignoring soft device (EasyDMA pending?) and forcing "
-        "system-off!\n");
-    NRF_POWER->SYSTEMOFF = 1;
-  }
+    auto ok = sd_power_system_off();
+    if (ok != NRF_SUCCESS) {
+        DEBUG_MSG("FIXME: Ignoring soft device (EasyDMA pending?) and forcing "
+                  "system-off!\n");
+        NRF_POWER->SYSTEMOFF = 1;
+    }

-  // The following code should not be run, because we are off
-  while (1) {
-    delay(5000);
-    DEBUG_MSG(".");
-  }
+    // The following code should not be run, because we are off
+    while (1) {
+        delay(5000);
+        DEBUG_MSG(".");
+    }
 }
--- a/src/plugins/AdminPlugin.cpp
+++ b/src/plugins/AdminPlugin.cpp
@@ -19,7 +19,7 @@ void AdminPlugin::handleGetChannel(const MeshPacket &req, uint32_t channelIndex)
        AdminMessage r = AdminMessage_init_default;
        r.get_channel_response = channels.getByIndex(channelIndex);
        r.which_variant = AdminMessage_get_channel_response_tag;
-        reply = allocDataProtobuf(r);
+        myReply = allocDataProtobuf(r);
    }
 }

@@ -36,7 +36,7 @@ void AdminPlugin::handleGetRadio(const MeshPacket &req)
        r.get_radio_response.preferences.ls_secs = getPref_ls_secs();

        r.which_variant = AdminMessage_get_radio_response_tag;
-        reply = allocDataProtobuf(r);
+        myReply = allocDataProtobuf(r);
    }
 }

@@ -56,8 +56,8 @@ bool AdminPlugin::handleReceivedProtobuf(const MeshPacket &mp, const AdminMessag

    case AdminMessage_set_channel_tag:
        DEBUG_MSG("Client is setting channel %d\n", r->set_channel.index);
-        if (r->set_channel.index < 0 || r->set_channel.index >= MAX_NUM_CHANNELS)
-            reply = allocErrorResponse(Routing_Error_BAD_REQUEST, &mp);
+        if (r->set_channel.index < 0 || r->set_channel.index >= (int)MAX_NUM_CHANNELS)
+            myReply = allocErrorResponse(Routing_Error_BAD_REQUEST, &mp);
        else
            handleSetChannel(r->set_channel);
        break;
@@ -66,7 +66,7 @@ bool AdminPlugin::handleReceivedProtobuf(const MeshPacket &mp, const AdminMessag
        uint32_t i = r->get_channel_request - 1;
        DEBUG_MSG("Client is getting channel %u\n", i);
        if (i >= MAX_NUM_CHANNELS)
-            reply = allocErrorResponse(Routing_Error_BAD_REQUEST, &mp);
+            myReply = allocErrorResponse(Routing_Error_BAD_REQUEST, &mp);
        else
            handleGetChannel(mp, i);
        break;
@@ -115,6 +115,10 @@ void AdminPlugin::handleSetOwner(const User &o)
        changed |= strcmp(owner.id, o.id);
        strcpy(owner.id, o.id);
    }
+    if (owner.is_licensed != o.is_licensed) {
+        changed = true;
+        owner.is_licensed = o.is_licensed;
+    }

    if (changed) // If nothing really changed, don't broadcast on the network or write to flash
        service.reloadOwner();
@@ -141,13 +145,6 @@ void AdminPlugin::handleSetRadio(const RadioConfig &r)
    service.reloadConfig();
 }

-MeshPacket *AdminPlugin::allocReply()
-{
-    auto r = reply;
-    reply = NULL; // Only use each reply once
-    return r;
-}
-
 AdminPlugin::AdminPlugin() : ProtobufPlugin("Admin", PortNum_ADMIN_APP, AdminMessage_fields)
 {
    // restrict to the admin channel for rx
--- a/src/plugins/AdminPlugin.h
+++ b/src/plugins/AdminPlugin.h
@@ -6,8 +6,6 @@
 */
 class AdminPlugin : public ProtobufPlugin<AdminMessage>
 {
-  MeshPacket *reply = NULL;
-  
  public:
    /** Constructor
     * name is for debugging output
@@ -21,10 +19,6 @@ class AdminPlugin : public ProtobufPlugin<AdminMessage>
    */
    virtual bool handleReceivedProtobuf(const MeshPacket &mp, const AdminMessage *p);

-    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
-     * so that subclasses can (optionally) send a response back to the original sender.  */
-    virtual MeshPacket *allocReply();
-
  private:
    void handleSetOwner(const User &o);
    void handleSetChannel(const Channel &cc);
--- a/src/plugins/RemoteHardwarePlugin.cpp
+++ b/src/plugins/RemoteHardwarePlugin.cpp
@@ -10,12 +10,13 @@

 // Because (FIXME) we currently don't tell API clients status on sent messages
 // we need to throttle our sending, so that if a gpio is bouncing up and down we
-// don't generate more messages than the net can send. So we limit watch messages to 
+// don't generate more messages than the net can send. So we limit watch messages to
 // a max of one change per 30 seconds
 #define WATCH_INTERVAL_MSEC (30 * 1000)

 /// Set pin modes for every set bit in a mask
-static void pinModes(uint64_t mask, uint8_t mode) {
+static void pinModes(uint64_t mask, uint8_t mode)
+{
    for (uint8_t i = 0; i < NUM_GPIOS; i++) {
        if (mask & (1 << i)) {
            pinMode(i, mode);
@@ -24,7 +25,8 @@ static void pinModes(uint64_t mask, uint8_t mode) {
 }

 /// Read all the pins mentioned in a mask
-static uint64_t digitalReads(uint64_t mask) {
+static uint64_t digitalReads(uint64_t mask)
+{
    uint64_t res = 0;

    pinModes(mask, INPUT_PULLUP);
@@ -40,10 +42,9 @@ static uint64_t digitalReads(uint64_t mask) {
    return res;
 }

-
 RemoteHardwarePlugin::RemoteHardwarePlugin()
-    : ProtobufPlugin("remotehardware", PortNum_REMOTE_HARDWARE_APP, HardwareMessage_fields),
-    concurrency::OSThread("remotehardware")
+    : ProtobufPlugin("remotehardware", PortNum_REMOTE_HARDWARE_APP, HardwareMessage_fields), concurrency::OSThread(
+                                                                                                 "remotehardware")
 {
 }

@@ -69,26 +70,26 @@ bool RemoteHardwarePlugin::handleReceivedProtobuf(const MeshPacket &req, const H

    case HardwareMessage_Type_READ_GPIOS: {
        // Print notification to LCD screen
-        if(screen)
+        if (screen)
            screen->print("Read GPIOs\n");

        uint64_t res = digitalReads(p.gpio_mask);

        // Send the reply
-        HardwareMessage reply = HardwareMessage_init_default;
-        reply.typ = HardwareMessage_Type_READ_GPIOS_REPLY;
-        reply.gpio_value = res;
-        MeshPacket *p = allocDataProtobuf(reply);
+        HardwareMessage r = HardwareMessage_init_default;
+        r.typ = HardwareMessage_Type_READ_GPIOS_REPLY;
+        r.gpio_value = res;
+        MeshPacket *p = allocDataProtobuf(r);
        setReplyTo(p, req);
-        service.sendToMesh(p);
+        myReply = p;
        break;
    }

    case HardwareMessage_Type_WATCH_GPIOS: {
        watchGpios = p.gpio_mask;
-        lastWatchMsec = 0; // Force a new publish soon
+        lastWatchMsec = 0;           // Force a new publish soon
        previousWatch = ~watchGpios; // generate a 'previous' value which is guaranteed to not match (to force an initial publish)
-        enabled = true; // Let our thread run at least once
+        enabled = true;              // Let our thread run at least once
        DEBUG_MSG("Now watching GPIOs 0x%llx\n", watchGpios);
        break;
    }
@@ -101,31 +102,31 @@ bool RemoteHardwarePlugin::handleReceivedProtobuf(const MeshPacket &req, const H
        DEBUG_MSG("Hardware operation %d not yet implemented! FIXME\n", p.typ);
        break;
    }
-    
-    return true; // handled
+
+    return false;
 }

-int32_t RemoteHardwarePlugin::runOnce() {
-    if(watchGpios) {
+int32_t RemoteHardwarePlugin::runOnce()
+{
+    if (watchGpios) {
        uint32_t now = millis();

-        if(now - lastWatchMsec >= WATCH_INTERVAL_MSEC) {
+        if (now - lastWatchMsec >= WATCH_INTERVAL_MSEC) {
            uint64_t curVal = digitalReads(watchGpios);

-            if(curVal != previousWatch) {
+            if (curVal != previousWatch) {
                previousWatch = curVal;
                DEBUG_MSG("Broadcasting GPIOS 0x%llx changed!\n", curVal);

                // Something changed!  Tell the world with a broadcast message
-                HardwareMessage reply = HardwareMessage_init_default;
-                reply.typ = HardwareMessage_Type_GPIOS_CHANGED;
-                reply.gpio_value = curVal;
-                MeshPacket *p = allocDataProtobuf(reply);
+                HardwareMessage r = HardwareMessage_init_default;
+                r.typ = HardwareMessage_Type_GPIOS_CHANGED;
+                r.gpio_value = curVal;
+                MeshPacket *p = allocDataProtobuf(r);
                service.sendToMesh(p);
            }
        }
-    }
-    else {
+    } else {
        // No longer watching anything - stop using CPU
        enabled = false;
    }
--- a/variants/WisCore_RAK4600_Board/variant.cpp
+++ b/variants/WisCore_RAK4600_Board/variant.cpp
@@ -0,0 +1,77 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+#include "nrf.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+	// D0 - D7
+	0, // xtal 1
+	1, // xtal 2
+	2, // a0
+	3, // a1
+	4, // a2
+	5, // a3
+	6, // TXD
+	7, // GPIO #7
+
+	// D8 - D13
+	8, // RXD
+
+	9,	// NFC1
+	10, // NFC2
+
+	11, // GPIO11
+
+	12, // SCK
+	13, // MOSI
+	14, // MISO
+
+	15, // GPIO #15
+	16, // GPIO #16
+
+	// function set pins
+	17, // LED #1 (red)
+	18, // SWO
+	19, // LED #2 (blue)
+	20, // DFU
+	21, // Reset
+	22, // Factory Reset
+	23, // N/A
+	24, // N/A
+
+	25, // SDA
+	26, // SCL
+	27, // GPIO #27
+	28, // A4
+	29, // A5
+	30, // A6
+	31, // A7
+};
+
+void initVariant()
+{
+	// LED1 & LED2
+	pinMode(PIN_LED1, OUTPUT);
+	ledOff(PIN_LED1);
+
+	pinMode(PIN_LED2, OUTPUT);
+	ledOff(PIN_LED2);
+}
--- a/variants/WisCore_RAK4600_Board/variant.h
+++ b/variants/WisCore_RAK4600_Board/variant.h
@@ -0,0 +1,126 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_RAK4600_
+#define _VARIANT_RAK4600_
+
+#define RAK4600
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+// define USE_LFRC    // Board uses RC for LF
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (32u)
+#define NUM_DIGITAL_PINS (32u)
+#define NUM_ANALOG_INPUTS (8u)
+#define NUM_ANALOG_OUTPUTS (0u)
+
+// LEDs
+#define PIN_LED1 (17)
+#define PIN_LED2 (19)
+
+#define LED_BUILTIN PIN_LED1
+#define LED_CONN PIN_LED2
+
+#define LED_RED PIN_LED1
+#define LED_BLUE PIN_LED2
+
+#define LED_STATE_ON 1 // State when LED is litted
+
+/*
+ * Analog pins
+ */
+#define PIN_A0 (2)
+#define PIN_A1 (3)
+#define PIN_A2 (4)
+#define PIN_A3 (5)
+#define PIN_A4 (28)
+#define PIN_A5 (29)
+#define PIN_A6 (30)
+#define PIN_A7 (31)
+
+	static const uint8_t A0 = PIN_A0;
+	static const uint8_t A1 = PIN_A1;
+	static const uint8_t A2 = PIN_A2;
+	static const uint8_t A3 = PIN_A3;
+	static const uint8_t A4 = PIN_A4;
+	static const uint8_t A5 = PIN_A5;
+	static const uint8_t A6 = PIN_A6;
+	static const uint8_t A7 = PIN_A7;
+#define ADC_RESOLUTION 14
+
+// Other pins
+#define PIN_AREF (24)
+#define PIN_VBAT PIN_A7
+#define PIN_NFC1 (9)
+#define PIN_NFC2 (10)
+
+	static const uint8_t AREF = PIN_AREF;
+
+/*
+ * Serial interfaces
+ */
+// Serial
+#define PIN_SERIAL_RX (22)
+#define PIN_SERIAL_TX (23)
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI_MISO (6)
+#define PIN_SPI_MOSI (5)
+#define PIN_SPI_SCK (7)
+
+	static const uint8_t SS = 4;
+	static const uint8_t MOSI = PIN_SPI_MOSI;
+	static const uint8_t MISO = PIN_SPI_MISO;
+	static const uint8_t SCK = PIN_SPI_SCK;
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (13u)
+#define PIN_WIRE_SCL (12u)
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif
--- a/variants/WisCore_RAK4631_Board/variant.cpp
+++ b/variants/WisCore_RAK4631_Board/variant.cpp
@@ -0,0 +1,46 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+#include "nrf.h"
+
+const uint32_t g_ADigitalPinMap[] =
+	{
+		// P0
+		0, 1, 2, 3, 4, 5, 6, 7,
+		8, 9, 10, 11, 12, 13, 14, 15,
+		16, 17, 18, 19, 20, 21, 22, 23,
+		24, 25, 26, 27, 28, 29, 30, 31,
+
+		// P1
+		32, 33, 34, 35, 36, 37, 38, 39,
+		40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+	// LED1 & LED2
+	pinMode(PIN_LED1, OUTPUT);
+	ledOff(PIN_LED1);
+
+	pinMode(PIN_LED2, OUTPUT);
+	ledOff(PIN_LED2);
+}
--- a/variants/WisCore_RAK4631_Board/variant.h
+++ b/variants/WisCore_RAK4631_Board/variant.h
@@ -0,0 +1,185 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _VARIANT_RAK4630_
+#define _VARIANT_RAK4630_
+
+#define RAK4630
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+// define USE_LFRC    // Board uses RC for LF
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (6)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// LEDs
+#define PIN_LED1 (35)
+#define PIN_LED2 (36)
+
+#define LED_BUILTIN PIN_LED1
+#define LED_CONN PIN_LED2
+
+#define LED_GREEN PIN_LED1
+#define LED_BLUE PIN_LED2
+
+#define LED_STATE_ON 1 // State when LED is litted
+
+/*
+ * Buttons
+ */
+#define PIN_BUTTON1 11
+#define PIN_BUTTON2 12
+#define PIN_BUTTON3 24
+#define PIN_BUTTON4 25
+
+/*
+ * Analog pins
+ */
+#define PIN_A0 (5)
+#define PIN_A1 (31)
+#define PIN_A2 (28)
+#define PIN_A3 (29)
+#define PIN_A4 (30)
+#define PIN_A5 (31)
+#define PIN_A6 (0xff)
+#define PIN_A7 (0xff)
+
+static const uint8_t A0 = PIN_A0;
+static const uint8_t A1 = PIN_A1;
+static const uint8_t A2 = PIN_A2;
+static const uint8_t A3 = PIN_A3;
+static const uint8_t A4 = PIN_A4;
+static const uint8_t A5 = PIN_A5;
+static const uint8_t A6 = PIN_A6;
+static const uint8_t A7 = PIN_A7;
+#define ADC_RESOLUTION 14
+
+// Other pins
+#define PIN_AREF (2)
+#define PIN_NFC1 (9)
+#define PIN_NFC2 (10)
+
+static const uint8_t AREF = PIN_AREF;
+
+/*
+ * Serial interfaces
+ */
+#define PIN_SERIAL1_RX (15)
+#define PIN_SERIAL1_TX (16)
+
+// Connected to Jlink CDC
+#define PIN_SERIAL2_RX (8)
+#define PIN_SERIAL2_TX (6)
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI_MISO (45)
+#define PIN_SPI_MOSI (44)
+#define PIN_SPI_SCK (43)
+
+static const uint8_t SS = 42;
+static const uint8_t MOSI = PIN_SPI_MOSI;
+static const uint8_t MISO = PIN_SPI_MISO;
+static const uint8_t SCK = PIN_SPI_SCK;
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (13)
+#define PIN_WIRE_SCL (14)
+
+// QSPI Pins
+#define PIN_QSPI_SCK 3
+#define PIN_QSPI_CS 26
+#define PIN_QSPI_IO0 30
+#define PIN_QSPI_IO1 29
+#define PIN_QSPI_IO2 28
+#define PIN_QSPI_IO3 2
+
+// On-board QSPI Flash
+#define EXTERNAL_FLASH_DEVICES IS25LP080D
+#define EXTERNAL_FLASH_USE_QSPI
+
+/* @note RAK5005-O GPIO mapping to RAK4631 GPIO ports
+   RAK5005-O <->  nRF52840
+   IO1       <->  P0.17 (Arduino GPIO number 17)
+   IO2       <->  P1.02 (Arduino GPIO number 34)
+   IO3       <->  P0.21 (Arduino GPIO number 21)
+   IO4       <->  P0.04 (Arduino GPIO number 4)
+   IO5       <->  P0.09 (Arduino GPIO number 9)
+   IO6       <->  P0.10 (Arduino GPIO number 10)
+   SW1       <->  P0.01 (Arduino GPIO number 1)
+   A0        <->  P0.04/AIN2 (Arduino Analog A2
+   A1        <->  P0.31/AIN7 (Arduino Analog A7
+   SPI_CS    <->  P0.26 (Arduino GPIO number 26)
+ */
+
+// RAK4630 LoRa module
+#define SX1262_CS (42)
+#define SX1262_DIO1 (47)
+#define SX1262_BUSY (46)
+#define SX1262_RESET (38)
+#define SX1262_TXEN (39)
+#define SX1262_RXEN (37)
+#define SX1262_E22 // DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
+
+// RAK1910 GPS module
+// If using the wisblock GPS module and pluged into Port A on WisBlock base
+// IO1 is hooked to PPS (pin 12 on header) = gpio 17
+// IO2 is hooked to GPS RESET = gpio 34, but it can not be used to this because IO2 is ALSO used to control 3V3_S power (1 is on).
+// Therefore must be 1 to keep peripherals powered
+// Power is on the controllable 3V3_S rail
+// #define PIN_GPS_RESET (34)
+#define PIN_GPS_EN (34)
+#define PIN_GPS_PPS (17) // Pulse per second input from the GPS
+#define GPS_RX_PIN PIN_SERIAL1_RX
+#define GPS_TX_PIN PIN_SERIAL1_TX
+
+// The battery sense is hooked to pin A0
+#define BATTERY_PIN PIN_A0
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 2
-build = 20
+build = 28
Author	SHA1	Message	Date
Kevin Hester	0d5c5046ee	Merge pull request #788 from geeksville/rak Add beginnings of RAK4600 and update to latest nrf52 arduino sources	2021-04-15 12:31:25 +08:00
Kevin Hester	7d3115bb9b	1.2.28	2021-04-15 12:30:46 +08:00
Kevin Hester	3156bb43c0	Merge remote-tracking branch 'root/master' into rak	2021-04-15 11:46:36 +08:00
Kevin Hester	ec18efbe7e	Add beginnings of RAK4600 and update to latest nrf52 arduino sources	2021-04-15 11:45:58 +08:00
Kevin Hester	b517b63be4	Merge pull request #786 from geeksville/rak Rak mostly finished	2021-04-12 13:46:56 +08:00
Kevin Hester	558571a23e	Merge remote-tracking branch 'root/master' into rak	2021-04-12 13:40:38 +08:00
Kevin Hester	f1376406fa	Add RAK4631 to build	2021-04-12 13:39:45 +08:00
Kevin Hester	55b38a7b02	RAK4631 is almost feature complete	2021-04-12 13:25:55 +08:00
Kevin Hester	7224782d23	rak4631: gps now works	2021-04-11 15:17:56 +08:00
Kevin Hester	f7d199a3be	rak4631: kinda runs	2021-04-11 13:58:48 +08:00
Kevin Hester	bfdc05154b	fix redundant segger init	2021-04-11 13:53:18 +08:00
Kevin Hester	f9a58b9dd1	lower brownout threshold to 1.7V	2021-04-11 13:52:39 +08:00
Kevin Hester	328b24537f	rak4631: builds but WIP	2021-04-11 13:33:27 +08:00
Kevin Hester	f97f02660e	Merge pull request #784 from geeksville/mqtt mqtt fixes	2021-04-11 10:05:48 +08:00
Kevin Hester	b4396da333	Merge remote-tracking branch 'root/master' into mqtt	2021-04-11 09:57:34 +08:00
Kevin Hester	a43a04986d	document peer_info	2021-04-11 09:24:36 +08:00
Kevin Hester	73384c5ac6	mqtt: don't downlink messages from us.	2021-04-11 09:23:34 +08:00
Kevin Hester	bc1726bbdb	Merge pull request #783 from geeksville/mqtt Mqtt	2021-04-10 12:36:03 +08:00
Kevin Hester	6d0a359ecf	1.2.25	2021-04-10 12:35:38 +08:00
Kevin Hester	63a10b9bf8	Merge remote-tracking branch 'root/master' into mqtt	2021-04-10 12:02:05 +08:00
Kevin Hester	992fae77ff	Merge pull request #782 from timgunter/more_trivial_updates_to_device_flash_scripts More trivial updates to device flash scripts	2021-04-10 12:01:56 +08:00
Kevin Hester	a39ba30a70	mqtt: fix downlink check	2021-04-10 11:57:20 +08:00
Kevin Hester	5e87ee338d	add is_licensed for ham users	2021-04-10 11:39:13 +08:00
Tim Gunter	ce5d57d250	Allow device-*.sh file to flash to be specified without '-f'	2021-04-09 20:02:25 -07:00
Tim Gunter	bae1d7a894	Default interpreter to "python" if "python3" doesn't exist	2021-04-09 20:01:12 -07:00
Kevin Hester	e71758457b	use production mqtt server	2021-04-10 10:55:56 +08:00
Kevin Hester	5dfd387b21	use real MQTT server DNS name	2021-04-09 16:56:28 +08:00
Kevin Hester	50ec03229f	Merge pull request #780 from geeksville/mqtt 1.2.23 - fix gpio access	2021-04-06 11:09:03 +08:00
Kevin Hester	4bfbb33a42	1.2.23	2021-04-06 11:00:03 +08:00
Kevin Hester	57bf4073c5	Merge remote-tracking branch 'root/master' into mqtt	2021-04-06 10:58:01 +08:00
Kevin Hester	cbfd80f893	fix #779 . Add basic GPIO documentation	2021-04-06 10:56:23 +08:00
Kevin Hester	cec905914c	Fix GPIO service and cleanup response handling	2021-04-06 10:34:23 +08:00
Jm Casler	4382caad88	Update RangeTestPlugin.md	2021-04-05 19:25:53 -07:00
Kevin Hester	c0cfd0bb41	remove dead code	2021-04-05 16:27:52 +08:00
Kevin Hester	276526005b	run-both should target tbeams	2021-04-05 16:27:44 +08:00
Kevin Hester	4a556099dc	Merge pull request #778 from geeksville/mqtt Add basics of MQTT (disabled by default)	2021-04-05 16:22:19 +08:00
Kevin Hester	7abc3534c4	fix build for !wifi devices	2021-04-05 13:00:56 +08:00
Kevin Hester	65914fad07	Merge remote-tracking branch 'root/master' into mqtt	2021-04-05 12:21:52 +08:00
Kevin Hester	63c976d4f1	update docs	2021-04-05 12:11:07 +08:00
Kevin Hester	7f5ab472b9	mqtt: downlink now works	2021-04-05 09:38:00 +08:00
Kevin Hester	a845406a19	cleanup packet encrypt/descrypt	2021-04-05 09:24:00 +08:00
Kevin Hester	8ef36bcc9c	note about security	2021-04-05 08:56:11 +08:00
Kevin Hester	3cd64bb8b5	allow passing even encrypted packets through the plugins	2021-04-05 08:44:47 +08:00
Kevin Hester	50a69d77e6	mqtt: begin subscription support	2021-04-05 08:42:52 +08:00
Kevin Hester	55b8314a2a	mqtt: only publish uplink_enabled channels	2021-04-05 07:57:06 +08:00
Kevin Hester	e84edc676f	mqtt: automatically start or stop as neede & attempt reconnect	2021-04-05 07:53:07 +08:00
Kevin Hester	d19af8b83d	mqtt: send packets after they are encrypted	2021-04-04 09:20:37 +08:00
Kevin Hester	638cec7f25	we now send packets to mqtt server	2021-04-03 22:27:06 +08:00
Kevin Hester	f3f09f0dcf	MQTT WIP	2021-04-03 16:06:40 +08:00
Kevin Hester	8890ca759d	fix nodeid	2021-04-03 15:04:03 +08:00
Kevin Hester	139da372e7	fix warning	2021-04-03 14:56:46 +08:00
Kevin Hester	dcf64dfacd	MQTT at least talks to server, works in native and esp32	2021-04-03 14:54:10 +08:00
Kevin Hester	2acde3333c	todo updates	2021-04-03 10:40:56 +08:00
				`@@ -0,0 +1 @@`
				`mosquitto_pub -h mqtt.meshtastic.org -u meshdev -P large4cats -t msh/1/stat/FakeNode -m online -d`