Merge branch 'Aircoookie:master' into master

awawa-dev · web-flow · commit fa73833a5b02 · 2021-10-25T06:17:18.000+02:00
diff --git a/wled00/set.cpp b/wled00/set.cpp
@@ -530,9 +530,9 @@ bool updateVal(const String* req, const char* key, byte* val, byte minv, byte ma
     if (out == 0)
     {
       if (req->charAt(pos+4) == '-') {
-        *val = min((int)maxv, max((int)minv, (int)(*val -1)));
+        *val = (int)(*val -1) < (int)minv ? maxv : min((int)maxv,(*val -1));
       } else {
-        *val = min((int)maxv, max((int)minv, (int)(*val +1)));
+        *val = (int)(*val +1) > (int)maxv ? minv : max((int)minv,(*val +1));
       }
     } else {
       out += *val;

Original file line number	Diff line number	Diff line change
`@@ -530,9 +530,9 @@ bool updateVal(const String* req, const char* key, byte* val, byte minv, byte ma`
`530`	`530`	`if (out == 0)`
`531`	`531`	`{`
`532`	`532`	`if (req->charAt(pos+4) == '-') {`
`533`		`- val = min((int)maxv, max((int)minv, (int)(val -1)));`
	`533`	`+ val = (int)(val -1) < (int)minv ? maxv : min((int)maxv,(*val -1));`
`534`	`534`	`} else {`
`535`		`- val = min((int)maxv, max((int)minv, (int)(val +1)));`
	`535`	`+ val = (int)(val +1) > (int)maxv ? minv : max((int)minv,(*val +1));`
`536`	`536`	`}`
`537`	`537`	`} else {`
`538`	`538`	`out += *val;`