Fixed string issues, replaced with char

Author: nothans

README.md

@@ -21,7 +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.
-- `getCurrentColor()`: Get the current CheerLights color from ThingSpeak channel 1417.
-- `currentColorName()`: The current CheerLights color name (e.g. "red").
-- `currentColorHex()`: The current CheerLights color as a hex value (e.g. 0xFF0000).
-- `currentRed()`, `currentGreen()`, `currentBlue()`: The RGB values for the current CheerLights color (e.g. 255, 0, 0).
+- `getCurrentColor()`: Get the current CheerLights color from ThingSpeak channel 1417. Returns a pointer to a constant char array.
+- `currentColorName()`: The current CheerLights color name (e.g. "red"). Returns a pointer to a constant char array.
+- `currentColorHex()`: The current CheerLights color as a hex value (e.g. 0xFF0000). Returns a uint32_t.
+- `currentRed()`, `currentGreen()`, `currentBlue()`: The RGB values for the current CheerLights color (e.g. 255, 0, 0). Returns a uint8_t.

library.properties

@@ -1,5 +1,6 @@
 name=CheerLights
-version=1.0.2
+version=1.0.3
+includes=CheerLights.h
 author=Hans Scharler <hscharler@gmail.com>
 maintainer=Hans Scharler <hscharler@gmail.com>
 sentence=Fetch and use the latest CheerLights color.

src/CheerLights.cpp

@@ -2,9 +2,10 @@
 
 #define MIN_UPDATE_INTERVAL 5000
 #define TIMEOUT             5000
+#define BUFFER_SIZE         128
 
 CheerLights::CheerLights() {
-  _colorName = "black";
+  strcpy(_colorName, "black");
   _colorHex = 0x000000;
 }
 
@@ -22,25 +23,11 @@ void CheerLights::begin(const char* ssid, const char* password) {
 void CheerLights::_connectToWiFi() {
   Serial.print("Connecting to WiFi");
 
-  #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) {
-      delay(5000);
-      Serial.print(".");
-    }
-  #else
-    // Default WiFi connection method
-    WiFi.begin(_ssid, _password);
-    while (WiFi.status() != WL_CONNECTED) {
-      delay(500);
-      Serial.print(".");
-    }
-  #endif
+  WiFi.begin(_ssid, _password);
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    Serial.print(".");
+  }
 
   Serial.println("\nConnected to WiFi");
 }
@@ -76,10 +63,12 @@ void CheerLights::_fetchColor() {
     return;
   }
 
-  // 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");
+  // Create the HTTP GET request without using String
+  client.print("GET ");
+  client.print(apiPath);
+  client.print(" HTTP/1.1\r\nHost: ");
+  client.print(host);
+  client.print("\r\nConnection: close\r\n\r\n");
 
   // Wait for response
   unsigned long timeout = millis();
@@ -93,32 +82,34 @@ void CheerLights::_fetchColor() {
 
   // Read the response
   bool headersEnd = false;
-  while (client.connected()) {
-    String line = client.readStringUntil('\n');
-    line.trim();
+  char line[BUFFER_SIZE];
+  while (client.connected() || client.available()) {
+    int len = client.readBytesUntil('\n', line, sizeof(line) - 1);
+    line[len] = 0;
+
+    char* start = line;
+    while (*start == ' ' || *start == '\r') start++;
+    char* end = line + strlen(line) - 1;
+    while (end > start && (*end == ' ' || *end == '\r')) *end-- = 0;
 
     if (!headersEnd) {
-      if (line.length() == 0) {
+      if (strlen(start) == 0) {
         headersEnd = true;
       }
       continue;
     }
 
-    if (line.length() > 0) {
-      _colorName = line;
+    if (strlen(start) > 0) {
+      strncpy(_colorName, start, sizeof(_colorName) - 1);
+      _colorName[sizeof(_colorName) - 1] = 0;
       break;
     }
   }
 
-  // Read any remaining data
-  while (client.available()) {
-    client.read();
-  }
-
   client.stop();
 
-  _colorName.trim();
-  _colorName.toLowerCase();
+  // Convert color name to lowercase
+  for (char* p = _colorName; *p; ++p) *p = tolower(*p);
 
   // Map the color name to a hex value
   static const struct {
@@ -142,20 +133,19 @@ void CheerLights::_fetchColor() {
 
   _colorHex = 0x000000; // Default to black
   for (const auto& color : colorMap) {
-    if (_colorName.equalsIgnoreCase(color.name)) {
+    if (strcasecmp(_colorName, color.name) == 0) {
       _colorHex = color.color;
       break;
     }
   }
-
 }
 
-String CheerLights::getCurrentColor() {
+const char* CheerLights::getCurrentColor() {
   _fetchColor();
   return _colorName;
 }
 
-String CheerLights::currentColorName() {
+const char* CheerLights::currentColorName() {
   return _colorName;
 }
 

src/CheerLights.h

@@ -4,12 +4,33 @@
 #include <Arduino.h>
 #include <WiFiClient.h>
 
+// Include the correct WiFi library based on the board
+#if defined(ESP8266)
+  #include <ESP8266WiFi.h>
+#elif defined(ESP32)
+  #include <WiFi.h>
+#elif defined(ARDUINO_SAMD_MKR1000)
+  // For Arduino MKR1000 using WiFi101 library
+  #include <WiFi101.h>
+#elif defined(ARDUINO_SAMD_MKRWIFI1010)
+  // For Arduino MKR WiFi 1010 using WiFiNINA library
+  #include <WiFiNINA.h>
+#elif defined(ARDUINO_AVR_UNO_WIFI_REV2)
+  // For Arduino Uno WiFi Rev2
+  #include <WiFiNINA.h>
+#elif defined(ARDUINO_ARCH_SAMD)
+  // For other SAMD boards
+  #include <WiFiNINA.h>
+#else
+  #include <WiFi.h>
+#endif
+
 class CheerLights {
   public:
     CheerLights();
     void begin(const char* ssid, const char* password);
-    String getCurrentColor();
-    String currentColorName();
+    const char* getCurrentColor();
+    const char* currentColorName();
     uint32_t currentColorHex();
     uint8_t currentRed();
     uint8_t currentGreen();
@@ -20,7 +41,7 @@ class CheerLights {
     void _fetchColor();
     const char* _ssid;
     const char* _password;
-    String _colorName;
+    const char* _colorName;
     uint32_t _colorHex;
 };