Bluetooth Classic fix
This commit is contained in:
parent
31bf59cd2f
commit
f4c3bead6a
|
|
@ -119,7 +119,7 @@ void setup() {
|
||||||
WiFi.mode(WIFI_OFF);
|
WiFi.mode(WIFI_OFF);
|
||||||
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "Main", "WiFi controller stopped");
|
logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "Main", "WiFi controller stopped");
|
||||||
|
|
||||||
if (Config.bluetoothType == 0 || Config.bluetoothType == 3) {
|
if (Config.bluetoothType == 0 || Config.bluetoothType == 2) {
|
||||||
BLE_Utils::setup();
|
BLE_Utils::setup();
|
||||||
} else {
|
} else {
|
||||||
#ifdef HAS_BT_CLASSIC
|
#ifdef HAS_BT_CLASSIC
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ extern logging::Logger logger;
|
||||||
extern TinyGPSPlus gps;
|
extern TinyGPSPlus gps;
|
||||||
extern bool bluetoothConnected;
|
extern bool bluetoothConnected;
|
||||||
|
|
||||||
bool bluetoothActive = Config.bluetoothActive;
|
bool bluetoothActive;
|
||||||
|
|
||||||
namespace BLUETOOTH_Utils {
|
namespace BLUETOOTH_Utils {
|
||||||
String serialReceived;
|
String serialReceived;
|
||||||
|
|
@ -22,6 +22,7 @@ namespace BLUETOOTH_Utils {
|
||||||
bool useKiss = false;
|
bool useKiss = false;
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
|
bluetoothActive = Config.bluetoothActive;
|
||||||
if (!bluetoothActive) {
|
if (!bluetoothActive) {
|
||||||
btStop();
|
btStop();
|
||||||
esp_bt_controller_disable();
|
esp_bt_controller_disable();
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ Configuration::Configuration() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Configuration::readFile(fs::FS &fs, const char *fileName) {
|
void Configuration::readFile(fs::FS &fs, const char *fileName) {
|
||||||
StaticJsonDocument<2560> data;
|
StaticJsonDocument<2800> data;
|
||||||
File configFile = fs.open(fileName, "r");
|
File configFile = fs.open(fileName, "r");
|
||||||
DeserializationError error = deserializeJson(data, configFile);
|
DeserializationError error = deserializeJson(data, configFile);
|
||||||
if (error) {
|
if (error) {
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,6 @@ extern String winlinkAlias;
|
||||||
extern String winlinkAliasComplete;
|
extern String winlinkAliasComplete;
|
||||||
extern bool winlinkCommentState;
|
extern bool winlinkCommentState;
|
||||||
extern int wxModuleType;
|
extern int wxModuleType;
|
||||||
//extern bool bmeSensorFound;
|
|
||||||
|
|
||||||
String freqChangeWarning;
|
String freqChangeWarning;
|
||||||
uint8_t lowBatteryPercent = 21;
|
uint8_t lowBatteryPercent = 21;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue