Skip to content

Commit efc476e

Browse files
committed
Disable register keyword to reduce compiler warnings
Minor formatting improvements "ps" string optimization Removed travis envs
1 parent 33f4e8c commit efc476e

File tree

8 files changed

+20
-44
lines changed

8 files changed

+20
-44
lines changed

platformio.ini

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
# ENVIRONMENTS
77
#
88
# Please uncomment one of the lines below to select your board(s)
9+
# (use `platformio_override.ini` when building for your own board; see `platformio_override.ini.sample` for an example)
910
# ------------------------------------------------------------------------------
1011

11-
# Travis CI binaries (use `platformio_override.ini` when building for your own board; see `platformio_override.ini.sample` for an example)
12-
; default_envs = travis_esp8266, travis_esp32
13-
14-
# Release binaries
12+
# Release / CI binaries
1513
default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s2_saola, esp32c3
1614

1715
# Build everything
18-
; 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
16+
; 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
1917

2018
# Single binaries (uncomment your board)
2119
; default_envs = elekstube_ips
@@ -113,20 +111,14 @@ build_flags =
113111
-D DECODE_SONY=true
114112
-D DECODE_SAMSUNG=true
115113
-D DECODE_LG=true
114+
-Dregister= # remove warnings in C++17 due to use of deprecated register keyword by the FastLED library
116115
-DWLED_USE_MY_CONFIG
117116
; -D USERMOD_SENSORSTOMQTT
118117
#For ADS1115 sensor uncomment following
119118
; -D USERMOD_ADS1115
120119

121120
build_unflags =
122121

123-
# enables all features for travis CI
124-
build_flags_all_features =
125-
-D WLED_ENABLE_ADALIGHT
126-
-D WLED_ENABLE_DMX
127-
-D WLED_ENABLE_MQTT
128-
-D WLED_ENABLE_WEBSOCKETS
129-
130122
build_flags_esp8266 = ${common.build_flags} ${esp8266.build_flags}
131123
build_flags_esp32 = ${common.build_flags} ${esp32.build_flags}
132124

@@ -588,22 +580,6 @@ build_unflags = ${common.build_unflags}
588580
build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP01 -D WLED_DISABLE_OTA -D USERMOD_MY9291
589581
lib_deps = ${esp8266.lib_deps}
590582

591-
# ------------------------------------------------------------------------------
592-
# travis test board configurations
593-
# ------------------------------------------------------------------------------
594-
595-
[env:travis_esp8266]
596-
extends = env:d1_mini
597-
build_type = debug
598-
build_unflags = ${common.build_unflags}
599-
build_flags = ${common.build_flags_esp8266} ${common.debug_flags} ${common.build_flags_all_features}
600-
601-
[env:travis_esp32]
602-
extends = env:esp32dev
603-
; build_type = debug
604-
build_unflags = ${common.build_unflags}
605-
build_flags = ${common.build_flags_esp32} ${common.debug_flags} ${common.build_flags_all_features}
606-
607583
# ------------------------------------------------------------------------------
608584
# codm pixel controller board configurations
609585
# codm-controller-0.6 can also be used for the TYWE3S controller

usermods/TTGO-T-Display/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ Also, while in the `platformio.ini` file, you must change the environment setup
5555

5656
Comment out the line described below:
5757
```ini
58-
# Travis CI binaries (comment this out when building for single board)
59-
; default_envs = travis_esp8266, esp01, esp01_1m_ota, travis_esp32
58+
# Release binaries
59+
; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s2_saola, esp32c3
6060
```
6161
and UNCOMMENT the following line in the 'Single binaries' section:
6262
```ini

usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ class RotaryEncoderUIUsermod : public Usermod {
750750
StaticJsonDocument<64> root;
751751
char str[64];
752752
sprintf_P(str, PSTR("%d~%d~%s"), presetLow, presetHigh, increase?"":"-");
753-
root[F("ps")] = str;
753+
root["ps"] = str;
754754
deserializeState(root.as<JsonObject>(), CALL_MODE_BUTTON_PRESET);
755755
/*
756756
String apireq = F("win&PL=~");

wled00/cfg.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
104104
CJSON(strip.matrix.bottomStart, matrix[F("pb")]);
105105
CJSON(strip.matrix.rightStart, matrix[F("pr")]);
106106
CJSON(strip.matrix.vertical, matrix[F("pv")]);
107-
CJSON(strip.matrix.serpentine, matrix[F("ps")]);
107+
CJSON(strip.matrix.serpentine, matrix["ps"]);
108108

109109
JsonArray panels = matrix[F("panels")];
110110
uint8_t s = 0;
@@ -694,7 +694,7 @@ void serializeConfig() {
694694
matrix[F("pb")] = strip.matrix.bottomStart;
695695
matrix[F("pr")] = strip.matrix.rightStart;
696696
matrix[F("pv")] = strip.matrix.vertical;
697-
matrix[F("ps")] = strip.matrix.serpentine;
697+
matrix["ps"] = strip.matrix.serpentine;
698698

699699
JsonArray panels = matrix.createNestedArray(F("panels"));
700700
for (uint8_t i=0; i<strip.hPanels*strip.vPanels; i++) {

wled00/json.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
410410
root.remove("v"); // may be added in UI call
411411
root.remove("time"); // may be added in UI call
412412
root.remove("ps");
413-
root.remove("on"); // some exetrnal calls add "on" to "ps" call
413+
root.remove("on"); // some external calls add "on" to "ps" call
414414
if (root.size() == 0) {
415415
unloadPlaylist(); // we need to unload playlist
416416
applyPreset(ps, callMode); // async load (only preset ID was specified)

wled00/led.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,14 @@ void handleTransitions()
195195
}
196196
if (tper - tperLast < 0.004) return;
197197
tperLast = tper;
198-
briT = briOld +((bri - briOld )*tper);
198+
briT = briOld + ((bri - briOld) * tper);
199199

200200
applyBri();
201201
}
202202
}
203203

204204

205-
//legacy method, applies values from col, effectCurrent, ... to selected segments
205+
// legacy method, applies values from col, effectCurrent, ... to selected segments
206206
void colorUpdated(byte callMode){
207207
applyValuesToSelectedSegs();
208208
stateUpdated(callMode);
@@ -213,8 +213,8 @@ void handleNightlight()
213213
{
214214
static unsigned long lastNlUpdate;
215215
unsigned long now = millis();
216-
if (now < 100 && lastNlUpdate > 0) lastNlUpdate = 0; //take care of millis() rollover
217-
if (now - lastNlUpdate < 100) return; //allow only 10 NL updates per second
216+
if (now < 100 && lastNlUpdate > 0) lastNlUpdate = 0; // take care of millis() rollover
217+
if (now - lastNlUpdate < 100) return; // allow only 10 NL updates per second
218218
lastNlUpdate = now;
219219

220220
if (nightlightActive)

wled00/wled.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
// version code in format yymmddb (b = daily build)
11-
#define VERSION 2211300
11+
#define VERSION 2212030
1212

1313
//uncomment this if you have a "my_config.h" file you'd like to use
1414
//#define WLED_USE_MY_CONFIG

wled00/ws.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventTyp
2222
if (client->id() == wsLiveClientId) wsLiveClientId = 0;
2323
DEBUG_PRINTLN(F("WS client disconnected."));
2424
} else if(type == WS_EVT_DATA){
25-
//data packet
25+
// data packet
2626
AwsFrameInfo * info = (AwsFrameInfo*)arg;
2727
if(info->final && info->index == 0 && info->len == len){
28-
//the whole message is in a single frame and we got all of its data (max. 1450byte)
28+
// the whole message is in a single frame and we got all of its data (max. 1450 bytes)
2929
if(info->opcode == WS_TEXT)
3030
{
3131
if (len > 0 && len < 10 && data[0] == 'p') {
32-
//application layer ping/pong heartbeat.
33-
//client-side socket layer ping packets are unresponded (investigate)
32+
// application layer ping/pong heartbeat.
33+
// client-side socket layer ping packets are unresponded (investigate)
3434
client->text(F("pong"));
3535
return;
3636
}
@@ -54,7 +54,7 @@ void wsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventTyp
5454
}
5555
releaseJSONBufferLock(); // will clean fileDoc
5656

57-
// force broadcast in 500ms after upadting client
57+
// force broadcast in 500ms after updating client
5858
if (verboseResponse) {
5959
sendDataWs(client);
6060
lastInterfaceUpdate = millis() - (INTERFACE_UPDATE_COOLDOWN -500);

0 commit comments

Comments
 (0)