Merge pull request #788 from geeksville/rak

Add beginnings of RAK4600 and update to latest nrf52 arduino sources

.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

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
 

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

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}

bin/mqtt-listen.sh

@@ -1,3 +1,3 @@
 
-mosquitto_sub -h test.mosquitto.org -v -t mesh/stat/\# -t mesh/json/\#
+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"

bin/mqtt-send-status.sh

@@ -1 +1 @@
-mosquitto_pub -h test.mosquitto.org -t mesh/stat/FakeNode -m online -d
+mosquitto_pub -h mqtt.meshtastic.org -u meshdev -P large4cats -t msh/1/stat/FakeNode -m online -d

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/

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"
+}

docs/software/TODO.md

@@ -4,9 +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

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        |                                                                                                                   |

docs/software/mqtt.md

@@ -72,15 +72,17 @@ Any gateway-device will contact the MQTT broker.
 
 ### Topics
 
-* The "/mesh/crypt/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 "/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 gateway 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". 
+* 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". 
 
-* If it was possible to republish on mesh/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 mesh/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).
+* 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? 

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

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
@@ -193,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)
@@ -240,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
@@ -261,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
@@ -289,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
@@ -308,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
@@ -316,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
@@ -330,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
@@ -352,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
@@ -376,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
 

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

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;

src/main.cpp

@@ -313,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
@@ -431,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);

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

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)
+
+
 
 
 

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" */

src/mqtt/MQTT.cpp

@@ -9,8 +9,8 @@
 
 MQTT *mqtt;
 
-String statusTopic = "mesh/stat/";
-String cryptTopic = "mesh/crypt/"; // mesh/crypt/CHANNELID/NODEID
+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)
 {
@@ -24,16 +24,19 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length)
     if (!pb_decode_from_bytes(payload, length, ServiceEnvelope_fields, &e)) {
         DEBUG_MSG("Invalid MQTT service envelope, topic %s, len %u!\n", topic, length);
     } else {
-        DEBUG_MSG("Received MQTT topic %s, len=%u\n", topic, length);
+        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);
 
-        if (e.packet) {
-            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);
+                // 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)
@@ -59,7 +62,7 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient)
 void MQTT::reconnect()
 {
     // pubSub.setServer("devsrv.ezdevice.net", 1883); or 192.168.10.188
-    const char *serverAddr = "test.mosquitto.org"; // "mqtt.meshtastic.org"; // default hostname
+    const char *serverAddr = "mqtt.meshtastic.org"; // default hostname
 
     if (*radioConfig.preferences.mqtt_server)
         serverAddr = radioConfig.preferences.mqtt_server; // Override the default
@@ -68,8 +71,7 @@ void MQTT::reconnect()
 
     DEBUG_MSG("Connecting to MQTT server\n", serverAddr);
     auto myStatus = (statusTopic + owner.id);
-    // bool connected = pubSub.connect(nodeId.c_str(), "meshdev", "apes4cats", myStatus.c_str(), 1, true, "offline");
-    bool connected = pubSub.connect(owner.id, myStatus.c_str(), 1, true, "offline");
+    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
@@ -89,7 +91,7 @@ void MQTT::sendSubscriptions()
     size_t numChan = channels.getNumChannels();
     for (size_t i = 0; i < numChan; i++) {
         auto &ch = channels.getByIndex(i);
-        if (ch.settings.uplink_enabled) {
+        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?

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(".");
+    }
 }

src/plugins/AdminPlugin.cpp

@@ -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();

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);
+}

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

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);
+}

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

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 2
-build = 23
+build = 28