Skip to content

Commit 92e6cab

Browse files
committed
Fix multiple build warnings
1 parent a425e0b commit 92e6cab

File tree

3 files changed

+36
-29
lines changed

3 files changed

+36
-29
lines changed

FSBrowser.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ bool handleFileRead(String path){
4040
if(SPIFFS.exists(pathWithGz))
4141
path += ".gz";
4242
File file = SPIFFS.open(path, "r");
43-
size_t sent = webServer.streamFile(file, contentType);
43+
(void)webServer.streamFile(file, contentType);
4444
file.close();
45+
4546
return true;
4647
}
4748
return false;

TwinkleFOX.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ CRGBPalette16 twinkleFoxPalette;
9393
// symmetrical up-and-down triangle sawtooth waveform, except that this
9494
// function produces a triangle wave with a faster attack and a slower decay:
9595
//
96-
// / \
97-
// / \
98-
// / \
99-
// / \
96+
// / \ / \ /
97+
// / \ / \ /
98+
// / \ / \ /
99+
// / \/ \/
100100
//
101101

102102
uint8_t attackDecayWave8( uint8_t i)

esp8266-fastled-webserver.ino

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,9 @@ void setup() {
282282
char nameChar[nameString.length() + 1];
283283
memset(nameChar, 0, nameString.length() + 1);
284284

285-
for (int i = 0; i < nameString.length(); i++)
285+
for (unsigned int i = 0; i < nameString.length(); i++) {
286286
nameChar[i] = nameString.charAt(i);
287+
}
287288

288289
Serial.printf("Name: %s\n", nameChar );
289290

@@ -359,9 +360,13 @@ void setup() {
359360

360361
webServer.on("/twinkleSpeed", HTTP_POST, []() {
361362
String value = webServer.arg("value");
362-
twinkleSpeed = value.toInt();
363-
if (twinkleSpeed < 0) twinkleSpeed = 0;
364-
else if (twinkleSpeed > 8) twinkleSpeed = 8;
363+
long tmp = value.toInt();
364+
if (tmp < 0) {
365+
tmp = 0;
366+
} else if (tmp > 8) {
367+
tmp = 8;
368+
}
369+
twinkleSpeed = (uint8_t)tmp;
365370
writeAndCommitSettings();
366371
broadcastInt("twinkleSpeed", twinkleSpeed);
367372
webServer.sendHeader("Access-Control-Allow-Origin", "*");
@@ -370,9 +375,13 @@ void setup() {
370375

371376
webServer.on("/twinkleDensity", HTTP_POST, []() {
372377
String value = webServer.arg("value");
373-
twinkleDensity = value.toInt();
374-
if (twinkleDensity < 0) twinkleDensity = 0;
375-
else if (twinkleDensity > 8) twinkleDensity = 8;
378+
long tmp = value.toInt();
379+
if (tmp < 0) {
380+
tmp = 0;
381+
} else if (tmp > 8) {
382+
tmp = 8;
383+
}
384+
twinkleDensity = tmp;
376385
writeAndCommitSettings();
377386
broadcastInt("twinkleDensity", twinkleDensity);
378387
webServer.sendHeader("Access-Control-Allow-Origin", "*");
@@ -381,9 +390,13 @@ void setup() {
381390

382391
webServer.on("/coolLikeIncandescent", HTTP_POST, []() {
383392
String value = webServer.arg("value");
384-
coolLikeIncandescent = value.toInt();
385-
if (coolLikeIncandescent < 0) coolLikeIncandescent = 0;
386-
else if (coolLikeIncandescent > 1) coolLikeIncandescent = 1;
393+
long tmp = value.toInt();
394+
if (tmp < 0) {
395+
tmp = 0;
396+
} else if (tmp > 1) {
397+
tmp = 1;
398+
}
399+
coolLikeIncandescent = tmp;
387400
writeAndCommitSettings();
388401
broadcastInt("coolLikeIncandescent", coolLikeIncandescent);
389402
sendInt(coolLikeIncandescent);
@@ -830,10 +843,9 @@ void readSettings()
830843
brightness = EEPROM.read(0);
831844

832845
currentPatternIndex = EEPROM.read(1);
833-
if (currentPatternIndex < 0)
834-
currentPatternIndex = 0;
835-
else if (currentPatternIndex >= patternCount)
846+
if (currentPatternIndex >= patternCount) {
836847
currentPatternIndex = patternCount - 1;
848+
}
837849

838850
byte r = EEPROM.read(2);
839851
byte g = EEPROM.read(3);
@@ -853,10 +865,9 @@ void readSettings()
853865
autoplayDuration = EEPROM.read(7);
854866

855867
currentPaletteIndex = EEPROM.read(8);
856-
if (currentPaletteIndex < 0)
857-
currentPaletteIndex = 0;
858-
else if (currentPaletteIndex >= paletteCount)
868+
if (currentPaletteIndex >= paletteCount) {
859869
currentPaletteIndex = paletteCount - 1;
870+
}
860871

861872
twinkleSpeed = EEPROM.read(9);
862873
twinkleDensity = EEPROM.read(10);
@@ -932,11 +943,10 @@ void adjustPattern(bool up)
932943
else
933944
currentPatternIndex--;
934945

935-
// wrap around at the ends
936-
if (currentPatternIndex < 0)
937-
currentPatternIndex = patternCount - 1;
938-
if (currentPatternIndex >= patternCount)
946+
// wrap around at the end
947+
if (currentPatternIndex >= patternCount) {
939948
currentPatternIndex = 0;
949+
}
940950

941951
if (autoplay == 0) {
942952
writeAndCommitSettings();
@@ -1005,10 +1015,6 @@ void adjustBrightness(bool up)
10051015

10061016
void setBrightness(uint8_t value)
10071017
{
1008-
if (value > 255)
1009-
value = 255;
1010-
else if (value < 0) value = 0;
1011-
10121018
brightness = value;
10131019

10141020
FastLED.setBrightness(brightness);

0 commit comments

Comments
 (0)