pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-28 02:32:09 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

#664 - Blink the LED when we enter disablePin()

Browse Source
This commit is contained in:
Jm 2021-01-27 18:56:09 -08:00
parent e19dd46f0f
commit 2561742683
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/nimble/BluetoothUtil.cpp
View File

@ -10,6 +10,7 @@
#include "nimble/NimbleDefs.h" #include "nimble/NimbleDefs.h"
#include "services/gap/ble_svc_gap.h" #include "services/gap/ble_svc_gap.h"
#include "services/gatt/ble_svc_gatt.h" #include "services/gatt/ble_svc_gatt.h"
#include "sleep.h"
#include <Arduino.h> #include <Arduino.h>
#include <WiFi.h> #include <WiFi.h>
@ -226,13 +227,11 @@ static int gap_event(struct ble_gap_event *event, void *arg)
if (event->passkey.params.action == BLE_SM_IOACT_DISP) { if (event->passkey.params.action == BLE_SM_IOACT_DISP) {
pkey.action = event->passkey.params.action; pkey.action = event->passkey.params.action;
DEBUG_MSG("dp: %d now:%d\n",doublepressed, now); DEBUG_MSG("dp: %d now:%d\n", doublepressed, now);
if (doublepressed > 0 && (doublepressed + (30*1000)) > now) if (doublepressed > 0 && (doublepressed + (30 * 1000)) > now) {
{
DEBUG_MSG("User has overridden passkey or no display available\n"); DEBUG_MSG("User has overridden passkey or no display available\n");
pkey.passkey = defaultBLEPin; pkey.passkey = defaultBLEPin;
} } else {
else {
DEBUG_MSG("Using random passkey\n"); DEBUG_MSG("Using random passkey\n");
pkey.passkey = random( pkey.passkey = random(
100000, 999999); // This is the passkey to be entered on peer - we pick a number >100,000 to ensure 6 digits 100000, 999999); // This is the passkey to be entered on peer - we pick a number >100,000 to ensure 6 digits
@ -395,7 +394,6 @@ void gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg)
} }
} }
/** /**
* A helper function that implements simple read and write handling for a uint32_t * A helper function that implements simple read and write handling for a uint32_t
* *
@ -449,8 +447,7 @@ int chr_readwrite8(uint8_t *v, size_t vlen, struct ble_gatt_access_ctxt *ctxt)
if (len < vlen) { if (len < vlen) {
DEBUG_MSG("Error: wrongsized write\n"); DEBUG_MSG("Error: wrongsized write\n");
return BLE_ATT_ERR_UNLIKELY; return BLE_ATT_ERR_UNLIKELY;
} } else {
else {
DEBUG_MSG("BLE writing bytes\n"); DEBUG_MSG("BLE writing bytes\n");
} }
} else { } else {
@ -465,6 +462,20 @@ void disablePin()
{ {
DEBUG_MSG("User Override, disabling bluetooth pin requirement\n"); DEBUG_MSG("User Override, disabling bluetooth pin requirement\n");
// keep track of when it was pressed, so we know it was within X seconds // keep track of when it was pressed, so we know it was within X seconds
// Flash the LED
setLed(true);
delay(100);
setLed(false);
delay(100);
setLed(true);
delay(100);
setLed(false);
delay(100);
setLed(true);
delay(100);
setLed(false);
doublepressed = millis(); doublepressed = millis();
} }