diff --git a/docs/software/TODO.md b/docs/software/TODO.md index e0dcb2459..d646b589f 100644 --- a/docs/software/TODO.md +++ b/docs/software/TODO.md @@ -1,7 +1,9 @@ # High priority - why is the net so chatty now? +- three bakc to back sends are getting overritten - shows up as three separate writes with the same payload - might be a bug on the android side or the device side - probably android - do a release +- device wakes, turns BLE on and phone doesn't notice (while phone was sitting in auto-connect) - E22 bringup - encryption review findings writeup - turn on modem-sleep mode - https://github.com/espressif/arduino-esp32/issues/1142#issuecomment-512428852 diff --git a/src/esp32/MeshBluetoothService.cpp b/src/esp32/MeshBluetoothService.cpp index 0f3b512e2..9bc41459a 100644 --- a/src/esp32/MeshBluetoothService.cpp +++ b/src/esp32/MeshBluetoothService.cpp @@ -49,8 +49,6 @@ class ToRadioCharacteristic : public CallbackCharacteristic void onWrite(BLECharacteristic *c) { - DEBUG_MSG("Got on write\n"); - bluetoothPhoneAPI->handleToRadio(c->getData(), c->getValue().length()); } }; diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 37233a3a0..e1ea45dd6 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -101,10 +101,12 @@ void NodeDB::resetRadioConfig() crypto->setKey(channelSettings.psk.size, channelSettings.psk.bytes); // temp hack for quicker testing + /* radioConfig.preferences.screen_on_secs = 30; radioConfig.preferences.wait_bluetooth_secs = 30; - radioConfig.preferences.position_broadcast_secs = 15; + radioConfig.preferences.position_broadcast_secs = 6 * 60; + radioConfig.preferences.ls_secs = 60; */ } diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp index ce8b13d22..ec071fa5f 100644 --- a/src/mesh/PhoneAPI.cpp +++ b/src/mesh/PhoneAPI.cpp @@ -42,8 +42,9 @@ void PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength) if (pb_decode_from_bytes(buf, bufLength, ToRadio_fields, &toRadioScratch)) { switch (toRadioScratch.which_variant) { case ToRadio_packet_tag: { - // If our phone is sending a position, see if we can use it to set our RTC MeshPacket &p = toRadioScratch.variant.packet; + DEBUG_MSG("PACKET FROM PHONE: id=%d, to=%x, want_ack=%d, which1=%d, which2=%d, typ=%d, buflen=%d\n", p.id, p.to, p.want_ack, p.which_payload, + p.decoded.which_payload, p.decoded.data.typ, bufLength); service.handleToRadio(p); break; }