From 6a872b6ac28ef627249920ae471911efe9fd9485 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 1 Apr 2021 13:46:30 +0800
Subject: [PATCH 1/6] remove unused lib from CI build

---
 .github/workflows/main.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6e6f8e66d..d71407be2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,9 +22,6 @@ jobs:
       - name: Install extra python tools
         run: |
           pip install -U adafruit-nrfutil
-      - name: Install libs needed for linux build
-        run: |
-          sudo apt install -y libpsocksxx-dev
       - name: Build for tbeam
         run: platformio run -e tbeam
       - name: Build for heltec

From 8a20155214797cb748721263308b69419ba7985f Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 1 Apr 2021 14:05:27 +0800
Subject: [PATCH 2/6] simplify build

---
 .idea/workspace.xml                     | 2 +-
 docs/software/TODO.md                   | 2 +-
 docs/software/running-github-actions.md | 6 ++++++
 platformio.ini                          | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 docs/software/running-github-actions.md

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c4ee9541e..452b9985d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,7 +14,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="58922733-b05b-4b90-9655-b9b18914977a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/docs/software/TODO.md" beforeDir="false" afterPath="$PROJECT_DIR$/docs/software/TODO.md" afterDir="false" />
+      <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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/docs/software/TODO.md b/docs/software/TODO.md
index 435e10491..dca789af7 100644
--- a/docs/software/TODO.md
+++ b/docs/software/TODO.md
@@ -5,7 +5,7 @@ You probably don't care about this section - skip to the next one.
 ## before next release
 
 * test github actions locally on linux
-* fix github actions per sasha tip
+* DONE fix github actions per sasha tip
 * @havealoha comments about odd sleep behavior
 * fix heltec battery scaling
 * DONE sendtext busted in portduino, due to bytetime calculations
diff --git a/docs/software/running-github-actions.md b/docs/software/running-github-actions.md
new file mode 100644
index 000000000..7b810afd2
--- /dev/null
+++ b/docs/software/running-github-actions.md
@@ -0,0 +1,6 @@
+# Running github actions locally
+
+If you'd like to run the **same** integration tests we run on github but on your own machine, you can do the following.
+
+1. Install homebrew per https://brew.sh/
+2. Install https://github.com/nektos/act with "brew install act"
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index 92f0f69ac..ff7169508 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -40,7 +40,7 @@ extra_scripts = bin/platformio-custom.py
 ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc
 build_flags = -Wno-missing-field-initializers
   -Wno-format 
-  -Isrc -Isrc/mesh -Isrc/gps -Ilib/nanopb/include -Isrc/buzz -Wl,-Map,.pio/build/output.map 
+  -Isrc -Isrc/mesh -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map 
   -DHW_VERSION_${sysenv.COUNTRY}
   -DHW_VERSION=${sysenv.HW_VERSION}
   -DUSE_THREAD_NAMES

From 9d452ebf29a2455d9ab699610d2dcce2344d53f9 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 1 Apr 2021 14:12:02 +0800
Subject: [PATCH 3/6] add WIP notes about running github actions locally...

---
 docs/software/running-github-actions.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/software/running-github-actions.md b/docs/software/running-github-actions.md
index 7b810afd2..e0e42d6ef 100644
--- a/docs/software/running-github-actions.md
+++ b/docs/software/running-github-actions.md
@@ -3,4 +3,8 @@
 If you'd like to run the **same** integration tests we run on github but on your own machine, you can do the following.
 
 1. Install homebrew per https://brew.sh/
-2. Install https://github.com/nektos/act with "brew install act"
\ No newline at end of file
+2. Install https://github.com/nektos/act with "brew install act"
+3. cd into meshtastic-device and run "act"
+4. Select a "medium" sized image
+5. Alas - this "act" build **almost** works, but fails because it can't find lib/nanopb/include/pb.h!  So someone (you the reader? @geeksville ays hopefully...) needs to fix that before these instructions are complete.
+6. 
\ No newline at end of file

From 2c5ea03b7447d2fdb608ba866eb44f1d4bd4bba6 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 1 Apr 2021 20:32:12 +0800
Subject: [PATCH 4/6] fix VFS creation bug in native.  fix heap corruption in
 Fsm free

---
 bin/native-gdbserver.sh | 2 +-
 bin/native-run.sh       | 2 +-
 docs/software/TODO.md   | 7 +++++--
 platformio.ini          | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/native-gdbserver.sh b/bin/native-gdbserver.sh
index 535260b6f..cbcbae4f9 100755
--- a/bin/native-gdbserver.sh
+++ b/bin/native-gdbserver.sh
@@ -1,3 +1,3 @@
 set -e
 pio run --environment native
-gdbserver --once localhost:2345 .pio/build/native/program
+gdbserver --once localhost:2345 .pio/build/native/program "$@"
diff --git a/bin/native-run.sh b/bin/native-run.sh
index 2a3677b07..64d44df52 100755
--- a/bin/native-run.sh
+++ b/bin/native-run.sh
@@ -1,3 +1,3 @@
 set -e
 pio run --environment native
-.pio/build/native/program
+.pio/build/native/program "$@"
diff --git a/docs/software/TODO.md b/docs/software/TODO.md
index dca789af7..527c680b6 100644
--- a/docs/software/TODO.md
+++ b/docs/software/TODO.md
@@ -4,9 +4,11 @@ You probably don't care about this section - skip to the next one.
 
 ## before next release
 
-* test github actions locally on linux
+* remote admin busted? https://github.com/meshtastic/Meshtastic-device/issues/772
+* ABANDONED test github actions locally on linux
 * DONE fix github actions per sasha tip
 * @havealoha comments about odd sleep behavior
+* tell ttgo to preinstall new bins
 * fix heltec battery scaling
 * DONE sendtext busted in portduino, due to bytetime calculations
 * remove linux dependency in native build
@@ -17,6 +19,7 @@ You probably don't care about this section - skip to the next one.
 * add license to portduino and make announcement
 * DONE naks are being dropped (though enqueuedLocal) sometimes before phone/PC gets them
 * DONE have android fill in if local GPS has poor signal
+* optionally restrict position sends to a named channel
 * release to beta and amazon
 * add reference counting to mesh packets
 * allow multiple simultanteous phoneapi connections
@@ -135,7 +138,7 @@ You probably don't care about this section - skip to the next one.
 * DONE make all subpackets different versions of data
 * DONE move routing control into a data packet
 * have phoneapi done via plugin (will allow multiple simultaneous API clients - stop disabling BLE while using phone API)
-* use reference counting and dynamic sizing for meshpackets.
+* use reference counting and dynamic sizing for meshpackets. - use https://docs.microsoft.com/en-us/cpp/cpp/how-to-create-and-use-shared-ptr-instances?view=msvc-160 (already used in arduino)
 * let multiple PhoneAPI endpoints work at once
 * allow multiple simultaneous bluetooth connections (create the bluetooth phoneapi instance dynamically based on client id)
 * DONE figure out how to add micro_delta to position, make it so that phone apps don't need to understand it?
diff --git a/platformio.ini b/platformio.ini
index ff7169508..12f901121 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -68,7 +68,7 @@ lib_deps =
   https://github.com/meshtastic/esp8266-oled-ssd1306.git#35d796226b853b0c0ff818b2f1aa3d35e7296a96 ; ESP8266_SSD1306 
   https://github.com/geeksville/OneButton.git ; OneButton library for non-blocking button debounce
   1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
-  https://github.com/meshtastic/arduino-fsm.git#55c47b6cded91645aff05a27b6e5821d8d0f64be
+  https://github.com/meshtastic/arduino-fsm.git#829e967b8a95c094f73c60ef8dacfe66eae38940
   https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git#31015a55e630a2df77d9d714669c621a5bf355ad
   https://github.com/meshtastic/RadioLib.git#07de964e929238949035fb0d5887026a3058df1a
   https://github.com/meshtastic/TinyGPSPlus.git#f0f47067ef2f67c856475933188251c1ef615e79

From c798c0032ca5cd6397d48452f1d11c1b0932bec1 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Fri, 2 Apr 2021 09:14:12 +0800
Subject: [PATCH 5/6] add frequency_offset

---
 proto                               |  2 +-
 src/mesh/RadioInterface.cpp         |  2 +-
 src/mesh/generated/admin.pb.h       |  2 +-
 src/mesh/generated/radioconfig.pb.h | 11 ++++--
 src/portduino/PortduinoGlue.cpp     | 61 +++++++++++------------------
 5 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/proto b/proto
index 5cb09ec96..2aa143921 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit 5cb09ec96321ce0cfae18141e5da3b75e001c9fe
+Subproject commit 2aa14392145c38476bf61fea2c43629e1973af6d
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index 24cb8d732..1b004f463 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -319,7 +319,7 @@ void RadioInterface::applyModemConfig()
     // If user has manually specified a channel num, then use that, otherwise generate one by hashing the name
     const char *channelName = channels.getName(channels.getPrimaryIndex());
     int channel_num = channelSettings.channel_num ? channelSettings.channel_num - 1 : hash(channelName) % myRegion->numChannels;
-    freq = myRegion->freq + myRegion->spacing * channel_num;
+    freq = myRegion->freq + radioConfig.preferences.frequency_offset + myRegion->spacing * channel_num;
 
     DEBUG_MSG("Set radio: name=%s, config=%u, ch=%d, power=%d\n", channelName, channelSettings.modem_config, channel_num, power);
     DEBUG_MSG("Radio myRegion->freq: %f\n", myRegion->freq);
diff --git a/src/mesh/generated/admin.pb.h b/src/mesh/generated/admin.pb.h
index 73dbc00af..1096a9add 100644
--- 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                        354
+#define AdminMessage_size                        360
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/src/mesh/generated/radioconfig.pb.h b/src/mesh/generated/radioconfig.pb.h
index 3dfbbdda0..51d4d71e6 100644
--- a/src/mesh/generated/radioconfig.pb.h
+++ b/src/mesh/generated/radioconfig.pb.h
@@ -86,6 +86,7 @@ typedef struct _RadioConfig_UserPreferences {
     bool is_low_power;
     bool fixed_position;
     bool serial_disabled;
+    float frequency_offset;
     bool factory_reset;
     bool debug_log_enabled;
     pb_size_t ignore_incoming_count;
@@ -151,9 +152,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, _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, _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, _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, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define RadioConfig_UserPreferences_position_broadcast_secs_tag 1
@@ -179,6 +180,7 @@ extern "C" {
 #define RadioConfig_UserPreferences_is_low_power_tag 38
 #define RadioConfig_UserPreferences_fixed_position_tag 39
 #define RadioConfig_UserPreferences_serial_disabled_tag 40
+#define RadioConfig_UserPreferences_frequency_offset_tag 41
 #define RadioConfig_UserPreferences_factory_reset_tag 100
 #define RadioConfig_UserPreferences_debug_log_enabled_tag 101
 #define RadioConfig_UserPreferences_ignore_incoming_tag 103
@@ -240,6 +242,7 @@ X(a, STATIC,   SINGULAR, BOOL,     is_router,        37) \
 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, BOOL,     factory_reset,   100) \
 X(a, STATIC,   SINGULAR, BOOL,     debug_log_enabled, 101) \
 X(a, STATIC,   REPEATED, UINT32,   ignore_incoming, 103) \
@@ -279,8 +282,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                         351
-#define RadioConfig_UserPreferences_size         348
+#define RadioConfig_size                         357
+#define RadioConfig_UserPreferences_size         354
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/src/portduino/PortduinoGlue.cpp b/src/portduino/PortduinoGlue.cpp
index 5e3746335..876168891 100644
--- a/src/portduino/PortduinoGlue.cpp
+++ b/src/portduino/PortduinoGlue.cpp
@@ -1,76 +1,61 @@
 #include "CryptoEngine.h"
-#include "target_specific.h"
 #include "PortduinoGPIO.h"
 #include "mesh/RF95Interface.h"
 #include "sleep.h"
+#include "target_specific.h"
 
 #include <Utility.h>
 #include <assert.h>
 
-// FIXME - move getMacAddr/setBluetoothEnable into a HALPlatform class
-
-uint32_t hwId; // fixme move into portduino
-
-void getMacAddr(uint8_t *dmac)
-{
-    if (!hwId) {
-        notImplemented("getMacAddr");
-        hwId = random();
-    }
-
-    dmac[0] = 0x80;
-    dmac[1] = 0;
-    dmac[2] = 0;
-    dmac[3] = hwId >> 16;
-    dmac[4] = hwId >> 8;
-    dmac[5] = hwId & 0xff;
-}
+// FIXME - move setBluetoothEnable into a HALPlatform class
 
 void setBluetoothEnable(bool on)
 {
     // not needed
 }
 
-void cpuDeepSleep(uint64_t msecs) {
+void cpuDeepSleep(uint64_t msecs)
+{
     notImplemented("cpuDeepSleep");
 }
 
 void updateBatteryLevel(uint8_t level) NOT_IMPLEMENTED("updateBatteryLevel");
 
 /** Dear pinetab hardware geeks!
- * 
+ *
  * The current pinetab lora module has a slight bug.  The ch341 part only provides ISR assertions on edges.
  * This makes sense because USB interrupts happen through fast/repeated special irq urbs that are constantly
  * chattering on the USB bus.
- * 
+ *
  * But this isn't sufficient for level triggered ISR sources like the sx127x radios.  The common way that seems to
  * be addressed by cs341 users is to **always** connect the INT# (pin 26 on the ch341f) signal to one of the GPIO signals
  * on the part.  I'd recommend connecting that LORA_DIO0/INT# line to pin 19 (data 4) on the pinetab board.  This would
  * provide an efficent mechanism so that the (kernel) code in the cs341 driver that I've slightly hacked up to see the
  * current state of LORA_DIO0.  Without that access, I can't know if the interrupt is still pending - which would create
- * race conditions in packet handling.  
- * 
+ * race conditions in packet handling.
+ *
  * My workaround is to poll the status register internally to the sx127x.  Which is expensive because it involves a number of
  * i2c transactions and many trips back and forth between kernel and my userspace app.  I think shipping the current version
  * of the pinetab lora device would be fine because I can poll slowly (because lora is slow).  But if you ever have cause to
  * rev this board.  I highly encourage this small change.
- * 
+ *
  * Btw - your little "USB lora dongle" is really neat.  I encourage you to sell it, because even non pinetab customers could
  * use it to easily add lora to rasberry pi, desktop pcs etc...
- * 
+ *
  * Porduino helper class to do this i2c based polling:
  */
-class R595PolledIrqPin : public GPIOPin {
-public:
+class R595PolledIrqPin : public GPIOPin
+{
+  public:
     R595PolledIrqPin() : GPIOPin(LORA_DIO0, "LORA_DIO0") {}
 
     /// Read the low level hardware for this pin
     virtual PinStatus readPinHardware()
     {
-        if(isrPinStatus < 0)
+        if (isrPinStatus < 0)
             return LOW; // No interrupt handler attached, don't bother polling i2c right now
         else {
-            extern RadioInterface *rIf; // FIXME, temporary hack until we know if we need to keep this 
+            extern RadioInterface *rIf; // FIXME, temporary hack until we know if we need to keep this
 
             assert(rIf);
             RF95Interface *rIf95 = static_cast<RF95Interface *>(rIf);
@@ -81,17 +66,17 @@ public:
     }
 };
 
-
-/** apps run under portduino can optionally define a portduinoSetup() to 
+/** apps run under portduino can optionally define a portduinoSetup() to
  * use portduino specific init code (such as gpioBind) to setup portduino on their host machine,
  * before running 'arduino' code.
  */
-void  portduinoSetup() {
-  printf("Setting up Meshtastic on Porduino...\n");
+void portduinoSetup()
+{
+    printf("Setting up Meshtastic on Porduino...\n");
 
-  // FIXME: disable while not testing with real hardware
-  // gpioBind(new R595PolledIrqPin());
+    // FIXME: disable while not testing with real hardware
+    // gpioBind(new R595PolledIrqPin());
 
-  // gpioBind((new SimGPIOPin(LORA_RESET, "LORA_RESET")));
-  // gpioBind((new SimGPIOPin(RF95_NSS, "RF95_NSS"))->setSilent());
+    // gpioBind((new SimGPIOPin(LORA_RESET, "LORA_RESET")));
+    // gpioBind((new SimGPIOPin(RF95_NSS, "RF95_NSS"))->setSilent());
 }

From 8d47e4f3e0ca1ff100f20cbefde133728111a63c Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Fri, 2 Apr 2021 13:44:53 +0800
Subject: [PATCH 6/6] 1.2.20

---
 docs/software/TODO.md | 8 +++++---
 version.properties    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/software/TODO.md b/docs/software/TODO.md
index 527c680b6..b875961eb 100644
--- a/docs/software/TODO.md
+++ b/docs/software/TODO.md
@@ -4,12 +4,12 @@ You probably don't care about this section - skip to the next one.
 
 ## before next release
 
-* remote admin busted? https://github.com/meshtastic/Meshtastic-device/issues/772
+* fix heltec battery scaling
+* DONE remote admin busted? 
+* DONE check android code - @havealoha comments about odd sleep behavior
 * ABANDONED test github actions locally on linux
 * DONE fix github actions per sasha tip
-* @havealoha comments about odd sleep behavior
 * tell ttgo to preinstall new bins
-* fix heltec battery scaling
 * DONE sendtext busted in portduino, due to bytetime calculations
 * remove linux dependency in native build
 * DONE tcp stream problem in python+pordtuino, server thinks client dropped when client DID NOT DROP
@@ -52,6 +52,8 @@ You probably don't care about this section - skip to the next one.
 
 ## 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
diff --git a/version.properties b/version.properties
index 6a086e6a3..f2a097aea 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 2
-build = 17
+build = 20