Fixed issues with WiFi client

Author: nothans

README.md

@@ -21,56 +21,7 @@ Include the library in your sketch and initialize it with your WiFi credentials.
 ## Methods
 
 - `begin(const char* ssid, const char* password)`: Initialize the library with your WiFi credentials.
-- `getColorName()`: Get the current CheerLights color name.
-- `getColorHex()`: Get the current CheerLights color as a hex value.
-- `getRed()`, `getGreen()`, `getBlue()`: Get the RGB values for the current CheerLights color.
-
-## Example
-
-```cpp
-#include <CheerLights.h>
-#include <WiFiClientSecure.h>
-#include <Adafruit_NeoPixel.h> // For controlling NeoPixels
-
-#define LED_PIN    6
-#define NUM_LEDS   8
-
-// Replace with your network credentials
-const char* ssid = "your_SSID";
-const char* password = "your_PASSWORD";
-
-CheerLights cheerLights;
-Adafruit_NeoPixel strip(NUM_LEDS, LED_PIN, NEO_GRB + NEO_KHZ800);
-
-void setup() {
-    Serial.begin(115200);
-    cheerLights.begin(ssid, password);
-    strip.begin();
-    strip.show(); // Initialize all pixels to 'off'
-}
-
-void loop() {
-    // Fetch and update the color
-    cheerLights.getColorHex();
-
-    // Now get the RGB values
-    uint8_t red = cheerLights.getRed();
-    uint8_t green = cheerLights.getGreen();
-    uint8_t blue = cheerLights.getBlue();
-
-    Serial.print("Current CheerLights Color: ");
-    Serial.println(cheerLights.getColorName());
-
-    // Set all pixels to the CheerLights color
-    for (int i = 0; i < NUM_LEDS; i++) {
-        strip.setPixelColor(i, strip.Color(red, green, blue));
-    }
-    strip.show();
-
-    delay(15000); // Update every 15 seconds
-}
-```
-
-## License
-
-This project is licensed under the MIT License.
+- `getCurrentColor()`: Get the current CheerLights color from ThingSpeak.
+- `showColorName()`: Show the current CheerLights color name (e.g. "red").
+- `showColorHex()`: Show the current CheerLights color as a hex value (e.g. 0xFF0000).
+- `showRed()`, `showGreen()`, `showBlue()`: Show the RGB values for the current CheerLights color (e.g. 255, 0, 0).

examples/CheerLightsExample/CheerLightsExample.ino

@@ -5,43 +5,61 @@ To learn more about CheerLights, visit https://cheerlights.com.
 */
 
 #include <CheerLights.h>
-#include <WiFiClientSecure.h>
+#include "secrets.h"
 #include <Adafruit_NeoPixel.h> // For controlling NeoPixels
 
 #define LED_PIN    6
 #define NUM_LEDS   8
 
-// Replace with your network credentials
-const char* ssid = "your_SSID";
-const char* password = "your_PASSWORD";
-
-CheerLights cheerLights;
+CheerLights CheerLights;
 Adafruit_NeoPixel strip(NUM_LEDS, LED_PIN, NEO_GRB + NEO_KHZ800);
 
+unsigned long previousMillis = 0;
+const long interval = 15000; // 15 seconds
+
 void setup() {
     Serial.begin(115200);
-    cheerLights.begin(ssid, password);
+    CheerLights.begin(SECRET_SSID, SECRET_PASSWORD);
     strip.begin();
     strip.show(); // Initialize all pixels to 'off'
 }
 
 void loop() {
-    // Fetch and update the color
-    cheerLights.getColorHex();
+    unsigned long currentMillis = millis();
+
+    if (currentMillis - previousMillis >= interval) {
+        previousMillis = currentMillis;
+
+        // Get the current CheerLights color
+        Serial.print("Current CheerLights Color: ");
+        Serial.println(CheerLights.getCurrentColor());
+
+        // Show the color as a hex value
+        Serial.print("Color Hex: 0x");
+        Serial.println(CheerLights.showColorHex(), HEX);
+
+        // Show the RGB values
+        uint8_t red = CheerLights.showRed();
+        uint8_t green = CheerLights.showGreen();
+        uint8_t blue = CheerLights.showBlue();
 
-    // Now get the RGB values
-    uint8_t red = cheerLights.getRed();
-    uint8_t green = cheerLights.getGreen();
-    uint8_t blue = cheerLights.getBlue();
+        Serial.print("Red: ");
+        Serial.print(red);
+        Serial.print(" Green: ");
+        Serial.print(green);
+        Serial.print(" Blue: ");
+        Serial.println(blue);
 
-    Serial.print("Current CheerLights Color: ");
-    Serial.println(cheerLights.getColorName());
+        // Show the color name
+        Serial.print("CheerLights Color Name: ");
+        Serial.println(CheerLights.showColorName());
 
-    // Set all pixels to the CheerLights color
-    for (int i = 0; i < NUM_LEDS; i++) {
-        strip.setPixelColor(i, strip.Color(red, green, blue));
+        // Set all pixels to the CheerLights color using the RGB values
+        for (int i = 0; i < NUM_LEDS; i++) {
+            strip.setPixelColor(i, strip.Color(red, green, blue));
+        }
+        strip.show();
     }
-    strip.show();
 
-    delay(15000); // Update every 15 seconds
+    // Other non-blocking code can go here
 }

examples/CheerLightsExample/secrets.h

@@ -0,0 +1,2 @@
+#define SECRET_SSID     "MySSID"		// replace MySSID with your WiFi network name
+#define SECRET_PASSWORD "MyPassword"	// replace MyPassword with your WiFi password

keywords.txt

@@ -1,4 +1,8 @@
 CheerLights	    KEYWORD1
-getColorName	KEYWORD2
-getColorHex	    KEYWORD2
+getCurrentColor	KEYWORD2
+showColorName	KEYWORD2
+showColorHex	KEYWORD2
+showRed	        KEYWORD2
+showGreen	    KEYWORD2
+showBlue	    KEYWORD2
 begin	        KEYWORD2

src/CheerLights.cpp

@@ -10,23 +10,31 @@ CheerLights::CheerLights() {
 void CheerLights::begin(const char* ssid, const char* password) {
   Serial.begin(115200);
 
-  // Connect to WiFi
+  // Store WiFi credentials
+  _ssid = ssid;
+  _password = password;
+
+  // Initial WiFi connection
+  _connectToWiFi();
+}
+
+void CheerLights::_connectToWiFi() {
   Serial.print("Connecting to WiFi");
-  
-  #if defined(ESP8266) || defined(ESP32)
-    WiFi.begin(ssid, password);
+
+  #if defined(ESP8266) || defined(ESP32) 
+    WiFi.begin(_ssid, _password);
     while (WiFi.status() != WL_CONNECTED) {
       delay(500);
       Serial.print(".");
     }
   #elif defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_ARCH_SAMD)
-    while (WiFi.begin(ssid, password) != WL_CONNECTED) {
+    while (WiFi.begin(_ssid, _password) != WL_CONNECTED) {
       delay(5000);
       Serial.print(".");
     }
   #else
     // Default WiFi connection method
-    WiFi.begin(ssid, password);
+    WiFi.begin(_ssid, _password);
     while (WiFi.status() != WL_CONNECTED) {
       delay(500);
       Serial.print(".");
@@ -41,36 +49,82 @@ void CheerLights::_fetchColor() {
   unsigned long currentTime = millis();
 
   if (currentTime - lastUpdate < MIN_UPDATE_INTERVAL) {
+    Serial.println("Update interval not reached, skipping request.");
     return;
   }
   lastUpdate = currentTime;
 
+  // Check WiFi connection and attempt to reconnect if necessary
   if (WiFi.status() != WL_CONNECTED) {
-    Serial.println(F("WiFi not connected"));
-    return;
+    Serial.println(F("WiFi not connected, attempting to reconnect..."));
+    _connectToWiFi();
+    if (WiFi.status() != WL_CONNECTED) {
+      Serial.println(F("Failed to reconnect to WiFi."));
+      return;
+    }
   }
 
-  HTTPClient http;
-  http.begin(F("http://api.thingspeak.com/channels/1417/field/1/last.txt"));
-  int httpCode = http.GET();
-  
-  if (httpCode != HTTP_CODE_OK) {
-    Serial.println(F("Failed to fetch color"));
-    http.end();
+  const char* host = "api.thingspeak.com";
+  const int httpPort = 80;
+  const char* apiPath = "/channels/1417/field/1/last.txt";
+
+  WiFiClient client;
+  if (!client.connect(host, httpPort)) {
+    Serial.println(F("Connection to ThingSpeak failed"));
+    client.stop();
     return;
   }
 
-  _colorName = http.getString();
-  http.end();
+  // Create the HTTP GET request
+  client.print(String("GET ") + apiPath + " HTTP/1.1\r\n" +
+               "Host: " + host + "\r\n" + 
+               "Connection: close\r\n\r\n");
+
+  // Wait for response
+  unsigned long timeout = millis();
+  while (client.connected() && !client.available()) {
+    if (millis() - timeout > 5000) { // 5 seconds timeout
+      Serial.println(F(">>> Client Timeout!"));
+      client.stop();
+      return;
+    }
+  }
+
+  // Read the response
+  bool headersEnd = false;
+  while (client.connected()) {
+    String line = client.readStringUntil('\n');
+    line.trim();
+
+    if (!headersEnd) {
+      // Check for end of headers
+      if (line.length() == 0) {
+        headersEnd = true;
+      }
+      continue;
+    }
+
+    if (line.length() > 0) {
+      _colorName = line;
+      break;
+    }
+  }
+
+  // Read any remaining data
+  while (client.available()) {
+    client.read();
+  }
+
+  client.stop();
 
   _colorName.trim();
   _colorName.toLowerCase();
 
-  // Use progmem for color mapping
+  // Map the color name to a hex value
   static const struct {
     const char* name;
     uint32_t color;
-  } colorMap[] PROGMEM = {
+  } colorMap[] = {
     {"red", 0xFF0000},
     {"green", 0x00FF00},
     {"blue", 0x0000FF},
@@ -88,31 +142,35 @@ void CheerLights::_fetchColor() {
 
   _colorHex = 0x000000; // Default to black
   for (const auto& color : colorMap) {
-    if (_colorName == FPSTR(color.name)) {
-      _colorHex = pgm_read_dword(&color.color);
+    if (_colorName.equalsIgnoreCase(color.name)) {
+      _colorHex = color.color;
       break;
     }
   }
+
 }
 
-String CheerLights::getColorName() {
+String CheerLights::getCurrentColor() {
   _fetchColor();
   return _colorName;
 }
 
-uint32_t CheerLights::getColorHex() {
-  _fetchColor();
+String CheerLights::showColorName() {
+  return _colorName;
+}
+
+uint32_t CheerLights::showColorHex() {
   return _colorHex;
 }
 
-uint8_t CheerLights::getRed() {
+uint8_t CheerLights::showRed() {
   return (_colorHex >> 16) & 0xFF;
 }
 
-uint8_t CheerLights::getGreen() {
+uint8_t CheerLights::showGreen() {
   return (_colorHex >> 8) & 0xFF;
 }
 
-uint8_t CheerLights::getBlue() {
+uint8_t CheerLights::showBlue() {
   return _colorHex & 0xFF;
 }