scratch/libretiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[realtek-ambz] Fix WiFiEvents linking when not needed

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2022-05-24 17:47:45 +02:00
parent 9a3c077ef1
commit aeebff9d5d
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arduino/realtek-ambz/libraries/WiFi/WiFiEvents.cpp
View File

@@ -10,6 +10,8 @@
static xQueueHandle wifiEventQueueHandle = NULL; static xQueueHandle wifiEventQueueHandle = NULL;
static xTaskHandle wifiEventTaskHandle = NULL; static xTaskHandle wifiEventTaskHandle = NULL;
WiFiClass *pWiFi = NULL;
// C code to support SDK-defined events (in wifi_conf.c) // C code to support SDK-defined events (in wifi_conf.c)
extern "C" { extern "C" {
// SDK events // SDK events
@@ -133,6 +135,9 @@ void WiFiClass::handleRtwEvent(uint16_t event, char *data, int len, int flags) {
handler(data, len, flags, event_callback_list[event][i].handler_user_data); handler(data, len, flags, event_callback_list[event][i].handler_user_data);
} }
if (pWiFi == NULL)
return;
EventId eventId; EventId eventId;
EventInfo eventInfo; EventInfo eventInfo;
String ssid; String ssid;
@@ -155,18 +160,18 @@ void WiFiClass::handleRtwEvent(uint16_t event, char *data, int len, int flags) {
case WIFI_EVENT_FOURWAY_HANDSHAKE_DONE: case WIFI_EVENT_FOURWAY_HANDSHAKE_DONE:
eventId = ARDUINO_EVENT_WIFI_STA_CONNECTED; eventId = ARDUINO_EVENT_WIFI_STA_CONNECTED;
ssid = WiFi.SSID(); ssid = pWiFi->SSID();
eventInfo.wifi_sta_connected.ssid_len = ssid.length(); eventInfo.wifi_sta_connected.ssid_len = ssid.length();
eventInfo.wifi_sta_connected.channel = WiFi.channel(); eventInfo.wifi_sta_connected.channel = pWiFi->channel();
eventInfo.wifi_sta_connected.authmode = WiFi.getEncryption(); eventInfo.wifi_sta_connected.authmode = pWiFi->getEncryption();
memcpy(eventInfo.wifi_sta_connected.ssid, ssid.c_str(), eventInfo.wifi_sta_connected.ssid_len + 1); memcpy(eventInfo.wifi_sta_connected.ssid, ssid.c_str(), eventInfo.wifi_sta_connected.ssid_len + 1);
memcpy(eventInfo.wifi_sta_connected.bssid, WiFi.BSSID(), 6); memcpy(eventInfo.wifi_sta_connected.bssid, pWiFi->BSSID(), 6);
break; break;
case WIFI_EVENT_SCAN_DONE: case WIFI_EVENT_SCAN_DONE:
eventId = ARDUINO_EVENT_WIFI_SCAN_DONE; eventId = ARDUINO_EVENT_WIFI_SCAN_DONE;
eventInfo.wifi_scan_done.status = 0; eventInfo.wifi_scan_done.status = 0;
eventInfo.wifi_scan_done.number = WiFi._netCount; eventInfo.wifi_scan_done.number = pWiFi->_netCount;
eventInfo.wifi_scan_done.scan_id = 0; eventInfo.wifi_scan_done.scan_id = 0;
break; break;

4
arduino/realtek-ambz/libraries/WiFi/WiFiGeneric.cpp
View File

@@ -9,9 +9,13 @@ int32_t WiFiClass::channel() {
return channel; return channel;
} }
extern WiFiClass *pWiFi;
extern void startWifiTask(); extern void startWifiTask();
bool WiFiClass::mode(WiFiMode mode) { bool WiFiClass::mode(WiFiMode mode) {
// store a pointer to WiFi for WiFiEvents.cpp
pWiFi = this;
WiFiMode currentMode = getMode(); WiFiMode currentMode = getMode();
LT_D_WG("Mode changing %u -> %u", currentMode, mode); LT_D_WG("Mode changing %u -> %u", currentMode, mode);
if (mode == currentMode) if (mode == currentMode)