From 405f7e0caa1341b83bdc0b092a4fa3b1b9b42822 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Fri, 16 Apr 2021 11:51:04 +0800
Subject: [PATCH] Fix integration test found by CI! verstr field was too short

---
 .github/workflows/main.yml         |  2 +-
 .idea/workspace.xml                | 18 ++++++++++--------
 bin/readprops.py                   |  3 ++-
 proto                              |  2 +-
 src/mesh/generated/deviceonly.pb.h |  2 +-
 src/mesh/generated/mesh.pb.h       |  4 ++--
 src/mesh/mesh-pb-constants.cpp     |  4 ++--
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 864add74..896d5cca 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -65,7 +65,7 @@ jobs:
     - name: Integration test
       run: |
         .pio/build/native/program &
-        sleep 5
+        sleep 30 # 5 seconds was not enough
         echo "Simulator started, launching python test..."
         python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
 
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 10278269..982b8130 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,9 +14,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="58922733-b05b-4b90-9655-b9b18914977a" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.github/workflows/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/main.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/proto" beforeDir="false" afterPath="$PROJECT_DIR$/proto" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/proto/docs/docs.md" beforeDir="false" afterPath="$PROJECT_DIR$/proto/docs/docs.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/mesh/mesh-pb-constants.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/mesh/mesh-pb-constants.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/mqtt/MQTT.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/mqtt/MQTT.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -62,11 +62,6 @@
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" PASS_PARENT_ENVS_2="true">
-      <method v="2">
-        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
-      </method>
-    </configuration>
     <configuration default="true" type="GradleAppRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" PASS_PARENT_ENVS_2="true">
       <method v="2">
         <option name="com.jetbrains.cidr.cpp.gradle.execution.GradleNativeBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
@@ -107,6 +102,7 @@
       <workItem from="1617279002260" duration="1626000" />
       <workItem from="1617425689081" duration="1896000" />
       <workItem from="1617437366919" duration="1182000" />
+      <workItem from="1618544034975" duration="586000" />
     </task>
     <servers />
   </component>
@@ -140,7 +136,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/src/mqtt/MQTT.cpp</url>
-          <line>84</line>
+          <line>166</line>
           <option name="timeStamp" value="10" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
@@ -148,11 +144,17 @@
           <line>468</line>
           <option name="timeStamp" value="11" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/src/mesh/mesh-pb-constants.cpp</url>
+          <line>20</line>
+          <option name="timeStamp" value="12" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
       <configuration name="CLion_Remote">
         <watch expression="radioConfig" language="ObjectiveC" />
+        <watch expression="fromRadioScratch" language="ObjectiveC" />
       </configuration>
     </watches-manager>
   </component>
diff --git a/bin/readprops.py b/bin/readprops.py
index 047b567d..7fc47177 100644
--- a/bin/readprops.py
+++ b/bin/readprops.py
@@ -21,7 +21,8 @@ def readProps(prefsLoc):
             ['git', 'diff', 'HEAD']).decode("utf-8").strip()
         suffix = sha
         if isDirty:
-            suffix = sha + "-dirty"
+            # short for 'dirty', we want to keep our verstrings source for protobuf reasons
+            suffix = sha + "-d"
         verStr = "{}.{}.{}.{}".format(
             version["major"], version["minor"], version["build"], suffix)
     except:
diff --git a/proto b/proto
index 6e05f72a..157f9891 160000
--- a/proto
+++ b/proto
@@ -1 +1 @@
-Subproject commit 6e05f72a1a75322bcbea21980386a61b2945fd4f
+Subproject commit 157f9891dd35d3087f51e32dc0b103fcb1f0ca7c
diff --git a/src/mesh/generated/deviceonly.pb.h b/src/mesh/generated/deviceonly.pb.h
index 43257282..76ab8d6a 100644
--- a/src/mesh/generated/deviceonly.pb.h
+++ b/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                         5184
+#define DeviceState_size                         5190
 #define ChannelFile_size                         832
 
 #ifdef __cplusplus
diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h
index eb771eba..faa915db 100644
--- a/src/mesh/generated/mesh.pb.h
+++ b/src/mesh/generated/mesh.pb.h
@@ -107,7 +107,7 @@ typedef struct _MyNodeInfo {
     uint32_t num_bands;
     char region[12];
     char hw_model_deprecated[16];
-    char firmware_version[12];
+    char firmware_version[18];
     CriticalErrorCode error_code;
     uint32_t error_address;
     uint32_t error_count;
@@ -495,7 +495,7 @@ extern const pb_msgdesc_t ToRadio_PeerInfo_msg;
 #define Data_size                                260
 #define MeshPacket_size                          309
 #define NodeInfo_size                            133
-#define MyNodeInfo_size                          95
+#define MyNodeInfo_size                          101
 #define LogRecord_size                           81
 #define FromRadio_size                           318
 #define ToRadio_size                             312
diff --git a/src/mesh/mesh-pb-constants.cpp b/src/mesh/mesh-pb-constants.cpp
index fac31872..eab15799 100644
--- a/src/mesh/mesh-pb-constants.cpp
+++ b/src/mesh/mesh-pb-constants.cpp
@@ -18,7 +18,7 @@ size_t pb_encode_to_bytes(uint8_t *destbuf, size_t destbufsize, const pb_msgdesc
 
     pb_ostream_t stream = pb_ostream_from_buffer(destbuf, destbufsize);
     if (!pb_encode(&stream, fields, src_struct)) {
-        DEBUG_MSG("Panic: can't encode protobuf %s, did you make a field too large?\n", PB_GET_ERROR(&stream));
+        DEBUG_MSG("Panic: can't encode protobuf reason='%s', reason=%s\n", PB_GET_ERROR(&stream));
         assert(0); // If this asser fails it probably means you made a field too large for the max limits specified in mesh.options
     } else {
         return stream.bytes_written;
@@ -30,7 +30,7 @@ bool pb_decode_from_bytes(const uint8_t *srcbuf, size_t srcbufsize, const pb_msg
 {
     pb_istream_t stream = pb_istream_from_buffer(srcbuf, srcbufsize);
     if (!pb_decode(&stream, fields, dest_struct)) {
-        DEBUG_MSG("Error: can't decode protobuf %s, pb_msgdesc 0x%p\n", PB_GET_ERROR(&stream), fields);
+        DEBUG_MSG("Error: can't decode protobuf reason='%s', pb_msgdesc 0x%p, reason=%s\n", PB_GET_ERROR(&stream), fields);
         return false;
     } else {
         return true;