jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 13:16:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unwanted WiZMote restart

Browse Source
This commit is contained in:
Theo Arends 2025-02-13 21:32:34 +01:00
parent cc14f721f9
commit f383c877c6
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib_div/QuickESPNow/src/Comms_hal.h
View File

@ -44,7 +44,7 @@ protected:
* @brief Communication subsistem initialization * @brief Communication subsistem initialization
* @param peerType Role that peer plays into the system, node or gateway. * @param peerType Role that peer plays into the system, node or gateway.
*/ */
virtual void initComms () = 0; virtual bool initComms () = 0;
public: public:

13
lib/lib_div/QuickESPNow/src/QuickEspNow_esp32.cpp
View File

@ -46,8 +46,8 @@ bool QuickEspNow::begin (uint8_t channel, uint32_t wifi_interface, bool synchron
DEBUG_INFO (QESPNOW_TAG, ARDUHAL_LOG_COLOR (ARDUHAL_LOG_COLOR_RED) "Starting ESP-NOW in in channel %u interface %s", channel, wifi_if == WIFI_IF_STA ? "STA" : "AP"); DEBUG_INFO (QESPNOW_TAG, ARDUHAL_LOG_COLOR (ARDUHAL_LOG_COLOR_RED) "Starting ESP-NOW in in channel %u interface %s", channel, wifi_if == WIFI_IF_STA ? "STA" : "AP");
this->channel = channel; this->channel = channel;
initComms ();
return true; return initComms ();
} }
void QuickEspNow::stop () { void QuickEspNow::stop () {
@ -303,11 +303,12 @@ bool QuickEspNow::addPeer (const uint8_t* peer_addr) {
return error == ESP_OK; return error == ESP_OK;
} }
void QuickEspNow::initComms () { bool QuickEspNow::initComms () {
if (esp_now_init ()) { if (esp_now_init ()) {
DEBUG_ERROR (QESPNOW_TAG, "Failed to init ESP-NOW"); DEBUG_ERROR (QESPNOW_TAG, "Failed to init ESP-NOW");
ESP.restart (); // ESP.restart ();
delay (1); // delay (1);
return false;
} }
esp_now_register_recv_cb (rx_cb); esp_now_register_recv_cb (rx_cb);
@ -328,6 +329,8 @@ void QuickEspNow::initComms () {
dataTPTimer = xTimerCreate ("espnow_tp_timer", pdMS_TO_TICKS (MEAS_TP_EVERY_MS), pdTRUE, NULL, tp_timer_cb); dataTPTimer = xTimerCreate ("espnow_tp_timer", pdMS_TO_TICKS (MEAS_TP_EVERY_MS), pdTRUE, NULL, tp_timer_cb);
xTimerStart (dataTPTimer, 0); xTimerStart (dataTPTimer, 0);
#endif // MEAS_TPUT #endif // MEAS_TPUT
return true;
} }
void QuickEspNow::espnowTxTask_cb (void* param) { void QuickEspNow::espnowTxTask_cb (void* param) {

2
lib/lib_div/QuickESPNow/src/QuickEspNow_esp32.h
View File

@ -150,7 +150,7 @@ protected:
//uint8_t channel; //uint8_t channel;
bool followWiFiChannel = false; bool followWiFiChannel = false;
void initComms (); bool initComms ();
bool addPeer (const uint8_t* peer_addr); bool addPeer (const uint8_t* peer_addr);
static void espnowTxTask_cb (void* param); static void espnowTxTask_cb (void* param);
int32_t sendEspNowMessage (comms_tx_queue_item_t* message); int32_t sendEspNowMessage (comms_tx_queue_item_t* message);

13
lib/lib_div/QuickESPNow/src/QuickEspNow_esp8266.cpp
View File

@ -74,9 +74,8 @@ bool QuickEspNow::begin (uint8_t channel, uint32_t wifi_interface, bool synchron
DEBUG_INFO (QESPNOW_TAG, "Starting ESP-NOW in in channel %u interface %s", channel, wifi_if == WIFI_IF_STA ? "STA" : "AP"); DEBUG_INFO (QESPNOW_TAG, "Starting ESP-NOW in in channel %u interface %s", channel, wifi_if == WIFI_IF_STA ? "STA" : "AP");
this->channel = channel; this->channel = channel;
initComms ();
// addPeer (ESPNOW_BROADCAST_ADDRESS); // Not needed ? return initComms ();
return true;
} }
void QuickEspNow::stop () { void QuickEspNow::stop () {
@ -261,11 +260,12 @@ void QuickEspNow::enableTransmit (bool enable) {
} }
} }
void QuickEspNow::initComms () { bool QuickEspNow::initComms () {
if (esp_now_init ()) { if (esp_now_init ()) {
DEBUG_ERROR (QESPNOW_TAG, "Failed to init ESP-NOW"); DEBUG_ERROR (QESPNOW_TAG, "Failed to init ESP-NOW");
ESP.restart (); // ESP.restart ();
delay (1); // delay (1);
return false;
} }
if (wifi_if == WIFI_IF_STA) { if (wifi_if == WIFI_IF_STA) {
@ -288,6 +288,7 @@ void QuickEspNow::initComms () {
os_timer_arm (&dataTPTimer, MEAS_TP_EVERY_MS, true); os_timer_arm (&dataTPTimer, MEAS_TP_EVERY_MS, true);
#endif // MEAS_TPUT #endif // MEAS_TPUT
return true;
} }
void QuickEspNow::espnowTxTask_cb (void* param) { void QuickEspNow::espnowTxTask_cb (void* param) {

2
lib/lib_div/QuickESPNow/src/QuickEspNow_esp8266.h
View File

@ -127,7 +127,7 @@ protected:
//uint8_t channel; //uint8_t channel;
bool followWiFiChannel = false; bool followWiFiChannel = false;
void initComms (); bool initComms ();
static void espnowTxTask_cb (void* param); static void espnowTxTask_cb (void* param);
static void espnowRxTask_cb (void* param); static void espnowRxTask_cb (void* param);
int32_t sendEspNowMessage (comms_tx_queue_item_t* message); int32_t sendEspNowMessage (comms_tx_queue_item_t* message);

3
tasmota/tasmota_xdrv_driver/xdrv_77_wizmote.ino
View File

@ -156,10 +156,11 @@ void EspNowInit(void) {
#ifdef ESP32 #ifdef ESP32
// quickEspNow.setWiFiBandwidth (WIFI_IF_STA, WIFI_BW_HT20); // Only needed for ESP32 in case you need coexistence with ESP8266 in the same network // quickEspNow.setWiFiBandwidth (WIFI_IF_STA, WIFI_BW_HT20); // Only needed for ESP32 in case you need coexistence with ESP8266 in the same network
#endif //ESP32 #endif //ESP32
quickEspNow.begin(); if (quickEspNow.begin()) {
AddLog(LOG_LEVEL_INFO, PSTR("NOW: ESP-NOW started")); AddLog(LOG_LEVEL_INFO, PSTR("NOW: ESP-NOW started"));
WizMote.active = true; WizMote.active = true;
} }
}
} }
/*********************************************************************************************\ /*********************************************************************************************\