From f2a731c22db55f9030287302c8572607a9587111 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Mon, 3 Feb 2020 22:22:53 -0800
Subject: [PATCH] update to nanopb

---
 lib/nanopb/src/pb.h |  2 +-
 platformio.ini      | 12 +++++++++---
 regen-protos.sh     |  2 +-
 src/mesh.pb.c       |  2 +-
 src/mesh.pb.h       |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/nanopb/src/pb.h b/lib/nanopb/src/pb.h
index fea0872c0..8e87b6263 100644
--- a/lib/nanopb/src/pb.h
+++ b/lib/nanopb/src/pb.h
@@ -55,7 +55,7 @@
 
 /* Version of the nanopb library. Just in case you want to check it in
  * your own program. */
-#define NANOPB_VERSION 0.4.1-dev
+#define NANOPB_VERSION nanopb-0.4.1
 
 /* Include all the system headers needed by nanopb. You will need the
  * definitions of the following:
diff --git a/platformio.ini b/platformio.ini
index bd7be700a..6099bdd75 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -20,11 +20,11 @@ framework = arduino
 board_build.partitions = partition-table.csv
 
 ; note: we add src to our include search path so that lmic_project_config can override
-build_flags = -Wall -Wextra -Wno-missing-field-initializers -O3 -Wl,-Map,.pio/build/esp32/output.map -DAXP_DEBUG_PORT=Serial
+build_flags = -Wall -Wextra -Wno-missing-field-initializers -ggdb -O3 -Wl,-Map,.pio/build/esp32/output.map -DAXP_DEBUG_PORT=Serial -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 ; -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
 upload_speed = 921600
-; upload_port = /dev/ttyUSB0
+upload_port = /dev/ttyUSB0
 
 ; the default is esptool
 ; upload_protocol = esp-prog
@@ -32,9 +32,15 @@ upload_speed = 921600
 ; monitor_port = /dev/ttyUSB0
 monitor_speed = 115200
 
-debug_tool = esp-prog
+# debug_tool = esp-prog
 # debug_port = /dev/ttyUSB0
 
+debug_tool = olimex-arm-usb-ocd-h
+; upload_protocol = olimex-arm-usb-ocd-h
+
+;debug_init_cmds =
+; adapter_khz 10000
+
 lib_deps =
   RadioHead
   TinyGPSPlus
diff --git a/regen-protos.sh b/regen-protos.sh
index deb723644..cfe49afb8 100755
--- a/regen-protos.sh
+++ b/regen-protos.sh
@@ -1 +1 @@
-/home/kevinh/packages/nanopb-0.4.0-linux-x86/generator-bin/protoc --nanopb_out=-v:src -I=../MeshUtil/app/src/main/proto mesh.proto
+/home/kevinh/packages/nanopb-0.4.1-linux-x86/generator-bin/protoc --nanopb_out=-v:src -I=../MeshUtil/app/src/main/proto mesh.proto
diff --git a/src/mesh.pb.c b/src/mesh.pb.c
index 51c4dc10c..eddf2d2a6 100644
--- a/src/mesh.pb.c
+++ b/src/mesh.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.0 */
+/* Generated by nanopb-0.4.1 */
 
 #include "mesh.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40
diff --git a/src/mesh.pb.h b/src/mesh.pb.h
index c3acdde29..8ce7994bf 100644
--- a/src/mesh.pb.h
+++ b/src/mesh.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.0 */
+/* Generated by nanopb-0.4.1 */
 
 #ifndef PB_MESH_PB_H_INCLUDED
 #define PB_MESH_PB_H_INCLUDED