From 9f49f90acd3f85645b94e29c7139f0d609f3f614 Mon Sep 17 00:00:00 2001 From: geeksville Date: Mon, 27 Apr 2020 09:42:31 -0700 Subject: [PATCH 1/6] ignore vscode/launch.json --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 171f0f3c4..b26acad66 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,5 @@ main/credentials.h .vscode/* !.vscode/settings.json !.vscode/tasks.json -!.vscode/launch.json !.vscode/extensions.json *.code-workspace \ No newline at end of file From 88a704c4d3a5f5f7f5a2f50056bb2ba6b95e3814 Mon Sep 17 00:00:00 2001 From: geeksville Date: Mon, 27 Apr 2020 09:46:06 -0700 Subject: [PATCH 2/6] for now, allow debug out to be interleaved with protobufs --- src/SerialConsole.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/SerialConsole.cpp b/src/SerialConsole.cpp index 5a86dbc1d..e5c2866c2 100644 --- a/src/SerialConsole.cpp +++ b/src/SerialConsole.cpp @@ -25,7 +25,11 @@ void SerialConsole::init() */ void SerialConsole::handleToRadio(const uint8_t *buf, size_t len) { - setDestination(&noopPrint); + // Note: for the time being we _allow_ debug printing to keep going out the console + // I _think_ this is okay because we currently only print debug msgs from loop() and we are only + // dispatching serial protobuf msgs from loop() as well. When things are more threaded in the future this + // will need to change. + // setDestination(&noopPrint); canWrite = true; StreamAPI::handleToRadio(buf, len); From 59086fd477d2b6a3a1da68febf7d978f527cce67 Mon Sep 17 00:00:00 2001 From: geeksville Date: Mon, 27 Apr 2020 18:52:57 -0700 Subject: [PATCH 3/6] fixes after testing stream protocol with python client --- src/SerialConsole.cpp | 4 ++-- src/mesh/StreamAPI.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/SerialConsole.cpp b/src/SerialConsole.cpp index e5c2866c2..3a8917fd3 100644 --- a/src/SerialConsole.cpp +++ b/src/SerialConsole.cpp @@ -9,7 +9,7 @@ SerialConsole console; SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port) { canWrite = false; // We don't send packets to our port until it has talked to us first - // setDestination(&noopPrint); + // setDestination(&noopPrint); for testing, try turning off 'all' debug output and see what leaks } /// Do late init that can't happen at constructor time @@ -25,7 +25,7 @@ void SerialConsole::init() */ void SerialConsole::handleToRadio(const uint8_t *buf, size_t len) { - // Note: for the time being we _allow_ debug printing to keep going out the console + // Note: for the time being we could _allow_ debug printing to keep going out the console // I _think_ this is okay because we currently only print debug msgs from loop() and we are only // dispatching serial protobuf msgs from loop() as well. When things are more threaded in the future this // will need to change. diff --git a/src/mesh/StreamAPI.cpp b/src/mesh/StreamAPI.cpp index b82054877..674e758c9 100644 --- a/src/mesh/StreamAPI.cpp +++ b/src/mesh/StreamAPI.cpp @@ -39,9 +39,10 @@ void StreamAPI::readStream() rxPtr = 0; // length is bogus, restart search for framing } - if (rxPtr != 0 && ptr == len + HEADER_LEN) { + if (rxPtr != 0 && ptr + 1 == len + HEADER_LEN) { // If we didn't just fail the packet and we now have the right # of bytes, parse it handleToRadio(rxBuf + HEADER_LEN, len); + rxPtr = 0; // start over again } } } From 0193c281ef0e7713c6a68c7ea2f92db478ea30ef Mon Sep 17 00:00:00 2001 From: geeksville Date: Tue, 28 Apr 2020 08:42:09 -0700 Subject: [PATCH 4/6] change webpage to say android app is in general availability --- docs/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index e3bbff93b..850ea89de 100644 --- a/docs/README.md +++ b/docs/README.md @@ -46,11 +46,11 @@ Note: Updates are happening almost daily, only major updates are listed below. F ## Meshtastic Android app -Once out of alpha the companion Android application will be released here: +Our Android application is available here: [![Download at https://play.google.com/store/apps/details?id=com.geeksville.mesh](https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png)](https://play.google.com/store/apps/details?id=com.geeksville.mesh&referrer=utm_source%3Dhomepage%26anid%3Dadmob) -But if you want the bleeding edge app now, we'd love to have your help testing. Three steps to opt-in to the alpha- test: +The link above will return older more stable releases. We would prefer if you join our alpha-test group, because the application is rapidly improving. Three steps to opt-in to the alpha- test: 1. Join [this Google group](https://groups.google.com/forum/#!forum/meshtastic-alpha-testers) with the account you use in Google Play. 2. Go to this [URL](https://play.google.com/apps/testing/com.geeksville.mesh) to opt-in to the alpha test. From b7049116039b3ddcd759ccb10c6dc539bd404ceb Mon Sep 17 00:00:00 2001 From: geeksville Date: Tue, 28 Apr 2020 11:20:00 -0700 Subject: [PATCH 5/6] minor protobuf update --- proto | 2 +- src/mesh/mesh.pb.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proto b/proto index 79b2cf728..8427b2301 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 79b2cf728c08007284542b32d9d075d01e8153d8 +Subproject commit 8427b23016dc96fc78885f05de5172e9eec5fe6d diff --git a/src/mesh/mesh.pb.h b/src/mesh/mesh.pb.h index f18b5c4f4..9e639ac7e 100644 --- a/src/mesh/mesh.pb.h +++ b/src/mesh/mesh.pb.h @@ -19,7 +19,7 @@ typedef enum _Constants { } Constants; typedef enum _Data_Type { - Data_Type_SIGNAL_OPAQUE = 0, + Data_Type_OPAQUE = 0, Data_Type_CLEAR_TEXT = 1, Data_Type_CLEAR_READACK = 2 } Data_Type; @@ -178,7 +178,7 @@ typedef struct _ToRadio { #define _Constants_MAX Constants_Unused #define _Constants_ARRAYSIZE ((Constants)(Constants_Unused+1)) -#define _Data_Type_MIN Data_Type_SIGNAL_OPAQUE +#define _Data_Type_MIN Data_Type_OPAQUE #define _Data_Type_MAX Data_Type_CLEAR_READACK #define _Data_Type_ARRAYSIZE ((Data_Type)(Data_Type_CLEAR_READACK+1)) From 02dfe7564f0c6ab215300922a147e99cb1fc022b Mon Sep 17 00:00:00 2001 From: geeksville Date: Tue, 28 Apr 2020 15:39:05 -0700 Subject: [PATCH 6/6] 0.6.0 release --- bin/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/version.sh b/bin/version.sh index 6c7385723..f0cbb5657 100644 --- a/bin/version.sh +++ b/bin/version.sh @@ -1,3 +1,3 @@ -export VERSION=0.5.5 \ No newline at end of file +export VERSION=0.6.0 \ No newline at end of file