Merge branch 'master' of github.com:meshtastic/Meshtastic-device

protobufs

@@ -1 +1 @@
-Subproject commit 62141e9d6889b3c088eca125e658b15b9d438beb
+Subproject commit 33b3ab5fde6b6ef158e3b111bf240d1d59c152ef

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

src/configuration.h

@@ -144,7 +144,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define DISABLE_NTP
 
 // Disable the welcome screen and allow 
-//#define DISABLE_WELCOME_UNSET
+#define DISABLE_WELCOME_UNSET
 
 // -----------------------------------------------------------------------------
 // OLED & Input

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, 

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1
 minor = 3
-build = 13
+build = 15