From 9821a0535b8a58547893cda642942ab97088d083 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Fri, 3 Jun 2022 14:32:32 -0700 Subject: [PATCH 1/5] Bump to 1.3.14 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index bfae41f27..4c91bb78e 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 3 -build = 13 +build = 14 From 2e1b89579138f8feff682ea2abf7a25be2a1ad8a Mon Sep 17 00:00:00 2001 From: mc-hamster Date: Sat, 4 Jun 2022 01:47:29 +0000 Subject: [PATCH 2/5] [create-pull-request] automated change --- protobufs | 2 +- src/mesh/generated/portnums.pb.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/protobufs b/protobufs index 62141e9d6..33b3ab5fd 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 62141e9d6889b3c088eca125e658b15b9d438beb +Subproject commit 33b3ab5fde6b6ef158e3b111bf240d1d59c152ef diff --git a/src/mesh/generated/portnums.pb.h b/src/mesh/generated/portnums.pb.h index b4fd37382..cc8466f88 100644 --- a/src/mesh/generated/portnums.pb.h +++ b/src/mesh/generated/portnums.pb.h @@ -48,6 +48,8 @@ typedef enum _PortNum { PortNum_ADMIN_APP = 6, /* Compressed TEXT_MESSAGE payloads. */ PortNum_TEXT_MESSAGE_COMPRESSED_APP = 7, + /* Waypoint payloads. */ + PortNum_WAYPOINT_APP = 8, /* Provides a 'ping' service that replies to any packet it receives. Also serves as a small example module. */ PortNum_REPLY_APP = 32, From 432d06741e0de76f20d02c5caa73b798341ff16a Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Fri, 3 Jun 2022 18:49:18 -0700 Subject: [PATCH 3/5] Update version.properties --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 4c91bb78e..e903aec4a 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 3 -build = 14 +build = 15 From 40ded630d040509eacff031317847aab1bd87b1f Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Fri, 3 Jun 2022 20:38:13 -0700 Subject: [PATCH 4/5] Change default screen on to 10 minutes --- src/PowerFSM.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp index 1bfc58694..0804d62dc 100644 --- a/src/PowerFSM.cpp +++ b/src/PowerFSM.cpp @@ -335,7 +335,7 @@ void PowerFSM_setup() powerFSM.add_timed_transition(&stateON, &stateDARK, config.display.screen_on_secs ? config.display.screen_on_secs - : 60 * 1000, + : 60 * 1000 * 10, NULL, "Screen-on timeout"); // On most boards we use light-sleep to be our main state, but on NRF52 we just stay in DARK From 80e08f6de9bcb8ec00f904d21a2915fac9c5dd8d Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Fri, 3 Jun 2022 21:51:47 -0700 Subject: [PATCH 5/5] Disabled the unset welcome screen --- src/configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configuration.h b/src/configuration.h index 1f4864f8a..aae49d98d 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -144,7 +144,7 @@ along with this program. If not, see . //#define DISABLE_NTP // Disable the welcome screen and allow -//#define DISABLE_WELCOME_UNSET +#define DISABLE_WELCOME_UNSET // ----------------------------------------------------------------------------- // OLED & Input