Reordering functions

src/main.cpp

@@ -8,18 +8,13 @@
 #define HTTP_HOST "google.com"
 #define HTTP_PORT (80)
 
+// ----- //
+// Setup //
+// ----- //
+
 void ensureWiFiConnection();
-
+void relayOn();
-bool testHTTP() {
+void relayOff();
-  WiFiClient client;
-  client.setNoDelay(true);
-  bool available = client.connect(HTTP_HOST, HTTP_PORT);
-  client.stop();
-  return available;
-}
-
-// Returns true if Internet works
-bool uplinkWorks() { return testHTTP(); }
 
 void setupOTA() {
 ArduinoOTA.onStart([]() {
@@ -60,10 +55,17 @@ void setup() {
   Serial.begin(9600);
   pinMode(LED_BUILTIN, OUTPUT);
   pinMode(RELAY, OUTPUT);
+  relayOn();
+  delay(2000);
+  relayOff();
   ensureWiFiConnection();
   setupOTA();
 }
 
+// ----- //
+// Relay //
+// ----- //
+
 void relayOn() {
     Serial.println("Lights on");
     digitalWrite(LED_BUILTIN, HIGH);
@@ -76,15 +78,9 @@ void relayOff() {
     digitalWrite(RELAY, LOW);
 }
 
-void testInternet() {
+// --------------- //
-  if (uplinkWorks()) {
+// Network Testing //
-    Serial.println("Internet is up");
+// --------------- //
-    relayOn();
-  } else {
-    Serial.println("Internet is down");
-    relayOff();
-  }
-}
 
 void ensureWiFiConnection() {
   wl_status_t status = WiFi.status();
@@ -104,6 +100,28 @@ void ensureWiFiConnection() {
   }
 }
 
+bool pingHTTP() {
+  WiFiClient client;
+  client.setNoDelay(true);
+  bool available = client.connect(HTTP_HOST, HTTP_PORT);
+  client.stop();
+  return available;
+}
+
+// ---- //
+// Loop //
+// ---- //
+
+void testInternet() {
+  if (pingHTTP()) {
+    Serial.println("Internet is up");
+    relayOn();
+  } else {
+    Serial.println("Internet is down");
+    relayOff();
+  }
+}
+
 void loop() {
   ensureWiFiConnection();
   testInternet();