Compiler guards for ethernet on S3

Author: theelims

lib/framework/EthernetSettingsService.cpp

@@ -14,6 +14,8 @@
 
 #include <EthernetSettingsService.h>
 
+#if FT_ENABLED(FT_ETHERNET)
+
 EthernetSettingsService::EthernetSettingsService(PsychicHttpServer *server,
                                                  FS *fs,
                                                  SecurityManager *securityManager,
@@ -86,7 +88,7 @@ void EthernetSettingsService::configureNetwork(ethernet_settings_t &network)
 #if CONFIG_IDF_TARGET_ESP32
     // ESP32 chips with built-in ethernet MAC/PHY
     ETH.begin();
-#elif FT_ENABLED(FT_ETHERNET)
+#else
     // For SPI based ethernet modules like W5500, ENC28J60 etc.
     SPI.begin(ETH_SPI_SCK, ETH_SPI_MISO, ETH_SPI_MOSI);
     ETH.begin(ETH_PHY_TYPE, ETH_PHY_ADDR, ETH_PHY_CS, ETH_PHY_IRQ, ETH_PHY_RST, SPI);
@@ -106,4 +108,6 @@ void EthernetSettingsService::updateEthernet()
     doc["connected"] = ETH.connected();
     JsonObject jsonObject = doc.as<JsonObject>();
     _socket->emitEvent(EVENT_ETHERNET, jsonObject);
-}
+}
+
+#endif // end FT_ENABLED(FT_ETHERNET)

lib/framework/EthernetSettingsService.h

@@ -38,6 +38,8 @@
 
 #define EVENT_ETHERNET "ethernet"
 
+#if FT_ENABLED(FT_ETHERNET)
+
 // Struct defining the ethernet settings
 typedef struct
 {
@@ -123,4 +125,5 @@ class EthernetSettingsService : public StatefulService<EthernetSettings>
     void updateEthernet();
 };
 
+#endif // end FT_ENABLED(FT_ETHERNET)
 #endif // end EthernetSettingsService_h

lib/framework/EthernetStatus.cpp

@@ -14,6 +14,8 @@
 
 #include <EthernetStatus.h>
 
+#if FT_ENABLED(FT_ETHERNET)
+
 EthernetStatus::EthernetStatus(PsychicHttpServer *server,
                                SecurityManager *securityManager) : _server(server),
                                                                    _securityManager(securityManager)
@@ -91,3 +93,5 @@ bool EthernetStatus::isConnected()
 {
     return ETH.connected();
 }
+
+#endif // end FT_ENABLED(FT_ETHERNET)

lib/framework/EthernetStatus.h

@@ -25,6 +25,8 @@
 
 #define ETHERNET_STATUS_SERVICE_PATH "/rest/ethernetStatus"
 
+#if FT_ENABLED(FT_ETHERNET)
+
 class EthernetStatus
 {
 public:
@@ -46,4 +48,6 @@ class EthernetStatus
     esp_err_t ethernetStatus(PsychicRequest *request);
 };
 
+#endif // end FT_ENABLED(FT_ETHERNET)
+
 #endif // end EthernetStatus_h