From 076251e6a8309e62e24b25a2a34a13d3efac19eb Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Wed, 3 Mar 2021 11:49:09 +0800 Subject: [PATCH 1/3] todo cleanup --- docs/software/TODO.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/software/TODO.md b/docs/software/TODO.md index b47fdb95b..5942aa438 100644 --- a/docs/software/TODO.md +++ b/docs/software/TODO.md @@ -2,7 +2,7 @@ You probably don't care about this section - skip to the next one. -1.2 cleanup & multichannel support: +## 1.2 cleanup & multichannel support: * DONE call RouterPlugin for *all* packets - not just Router packets * DONE generate channel hash from the name of the channel+the psk (not just one or the other) @@ -44,8 +44,8 @@ You probably don't care about this section - skip to the next one. * DONE android should stop fetching channels once we've reached our first empty channel definition (hasSettings == true) * add channel restrictions for plugins (and restrict routing plugin to the "control" channel) * restrict gpio & serial & settings operations to the admin channel (unless local to the current node) -* warn in python api if we are too new to talk to the device code -* make a post warning about 1.2, telling how to stay on old android & python clients. link to this from the android dialog message and python version warning. +* DONE warn in python api if we are too new to talk to the device code +* DONE make a post warning about 1.2, telling how to stay on old android & python clients. link to this from the android dialog message and python version warning. * DONE "FIXME - move the radioconfig/user/channel READ operations into SettingsMessage as well" * DONE scrub protobufs to make sure they are absoloute minimum wiresize (in particular Data, ChannelSets and positions) * DONE change syncword (now ox2b) From 955d03acb1859ad9108f407cfabdb01841b45223 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Thu, 4 Mar 2021 11:28:50 +0800 Subject: [PATCH 2/3] fix symbol conflict with new nrf52 libs --- src/mesh/NodeDB.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h index 29c35369f..b424adcba 100644 --- a/src/mesh/NodeDB.h +++ b/src/mesh/NodeDB.h @@ -154,7 +154,7 @@ extern NodeDB nodeDB; */ // Our delay functions check for this for times that should never expire -#define DELAY_FOREVER 0xffffffff +#define NODE_DELAY_FOREVER 0xffffffff #define IF_ROUTER(routerVal, normalVal) (radioConfig.preferences.is_router ? (routerVal) : (normalVal)) @@ -168,8 +168,8 @@ PREF_GET(position_broadcast_secs, IF_ROUTER(12 * 60 * 60, 15 * 60)) PREF_GET(wait_bluetooth_secs, IF_ROUTER(1, 60)) PREF_GET(screen_on_secs, 60) -PREF_GET(mesh_sds_timeout_secs, IF_ROUTER(DELAY_FOREVER, 2 * 60 * 60)) -PREF_GET(phone_sds_timeout_sec, IF_ROUTER(DELAY_FOREVER, 2 * 60 * 60)) +PREF_GET(mesh_sds_timeout_secs, IF_ROUTER(NODE_DELAY_FOREVER, 2 * 60 * 60)) +PREF_GET(phone_sds_timeout_sec, IF_ROUTER(NODE_DELAY_FOREVER, 2 * 60 * 60)) PREF_GET(sds_secs, 365 * 24 * 60 * 60) // We default to sleeping (with bluetooth off for 5 minutes at a time). This seems to be a good tradeoff between From 56fe211466cc2cd569512bc6a940cd7e5115a3a4 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Thu, 4 Mar 2021 11:29:55 +0800 Subject: [PATCH 3/3] 1.2.1 --- docs/software/TODO.md | 7 +++++-- version.properties | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/software/TODO.md b/docs/software/TODO.md index 5942aa438..5547110dd 100644 --- a/docs/software/TODO.md +++ b/docs/software/TODO.md @@ -29,10 +29,11 @@ You probably don't care about this section - skip to the next one. * DONE release protobufs * DONE release to developers * fix 1.1.50 android debug panel display -* add gui in android app for setting region +* warn in android app about unset regions +* use set-channel from android +* DONE add gui in android app for setting region * stress test channel download from python, sometimes it seems like we don't get all replies * investigate @mc-hamster report of heap corruption -* use set-channel from android * DONE use set-user from android * combine acks and responses in a single message if possible (do routing plugin LAST and drop ACK if someone else has already replied) * don't send packets we received from the phone BACK TOWARDS THE PHONE (possibly use fromnode 0 for packets the phone sends?) @@ -40,6 +41,8 @@ You probably don't care about this section - skip to the next one. * make python tests more exhaustive * document the relationship between want_response (indicating remote node received it) and want_ack (indicating that this message should be sent reliably - and also get acks from the first rx node and naks if it is never delivered) * stress test multi channel +* use single byte 'well known' channel names for the four default channel names (longslow etc), and for admin, gpio, etc... +* use presence of gpio channel to enable gpio ops, same for serial etc... * pick default random admin key * DONE android should stop fetching channels once we've reached our first empty channel definition (hasSettings == true) * add channel restrictions for plugins (and restrict routing plugin to the "control" channel) diff --git a/version.properties b/version.properties index c77424e6a..9d155e715 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 2 -build = 0 +build = 1