Merge branch 'dev' into cubecell

src/main.cpp

@@ -152,7 +152,10 @@ void setup()
 #else
     Wire.begin();
 #endif
+    // i2c still busted on new board
+#ifndef ARDUINO_NRF52840_PPR
     scanI2Cdevice();
+#endif
 
     // Buttons & LED
 #ifdef BUTTON_PIN
@@ -234,7 +237,7 @@ void setup()
         new SimRadio();
 #endif
 
-    if (!rIf->init())
+    if (!rIf || !rIf->init())
         recordCriticalError(ErrNoRadio);
     else
         router.addInterface(rIf);

src/mesh/NodeDB.cpp

@@ -110,8 +110,10 @@ void NodeDB::resetRadioConfig()
     */
 }
 
-void NodeDB::init()
+void NodeDB::installDefaultDeviceState()
 {
+    memset(&devicestate, 0, sizeof(devicestate));
+
     // init our devicestate with valid flags so protobuf writing/reading will work
     devicestate.has_my_node = true;
     devicestate.has_radio = true;
@@ -119,7 +121,7 @@ void NodeDB::init()
     devicestate.radio.has_channel_settings = true;
     devicestate.radio.has_preferences = true;
     devicestate.node_db_count = 0;
-    devicestate.receive_queue_count = 0;
+    devicestate.receive_queue_count = 0; // Not yet implemented FIXME
 
     resetRadioConfig();
 
@@ -139,12 +141,17 @@ void NodeDB::init()
     pickNewNodeNum(); // Note: we will repick later, just in case the settings are corrupted, but we need a valid
     // owner.short_name now
     sprintf(owner.long_name, "Unknown %02x%02x", ourMacAddr[4], ourMacAddr[5]);
-    sprintf(owner.short_name, "?%02X", myNodeInfo.my_node_num & 0xff);
+    sprintf(owner.short_name, "?%02X", (unsigned)(myNodeInfo.my_node_num & 0xff));
+}
+
+void NodeDB::init()
+{
+    installDefaultDeviceState();
 
     if (!FSBegin()) // FIXME - do this in main?
     {
         DEBUG_MSG("ERROR filesystem mount Failed\n");
-        // FIXME - report failure to phone
+        assert(0); // FIXME - report failure to phone
     }
 
     // saveToDisk();
@@ -210,7 +217,7 @@ const char *preftmp = "/db.proto.tmp";
 void NodeDB::loadFromDisk()
 {
 #ifdef FS
-    static DeviceState scratch;
+    // static DeviceState scratch; We no longer read into a tempbuf because this structure is 15KB of valuable RAM
 
     auto f = FS.open(preffile);
     if (f) {
@@ -219,16 +226,17 @@ void NodeDB::loadFromDisk()
 
         // DEBUG_MSG("Preload channel name=%s\n", channelSettings.name);
 
-        memset(&scratch, 0, sizeof(scratch));
-        if (!pb_decode(&stream, DeviceState_fields, &scratch)) {
+        memset(&devicestate, 0, sizeof(devicestate));
+        if (!pb_decode(&stream, DeviceState_fields, &devicestate)) {
             DEBUG_MSG("Error: can't decode protobuf %s\n", PB_GET_ERROR(&stream));
+            installDefaultDeviceState(); // Our in RAM copy might now be corrupt
             // FIXME - report failure to phone
         } else {
-            if (scratch.version < DEVICESTATE_MIN_VER)
+            if (devicestate.version < DEVICESTATE_MIN_VER) {
                 DEBUG_MSG("Warn: devicestate is old, discarding\n");
-            else {
-                DEBUG_MSG("Loaded saved preferences version %d\n", scratch.version);
-                devicestate = scratch;
+                installDefaultDeviceState();
+            } else {
+                DEBUG_MSG("Loaded saved preferences version %d\n", devicestate.version);
             }
 
             // DEBUG_MSG("Postload channel name=%s\n", channelSettings.name);
@@ -238,6 +246,7 @@ void NodeDB::loadFromDisk()
     } else {
         DEBUG_MSG("No saved preferences found\n");
     }
+
 #else
     DEBUG_MSG("ERROR: Filesystem not implemented\n");
 #endif

src/mesh/NodeDB.h

@@ -93,6 +93,9 @@ class NodeDB
 
     /// read our db from flash
     void loadFromDisk();
+
+    /// Reinit device state from scratch (not loading from disk)
+    void installDefaultDeviceState();
 };
 
 /**

src/mesh/RadioLibInterface.cpp

@@ -304,6 +304,8 @@ void RadioLibInterface::startSend(MeshPacket *txp)
     printPacket("Starting low level send", txp);
     setStandby(); // Cancel any already in process receives
 
+    configHardwareForSend(); // must be after setStandby
+
     size_t numbytes = beginSending(txp);
 
     int res = iface->startTransmit(radiobuf, numbytes);

src/mesh/RadioLibInterface.h

@@ -91,9 +91,6 @@ class RadioLibInterface : public RadioInterface, private PeriodicTask
     virtual void startReceive() = 0;
 
   private:
-    /** start an immediate transmit */
-    void startSend(MeshPacket *txp);
-
     /** if we have something waiting to send, start a short random timer so we can come check for collision before actually doing
      * the transmit
      *
@@ -108,12 +105,20 @@ class RadioLibInterface : public RadioInterface, private PeriodicTask
 
     virtual void doTask();
 
+    /** start an immediate transmit
+     *  This method is virtual so subclasses can hook as needed, subclasses should not call directly
+     */
+    virtual void startSend(MeshPacket *txp);
+
   protected:
     /// Initialise the Driver transport hardware and software.
     /// Make sure the Driver is properly configured before calling init().
     /// \return true if initialisation succeeded.
     virtual bool init();
-    
+
+    /** Do any hardware setup needed on entry into send configuration for the radio.  Subclasses can customize */
+    virtual void configHardwareForSend() {}
+
     /**
      * Convert our modemConfig enum into wf, sf, etc...
      *

src/mesh/SX1262Interface.cpp

@@ -14,7 +14,19 @@ bool SX1262Interface::init()
 {
     RadioLibInterface::init();
 
-    float tcxoVoltage = 0;        // None - we use an XTAL
+#ifdef SX1262_RXEN // set not rx or tx mode
+    pinMode(SX1262_RXEN, OUTPUT);
+#endif
+#ifdef SX1262_TXEN
+    pinMode(SX1262_TXEN, OUTPUT);
+#endif
+
+#ifndef SX1262_E22
+    float tcxoVoltage = 0; // None - we use an XTAL
+#else
+    float tcxoVoltage =
+        1.8; // E22 uses DIO3 to power tcxo per https://github.com/jgromes/RadioLib/issues/12#issuecomment-520695575
+#endif
     bool useRegulatorLDO = false; // Seems to depend on the connection to pin 9/DCC_SW - if an inductor DCDC?
 
     applyModemConfig();
@@ -23,6 +35,12 @@ bool SX1262Interface::init()
     int res = lora.begin(freq, bw, sf, cr, syncWord, power, currentLimit, preambleLength, tcxoVoltage, useRegulatorLDO);
     DEBUG_MSG("LORA init result %d\n", res);
 
+#ifdef SX1262_TXEN
+    // lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
+    if (res == ERR_NONE)
+        res = lora.setDio2AsRfSwitch(false);
+#endif
+
     if (res == ERR_NONE)
         res = lora.setCRC(SX126X_LORA_CRC_ON);
 
@@ -81,6 +99,13 @@ void SX1262Interface::setStandby()
     int err = lora.standby();
     assert(err == ERR_NONE);
 
+#ifdef SX1262_RXEN // we have RXEN/TXEN control - turn off RX and TX power
+    digitalWrite(SX1262_RXEN, LOW);
+#endif
+#ifdef SX1262_TXEN
+    digitalWrite(SX1262_TXEN, LOW);
+#endif
+
     isReceiving = false; // If we were receiving, not any more
     disableInterrupt();
     completeSending(); // If we were sending, not anymore
@@ -94,6 +119,18 @@ void SX1262Interface::addReceiveMetadata(MeshPacket *mp)
     mp->rx_snr = lora.getSNR();
 }
 
+/** start an immediate transmit
+ *  We override to turn on transmitter power as needed.
+ */
+void SX1262Interface::configHardwareForSend()
+{
+#ifdef SX1262_TXEN // we have RXEN/TXEN control - turn on TX power / off RX power
+    digitalWrite(SX1262_TXEN, HIGH);
+#endif
+
+    RadioLibInterface::configHardwareForSend();
+}
+
 // For power draw measurements, helpful to force radio to stay sleeping
 // #define SLEEP_ONLY
 
@@ -102,7 +139,13 @@ void SX1262Interface::startReceive()
 #ifdef SLEEP_ONLY
     sleep();
 #else
+
     setStandby();
+
+#ifdef SX1262_RXEN // we have RXEN/TXEN control - turn on RX power / off TX power
+    digitalWrite(SX1262_RXEN, HIGH);
+#endif
+
     // int err = lora.startReceive();
     int err = lora.startReceiveDutyCycleAuto(); // We use a 32 bit preamble so this should save some power by letting radio sit in
                                                 // standby mostly.

src/mesh/SX1262Interface.h

@@ -43,6 +43,12 @@ class SX1262Interface : public RadioLibInterface
      * Start waiting to receive a message
      */
     virtual void startReceive();
+
+    /**
+     *  We override to turn on transmitter power as needed.
+     */
+    virtual void configHardwareForSend();
+
     /**
      * Add SNR data to received messages
      */
@@ -51,5 +57,4 @@ class SX1262Interface : public RadioLibInterface
     virtual void setStandby();
 
   private:
-
 };

src/mesh/mesh-pb-constants.h

@@ -8,7 +8,9 @@
 #define member_size(type, member) sizeof(((type *)0)->member)
 
 /// max number of packets which can be waiting for delivery to android - note, this value comes from mesh.options protobuf
-#define MAX_RX_TOPHONE (member_size(DeviceState, receive_queue) / member_size(DeviceState, receive_queue[0]))
+// FIXME - max_count is actually 32 but we save/load this as one long string of preencoded MeshPacket bytes - not a big array in RAM
+// #define MAX_RX_TOPHONE (member_size(DeviceState, receive_queue) / member_size(DeviceState, receive_queue[0]))
+#define MAX_RX_TOPHONE 32
 
 /// max number of nodes allowed in the mesh
 #define MAX_NUM_NODES (member_size(DeviceState, node_db) / member_size(DeviceState, node_db[0]))

src/mesh/mesh.pb.c

@@ -39,7 +39,7 @@ PB_BIND(NodeInfo, NodeInfo, AUTO)
 PB_BIND(MyNodeInfo, MyNodeInfo, AUTO)
 
 
-PB_BIND(DeviceState, DeviceState, 4)
+PB_BIND(DeviceState, DeviceState, 2)
 
 
 PB_BIND(DebugString, DebugString, 2)

src/mesh/mesh.pb.h

@@ -183,7 +183,7 @@ typedef struct _DeviceState {
     pb_size_t node_db_count;
     NodeInfo node_db[32];
     pb_size_t receive_queue_count;
-    MeshPacket receive_queue[32];
+    MeshPacket receive_queue[1];
     bool has_rx_text_message;
     MeshPacket rx_text_message;
     uint32_t version;
@@ -244,7 +244,7 @@ typedef struct _ToRadio {
 #define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}}
 #define NodeInfo_init_default                    {0, false, User_init_default, false, Position_init_default, 0, 0}
 #define MyNodeInfo_init_default                  {0, 0, 0, "", "", "", 0, 0, 0, 0, 0, 0, 0, 0}
-#define DeviceState_init_default                 {false, RadioConfig_init_default, false, MyNodeInfo_init_default, false, User_init_default, 0, {NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default}, 0, {MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default, MeshPacket_init_default}, false, MeshPacket_init_default, 0}
+#define DeviceState_init_default                 {false, RadioConfig_init_default, false, MyNodeInfo_init_default, false, User_init_default, 0, {NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default}, 0, {MeshPacket_init_default}, false, MeshPacket_init_default, 0}
 #define DebugString_init_default                 {""}
 #define FromRadio_init_default                   {0, 0, {MeshPacket_init_default}}
 #define ToRadio_init_default                     {0, {MeshPacket_init_default}}
@@ -260,7 +260,7 @@ typedef struct _ToRadio {
 #define RadioConfig_UserPreferences_init_zero    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}}
 #define NodeInfo_init_zero                       {0, false, User_init_zero, false, Position_init_zero, 0, 0}
 #define MyNodeInfo_init_zero                     {0, 0, 0, "", "", "", 0, 0, 0, 0, 0, 0, 0, 0}
-#define DeviceState_init_zero                    {false, RadioConfig_init_zero, false, MyNodeInfo_init_zero, false, User_init_zero, 0, {NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero}, 0, {MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero, MeshPacket_init_zero}, false, MeshPacket_init_zero, 0}
+#define DeviceState_init_zero                    {false, RadioConfig_init_zero, false, MyNodeInfo_init_zero, false, User_init_zero, 0, {NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero}, 0, {MeshPacket_init_zero}, false, MeshPacket_init_zero, 0}
 #define DebugString_init_zero                    {""}
 #define FromRadio_init_zero                      {0, 0, {MeshPacket_init_zero}}
 #define ToRadio_init_zero                        {0, {MeshPacket_init_zero}}
@@ -596,7 +596,7 @@ extern const pb_msgdesc_t ManufacturingData_msg;
 #define RadioConfig_UserPreferences_size         93
 #define NodeInfo_size                            132
 #define MyNodeInfo_size                          110
-#define DeviceState_size                         15100
+#define DeviceState_size                         5305
 #define DebugString_size                         258
 #define FromRadio_size                           322
 #define ToRadio_size                             316

src/nrf52/UC1701Spi.cpp

@@ -36,15 +36,18 @@ class UC1701Spi : public OLEDDisplay
 };
 
 #include "variant.h"
+
+#ifdef ERC12864_CS
 #include <UC1701.h>
 static UC1701 lcd(PIN_SPI_SCK, PIN_SPI_MOSI, ERC12864_CS, ERC12864_CD);
 
+void testLCD()
+{
+    // PCD8544-compatible displays may have a different resolution...
+    lcd.begin();
 
-void testLCD() {
-  // PCD8544-compatible displays may have a different resolution...
-  lcd.begin();
-
-  // Write a piece of text on the first line...
-  lcd.setCursor(0, 0);
-  lcd.print("Hello, World!");
-}
+    // Write a piece of text on the first line...
+    lcd.setCursor(0, 0);
+    lcd.print("Hello, World!");
+}
+#endif

src/nrf52/main-nrf52.cpp

@@ -59,12 +59,6 @@ void setBluetoothEnable(bool on)
     }
 }
 
-#ifdef ARDUINO_NRF52840_PPR
-#include "PmuBQ25703A.h"
-
-PmuBQ25703A pmu;
-#endif
-
 void nrf52Setup()
 {
 

src/sleep.cpp

@@ -129,7 +129,7 @@ static void waitEnterSleep()
 
         if (millis() - now > 30 * 1000) { // If we wait too long just report an error and go to sleep
             recordCriticalError(ErrSleepEnterWait);
-            ESP.restart(); // FIXME - for now we just restart, need to fix bug #167
+            assert(0); // FIXME - for now we just restart, need to fix bug #167
             break;
         }
     }
@@ -289,8 +289,6 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
 
     return cause;
 }
-#endif
-
 
 // not legal on the stock android ESP build
 
@@ -310,4 +308,4 @@ void enableModemSleep()
   config.light_sleep_enable = false;
   DEBUG_MSG("Sleep request result %x\n", esp_pm_configure(&config));
 }
-
+#endif