Merge pull request #10 from meshtastic/master

update my fork from head

.vscode/settings.json

@@ -56,6 +56,7 @@
         "HFSR",
         "Meshtastic",
         "NEMAGPS",
+        "RDEF",
         "Ublox",
         "bkpt",
         "cfsr",

docs/_config.yml

@@ -1,7 +1,7 @@
 theme: jekyll-theme-cayman
 
 title: Meshtastic
-description: An opensource hiking, pilot, skiing, Signal-App-extending GPS mesh communicator
+description: An opensource hiking, pilot, skiing, secure GPS mesh communicator
 google_analytics: G-DRZ5H5EXHV
 
 include: [".well-known"]

docs/software/power.md

@@ -32,11 +32,15 @@ From lower to higher power consumption.
   onEntry: setBluetoothOn(true)
   onExit:
 
-- full on (ON) - Everything is on
+- serial API usage (SERIAL) - Screen is on, device doesn't sleep, bluetooth off
+  onEntry: setBluetooth off, screen on
+  onExit:
+
+- full on (ON) - Everything is on, can eventually timeout and lower to a lower power state
   onEntry: setBluetoothOn(true), screen.setOn(true)
   onExit: screen.setOn(false)
 
-- serial API usage (SERIAL) - Screen is on, device doesn't sleep, bluetooth off
+- has power (POWER) - Screen is on, device doesn't sleep, bluetooth on, will stay in this state as long as we have power
   onEntry: setBluetooth off, screen on
   onExit:
 
@@ -56,9 +60,11 @@ From lower to higher power consumption.
 - While in NB/DARK/ON: If we receive EVENT_NODEDB_UPDATED we transition to ON (so the new screen can be shown)
 - While in DARK: While the phone talks to us over BLE (EVENT_CONTACT_FROM_PHONE) reset any sleep timers and stay in DARK (needed for bluetooth sw update and nice user experience if the user is reading/replying to texts)
 - while in LS/NB/DARK: if SERIAL_CONNECTED, go to serial
+- while in any state: if we have AC power, go to POWER
 
 ### events that decrease cpu activity
 
+- While in POWER: if lose AC go to ON
 - While in SERIAL: if SERIAL_DISCONNECTED, go to NB
 - While in ON: If PRESS event occurs, reset screen_on_secs timer and tell the screen to handle the pess
 - While in ON: If it has been more than screen_on_secs since a press, lower to DARK

docs/software/sw-design.md

@@ -5,5 +5,5 @@ This is a mini design doc for developing the meshtastic software.
 * Our [project board](https://github.com/orgs/meshtastic/projects/1) - shows what things we are currently working on and remaining work items for the current release.
 * [Power Management](power.md)
 * [Mesh algorithm](mesh-alg.md)
-* [Bluetooth API](bluetooth-api.md) and porting guide for new clients (iOS, python, etc...)
+* [Device API](device-api.md) and porting guide for new clients (iOS, python, etc...)
 * TODO: how to port the device code to a new device.

platformio.ini

@@ -172,7 +172,7 @@ build_flags =
   -Isdk-nrfxlib/crypto/nrf_oberon/include -Lsdk-nrfxlib/crypto/nrf_oberon/lib/cortex-m4/hard-float/ -lliboberon_3.0.3 
 ;-DCFG_DEBUG=3
 src_filter = 
-  ${env.src_filter} -<esp32/> -<nimble/> -<meshwifi/>
+  ${arduino_base.src_filter} -<esp32/> -<nimble/> -<meshwifi/>
 lib_ignore =
   BluetoothOTA
 monitor_port = /dev/ttyACM1
@@ -253,7 +253,7 @@ lib_deps =
 ; The Portduino based sim environment on top of linux
 [env:linux]
 platform = https://github.com/geeksville/platform-portduino.git
-src_filter = ${env.src_filter} -<esp32/> -<nimble/> -<nrf52/>
+src_filter = ${env.src_filter} -<esp32/> -<nimble/> -<nrf52/> -<meshwifi/>
 build_flags = ${arduino_base.build_flags} -O0
 framework = arduino
 board = linux_x86_64

src/Power.cpp

@@ -119,6 +119,7 @@ void Power::readPowerStatus()
         const PowerStatus powerStatus =
             PowerStatus(hasBattery ? OptTrue : OptFalse, batteryLevel->isVBUSPlug() ? OptTrue : OptFalse,
                         batteryLevel->isChargeing() ? OptTrue : OptFalse, batteryVoltageMv, batteryChargePercent);
+        DEBUG_MSG("Read power stat %d\n", powerStatus.getHasUSB());
         newStatus.notifyObservers(&powerStatus);
 
         // If we have a battery at all and it is less than 10% full, force deep sleep
@@ -237,9 +238,11 @@ void Power::loop()
         }
         if (axp.isVbusRemoveIRQ()) {
             DEBUG_MSG("USB unplugged\n");
+            powerFSM.trigger(EVENT_POWER_DISCONNECTED);
         }
         if (axp.isVbusPlugInIRQ()) {
             DEBUG_MSG("USB plugged In\n");
+            powerFSM.trigger(EVENT_POWER_CONNECTED);
         }
         if (axp.isBattPlugInIRQ()) {
             DEBUG_MSG("Battery inserted\n");

src/PowerFSM.cpp

@@ -4,8 +4,8 @@
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "configuration.h"
-#include "main.h"
 #include "graphics/Screen.h"
+#include "main.h"
 #include "sleep.h"
 #include "target_specific.h"
 
@@ -123,6 +123,12 @@ static void serialEnter()
     screen.setOn(true);
 }
 
+static void powerEnter()
+{
+    screen.setOn(true);
+    setBluetoothEnable(true);
+}
+
 static void onEnter()
 {
     screen.setOn(true);
@@ -155,24 +161,31 @@ State stateDARK(darkEnter, NULL, NULL, "DARK");
 State stateSERIAL(serialEnter, NULL, NULL, "SERIAL");
 State stateBOOT(bootEnter, NULL, NULL, "BOOT");
 State stateON(onEnter, NULL, NULL, "ON");
+State statePOWER(powerEnter, NULL, NULL, "POWER");
 Fsm powerFSM(&stateBOOT);
 
 void PowerFSM_setup()
 {
-    powerFSM.add_timed_transition(&stateBOOT, &stateON, 3 * 1000, NULL, "boot timeout");
+    // If we already have AC power go to POWER state after init, otherwise go to ON
+    bool hasPower = powerStatus && powerStatus->getHasUSB();
+    DEBUG_MSG("PowerFSM init, USB power=%d\n", hasPower);
+    powerFSM.add_timed_transition(&stateBOOT, hasPower ? &statePOWER : &stateON, 3 * 1000, NULL, "boot timeout");
 
     powerFSM.add_transition(&stateLS, &stateDARK, EVENT_WAKE_TIMER, wakeForPing, "Wake timer");
 
-    // Note we don't really use this transition, because when we wake from light sleep we _always_ transition to NB and then it
-    // handles things powerFSM.add_transition(&stateLS, &stateNB, EVENT_RECEIVED_PACKET, NULL, "Received packet");
+    // Note we don't really use this transition, because when we wake from light sleep we _always_ transition to NB and then
+    // it handles things powerFSM.add_transition(&stateLS, &stateNB, EVENT_RECEIVED_PACKET, NULL, "Received packet");
 
     powerFSM.add_transition(&stateNB, &stateNB, EVENT_RECEIVED_PACKET, NULL, "Received packet, resetting win wake");
 
     // Handle press events - note: we ignore button presses when in API mode
     powerFSM.add_transition(&stateLS, &stateON, EVENT_PRESS, NULL, "Press");
     powerFSM.add_transition(&stateNB, &stateON, EVENT_PRESS, NULL, "Press");
     powerFSM.add_transition(&stateDARK, &stateON, EVENT_PRESS, NULL, "Press");
+    powerFSM.add_transition(&statePOWER, &statePOWER, EVENT_PRESS, screenPress, "Press");
     powerFSM.add_transition(&stateON, &stateON, EVENT_PRESS, screenPress, "Press"); // reenter On to restart our timers
+    powerFSM.add_transition(&stateSERIAL, &stateSERIAL, EVENT_PRESS, screenPress,
+                            "Press"); // Allow button to work while in serial API
 
     // Handle critically low power battery by forcing deep sleep
     powerFSM.add_transition(&stateBOOT, &stateSDS, EVENT_LOW_BATTERY, NULL, "LowBat");
@@ -199,6 +212,14 @@ void PowerFSM_setup()
     powerFSM.add_transition(&stateDARK, &stateSERIAL, EVENT_SERIAL_CONNECTED, NULL, "serial API");
     powerFSM.add_transition(&stateON, &stateSERIAL, EVENT_SERIAL_CONNECTED, NULL, "serial API");
 
+    powerFSM.add_transition(&stateLS, &statePOWER, EVENT_POWER_CONNECTED, NULL, "power connect");
+    powerFSM.add_transition(&stateNB, &statePOWER, EVENT_POWER_CONNECTED, NULL, "power connect");
+    powerFSM.add_transition(&stateDARK, &statePOWER, EVENT_POWER_CONNECTED, NULL, "power connect");
+    powerFSM.add_transition(&stateON, &statePOWER, EVENT_POWER_CONNECTED, NULL, "power connect");
+
+    powerFSM.add_transition(&statePOWER, &stateON, EVENT_POWER_DISCONNECTED, NULL, "power disconnected");
+    powerFSM.add_transition(&stateSERIAL, &stateON, EVENT_POWER_DISCONNECTED, NULL, "power disconnected");
+
     powerFSM.add_transition(&stateSERIAL, &stateNB, EVENT_SERIAL_DISCONNECTED, NULL, "serial disconnect");
 
     powerFSM.add_transition(&stateDARK, &stateDARK, EVENT_CONTACT_FROM_PHONE, NULL, "Contact from phone");

src/PowerFSM.h

@@ -13,9 +13,11 @@
 #define EVENT_BLUETOOTH_PAIR 7
 #define EVENT_NODEDB_UPDATED 8     // NodeDB has a big enough change that we think you should turn on the screen
 #define EVENT_CONTACT_FROM_PHONE 9 // the phone just talked to us over bluetooth
-#define EVENT_LOW_BATTERY 10 // Battery is critically low, go to sleep
+#define EVENT_LOW_BATTERY 10       // Battery is critically low, go to sleep
 #define EVENT_SERIAL_CONNECTED 11
 #define EVENT_SERIAL_DISCONNECTED 12
+#define EVENT_POWER_CONNECTED 13
+#define EVENT_POWER_DISCONNECTED 14
 
 extern Fsm powerFSM;
 

src/SerialConsole.cpp

@@ -40,6 +40,8 @@ void SerialConsole::onConnectionChanged(bool connected)
     if (connected) { // To prevent user confusion, turn off bluetooth while using the serial port api
         powerFSM.trigger(EVENT_SERIAL_CONNECTED);
     } else {
+        // FIXME, we get no notice of serial going away, we should instead automatically generate this event if we haven't
+        // received a packet in a while
         powerFSM.trigger(EVENT_SERIAL_DISCONNECTED);
     }
 }

src/esp32/WiFiServerAPI.cpp

@@ -52,6 +52,14 @@ void WiFiServerPort::loop()
 {
     auto client = available();
     if (client) {
-        new WiFiServerAPI(client);
+        // Close any previous connection (see FIXME in header file)
+        if (openAPI)
+            delete openAPI;
+
+        openAPI = new WiFiServerAPI(client);
     }
+
+    if (openAPI)
+        // Allow idle processing so the API can read from its incoming stream
+        openAPI->loop();
 }

src/esp32/WiFiServerAPI.h

@@ -29,6 +29,13 @@ class WiFiServerAPI : public StreamAPI
  */
 class WiFiServerPort : public WiFiServer
 {
+    /** The currently open port
+     *
+     * FIXME: We currently only allow one open TCP connection at a time, because we depend on the loop() call in this class to
+     * delegate to the worker.  Once coroutines are implemented we can relax this restriction.
+     */
+    WiFiServerAPI *openAPI = NULL;
+
   public:
     WiFiServerPort();
 

src/graphics/Screen.cpp

@@ -31,8 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "graphics/images.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
-#include "target_specific.h"
 #include "meshwifi/meshwifi.h"
+#include "target_specific.h"
 #include "utils.h"
 
 using namespace meshtastic; /** @todo remove */
@@ -809,18 +809,18 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     {
         concurrency::LockGuard guard(&lock);
         snprintf(channelStr, sizeof(channelStr), "%s", channelName.c_str());
-
-        // Display power status
-        if (powerStatus->getHasBattery())
-            drawBattery(display, x, y + 2, imgBattery, powerStatus);
-        else if (powerStatus->knowsUSB())
-            display->drawFastImage(x, y + 2, 16, 8, powerStatus->getHasUSB() ? imgUSB : imgPower);
-        // Display nodes status
-        drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 2, nodeStatus);
-        // Display GPS status
-        drawGPS(display, x + (SCREEN_WIDTH * 0.63), y + 2, gpsStatus);
     }
 
+    // Display power status
+    if (powerStatus->getHasBattery())
+        drawBattery(display, x, y + 2, imgBattery, powerStatus);
+    else if (powerStatus->knowsUSB())
+        display->drawFastImage(x, y + 2, 16, 8, powerStatus->getHasUSB() ? imgUSB : imgPower);
+    // Display nodes status
+    drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 2, nodeStatus);
+    // Display GPS status
+    drawGPS(display, x + (SCREEN_WIDTH * 0.63), y + 2, gpsStatus);
+
     // Draw the channel name
     display->drawString(x, y + FONT_HEIGHT, channelStr);
     // Draw our hardware ID to assist with bluetooth pairing

src/main.cpp

@@ -215,9 +215,9 @@ void setup()
 
     // Currently only the tbeam has a PMU
     power = new Power();
-    power->setup();
     power->setStatusHandler(powerStatus);
     powerStatus->observe(&power->newStatus);
+    power->setup(); // Must be after status handler is installed, so that handler gets notified of the initial configuration
 
 #ifdef NRF52_SERIES
     nrf52Setup();

src/mesh/MeshRadio.h

@@ -6,87 +6,14 @@
 #include "configuration.h"
 #include "mesh.pb.h"
 
-// US channel settings
-#define CH0_US 903.08f      // MHz
-#define CH_SPACING_US 2.16f // MHz
-#define NUM_CHANNELS_US 13
-
-// EU433 channel settings
-#define CH0_EU433 433.175f    // MHz
-#define CH_SPACING_EU433 0.2f // MHz
-#define NUM_CHANNELS_EU433 8
-
-// EU865 channel settings
-#define CH0_EU865 865.2f      // MHz
-#define CH_SPACING_EU865 0.3f // MHz
-#define NUM_CHANNELS_EU865 10
-
-// CN channel settings
-#define CH0_CN 470.0f      // MHz
-#define CH_SPACING_CN 2.0f // MHz FIXME, this is just a guess for 470-510
-#define NUM_CHANNELS_CN 20
-
-// JP channel settings (AS1 bandplan)
-#define CH0_JP 920.0f // MHz
-#define CH_SPACING_JP 0.5f
-#define NUM_CHANNELS_JP 10
-
-// TW channel settings (AS2 bandplan 923-925MHz)
-#define CH0_TW 923.0f // MHz
-#define CH_SPACING_TW 0.2
-#define NUM_CHANNELS_TW 10
-
-// AU/NZ channel settings 915-928MHz
-#define CH0_ANZ 916.0f      // MHz - avoid overcrowding on 915.0
-#define CH_SPACING_ANZ 0.5f
-#define NUM_CHANNELS_ANZ 20
-
-// KR channel settings (KR920-923)
-// Start from TTN download channel freq. (921.9f is for download, others are for uplink)
-#define CH0_KR 921.9f // MHz
-#define CH_SPACING_KR 0.2f
-#define NUM_CHANNELS_KR 8
-
-// FIXME add defs for other regions and use them here
-#ifdef HW_VERSION_US
-#define CH0 CH0_US
-#define CH_SPACING CH_SPACING_US
-#define NUM_CHANNELS NUM_CHANNELS_US
-#elif defined(HW_VERSION_EU433)
-#define CH0 CH0_EU433
-#define CH_SPACING CH_SPACING_EU433
-#define NUM_CHANNELS NUM_CHANNELS_EU433
-#elif defined(HW_VERSION_EU865)
-#define CH0 CH0_EU865
-#define CH_SPACING CH_SPACING_EU865
-#define NUM_CHANNELS NUM_CHANNELS_EU865
-#elif defined(HW_VERSION_CN)
-#define CH0 CH0_CN
-#define CH_SPACING CH_SPACING_CN
-#define NUM_CHANNELS NUM_CHANNELS_CN
-#elif defined(HW_VERSION_JP)
-// Also called AS1 bandplan
-#define CH0 CH0_JP
-#define CH_SPACING CH_SPACING_JP
-#define NUM_CHANNELS NUM_CHANNELS_JP
-#elif defined(HW_VERSION_TW)
-// Also called AS2 bandplan
-#define CH0 CH0_TW
-#define CH_SPACING CH_SPACING_TW
-#define NUM_CHANNELS NUM_CHANNELS_TW
-#elif defined(HW_VERSION_ANZ)
-// Australia and NZ
-#define CH0 CH0_ANZ
-#define CH_SPACING CH_SPACING_ANZ
-#define NUM_CHANNELS NUM_CHANNELS_ANZ
-#elif defined(HW_VERSION_KR)
-// Republic of Korea
-#define CH0 CH0_KR
-#define CH_SPACING CH_SPACING_KR
-#define NUM_CHANNELS NUM_CHANNELS_KR
-#else
-// HW version not set - assume US
-#define CH0 CH0_US
-#define CH_SPACING CH_SPACING_US
-#define NUM_CHANNELS NUM_CHANNELS_US
-#endif
+// Map from old region names to new region enums
+struct RegionInfo {
+    RegionCode code;
+    uint8_t numChannels;
+    uint8_t powerLimit; // Or zero for not set
+    float freq;
+    float spacing;
+    const char *name; // EU433 etc
+};
+
+extern const RegionInfo regions[];

src/mesh/MeshService.cpp

@@ -197,12 +197,14 @@ void MeshService::loop()
 }
 
 /// The radioConfig object just changed, call this to force the hw to change to the new settings
-void MeshService::reloadConfig()
+bool MeshService::reloadConfig()
 {
     // If we can successfully set this radio to these settings, save them to disk
-    nodeDB.resetRadioConfig(); // Don't let the phone send us fatally bad settings
+    bool didReset = nodeDB.resetRadioConfig(); // Don't let the phone send us fatally bad settings
     configChanged.notifyObservers(NULL);
     nodeDB.saveToDisk();
+
+    return didReset;
 }
 
 /// The owner User record just got updated, update our node DB and broadcast the info into the mesh