jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor BLE

Browse Source
This commit is contained in:
Theo Arends 2021-01-18 11:51:24 +01:00
parent 1c6b0d8a4d
commit d99ba6992c
4 changed files with 256 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasmota/support_command.ino
View File

@ -690,12 +690,6 @@ void CmndSleep(void)
} }
#ifdef USE_BLE_ESP32
// declare the fn
int ExtStopBLE();
#endif
void CmndUpgrade(void) void CmndUpgrade(void)
{ {
// Check if the payload is numerically 1, and had no trailing chars. // Check if the payload is numerically 1, and had no trailing chars.
@ -706,11 +700,6 @@ void CmndUpgrade(void)
TasmotaGlobal.ota_state_flag = 3; TasmotaGlobal.ota_state_flag = 3;
char stemp1[TOPSZ]; char stemp1[TOPSZ];
Response_P(PSTR("{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}"), XdrvMailbox.command, TasmotaGlobal.version, GetOtaUrl(stemp1, sizeof(stemp1))); Response_P(PSTR("{\"%s\":\"" D_JSON_VERSION " %s " D_JSON_FROM " %s\"}"), XdrvMailbox.command, TasmotaGlobal.version, GetOtaUrl(stemp1, sizeof(stemp1)));
#ifdef USE_BLE_ESP32
ExtStopBLE();
#endif
} else { } else {
Response_P(PSTR("{\"%s\":\"" D_JSON_ONE_OR_GT "\"}"), XdrvMailbox.command, TasmotaGlobal.version); Response_P(PSTR("{\"%s\":\"" D_JSON_ONE_OR_GT "\"}"), XdrvMailbox.command, TasmotaGlobal.version);
} }

8
tasmota/support_tasmota.ino
View File

@ -941,6 +941,11 @@ void Every100mSeconds(void)
* Every 0.25 second * Every 0.25 second
\*-------------------------------------------------------------------------------------------*/ \*-------------------------------------------------------------------------------------------*/
#ifdef USE_BLE_ESP32
// declare the fn
int ExtStopBLE();
#endif // USE_BLE_ESP32
void Every250mSeconds(void) void Every250mSeconds(void)
{ {
// As the max amount of sleep = 250 mSec this loop should always be taken... // As the max amount of sleep = 250 mSec this loop should always be taken...
@ -1010,6 +1015,9 @@ void Every250mSeconds(void)
SettingsSave(1); // Free flash for OTA update SettingsSave(1); // Free flash for OTA update
} }
if (TasmotaGlobal.ota_state_flag <= 0) { if (TasmotaGlobal.ota_state_flag <= 0) {
#ifdef USE_BLE_ESP32
ExtStopBLE();
#endif // USE_BLE_ESP32
#ifdef USE_COUNTER #ifdef USE_COUNTER
CounterInterruptDisable(true); // Prevent OTA failures on 100Hz counter interrupts CounterInterruptDisable(true); // Prevent OTA failures on 100Hz counter interrupts
#endif // USE_COUNTER #endif // USE_COUNTER

18
tasmota/xdrv_01_webserver.ino
View File

@ -2331,6 +2331,11 @@ void HandleUploadDone(void) {
WSContentStop(); WSContentStop();
} }
#ifdef USE_BLE_ESP32
// declare the fn
int ExtStopBLE();
#endif
void UploadServices(uint32_t start_service) { void UploadServices(uint32_t start_service) {
if (Web.upload_services_stopped != start_service) { return; } if (Web.upload_services_stopped != start_service) { return; }
Web.upload_services_stopped = !start_service; Web.upload_services_stopped = !start_service;
@ -2355,6 +2360,9 @@ void UploadServices(uint32_t start_service) {
} else { } else {
// AddLog_P(LOG_LEVEL_DEBUG, PSTR("UPL: Services disabled")); // AddLog_P(LOG_LEVEL_DEBUG, PSTR("UPL: Services disabled"));
#ifdef USE_BLE_ESP32
ExtStopBLE();
#endif
#ifdef USE_EMULATION #ifdef USE_EMULATION
UdpDisconnect(); UdpDisconnect();
#endif // USE_EMULATION #endif // USE_EMULATION
@ -2374,11 +2382,6 @@ void UploadServices(uint32_t start_service) {
} }
} }
#ifdef USE_BLE_ESP32
// declare the fn
int ExtStopBLE();
#endif
void HandleUploadLoop(void) { void HandleUploadLoop(void) {
// Based on ESP8266HTTPUpdateServer.cpp uses ESP8266WebServer Parsing.cpp and Cores Updater.cpp (Update) // Based on ESP8266HTTPUpdateServer.cpp uses ESP8266WebServer Parsing.cpp and Cores Updater.cpp (Update)
static uint32_t upload_size; static uint32_t upload_size;
@ -2414,11 +2417,6 @@ void HandleUploadLoop(void) {
} }
SettingsSave(1); // Free flash for upload SettingsSave(1); // Free flash for upload
#ifdef USE_BLE_ESP32
ExtStopBLE();
#endif
AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_FILE " %s"), upload.filename.c_str()); AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_UPLOAD D_FILE " %s"), upload.filename.c_str());
if (UPL_SETTINGS == Web.upload_file_type) { if (UPL_SETTINGS == Web.upload_file_type) {

486
tasmota/xdrv_52_BLE_ESP32.ino
View File

File diff suppressed because it is too large Load Diff