Skip to content

Commit

Permalink
Merge pull request #366 from jekader/wifimanager
Browse files Browse the repository at this point in the history 
Upgrade SDK for esp8266, use common library versions for all targets
  • Loading branch information
@foorschtbar
foorschtbar authored Aug 29, 2024
2 parents 4f461a2 + e63912a commit 64ae2ba
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 25 deletions.
12 changes: 4 additions & 8 deletions platformio.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,17 @@ lib_deps =
bblanchon/[email protected]
beegee-tokyo/DHT sensor library for [email protected]
claws/[email protected]
ColorConverter=https://github.com/luisllamasbinaburo/Arduino-ColorConverter.git#v2.0.0
fastled/[email protected]
knolleary/[email protected]
Hash = https://github.com/bbx10/Hash_tng.git#1f100823284a28e8aedeae7e7f593e189fe16982
LightDependentResistor=https://github.com/QuentinCG/Arduino-Light-Dependent-Resistor-Library.git#1.4.0
links2004/[email protected]
marcmerlin/FastLED [email protected]
powerbroker2/[email protected]
plerup/EspSoftwareSerial@^8.2.0
robtillaart/[email protected]
TimeLib = https://github.com/PaulStoffregen/Time.git#v1.6.1
WiFiManager = https://github.com/tzapu/WiFiManager.git#v2.0.17

[env:ESP32_generic]
platform = espressif32
Expand All @@ -79,13 +81,9 @@ platform_packages =
toolchain-xtensa32@~2.80400.0
lib_deps =
${common.lib_deps}
fastled/FastLED@^3.5.0
Hash = https://github.com/bbx10/Hash_tng.git
plerup/EspSoftwareSerial@^6.11.4
WiFiManager = https://github.com/tzapu/WiFiManager.git#v2.0.15-rc.1

[env:ESP8266_generic]
platform = espressif8266@2.6.3
platform = espressif8266@4.2.1
board = esp12e
framework = ${common.framework}
board_build.filesystem = littlefs
Expand All @@ -97,8 +95,6 @@ build_flags =
-DBUILD_SECTION="ESP8266_generic"
lib_deps =
${common.lib_deps}
mr-glt/SHA-1 Hash@^1.1.0
tzapu/WiFiManager@^0.16.0

[env:ESP8266_d1_mini]
extends = env:ESP8266_generic
Expand Down
68 changes: 51 additions & 17 deletions src/PixelIt.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <DHTesp.h>
#include <DFPlayerMini_Fast.h>
#include <SoftwareSerial.h>
#include "ColorConverterLib.h"
#include <TimeLib.h>
#include <ArduinoJson.h>
#include <ArduinoHttpClient.h>
Expand Down Expand Up @@ -508,8 +507,8 @@ void SaveConfig()
json["clockTimeZone"] = clockTimeZone;

String clockColorHex;
ColorConverter::RgbToHex(clockColorR, clockColorG, clockColorB, clockColorHex);
json["clockColor"] = "#" + clockColorHex;
RgbToHex(clockColorR, clockColorG, clockColorB, clockColorHex);
json["clockColor"] = clockColorHex;

json["clockSwitchAktiv"] = clockSwitchAktiv;
json["clockSwitchSec"] = clockSwitchSec;
Expand Down Expand Up @@ -692,7 +691,7 @@ void SetConfigVariables(JsonObject &json)

if (json.containsKey("clockColor"))
{
ColorConverter::HexToRgb(json["clockColor"].as<String>(), clockColorR, clockColorG, clockColorB);
HexToRgb(json["clockColor"].as<String>(), clockColorR, clockColorG, clockColorB);
}

if (json.containsKey("clockSwitchAktiv"))
Expand Down Expand Up @@ -1112,7 +1111,8 @@ void HandleAndSendButtonPress(uint button, bool state)
{
for (uint i = 0; i < sizeof websocketConnection / sizeof websocketConnection[0]; i++)
{
webSocket.sendTXT(i, "{\"buttons\":{\"" + btnAPINames[button] + "\":" + (state ? "true" : "false") + "}}");
String payload = "{\"buttons\":{\"" + btnAPINames[button] + "\":" + (state ? "true" : "false") + "}}";
webSocket.sendTXT(i, payload);
}
}

Expand Down Expand Up @@ -1235,8 +1235,10 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t *payload, size_t length)
SendLDR(true);
SendSensor(true);
SendConfig();
webSocket.sendTXT(num, "{\"buttons\":" + GetButtons() + "}");
webSocket.sendTXT(num, "{\"telemetry\":" + GetTelemetry() + "}");
String payload = "{\"buttons\":" + GetButtons() + "}";
webSocket.sendTXT(num, payload);
payload = "{\"telemetry\":" + GetTelemetry() + "}";
webSocket.sendTXT(num, payload);
break;
}
case WStype_TEXT:
Expand Down Expand Up @@ -1545,7 +1547,7 @@ void CreateFrames(JsonObject &json, int forceDuration)
uint8_t b = 255;
if (json["switchAnimation"]["hexColor"].as<char *>() != NULL)
{
ColorConverter::HexToRgb(json["switchAnimation"]["hexColor"].as<char *>(), r, g, b);
HexToRgb(json["switchAnimation"]["hexColor"].as<char *>(), r, g, b);
}
else if (json["switchAnimation"]["color"]["r"].as<char *>() != NULL)
{
Expand Down Expand Up @@ -1628,7 +1630,7 @@ void CreateFrames(JsonObject &json, int forceDuration)
else if (json["clock"]["hexColor"].as<char *>() != NULL)
{
logMessage += F("hexColor, ");
ColorConverter::HexToRgb(json["clock"]["hexColor"].as<char *>(), clockColorR, clockColorG, clockColorB);
HexToRgb(json["clock"]["hexColor"].as<char *>(), clockColorR, clockColorG, clockColorB);
}
if (logMessage.endsWith(", "))
{
Expand All @@ -1651,7 +1653,7 @@ void CreateFrames(JsonObject &json, int forceDuration)
uint8_t r, g, b;
if (json["bar"]["hexColor"].as<char *>() != NULL)
{
ColorConverter::HexToRgb(json["bar"]["hexColor"].as<char *>(), r, g, b);
HexToRgb(json["bar"]["hexColor"].as<char *>(), r, g, b);
}
else
{
Expand All @@ -1671,7 +1673,7 @@ void CreateFrames(JsonObject &json, int forceDuration)
uint8_t r, g, b;
if (x["hexColor"].as<char *>() != NULL)
{
ColorConverter::HexToRgb(x["hexColor"].as<char *>(), r, g, b);
HexToRgb(x["hexColor"].as<char *>(), r, g, b);
}
else
{
Expand Down Expand Up @@ -1797,7 +1799,7 @@ void CreateFrames(JsonObject &json, int forceDuration)
uint8_t r, g, b;
if (json["text"]["hexColor"].as<char *>() != NULL)
{
ColorConverter::HexToRgb(json["text"]["hexColor"].as<char *>(), r, g, b);
HexToRgb(json["text"]["hexColor"].as<char *>(), r, g, b);
}
else
{
Expand Down Expand Up @@ -4218,7 +4220,8 @@ void SendMatrixInfo()
{
for (uint i = 0; i < sizeof websocketConnection / sizeof websocketConnection[0]; i++)
{
webSocket.sendTXT(i, "{\"sysinfo\":" + matrixInfo + "}");
String payload = "{\"sysinfo\":" + matrixInfo + "}";
webSocket.sendTXT(i, payload);
}
}
}
Expand Down Expand Up @@ -4252,7 +4255,8 @@ void SendLDR(bool force)
{
for (unsigned int i = 0; i < sizeof websocketConnection / sizeof websocketConnection[0]; i++)
{
webSocket.sendTXT(i, "{\"sensor\":" + luxSensor + "}");
String payload = "{\"sensor\":" + luxSensor + "}";
webSocket.sendTXT(i, payload);
}
}

Expand Down Expand Up @@ -4299,7 +4303,8 @@ void SendSensor(bool force)
{
for (uint i = 0; i < sizeof websocketConnection / sizeof websocketConnection[0]; i++)
{
webSocket.sendTXT(i, "{\"sensor\":" + Sensor + "}");
String payload = "{\"sensor\":" + Sensor + "}";
webSocket.sendTXT(i, payload);
}
}

Expand All @@ -4312,8 +4317,8 @@ void SendConfig()
{
for (uint i = 0; i < sizeof websocketConnection / sizeof websocketConnection[0]; i++)
{
String config = GetConfig();
webSocket.sendTXT(i, "{\"config\":" + config + "}");
String payload = "{\"config\":" + GetConfig() + "}";
webSocket.sendTXT(i, payload);
}
}
}
Expand Down Expand Up @@ -4374,6 +4379,35 @@ void sendNTPpacket(String &address)
udp.endPacket();
}

//decode hex string into R G B decimals
void HexToRgb(String hex, uint8_t& red, uint8_t& green, uint8_t& blue)
{
const char* hexString = (hex[0] == '#') ? hex.c_str() + 1 : hex.c_str();
long number = strtol(hexString, nullptr, 16);
red = (number >> 16) & 0xFF;
green = (number >> 8) & 0xFF;
blue = number & 0xFF;
}

// convert R G B decimal values to hex string
void RgbToHex(uint8_t red, uint8_t green, uint8_t blue, String &hex)
{
String redHex = String(red, HEX);
if (redHex.length() < 2) {
redHex = "0" + redHex;
}
String greenHex = String(green, HEX);
if (greenHex.length() < 2) {
greenHex = "0" + greenHex;
}
String blueHex = String(blue, HEX);
if (blueHex.length() < 2) {
blueHex = "0" + blueHex;
}
hex = "#" + redHex + greenHex + blueHex;
hex.toUpperCase();
}

void Log(String function, String message)
{

Expand Down

0 comments on commit 64ae2ba

Please sign in to comment.