Git-Mirrors/RNode_Firmware_CE
1
0
Fork 0
mirror of https://github.com/liberatedsystems/RNode_Firmware_CE.git synced 2025-05-02 06:36:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implemented Bluetooth power and pairing state control

Browse source
This commit is contained in:
Mark Qvist 2022-10-30 14:52:22 +01:00
parent b6a26b3226
commit 8b7e324a5a
6 changed files with 53 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Bluetooth.h
View file

@ -3,7 +3,7 @@
#include "esp_bt_device.h"
BluetoothSerial SerialBT;
#define BT_PAIRING_TIMEOUT 30000
#define BT_PAIRING_TIMEOUT 35000
uint32_t bt_pairing_started = 0;
#define BT_DEV_ADDR_LEN 6
@ -13,7 +13,7 @@ char bt_dh[BT_DEV_HASH_LEN];
char bt_devname[11];
bool bt_ready = false;
bool bt_enabled = true;
bool bt_enabled = false;
bool bt_allow_pairing = false;
#if MCU_VARIANT == MCU_ESP32
@ -30,13 +30,29 @@ bool bt_allow_pairing = false;
void bt_pairing_complete(boolean success) {
if (success) {
Serial.println("Paired");
// Pass
} else {
Serial.println("Not Paired");
// Pass
}
}
void bt_stop() {
if (bt_state != BT_STATE_OFF) {
SerialBT.end();
bt_allow_pairing = false;
bt_state = BT_STATE_OFF;
}
}
void bt_start() {
if (bt_state == BT_STATE_OFF) {
SerialBT.begin(bt_devname);
bt_state = BT_STATE_ON;
}
}
void bt_enable_pairing() {
if (bt_state == BT_STATE_OFF) bt_start();
bt_allow_pairing = true;
bt_pairing_started = millis();
bt_state = BT_STATE_PAIRING;
@ -47,30 +63,18 @@ bool bt_allow_pairing = false;
bt_state = BT_STATE_ON;
}
void bt_disable() {
if (bt_state != BT_STATE_OFF) {
SerialBT.end();
bt_state = BT_STATE_OFF;
}
}
void bt_enable() {
if (bt_state == BT_STATE_OFF) {
SerialBT.begin(bt_devname);
bt_state = BT_STATE_ON;
}
}
bool bt_setup_hw() {
if (!bt_ready) {
if (EEPROM.read(eeprom_addr(ADDR_CONF_BT)) == BT_ENABLE_BYTE) { bt_enabled = true; } else { bt_enabled = false; }
if (btStart()) {
if (esp_bluedroid_init() == ESP_OK) {
if (esp_bluedroid_enable() == ESP_OK) {
const uint8_t* bda_ptr = esp_bt_dev_get_address();
char *data = (char*)malloc(BT_DEV_ADDR_LEN);
char *data = (char*)malloc(BT_DEV_ADDR_LEN+1);
for (int i = 0; i < BT_DEV_ADDR_LEN; i++) {
data[i] = bda_ptr[i];
}
data[BT_DEV_ADDR_LEN] = EEPROM.read(eeprom_addr(ADDR_SIGNATURE));
unsigned char *hash = MD5::make_hash(data, BT_DEV_ADDR_LEN);
memcpy(bt_dh, hash, BT_DEV_HASH_LEN);
sprintf(bt_devname, "RNode %02X%02X", bt_dh[14], bt_dh[15]);
@ -91,23 +95,18 @@ bool bt_allow_pairing = false;
bool bt_init() {
bt_state = BT_STATE_OFF;
if (bt_enabled) {
if (bt_setup_hw()) {
// TODO: Read from conf
bt_enable();
return true;
} else {
return false;
}
if (bt_setup_hw()) {
if (bt_enabled) bt_start();
return true;
} else {
return false;
}
}
void update_bt() {
if (millis()-bt_pairing_started >= BT_PAIRING_TIMEOUT) {
if (bt_allow_pairing && millis()-bt_pairing_started >= BT_PAIRING_TIMEOUT) {
bt_disable_pairing();
}
}
#endif