Merge pull request #18 from meshtastic/dev-https

From Dev https to mc-hamster master

bin/version.sh

@@ -1,3 +1,3 @@
 
 
-export VERSION=1.1.4
+export VERSION=1.1.5

docs/software/device-api.md

@@ -42,7 +42,6 @@ Expected sequence for initial download:
 - Read a RadioConfig from "radio" - used to get the channel and radio settings
 - Read a User from "user" - to get the username for this node
 - Read a MyNodeInfo from "mynode" to get information about this local device
-- Write an empty record to "nodeinfo" to restart the nodeinfo reading state machine
 - Read a series of NodeInfo packets to build the phone's copy of the current NodeDB for the mesh
 - Read a endConfig packet that indicates that the entire state you need has been sent.
 - Read a series of MeshPackets until it returns empty to get any messages that arrived for this node while the phone was away

src/mesh/NodeDB.h

@@ -144,11 +144,18 @@ const char *getChannelName();
 
 PREF_GET(send_owner_interval, 4)
 PREF_GET(position_broadcast_secs, 15 * 60)
-PREF_GET(wait_bluetooth_secs, 120)
+
+// Each time we wake into the DARK state allow 1 minute to send and receive BLE packets to the phone
+PREF_GET(wait_bluetooth_secs, 60)
+
 PREF_GET(screen_on_secs, 60)
 PREF_GET(mesh_sds_timeout_secs, 2 * 60 * 60)
 PREF_GET(phone_sds_timeout_sec, 2 * 60 * 60)
 PREF_GET(sds_secs, 365 * 24 * 60 * 60)
-PREF_GET(ls_secs, 60 * 60)
+
+// We default to sleeping (with bluetooth off for 5 minutes at a time).  This seems to be a good tradeoff between
+// latency for the user sending messages and power savings because of not having to run (expensive) ESP32 bluetooth
+PREF_GET(ls_secs, 5 * 60)
+
 PREF_GET(phone_timeout_secs, 15 * 60)
 PREF_GET(min_wake_secs, 10)

src/mesh/PhoneAPI.cpp

@@ -121,7 +121,14 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
 
     case STATE_SEND_RADIO:
         fromRadioScratch.which_variant = FromRadio_radio_tag;
+
         fromRadioScratch.variant.radio = radioConfig;
+
+        // NOTE: The phone app needs to know the ls_secs value so it can properly expect sleep behavior.
+        // So even if we internally use 0 to represent 'use default' we still need to send the value we are
+        // using to the app (so that even old phone apps work with new device loads).
+        fromRadioScratch.variant.radio.preferences.ls_secs = getPref_ls_secs();
+
         state = STATE_SEND_NODEINFO;
         break;