@@ -282,8 +282,9 @@ void setup() {
282
282
char nameChar[nameString.length () + 1 ];
283
283
memset (nameChar, 0 , nameString.length () + 1 );
284
284
285
- for (int i = 0 ; i < nameString.length (); i++)
285
+ for (unsigned int i = 0 ; i < nameString.length (); i++) {
286
286
nameChar[i] = nameString.charAt (i);
287
+ }
287
288
288
289
Serial.printf (" Name: %s\n " , nameChar );
289
290
@@ -359,9 +360,13 @@ void setup() {
359
360
360
361
webServer.on (" /twinkleSpeed" , HTTP_POST, []() {
361
362
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;
365
370
writeAndCommitSettings ();
366
371
broadcastInt (" twinkleSpeed" , twinkleSpeed);
367
372
webServer.sendHeader (" Access-Control-Allow-Origin" , " *" );
@@ -370,9 +375,13 @@ void setup() {
370
375
371
376
webServer.on (" /twinkleDensity" , HTTP_POST, []() {
372
377
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;
376
385
writeAndCommitSettings ();
377
386
broadcastInt (" twinkleDensity" , twinkleDensity);
378
387
webServer.sendHeader (" Access-Control-Allow-Origin" , " *" );
@@ -381,9 +390,13 @@ void setup() {
381
390
382
391
webServer.on (" /coolLikeIncandescent" , HTTP_POST, []() {
383
392
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;
387
400
writeAndCommitSettings ();
388
401
broadcastInt (" coolLikeIncandescent" , coolLikeIncandescent);
389
402
sendInt (coolLikeIncandescent);
@@ -830,10 +843,9 @@ void readSettings()
830
843
brightness = EEPROM.read (0 );
831
844
832
845
currentPatternIndex = EEPROM.read (1 );
833
- if (currentPatternIndex < 0 )
834
- currentPatternIndex = 0 ;
835
- else if (currentPatternIndex >= patternCount)
846
+ if (currentPatternIndex >= patternCount) {
836
847
currentPatternIndex = patternCount - 1 ;
848
+ }
837
849
838
850
byte r = EEPROM.read (2 );
839
851
byte g = EEPROM.read (3 );
@@ -853,10 +865,9 @@ void readSettings()
853
865
autoplayDuration = EEPROM.read (7 );
854
866
855
867
currentPaletteIndex = EEPROM.read (8 );
856
- if (currentPaletteIndex < 0 )
857
- currentPaletteIndex = 0 ;
858
- else if (currentPaletteIndex >= paletteCount)
868
+ if (currentPaletteIndex >= paletteCount) {
859
869
currentPaletteIndex = paletteCount - 1 ;
870
+ }
860
871
861
872
twinkleSpeed = EEPROM.read (9 );
862
873
twinkleDensity = EEPROM.read (10 );
@@ -932,11 +943,10 @@ void adjustPattern(bool up)
932
943
else
933
944
currentPatternIndex--;
934
945
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) {
939
948
currentPatternIndex = 0 ;
949
+ }
940
950
941
951
if (autoplay == 0 ) {
942
952
writeAndCommitSettings ();
@@ -1005,10 +1015,6 @@ void adjustBrightness(bool up)
1005
1015
1006
1016
void setBrightness (uint8_t value)
1007
1017
{
1008
- if (value > 255 )
1009
- value = 255 ;
1010
- else if (value < 0 ) value = 0 ;
1011
-
1012
1018
brightness = value;
1013
1019
1014
1020
FastLED.setBrightness (brightness);
0 commit comments