From 21cfb151a825f555c65fe32e865865388ca7fd8c Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 19 Mar 2021 15:24:05 +0800 Subject: [PATCH 1/6] specify clang for c++ formatting conventions --- .github/pull_request_template.md | 2 +- .vscode/extensions.json | 3 ++- .vscode/settings.json | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8b7b4592..9ef8f77c 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -7,7 +7,7 @@ is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc... - Please do not check in files that don't have real changes - Please do not reformat lines that you didn't have to change the code on -- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor, +- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor and the 'clang-format' extension, because automatically follows our indentation rules and it's auto reformatting will not cause spurious changes to lines. - If your PR fixes a bug, mention "fixes #bugnum" somewhere in your pull request description. - If your other co-developers have comments on your PR please tweak as needed. diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 0f0d7401..27bdd05a 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,6 +2,7 @@ // See http://go.microsoft.com/fwlink/?LinkId=827846 // for the documentation about the extensions.json format "recommendations": [ - "platformio.platformio-ide" + "platformio.platformio-ide", + "xaver.clang-format" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index b89870c5..5ce21fa3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -77,5 +77,6 @@ "--java_out=/tmp", "-I=/home/kevinh/development/meshtastic/meshtastic-esp32/proto" ] - } + }, + "editor.formatOnSave": true } \ No newline at end of file From 7c5ab885bec039559fc088f3f526b4d0a9eb1adf Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 19 Mar 2021 15:24:24 +0800 Subject: [PATCH 2/6] geeksville todo --- docs/software/TODO.md | 11 +++++++---- src/plugins/AdminPlugin.cpp | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/software/TODO.md b/docs/software/TODO.md index c65a5365..18fa36a6 100644 --- a/docs/software/TODO.md +++ b/docs/software/TODO.md @@ -2,16 +2,19 @@ You probably don't care about this section - skip to the next one. -## 1.2 cleanup & multichannel support: +## before next release * before next relase: test empty channel sets on android * test link sharing on android +* timestamps on oled screen are wrong - don't seem to be updating based on message rx +* channel hash suffixes are wrong on android +* luxon bug report - seeing rx acks for nodes that are not on the network +## 1.2 cleanup & multichannel support: + * DONE cleanup the external notification and serial plugins * non ack version of stress test fails sometimes! -* timestamps on oled screen are wrong - don't seem to be updating based on message rx -* luxon bug report - seeing rx acks for nodes that are not on the network -* channel hash suffixes are wrong on android + * tx fault test has a bug #734 * DONE move device types into an enum in nodeinfo * fix android to use new device types for firmware update diff --git a/src/plugins/AdminPlugin.cpp b/src/plugins/AdminPlugin.cpp index 5cc4876a..e80ae32a 100644 --- a/src/plugins/AdminPlugin.cpp +++ b/src/plugins/AdminPlugin.cpp @@ -113,8 +113,7 @@ void AdminPlugin::handleSetChannel(const Channel &cc) if (cc.index == 0) { // FIXME, this updates the user preferences also, which isn't needed - we really just want to notify on configChanged service.reloadConfig(); - } - else { + } else { channels.onConfigChanged(); // tell the radios about this change nodeDB.saveChannelsToDisk(); } From 2a6480ec485a73b59384b91adc683dcea997d2ad Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 19 Mar 2021 23:40:04 +0800 Subject: [PATCH 3/6] update release test scripts --- bin/program-1.0-tbeam.sh | 3 +++ bin/program-1.1-tbeam.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100755 bin/program-1.0-tbeam.sh diff --git a/bin/program-1.0-tbeam.sh b/bin/program-1.0-tbeam.sh new file mode 100755 index 00000000..b2b37756 --- /dev/null +++ b/bin/program-1.0-tbeam.sh @@ -0,0 +1,3 @@ +esptool.py --baud 921600 write_flash 0x10000 release/archive/old/firmware-tbeam-EU865-1.0.0.bin +echo "Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used" +esptool.py --baud 921600 erase_region 0xe000 0x2000 diff --git a/bin/program-1.1-tbeam.sh b/bin/program-1.1-tbeam.sh index 9b95c338..98ba5c68 100755 --- a/bin/program-1.1-tbeam.sh +++ b/bin/program-1.1-tbeam.sh @@ -1 +1 @@ -esptool.py --baud 921600 write_flash 0x10000 release/archive/firmware-tbeam-1.1.50.bin +esptool.py --baud 921600 write_flash 0x10000 release/archive/old/firmware-tbeam-1.1.50.bin From 9502fa62e61c34a45c83ebebb6fb8693d848c8b7 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 19 Mar 2021 23:40:24 +0800 Subject: [PATCH 4/6] todo updates --- docs/software/TODO.md | 15 +++++++++++---- platformio.ini | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/software/TODO.md b/docs/software/TODO.md index 18fa36a6..7ffe9361 100644 --- a/docs/software/TODO.md +++ b/docs/software/TODO.md @@ -4,11 +4,18 @@ You probably don't care about this section - skip to the next one. ## before next release -* before next relase: test empty channel sets on android -* test link sharing on android -* timestamps on oled screen are wrong - don't seem to be updating based on message rx -* channel hash suffixes are wrong on android +* DONE timestamps on oled screen are wrong - don't seem to be updating based on message rx (actually: this is expected behavior when no node on the mesh has GPS time) +* DONE add ch-del +* DONE channel hash suffixes are wrong on android +* DONE before next relase: test empty channel sets on android +* DONE channel sharing in android +* DONE test 1.0 firmware update on android +* DONE test 1.1 firmware update on android +* test 1.2.10 firmware update on android +* DONE test link sharing on android * luxon bug report - seeing rx acks for nodes that are not on the network +* document how to do remote admin +* release py, android, device ## 1.2 cleanup & multichannel support: diff --git a/platformio.ini b/platformio.ini index 3965c848..0771b001 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -;default_envs = tbeam +default_envs = tbeam ;default_envs = tbeam0.7 ;default_envs = heltec ;default_envs = tlora-v1 @@ -17,7 +17,7 @@ ;default_envs = lora-relay-v1 # nrf board ;default_envs = eink ;default_envs = nrf52840dk-geeksville -default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here +;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here [common] ; common is not currently used From c410f2d1511473a120a55d199237b3166dcedd6f Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 19 Mar 2021 23:40:41 +0800 Subject: [PATCH 5/6] fix tlora 1.6 build --- src/configuration.h | 6 +++--- src/plugins/AdminPlugin.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/configuration.h b/src/configuration.h index e389e46c..d6e00e89 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -338,7 +338,7 @@ along with this program. If not, see . #elif defined(TLORA_V2_1_16) // This string must exactly match the case used in release file names or the android updater won't work -#define HW_VENDOR HardwareModel_TLORA_V2_1p6_ +#define HW_VENDOR HardwareModel_TLORA_V2_1_1p6 #undef GPS_RX_PIN #undef GPS_TX_PIN @@ -382,8 +382,8 @@ along with this program. If not, see . #define LED_PIN 12 // If defined we will blink this LED //#define BUTTON_PIN 36 // If defined, this will be used for user button presses (ToDo problem on that line on debug screen --> -//Long press start!) #define BUTTON_NEED_PULLUP //GPIOs 34 to 39 are GPIs – input only pins. These pins don’t have internal -//pull-ups or pull-down resistors. +// Long press start!) #define BUTTON_NEED_PULLUP //GPIOs 34 to 39 are GPIs – input only pins. These pins don’t have internal +// pull-ups or pull-down resistors. #define USE_RF95 #define LORA_DIO0 38 // a No connect on the SX1262 module diff --git a/src/plugins/AdminPlugin.cpp b/src/plugins/AdminPlugin.cpp index e80ae32a..65c90112 100644 --- a/src/plugins/AdminPlugin.cpp +++ b/src/plugins/AdminPlugin.cpp @@ -55,7 +55,7 @@ bool AdminPlugin::handleReceivedProtobuf(const MeshPacket &mp, const AdminMessag break; case AdminMessage_set_channel_tag: - DEBUG_MSG("Client is setting channel\n"); + DEBUG_MSG("Client is setting channel %d\n", r->set_channel.index); handleSetChannel(r->set_channel); break; From 591a07c0fef1164403e9d1077cc158976cc4e935 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 19 Mar 2021 23:41:28 +0800 Subject: [PATCH 6/6] 1.2.11 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index e615e8b4..565c9052 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 2 -build = 10 +build = 11