Merge pull request #23 from arduino-libraries/fix-opta-lite

Handle opta lite

Author: fabik111

examples/utility/DeleteConfiguration/DeleteConfiguration.ino

@@ -16,12 +16,8 @@
 #include <GenericConnectionHandler.h>
 #include <Arduino_KVStore.h>
 #include <Arduino_NetworkConfigurator.h>
-#include <configuratorAgents/agents/BLEAgent.h>
-#include <configuratorAgents/agents/SerialAgent.h>
 
 KVStore kvstore;
-BLEAgentClass BLEAgent;
-SerialAgentClass SerialAgent;
 GenericConnectionHandler conMan;
 NetworkConfiguratorClass NetworkConfigurator(conMan);
 

src/ANetworkConfigurator_Config.h

@@ -72,6 +72,7 @@
 #if defined(ARDUINO_OPTA)
   #define NETWORK_CONFIGURATOR_COMPATIBLE 1
   #define ZERO_TOUCH_ENABLED 1
+  #define OPTA_WIFI_PID  _BOARD_PRODUCTID
   #define PIN_RECONFIGURE BTN_USER
   #define LED_RECONFIGURE LED_USER
   #define BOARD_HAS_RGB

src/Arduino_NetworkConfigurator.cpp

@@ -57,10 +57,17 @@ bool NetworkConfiguratorClass::begin() {
   memset(&_networkSetting, 0x00, sizeof(models::NetworkSetting));
   _ledFeedback->begin();
 #ifdef BOARD_HAS_WIFI
+#ifdef ARDUINO_OPTA
+  if(_getPid_() == OPTA_WIFI_PID) {
+#endif
   String fv = WiFi.firmwareVersion();
   if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
     DEBUG_ERROR(F("The current WiFi firmware version is not the latest and it may cause compatibility issues. Please upgrade the WiFi firmware"));
   }
+
+#ifdef ARDUINO_OPTA
+  }
+#endif
   _agentsManager->addRequestHandler(RequestType::SCAN, scanReqHandler);
 
   _agentsManager->addRequestHandler(RequestType::GET_WIFI_FW_VERSION, getWiFiFWVersionHandler);
@@ -294,6 +301,13 @@ bool NetworkConfiguratorClass::insertWiFiAP(WiFiOption &wifiOptObj, char *ssid,
 
 bool NetworkConfiguratorClass::scanWiFiNetworks(WiFiOption &wifiOptObj) {
   wifiOptObj.numDiscoveredWiFiNetworks = 0;
+
+#if defined(ARDUINO_OPTA)
+  if(_getPid_() != OPTA_WIFI_PID) {
+    return true; // Skip scanning if it's not the Opta with WiFi
+  }
+#endif
+
 #if defined(ARDUINO_UNOR4_WIFI)
   WiFi.end();
 #endif
@@ -349,6 +363,14 @@ bool NetworkConfiguratorClass::handleConnectRequest() {
     return false;
   }
 
+#ifdef ARDUINO_OPTA
+  if(_networkSetting.type == NetworkAdapter::WIFI && _getPid_() != OPTA_WIFI_PID) {
+    DEBUG_WARNING("NetworkConfiguratorClass::%s WiFi configuration is not supported on this board", __FUNCTION__);
+    sendStatus(StatusMessage::INVALID_PARAMS);
+    return false;
+  }
+#endif
+
   if (_kvstore != nullptr) {
     if (!_kvstore->begin()) {
       DEBUG_ERROR("NetworkConfiguratorClass::%s error initializing kvstore", __FUNCTION__);
@@ -469,7 +491,13 @@ String NetworkConfiguratorClass::decodeConnectionErrorMessage(NetworkConnectionS
 void NetworkConfiguratorClass::handleGetWiFiFWVersion() {
   String fwVersion = "";
   #ifdef BOARD_HAS_WIFI
+  #ifdef ARDUINO_OPTA
+  if(_getPid_() == OPTA_WIFI_PID) {
+  #endif
   fwVersion = WiFi.firmwareVersion();
+  #ifdef ARDUINO_OPTA
+  }
+  #endif
   #endif
   ProvisioningOutputMessage fwVersionMsg = { MessageOutputType::WIFI_FW_VERSION };
   fwVersionMsg.m.wifiFwVersion = fwVersion.c_str();

src/configuratorAgents/AgentsManager.cpp

@@ -19,7 +19,13 @@
  ******************************************************************************/
 
 bool AgentsManagerClass::addAgent(ConfiguratorAgent &agent) {
+#ifdef ARDUINO_OPTA
+  if(agent.getAgentType() == ConfiguratorAgent::AgentTypes::BLE && _getPid_() != OPTA_WIFI_PID) {
+    return false;
+  }
+#endif
   _agentsList.push_back(&agent);
+  return true;
 }
 
 AgentsManagerClass &AgentsManagerClass::getInstance() {

src/utility/LEDFeedback.cpp

@@ -150,10 +150,15 @@ void LEDFeedbackClass::begin() {
 #else
   pinMode(GREEN_LED, OUTPUT);
   digitalWrite(GREEN_LED, LED_OFF);
-  pinMode(BLUE_LED, OUTPUT);
-  digitalWrite(BLUE_LED, LED_OFF);
+
   pinMode(RED_LED, OUTPUT);
   digitalWrite(RED_LED, LED_OFF);
+  #if defined(ARDUINO_OPTA)
+    if(_getPid_() == OPTA_WIFI_PID){
+      pinMode(BLUE_LED, OUTPUT);
+      digitalWrite(BLUE_LED, LED_OFF);
+    }
+  #endif
 #endif
 #else
   pinMode(GREEN_LED, OUTPUT);
@@ -364,6 +369,11 @@ void LEDFeedbackClass::configurePeerConnectedMode() {
   #ifdef BOARD_HAS_RGB
     turnOFF();
     _ledPin = BLUE_LED;
+    #if defined(ARDUINO_OPTA)
+    if(_getPid_() != OPTA_WIFI_PID){
+      _ledPin = GREEN_LED;
+    }
+    #endif
   #else
     _ledPin = GREEN_LED;
   #endif

src/utility/ResetInput.cpp

@@ -48,7 +48,7 @@ ResetInput::ResetInput() {
   #else
   _pin = PIN_RECONFIGURE;
   #endif
-
+  _ledFeedbackPin = LED_RECONFIGURE;
   _expired = false;
   _startPressed = 0;
   _fireEvent = false;
@@ -67,11 +67,14 @@ void ResetInput::begin() {
   }
 #ifdef ARDUINO_OPTA
   pinMode(_pin, INPUT);
+  if(_getPid_() != OPTA_WIFI_PID){
+    _ledFeedbackPin = GREEN_LED;
+  }
 #else
   pinMode(_pin, INPUT_PULLUP);
 #endif
-  pinMode(LED_RECONFIGURE, OUTPUT);
-  digitalWrite(LED_RECONFIGURE, LED_OFF);
+  pinMode(_ledFeedbackPin, OUTPUT);
+  digitalWrite(_ledFeedbackPin, LED_OFF);
   attachInterrupt(digitalPinToInterrupt(_pin),_pressedCallback, CHANGE);
 }
 
@@ -81,7 +84,7 @@ bool ResetInput::isEventFired() {
     LEDFeedbackClass::getInstance().stop();
 #endif
     if(micros() - _startPressed > RESET_HOLD_TIME){
-      digitalWrite(LED_RECONFIGURE, LED_OFF);
+      digitalWrite(_ledFeedbackPin, LED_OFF);
       _expired = true;
     }
   }
@@ -111,9 +114,9 @@ void ResetInput::_pressedCallback() {
     LEDFeedbackClass::getInstance().stop();
 #endif
     _startPressed = micros();
-    digitalWrite(LED_RECONFIGURE, LED_ON);
+    digitalWrite(_ledFeedbackPin, LED_ON);
   } else {
-    digitalWrite(LED_RECONFIGURE, LED_OFF);
+    digitalWrite(_ledFeedbackPin, LED_OFF);
     if(_startPressed != 0 && _expired){
       _fireEvent = true;
     }else{

src/utility/ResetInput.h

@@ -65,6 +65,7 @@ class ResetInput{
   ResetInput();
   static inline ResetInputCallback _pressedCustomCallback;
   static inline int _pin;
+  static inline int _ledFeedbackPin;
   static inline volatile bool _expired;
   static inline volatile bool _fireEvent;
   static inline volatile uint32_t _startPressed;