Disable register keyword to reduce compiler warnings
Minor formatting improvements "ps" string optimization Removed travis envs
This commit is contained in:
parent
33f4e8cf73
commit
efc476e50b
@ -6,16 +6,14 @@
|
|||||||
# ENVIRONMENTS
|
# ENVIRONMENTS
|
||||||
#
|
#
|
||||||
# Please uncomment one of the lines below to select your board(s)
|
# Please uncomment one of the lines below to select your board(s)
|
||||||
|
# (use `platformio_override.ini` when building for your own board; see `platformio_override.ini.sample` for an example)
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
# Travis CI binaries (use `platformio_override.ini` when building for your own board; see `platformio_override.ini.sample` for an example)
|
# Release / CI binaries
|
||||||
; default_envs = travis_esp8266, travis_esp32
|
|
||||||
|
|
||||||
# Release binaries
|
|
||||||
default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s2_saola, esp32c3
|
default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s2_saola, esp32c3
|
||||||
|
|
||||||
# Build everything
|
# Build everything
|
||||||
; default_envs = esp32dev, esp8285_4CH_MagicHome, codm-controller-0.6-rev2, codm-controller-0.6, esp32s2_saola, d1_mini_5CH_Shojo_PCB, d1_mini, sp501e, travis_esp8266, travis_esp32, nodemcuv2, esp32_eth, anavi_miracle_controller, esp07, esp01_1m_full, m5atom, h803wf, d1_mini_ota, heltec_wifi_kit_8, esp8285_H801, d1_mini_debug, wemos_shield_esp32, elekstube_ips
|
; default_envs = esp32dev, esp8285_4CH_MagicHome, codm-controller-0.6-rev2, codm-controller-0.6, esp32s2_saola, d1_mini_5CH_Shojo_PCB, d1_mini, sp501e, nodemcuv2, esp32_eth, anavi_miracle_controller, esp07, esp01_1m_full, m5atom, h803wf, d1_mini_ota, heltec_wifi_kit_8, esp8285_H801, d1_mini_debug, wemos_shield_esp32, elekstube_ips
|
||||||
|
|
||||||
# Single binaries (uncomment your board)
|
# Single binaries (uncomment your board)
|
||||||
; default_envs = elekstube_ips
|
; default_envs = elekstube_ips
|
||||||
@ -113,6 +111,7 @@ build_flags =
|
|||||||
-D DECODE_SONY=true
|
-D DECODE_SONY=true
|
||||||
-D DECODE_SAMSUNG=true
|
-D DECODE_SAMSUNG=true
|
||||||
-D DECODE_LG=true
|
-D DECODE_LG=true
|
||||||
|
-Dregister= # remove warnings in C++17 due to use of deprecated register keyword by the FastLED library
|
||||||
-DWLED_USE_MY_CONFIG
|
-DWLED_USE_MY_CONFIG
|
||||||
; -D USERMOD_SENSORSTOMQTT
|
; -D USERMOD_SENSORSTOMQTT
|
||||||
#For ADS1115 sensor uncomment following
|
#For ADS1115 sensor uncomment following
|
||||||
@ -120,13 +119,6 @@ build_flags =
|
|||||||
|
|
||||||
build_unflags =
|
build_unflags =
|
||||||
|
|
||||||
# enables all features for travis CI
|
|
||||||
build_flags_all_features =
|
|
||||||
-D WLED_ENABLE_ADALIGHT
|
|
||||||
-D WLED_ENABLE_DMX
|
|
||||||
-D WLED_ENABLE_MQTT
|
|
||||||
-D WLED_ENABLE_WEBSOCKETS
|
|
||||||
|
|
||||||
build_flags_esp8266 = ${common.build_flags} ${esp8266.build_flags}
|
build_flags_esp8266 = ${common.build_flags} ${esp8266.build_flags}
|
||||||
build_flags_esp32 = ${common.build_flags} ${esp32.build_flags}
|
build_flags_esp32 = ${common.build_flags} ${esp32.build_flags}
|
||||||
|
|
||||||
@ -588,22 +580,6 @@ build_unflags = ${common.build_unflags}
|
|||||||
build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP01 -D WLED_DISABLE_OTA -D USERMOD_MY9291
|
build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP01 -D WLED_DISABLE_OTA -D USERMOD_MY9291
|
||||||
lib_deps = ${esp8266.lib_deps}
|
lib_deps = ${esp8266.lib_deps}
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
# travis test board configurations
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
[env:travis_esp8266]
|
|
||||||
extends = env:d1_mini
|
|
||||||
build_type = debug
|
|
||||||
build_unflags = ${common.build_unflags}
|
|
||||||
build_flags = ${common.build_flags_esp8266} ${common.debug_flags} ${common.build_flags_all_features}
|
|
||||||
|
|
||||||
[env:travis_esp32]
|
|
||||||
extends = env:esp32dev
|
|
||||||
; build_type = debug
|
|
||||||
build_unflags = ${common.build_unflags}
|
|
||||||
build_flags = ${common.build_flags_esp32} ${common.debug_flags} ${common.build_flags_all_features}
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# codm pixel controller board configurations
|
# codm pixel controller board configurations
|
||||||
# codm-controller-0.6 can also be used for the TYWE3S controller
|
# codm-controller-0.6 can also be used for the TYWE3S controller
|
||||||
|
@ -55,8 +55,8 @@ Also, while in the `platformio.ini` file, you must change the environment setup
|
|||||||
|
|
||||||
Comment out the line described below:
|
Comment out the line described below:
|
||||||
```ini
|
```ini
|
||||||
# Travis CI binaries (comment this out when building for single board)
|
# Release binaries
|
||||||
; default_envs = travis_esp8266, esp01, esp01_1m_ota, travis_esp32
|
; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s2_saola, esp32c3
|
||||||
```
|
```
|
||||||
and UNCOMMENT the following line in the 'Single binaries' section:
|
and UNCOMMENT the following line in the 'Single binaries' section:
|
||||||
```ini
|
```ini
|
||||||
|
@ -750,7 +750,7 @@ public:
|
|||||||
StaticJsonDocument<64> root;
|
StaticJsonDocument<64> root;
|
||||||
char str[64];
|
char str[64];
|
||||||
sprintf_P(str, PSTR("%d~%d~%s"), presetLow, presetHigh, increase?"":"-");
|
sprintf_P(str, PSTR("%d~%d~%s"), presetLow, presetHigh, increase?"":"-");
|
||||||
root[F("ps")] = str;
|
root["ps"] = str;
|
||||||
deserializeState(root.as<JsonObject>(), CALL_MODE_BUTTON_PRESET);
|
deserializeState(root.as<JsonObject>(), CALL_MODE_BUTTON_PRESET);
|
||||||
/*
|
/*
|
||||||
String apireq = F("win&PL=~");
|
String apireq = F("win&PL=~");
|
||||||
|
@ -104,7 +104,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
|
|||||||
CJSON(strip.matrix.bottomStart, matrix[F("pb")]);
|
CJSON(strip.matrix.bottomStart, matrix[F("pb")]);
|
||||||
CJSON(strip.matrix.rightStart, matrix[F("pr")]);
|
CJSON(strip.matrix.rightStart, matrix[F("pr")]);
|
||||||
CJSON(strip.matrix.vertical, matrix[F("pv")]);
|
CJSON(strip.matrix.vertical, matrix[F("pv")]);
|
||||||
CJSON(strip.matrix.serpentine, matrix[F("ps")]);
|
CJSON(strip.matrix.serpentine, matrix["ps"]);
|
||||||
|
|
||||||
JsonArray panels = matrix[F("panels")];
|
JsonArray panels = matrix[F("panels")];
|
||||||
uint8_t s = 0;
|
uint8_t s = 0;
|
||||||
@ -694,7 +694,7 @@ void serializeConfig() {
|
|||||||
matrix[F("pb")] = strip.matrix.bottomStart;
|
matrix[F("pb")] = strip.matrix.bottomStart;
|
||||||
matrix[F("pr")] = strip.matrix.rightStart;
|
matrix[F("pr")] = strip.matrix.rightStart;
|
||||||
matrix[F("pv")] = strip.matrix.vertical;
|
matrix[F("pv")] = strip.matrix.vertical;
|
||||||
matrix[F("ps")] = strip.matrix.serpentine;
|
matrix["ps"] = strip.matrix.serpentine;
|
||||||
|
|
||||||
JsonArray panels = matrix.createNestedArray(F("panels"));
|
JsonArray panels = matrix.createNestedArray(F("panels"));
|
||||||
for (uint8_t i=0; i<strip.hPanels*strip.vPanels; i++) {
|
for (uint8_t i=0; i<strip.hPanels*strip.vPanels; i++) {
|
||||||
|
@ -410,7 +410,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
|
|||||||
root.remove("v"); // may be added in UI call
|
root.remove("v"); // may be added in UI call
|
||||||
root.remove("time"); // may be added in UI call
|
root.remove("time"); // may be added in UI call
|
||||||
root.remove("ps");
|
root.remove("ps");
|
||||||
root.remove("on"); // some exetrnal calls add "on" to "ps" call
|
root.remove("on"); // some external calls add "on" to "ps" call
|
||||||
if (root.size() == 0) {
|
if (root.size() == 0) {
|
||||||
unloadPlaylist(); // we need to unload playlist
|
unloadPlaylist(); // we need to unload playlist
|
||||||
applyPreset(ps, callMode); // async load (only preset ID was specified)
|
applyPreset(ps, callMode); // async load (only preset ID was specified)
|
||||||
|
@ -195,14 +195,14 @@ void handleTransitions()
|
|||||||
}
|
}
|
||||||
if (tper - tperLast < 0.004) return;
|
if (tper - tperLast < 0.004) return;
|
||||||
tperLast = tper;
|
tperLast = tper;
|
||||||
briT = briOld +((bri - briOld )*tper);
|
briT = briOld + ((bri - briOld) * tper);
|
||||||
|
|
||||||
applyBri();
|
applyBri();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//legacy method, applies values from col, effectCurrent, ... to selected segments
|
// legacy method, applies values from col, effectCurrent, ... to selected segments
|
||||||
void colorUpdated(byte callMode){
|
void colorUpdated(byte callMode){
|
||||||
applyValuesToSelectedSegs();
|
applyValuesToSelectedSegs();
|
||||||
stateUpdated(callMode);
|
stateUpdated(callMode);
|
||||||
@ -213,8 +213,8 @@ void handleNightlight()
|
|||||||
{
|
{
|
||||||
static unsigned long lastNlUpdate;
|
static unsigned long lastNlUpdate;
|
||||||
unsigned long now = millis();
|
unsigned long now = millis();
|
||||||
if (now < 100 && lastNlUpdate > 0) lastNlUpdate = 0; //take care of millis() rollover
|
if (now < 100 && lastNlUpdate > 0) lastNlUpdate = 0; // take care of millis() rollover
|
||||||
if (now - lastNlUpdate < 100) return; //allow only 10 NL updates per second
|
if (now - lastNlUpdate < 100) return; // allow only 10 NL updates per second
|
||||||
lastNlUpdate = now;
|
lastNlUpdate = now;
|
||||||
|
|
||||||
if (nightlightActive)
|
if (nightlightActive)
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// version code in format yymmddb (b = daily build)
|
// version code in format yymmddb (b = daily build)
|
||||||
#define VERSION 2211300
|
#define VERSION 2212030
|
||||||
|
|
||||||
//uncomment this if you have a "my_config.h" file you'd like to use
|
//uncomment this if you have a "my_config.h" file you'd like to use
|
||||||
//#define WLED_USE_MY_CONFIG
|
//#define WLED_USE_MY_CONFIG
|
||||||
|
@ -22,15 +22,15 @@ void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventTyp
|
|||||||
if (client->id() == wsLiveClientId) wsLiveClientId = 0;
|
if (client->id() == wsLiveClientId) wsLiveClientId = 0;
|
||||||
DEBUG_PRINTLN(F("WS client disconnected."));
|
DEBUG_PRINTLN(F("WS client disconnected."));
|
||||||
} else if(type == WS_EVT_DATA){
|
} else if(type == WS_EVT_DATA){
|
||||||
//data packet
|
// data packet
|
||||||
AwsFrameInfo * info = (AwsFrameInfo*)arg;
|
AwsFrameInfo * info = (AwsFrameInfo*)arg;
|
||||||
if(info->final && info->index == 0 && info->len == len){
|
if(info->final && info->index == 0 && info->len == len){
|
||||||
//the whole message is in a single frame and we got all of its data (max. 1450byte)
|
// the whole message is in a single frame and we got all of its data (max. 1450 bytes)
|
||||||
if(info->opcode == WS_TEXT)
|
if(info->opcode == WS_TEXT)
|
||||||
{
|
{
|
||||||
if (len > 0 && len < 10 && data[0] == 'p') {
|
if (len > 0 && len < 10 && data[0] == 'p') {
|
||||||
//application layer ping/pong heartbeat.
|
// application layer ping/pong heartbeat.
|
||||||
//client-side socket layer ping packets are unresponded (investigate)
|
// client-side socket layer ping packets are unresponded (investigate)
|
||||||
client->text(F("pong"));
|
client->text(F("pong"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -54,7 +54,7 @@ void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventTyp
|
|||||||
}
|
}
|
||||||
releaseJSONBufferLock(); // will clean fileDoc
|
releaseJSONBufferLock(); // will clean fileDoc
|
||||||
|
|
||||||
// force broadcast in 500ms after upadting client
|
// force broadcast in 500ms after updating client
|
||||||
if (verboseResponse) {
|
if (verboseResponse) {
|
||||||
sendDataWs(client);
|
sendDataWs(client);
|
||||||
lastInterfaceUpdate = millis() - (INTERFACE_UPDATE_COOLDOWN -500);
|
lastInterfaceUpdate = millis() - (INTERFACE_UPDATE_COOLDOWN -500);
|
||||||
|
Loading…
Reference in New Issue
Block a user