|
7 | 7 | */ |
8 | 8 | #include "ANetworkConfigurator_Config.h" |
9 | 9 | #if NETWORK_CONFIGURATOR_COMPATIBLE |
| 10 | +#include "Arduino_NetworkConfigurator.h" |
10 | 11 |
|
11 | 12 | #include <Arduino_DebugUtils.h> |
12 | 13 | #include "ConnectionHandlerDefinitions.h" |
|
15 | 16 | #ifdef BOARD_HAS_WIFI |
16 | 17 | #include "WiFiConnectionHandler.h" |
17 | 18 | #endif |
18 | | -#include "Arduino_NetworkConfigurator.h" |
19 | 19 |
|
20 | 20 | #define NC_CONNECTION_RETRY_TIMER_ms 120000 |
21 | 21 | #define NC_CONNECTION_TIMEOUT_ms 15000 |
@@ -71,14 +71,14 @@ bool NetworkConfiguratorClass::begin() { |
71 | 71 | DEBUG_ERROR(F("The current WiFi firmware version is not the latest and it may cause compatibility issues. Please upgrade the WiFi firmware")); |
72 | 72 | } |
73 | 73 | _agentsManager->addRequestHandler(RequestType::SCAN, scanReqHandler); |
| 74 | + |
| 75 | + _agentsManager->addRequestHandler(RequestType::GET_WIFI_FW_VERSION, getWiFiFWVersionHandler); |
74 | 76 | #endif |
75 | 77 | // Register callbacks to agentsManager |
76 | 78 | _agentsManager->addRequestHandler(RequestType::CONNECT, connectReqHandler); |
77 | 79 |
|
78 | 80 | _agentsManager->addReturnNetworkSettingsCallback(setNetworkSettingsHandler); |
79 | 81 |
|
80 | | - _agentsManager->addRequestHandler(RequestType::GET_WIFI_FW_VERSION, getWiFiFWVersionHandler); |
81 | | - |
82 | 82 | _agentsManager->addRequestHandler(RequestType::GET_NETCONFIG_LIB_VERSION, getNetConfLibVersionHandler); |
83 | 83 |
|
84 | 84 | if (!_agentsManager->begin()) { |
@@ -419,7 +419,10 @@ String NetworkConfiguratorClass::decodeConnectionErrorMessage(NetworkConnectionS |
419 | 419 | } |
420 | 420 |
|
421 | 421 | void NetworkConfiguratorClass::handleGetWiFiFWVersion() { |
422 | | - String fwVersion = WiFi.firmwareVersion(); |
| 422 | + String fwVersion = ""; |
| 423 | + #ifdef BOARD_HAS_WIFI |
| 424 | + fwVersion = WiFi.firmwareVersion(); |
| 425 | + #endif |
423 | 426 | ProvisioningOutputMessage fwVersionMsg = { MessageOutputType::WIFI_FW_VERSION }; |
424 | 427 | fwVersionMsg.m.wifiFwVersion = fwVersion.c_str(); |
425 | 428 | _agentsManager->sendMsg(fwVersionMsg); |
|
0 commit comments