save db to flash

src/NodeDB.cpp

@@ -2,6 +2,9 @@
 #include <Arduino.h>
 #include <assert.h>
 
+#include "FS.h"
+#include "SPIFFS.h"
+
 #include <pb_encode.h>
 #include <pb_decode.h>
 #include "configuration.h"
@@ -9,16 +12,22 @@
 #include "NodeDB.h"
 #include "GPS.h"
 
-MyNodeInfo myNodeInfo = MyNodeInfo_init_zero;
 NodeDB nodeDB;
 
+// we have plenty of ram so statically alloc this tempbuf (for now)
+DeviceState devicestate;
+MyNodeInfo &myNodeInfo = devicestate.my_node;
+RadioConfig &radioConfig = devicestate.radio;
+
+#define FS SPIFFS
+
 /** 
  * 
  * Normally userids are unique and start with +country code to look like Signal phone numbers.
  * But there are some special ids used when we haven't yet been configured by a user.  In that case
  * we use !macaddr (no colons).
  */
-User owner = {"+1650xxxyyyy", "unset name", "????", {0}};
+User &owner = devicestate.owner;
 
 static uint8_t ourMacAddr[6];
 
@@ -35,16 +44,22 @@ static NodeNum getDesiredNodeNum()
     return r;
 }
 
-
-
-NodeDB::NodeDB() 
+NodeDB::NodeDB() : nodes(devicestate.node_db), numNodes(&devicestate.node_db_count)
 {
 }
 
-
-void NodeDB::init() {
+void NodeDB::init()
+{
+    // Crummy guess at our nodenum
     myNodeInfo.my_node_num = getDesiredNodeNum();
 
+    // init our devicestate with valid flags so protobuf writing/reading will work
+    devicestate.has_my_node = true;
+    devicestate.has_radio = true;
+    devicestate.has_owner = true;
+    devicestate.node_db_count = 0;
+    devicestate.receive_queue_count = 0;
+
     // Init our blank owner info to reasonable defaults
     sprintf(owner.id, "!%02x%02x%02x%02x%02x%02x", ourMacAddr[0],
             ourMacAddr[1], ourMacAddr[2], ourMacAddr[3], ourMacAddr[4], ourMacAddr[5]);
@@ -59,11 +74,73 @@ void NodeDB::init() {
     info->user = owner;
     info->has_user = true;
     info->last_seen = 0; // haven't heard a real message yet
+
+    if (!FS.begin(true)) // FIXME - do this in main?
+    {
+        DEBUG_MSG("ERROR SPIFFS Mount Failed\n");
+        // FIXME - report failure to phone
+    }
+
+    // saveToDisk();
+    loadFromDisk();
+
+    DEBUG_MSG("NODENUM=0x%x, dbsize=%d\n", myNodeInfo.my_node_num, *numNodes);
+}
+
+const char *preffile = "/db.proto";
+const char *preftmp = "/db.proto.tmp";
+
+void NodeDB::loadFromDisk()
+{
+    File f = FS.open(preffile);
+    if (f)
+    {
+        DEBUG_MSG("Loading saved preferences\n");
+        pb_istream_t stream = {&readcb, &f, DeviceState_size};
+
+        if (!pb_decode(&stream, DeviceState_fields, &devicestate))
+        {
+            DEBUG_MSG("Error: can't decode protobuf %s\n", PB_GET_ERROR(&stream));
+            // FIXME - report failure to phone
+        }
+
+        f.close();
+    }
+    else
+    {
+        DEBUG_MSG("No saved preferences found\n");
+    }
+}
+
+void NodeDB::saveToDisk()
+{
+    File f = FS.open(preftmp, "w");
+    if (f)
+    {
+        DEBUG_MSG("Writing preferences\n");
+        pb_ostream_t stream = {&writecb, &f, DeviceState_size, 0};
+
+        if (!pb_encode(&stream, DeviceState_fields, &devicestate))
+        {
+            DEBUG_MSG("Error: can't write protobuf %s\n", PB_GET_ERROR(&stream));
+            // FIXME - report failure to phone
+        }
+
+        f.close();
+
+        // brief window of risk here ;-)
+        FS.remove(preffile);
+        FS.rename(preftmp, preffile);
+    }
+    else
+    {
+        DEBUG_MSG("ERROR: can't write prefs\n"); // FIXME report to app
+    }
 }
 
 const NodeInfo *NodeDB::readNextInfo()
 {
-    if (readPointer < numNodes)
+    if (readPointer < *numNodes)
         return &nodes[readPointer++];
     else
         return NULL;
@@ -79,10 +156,10 @@ void NodeDB::updateFrom(const MeshPacket &mp)
         DEBUG_MSG("Update DB node 0x%x for variant %d\n", mp.from, p.which_variant);
         if (p.which_variant != SubPacket_want_node_tag) // we don't create nodeinfo records for someone that is just trying to claim a nodenum
         {
-            int oldNumNodes = numNodes;
+            int oldNumNodes = *numNodes;
             NodeInfo *info = getOrCreateNode(mp.from);
 
-            if (oldNumNodes != numNodes)
+            if (oldNumNodes != *numNodes)
                 updateGUI = true; // we just created a nodeinfo
 
             info->last_seen = gps.getTime();
@@ -96,10 +173,23 @@ void NodeDB::updateFrom(const MeshPacket &mp)
                 break;
 
             case SubPacket_user_tag:
+            {
+                DEBUG_MSG("old user %s/%s/%s\n", info->user.id, info->user.long_name, info->user.short_name);
+
+                bool changed = memcmp(&info->user, &p.variant.user, sizeof(info->user)); // Both of these blocks start as filled with zero so I think this is okay
+
                 info->user = p.variant.user;
+                DEBUG_MSG("updating changed=%d user %s/%s/%s\n", changed, info->user.id, info->user.long_name, info->user.short_name);
                 info->has_user = true;
                 updateGUIforNode = info;
+
+                if (changed)
+                {
+                    // We just created a user for the first time, store our DB
+                    saveToDisk();
+                }
                 break;
+            }
 
             default:
                 break; // Ignore other packet types
@@ -111,7 +201,7 @@ void NodeDB::updateFrom(const MeshPacket &mp)
 /// Find a node in our DB, return null for missing
 NodeInfo *NodeDB::getNode(NodeNum n)
 {
-    for (int i = 0; i < numNodes; i++)
+    for (int i = 0; i < *numNodes; i++)
         if (nodes[i].num == n)
             return &nodes[i];
 
@@ -126,8 +216,8 @@ NodeInfo *NodeDB::getOrCreateNode(NodeNum n)
     if (!info)
     {
         // add the node
-        assert(numNodes < MAX_NUM_NODES);
-        info = &nodes[numNodes++];
+        assert(*numNodes < MAX_NUM_NODES);
+        info = &nodes[(*numNodes)++];
 
         // everything is missing except the nodenum
         memset(info, 0, sizeof(*info));