From b3d728df9177ba2e7f727176c0e92a7f0fa41007 Mon Sep 17 00:00:00 2001
From: cschwinne <dev.aircoookie@gmail.com>
Date: Tue, 12 Nov 2019 19:33:34 +0100
Subject: [PATCH] Add 12V brightness limiter and configurable per-led current
 (#295)

---
 wled00/FX.h                   |   1 +
 wled00/FX_fcn.cpp             |  19 ++--
 wled00/data/settings_leds.htm | Bin 14294 -> 19782 bytes
 wled00/html_settings.h        | 162 +++++++++++++++++++++-------------
 wled00/wled00.ino             |   4 +-
 wled00/wled01_eeprom.ino      |  23 +++--
 wled00/wled02_xml.ino         |   6 ++
 wled00/wled03_set.ino         |   4 +-
 wled00/wled05_init.ino        |   2 +-
 wled00/wled18_server.ino      |   4 +-
 wled00/wled19_json.ino        |   2 +-
 11 files changed, 138 insertions(+), 89 deletions(-)

diff --git a/wled00/FX.h b/wled00/FX.h
index 2cd886f61..f691ec850 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -363,6 +363,7 @@ class WS2812FX {
       paletteFade = 0,
       paletteBlend = 0,
       colorOrder = 0,
+      milliampsPerLed = 55,
       getBrightness(void),
       getMode(void),
       getSpeed(void),
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 429def728..50e881ed9 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -183,11 +183,7 @@ void WS2812FX::setCronixieDigits(byte d[])
 //Stay safe with high amperage and have a reasonable safety margin!
 //I am NOT to be held liable for burned down garages!
 
-//fine tune power estimation constants for your setup
-#define PU_PER_MA        3600 //power units per milliamperere for accurate power estimation 
-                              //formula: 195075 divided by mA per fully lit LED, here ~54mA)
-                              //lowering the value increases the estimated usage and therefore makes the ABL more aggressive
-                              
+//fine tune power estimation constants for your setup                  
 #define MA_FOR_ESP        100 //how much mA does the ESP use (Wemos D1 about 80mA, ESP32 about 120mA)
                               //you can set it to 0 if the ESP is powered by USB and the LEDs by external
 
@@ -197,12 +193,13 @@ void WS2812FX::show(void) {
   //one PU is the power it takes to have 1 channel 1 step brighter per brightness step
   //so A=2,R=255,G=0,B=0 would use 510 PU per LED (1mA is about 3700 PU)
   
-  if (ablMilliampsMax > 149 && ablMilliampsMax < 65000) //lower numbers and 65000 turn off calculation
+  if (ablMilliampsMax > 149 && milliampsPerLed > 0) //0 mA per LED and too low numbers turn off calculation
   {
-    uint32_t powerBudget = (ablMilliampsMax - MA_FOR_ESP) * PU_PER_MA; //100mA for ESP power
-    if (powerBudget > PU_PER_MA * _length) //each LED uses about 1mA in standby, exclude that from power budget
+    uint32_t puPerMilliamp = 195075 / milliampsPerLed;
+    uint32_t powerBudget = (ablMilliampsMax - MA_FOR_ESP) * puPerMilliamp; //100mA for ESP power
+    if (powerBudget > puPerMilliamp * _length) //each LED uses about 1mA in standby, exclude that from power budget
     {
-      powerBudget -= PU_PER_MA * _length;
+      powerBudget -= puPerMilliamp * _length;
     } else
     {
       powerBudget = 0;
@@ -232,10 +229,10 @@ void WS2812FX::show(void) {
       uint8_t scaleB = (scaleI > 255) ? 255 : scaleI;
       uint8_t newBri = scale8(_brightness, scaleB);
       bus->SetBrightness(newBri);
-      currentMilliamps = (powerSum0 * newBri) / PU_PER_MA;
+      currentMilliamps = (powerSum0 * newBri) / puPerMilliamp;
     } else
     {
-      currentMilliamps = powerSum / PU_PER_MA;
+      currentMilliamps = powerSum / puPerMilliamp;
       bus->SetBrightness(_brightness);
     }
     currentMilliamps += MA_FOR_ESP; //add power of ESP back to estimate
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 7c062cbcbdfc3937e24f5c1452079d9bfe6244e1..dc87e409fe829d41129c02a2bcb78e8413e8d4ab 100644
GIT binary patch
delta 4137
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

delta 524
zcmZ8eIY<Lh5PfSr$VQXZ7{pi@S3Ck6NsRFzG4WW%;8}Ro@xnlKHHoN|*m$6zFkQe-
zdto~}L2RwGw6hY##zGKv_G6<=@&CL(Z)V>6cLnLuxN=HTlq!qr%xOt3vd<uiR`?O6
zZ+Wu9zydb0iY2TePvee<e@H|57F{?;{-H0<dRqh$^0-dv%cW9>a!A8UwQC!B?v&+T
zDP-WIcjd@qhZT$XJ87f1ktW=ljo-+yHJD%SLWx614+aoM2thipt#<@PHi!sxy5T$o
z9qs6{D(IQ>FlXHu<Oq@7+hhj4uX5S1K1wBOsIN&TC0R<J&DZ4B6;k~t)Euj#Cw~>K
zwUkm^+ZP+$YX{;?1){8LmM#PRyVlk!I(c|dgbE*fWw2N4tZhjs&0vSoMWk784)X%f
zF_Om$SNOQnz?N{t;#!_qZfE$GXO6)>wIRm5EaIquESzd(Ih)ARN8p&w62<07c&d`F
ydNuP_*UDOw%t<rbhcOJX9oDoImc=$%zR&UNFw)fDohTXNpH^uv;Wpn!XQdzS{CDX9

diff --git a/wled00/html_settings.h b/wled00/html_settings.h
index cb3b29fc3..f4d9f1119 100644
--- a/wled00/html_settings.h
+++ b/wled00/html_settings.h
@@ -71,90 +71,126 @@ AP IP: <span class="sip"> Not active </span><hr>
 
 //LED settings
 const char PAGE_settings_leds[] PROGMEM = R"=====(<!DOCTYPE html>
-<html><head><meta name="viewport" content="width=500">
-<title>LED Settings</title><script>var f=0,p=0;function H()
+<html><head><meta name=viewport content="width=500">
+<title>LED Settings</title>
+<script>var f=0,p=0,d=document,laprev=55;function H()
 {window.open("https://github.com/Aircoookie/WLED/wiki/Settings#led-settings");}
-function B(){window.open("/settings","_self");}function S(){GetV();setTimeout(function(){fillfx(0);},200);setTimeout(function(){fillfx(1);},400);UI();}
-function UI(){var myC=document.querySelectorAll('.wc'),l=myC.length;for(i=0;i<l;i++){myC[i].style.display=(document.getElementById('rgbw').checked)?'inline':'none';}
-var val=Math.ceil((100+document.Sf.LC.value*55)/500)/2;val=(val>5)?Math.ceil(val):val;var s="";if(val<1.02){s="ESP 5V pin with 1A USB supply";}else{s="External 5V ";s+=val;s+="A supply connected to LEDs";}document.getElementById('psu').innerHTML=s;}
-function fillfx(pl){e="<option>Error loading list!</option>";el=pl?Sf.FP:Sf.FX;fetch(pl?'/json/pal':'/json/eff').then(res=>{if(!res.ok){el.innerHTML=e;}
+function B()
+{window.open("/settings","_self");}
+function S(){GetV();setTimeout(function(){fillfx(0);},200);setTimeout(function(){fillfx(1);},400);setABL();}
+function enABL(){var en=d.getElementById('able').checked;d.Sf.LA.value=(en)?laprev:0;d.getElementById('abl').style.display=(en)?'inline':'none';d.getElementById('psu2').style.display=(en)?'inline':'none';if(d.Sf.LA.value>0)setABL();}
+function enLA(){var val=d.Sf.LAsel.value;d.Sf.LA.value=val;d.getElementById('LAdis').style.display=(val==50)?'inline':'none';UI();}
+function setABL(){d.getElementById('able').checked = true;d.Sf.LAsel.value = 50;switch(parseInt(d.Sf.LA.value)){case 0:d.getElementById('able').checked=false;enABL();break;case 30:d.Sf.LAsel.value=30;break;case 35:d.Sf.LAsel.value=35;break;case 55:d.Sf.LAsel.value=55;break;default:d.getElementById('LAdis').style.display='inline';}
+UI();}
+function UI(){var myC=d.querySelectorAll('.wc'),l=myC.length;for(i=0;i<l;i++){myC[i].style.display=(d.getElementById('rgbw').checked)?'inline':'none';}
+d.getElementById('ledwarning').style.display=(d.Sf.LC.value>1000)?'inline':'none';d.getElementById('ampwarning').style.display=(d.Sf.MA.value>7200)?'inline':'none';if(d.Sf.LA.value>0)laprev=d.Sf.LA.value;var val=Math.ceil((100+d.Sf.LC.value*laprev)/500)/2;val=(val>5)?Math.ceil(val):val;var s="";var is12V=(d.Sf.LAsel.value==30);if(val<1.02&&!is12V)
+{s="ESP 5V pin with 1A USB supply";}else
+{s+=is12V?"12V ":"5V ";s+=val;s+="A supply connected to LEDs";}
+var val2=Math.ceil((100+d.Sf.LC.value*laprev)/1500)/2;val2=(val2>5)?Math.ceil(val2):val2;var s2="(for most effects, ~";s2+=val2;s2+="A is enough)<br>";d.getElementById('psu').innerHTML=s;d.getElementById('psu2').innerHTML=s2;}
+function fillfx(pl)
+{e="<option>Error loading list!</option>";el=pl?Sf.FP:Sf.FX;fetch(pl?'/json/palettes':'/json/effects').then(res=>{if(!res.ok){el.innerHTML=e;}
 return res.json();}).then(json=>{var x="";for(i in json){x+="<option value=\""+i+"\">"+json[i]+" ("+i+")</option>";}
-el.innerHTML=x;el.selectedIndex=pl?p:f;}).catch(function(){el.innerHTML=e;})}function GetV(){var d=document;%CSS%%SCSS%</head>
-<body onload="S()">
-<form id="form_s" name="Sf" method="post">
-<div class="helpB"><button type="button" onclick="H()">?</button></div>
-<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
+el.innerHTML=x;el.selectedIndex=pl?p:f;}).catch(function(){el.innerHTML=e;})}
+function GetV(){%CSS%%SCSS%</head>
+<body onload=S()>
+<form id=form_s name=Sf method=post>
+<div class=helpB><button type=button onclick=H()>?</button></div>
+<button type=button onclick=B()>Back</button><button type=submit>Save</button><hr>
 <h2>LED setup</h2>
-LED count: <input name="LC" type="number" min="1" max="1500" oninput=UI() required><br>
+LED count: <input name=LC type=number min=1 max=1500 oninput=UI() required><br>
+<div id=ledwarning style="color:orange; display: none;">
+&#9888; You might run into stability or lag issues.<br>
+Use less than 1000 LEDs per ESP for the best experience!<br>
+</div>
 <i>Recommended power supply for brightest white:</i><br>
-<b><span id="psu">?</span></b><br><br>
-Maximum Current: <input name="MA" type="number" min="250" max="65000" required> mA<br>
+<b><span id=psu>?</span></b><br>
+<span id=psu2><br></span>
+<br>
+Enable automatic brightness limiter: <input type=checkbox name=ABen onchange=enABL() id=able><br>
+<div id=abl>
+Maximum Current: <input name=MA type=number min=250 max=65000 oninput=UI() required> mA<br>
+<div id=ampwarning style="color:orange; display: none;">
+&#9888; Your power supply provides high current.<br>
+To improve the safety of your setup,<br>
+please use thick cables,<br>
+multiple power injection points and a fuse!<br>
+</div>
 <i>Automatically limits brightness to stay close to the limit.<br>
 Keep at &lt;1A if powering LEDs directly from the ESP 5V pin!<br>
-If you are using an external 5V supply, enter its rating.<br>
-"65000" completely diasbles the power calculation.<br>
-(Current estimated usage: <span class="pow">unknown</span>)</i><br><br>
-LEDs are 4-channel type (RGBW): <input type="checkbox" name="EW" onchange=UI() id="rgbw"><br>
+If you are using an external power supply, enter its rating.<br>
+(Current estimated usage: <span class=pow>unknown</span>)</i><br><br>
+LED voltage (Max. current for a single LED):<br>
+<select name=LAsel onchange=enLA()>
+<option value=55 selected>5V default (55mA)</option>
+<option value=35>5V efficient (35mA)</option>
+<option value=30>12V (30mA)</option>
+<option value=50>Custom</option>
+</select><br>
+<span id=LAdis style=display:none>Custom max. current per LED: <input name=LA type=number min=0 max=255 id=la oninput=UI() required> mA<br></span>
+<i>Keep at default if you are unsure about your type of LEDs.</i><br>
+</div>
+<br>
+LEDs are 4-channel type (RGBW): <input type=checkbox name=EW onchange=UI() id=rgbw><br>
 Color order:
-<select name="CO">
-<option value="0">GRB</option>
-<option value="1">RGB</option>
-<option value="2">BRG</option>
-<option value="3">RBG</option></select>
+<select name=CO>
+<option value=0>GRB</option>
+<option value=1>RGB</option>
+<option value=2>BRG</option>
+<option value=3>RBG</option>
+</select>
 <h3>Defaults</h3>
-Turn LEDs on after power up/reset: <input type="checkbox" name="BO"><br>
-Default brightness: <input name="CA" type="number" min="0" max="255" required> (0-255)<br><br>
-Set current color, brightness and effects as boot default: <input type="checkbox" name="IS"><br>
-Set current preset cycle setting as boot default: <input type="checkbox" name="PC">
+Turn LEDs on after power up/reset: <input type=checkbox name=BO><br>
+Default brightness: <input name=CA type=number min=0 max=255 required> (0-255)<br><br>
+Set current color, brightness and effects as boot default: <input type=checkbox name=IS><br>
+Set current preset cycle setting as boot default: <input type=checkbox name=PC>
 <br>- <i>or</i> -<br>
-Apply preset <input name="BP" type="number" min="0" max="25" required> at boot (0 uses defaults)
+Apply preset <input name=BP type=number min=0 max=25 required> at boot (0 uses defaults)
 <br>- <i>or</i> -<br>
-Default RGB<span class="wc">W</span> color:<br>
-<input name="CR" type="number" min="0" max="255" required>
-<input name="CG" type="number" min="0" max="255" required>
-<input name="CB" type="number" min="0" max="255" required>
-<span class="wc"><input name="CW" type="number" min="0" max="255" required><br>
-Auto-calculate white from RGB instead: <input type="checkbox" name="AW"></span><br>
-Default secondary RGB<span class="wc">W</span>:<br>
-<input name="SR" type="number" min="0" max="255" required>
-<input name="SG" type="number" min="0" max="255" required>
-<input name="SB" type="number" min="0" max="255" required>
-<span class="wc"><input name="SW" type="number" min="0" max="255" required></span><br>
+Default RGB<span class=wc>W</span> color:<br>
+<input name=CR type=number min=0 max=255 required>
+<input name=CG type=number min=0 max=255 required>
+<input name=CB type=number min=0 max=255 required>
+<span class=wc><input name=CW type=number min=0 max=255 required><br>
+Auto-calculate white from RGB instead: <input type=checkbox name=AW></span><br>
+Default secondary RGB<span class=wc>W</span>:<br>
+<input name=SR type=number min=0 max=255 required>
+<input name=SG type=number min=0 max=255 required>
+<input name=SB type=number min=0 max=255 required>
+<span class=wc><input name=SW type=number min=0 max=255 required></span><br>
 Default effect ID:<br>
-<select name="FX">
+<select name=FX>
 <option>Loading...</option>
 </select>
 <br>Default color palette:<br>
-<select name="FP">
+<select name=FP>
 <option>Loading...</option>
 </select><br>
-Default effect speed: <input name="SX" type="number" min="0" max="255" required><br>
-Default effect intensity: <input name="IX" type="number" min="0" max="255" required><br><br>
-Use Gamma correction for color: <input type="checkbox" name="GC"> (strongly recommended)<br>
-Use Gamma correction for brightness: <input type="checkbox" name="GB"> (not recommended)<br><br>
-Brightness factor: <input name="BF" type="number" min="0" max="255" required> %%
+Default effect speed: <input name=SX type=number min=0 max=255 required><br>
+Default effect intensity: <input name=IX type=number min=0 max=255 required><br><br>
+Use Gamma correction for color: <input type=checkbox name=GC> (strongly recommended)<br>
+Use Gamma correction for brightness: <input type=checkbox name=GB> (not recommended)<br><br>
+Brightness factor: <input name=BF type=number min=1 max=255 required> %
 <h3>Transitions</h3>
-Crossfade: <input type="checkbox" name="TF"><br>
-Transition Time: <input name="TD" maxlength="5" size="2"> ms<br>
-Enable transition for secondary color: <input type="checkbox" name="T2"><br>
-Enable Palette transitions: <input type="checkbox" name="PF">
+Crossfade: <input type=checkbox name=TF><br>
+Transition Time: <input name=TD maxlength=5 size=2> ms<br>
+Enable transition for secondary color: <input type=checkbox name=T2><br>
+Enable Palette transitions: <input type=checkbox name=PF>
 <h3>Timed light</h3>
-Default Duration: <input name="TL" type="number" min="1" max="255" required> min<br>
-Default Target brightness: <input name="TB" type="number" min="0" max="255" required><br>
-Fade down: <input type="checkbox" name="TW"><br>
+Default Duration: <input name=TL type=number min=1 max=255 required> min<br>
+Default Target brightness: <input name=TB type=number min=0 max=255 required><br>
+Fade down: <input type=checkbox name=TW><br>
 <h3>Advanced</h3>
 Palette blending:
-<select name="PB">
-<option value="0">Linear (wrap if moving)</option>
-<option value="1">Linear (always wrap)</option>
-<option value="2">Linear (never wrap)</option>
-<option value="3">None (not recommended)</option>
+<select name=PB>
+<option value=0>Linear (wrap if moving)</option>
+<option value=1>Linear (always wrap)</option>
+<option value=2>Linear (never wrap)</option>
+<option value=3>None (not recommended)</option>
 </select><br>
-Reverse LED order (rotate 180): <input type="checkbox" name="RV"><br>
-Skip first LED: <input type="checkbox" name="SL"><hr>
-<button type="button" onclick="B()">Back</button><button type="submit">Save</button>
-</form>
-</body>
+Reverse LED order (rotate 180): <input type=checkbox name=RV><br>
+Skip first LED: <input type=checkbox name=SL><hr>
+<button type=button onclick=B()>Back</button><button type=submit>Save</button>
+</form></body>
 </html>)=====";
 
 
diff --git a/wled00/wled00.ino b/wled00/wled00.ino
index bc85f31e4..737a058ce 100644
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@@ -100,8 +100,8 @@
 
 
 //version code in format yymmddb (b = daily build)
-#define VERSION 1911102
-char versionString[] = "0.8.6";
+#define VERSION 1911121
+char versionString[] = "0.8.7-dev";
 
 
 //AP and OTA default passwords (for maximum change them!)
diff --git a/wled00/wled01_eeprom.ino b/wled00/wled01_eeprom.ino
index babbf580f..486b3f1fc 100644
--- a/wled00/wled01_eeprom.ino
+++ b/wled00/wled01_eeprom.ino
@@ -6,7 +6,7 @@
 #define EEPSIZE 2560
 
 //eeprom Version code, enables default settings instead of 0 init on update
-#define EEPVER 11
+#define EEPVER 12
 //0 -> old version, default
 //1 -> 0.4p 1711272 and up
 //2 -> 0.4p 1711302 and up
@@ -19,7 +19,7 @@
 //9 -> 0.8.0
 //10-> 0.8.2
 //11-> 0.8.5-dev #mqttauth @TimothyBrown
-
+//12-> 0.8.7
 
 /*
  * Erase all configuration data
@@ -134,7 +134,7 @@ void saveSettingsToEEPROM()
   EEPROM.write(372, useRGBW);
   EEPROM.write(373, effectPaletteDefault);
   EEPROM.write(374, strip.paletteFade);
-  //EEPROM.write(375, apWaitTimeSecs);
+  EEPROM.write(375, strip.milliampsPerLed); //was apWaitTimeSecs up to 0.8.5
   EEPROM.write(376, apBehavior);
 
   EEPROM.write(377, EEPVER); //eeprom was updated to latest
@@ -363,11 +363,9 @@ void loadSettingsFromEEPROM(bool first)
   useRGBW = EEPROM.read(372);
   effectPaletteDefault = EEPROM.read(373); effectPalette = effectPaletteDefault;
   //374 - strip.paletteFade
-
-  if (lastEEPROMversion > 0) {
-    //apWaitTimeSecs = EEPROM.read(375);
-    apBehavior = EEPROM.read(376);
-  }
+  
+  apBehavior = EEPROM.read(376);
+    
   //377 = lastEEPROMversion
   if (lastEEPROMversion > 1) {
     for (byte i=0; i<4; i++)
@@ -485,6 +483,15 @@ void loadSettingsFromEEPROM(bool first)
     mqttPort = EEPROM.read(2522) + ((EEPROM.read(2523) << 8) & 0xFF00);
   }
 
+  if (lastEEPROMversion > 11)
+  {
+    strip.milliampsPerLed = EEPROM.read(375);
+  } else if (strip.ablMilliampsMax == 65000) //65000 indicates disabled ABL in <0.8.7
+  {
+    strip.ablMilliampsMax = ABL_MILLIAMPS_DEFAULT;
+    strip.milliampsPerLed = 0; //disable ABL
+  }
+
   receiveDirect = !EEPROM.read(2200);
   notifyMacro = EEPROM.read(2201);
   uiConfiguration = EEPROM.read(2202);
diff --git a/wled00/wled02_xml.ino b/wled00/wled02_xml.ino
index 9b0c58b2f..e0546f0ad 100644
--- a/wled00/wled02_xml.ino
+++ b/wled00/wled02_xml.ino
@@ -223,8 +223,14 @@ void getSettingsJS(byte subPage, char* dest)
   }
 
   if (subPage == 2) {
+    #ifdef ESP8266
+    #if LEDPIN == 3
+    oappend("d.Sf.LC.max=500;");
+    #endif
+    #endif
     sappend('v',"LC",ledCount);
     sappend('v',"MA",strip.ablMilliampsMax);
+    sappend('v',"LA",strip.milliampsPerLed);
     if (strip.currentMilliamps)
     {
       sappends('m',"(\"pow\")[0]","");
diff --git a/wled00/wled03_set.ino b/wled00/wled03_set.ino
index 54dafb894..a15307709 100644
--- a/wled00/wled03_set.ino
+++ b/wled00/wled03_set.ino
@@ -56,12 +56,14 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
   {
     int t = request->arg("LC").toInt();
     if (t > 0 && t <= MAX_LEDS) ledCount = t;
-    #ifndef ARDUINO_ARCH_ESP32
+    #ifdef ESP8266
     #if LEDPIN == 3
     if (ledCount > MAX_LEDS_DMA) ledCount = MAX_LEDS_DMA; //DMA method uses too much ram
     #endif
     #endif
     strip.ablMilliampsMax = request->arg("MA").toInt();
+    strip.milliampsPerLed = request->arg("LA").toInt();
+    
     useRGBW = request->hasArg("EW");
     strip.colorOrder = request->arg("CO").toInt();
     autoRGBtoRGBW = request->hasArg("AW");
diff --git a/wled00/wled05_init.ino b/wled00/wled05_init.ino
index f84be5ac1..405525625 100644
--- a/wled00/wled05_init.ino
+++ b/wled00/wled05_init.ino
@@ -7,7 +7,7 @@ void wledInit()
   EEPROM.begin(EEPSIZE);
   ledCount = EEPROM.read(229) + ((EEPROM.read(398) << 8) & 0xFF00);
   if (ledCount > MAX_LEDS || ledCount == 0) ledCount = 30;
-  #ifndef ARDUINO_ARCH_ESP32
+  #ifdef ESP8266
   #if LEDPIN == 3
   if (ledCount > MAX_LEDS_DMA) ledCount = MAX_LEDS_DMA; //DMA method uses too much ram
   #endif
diff --git a/wled00/wled18_server.ino b/wled00/wled18_server.ino
index 8d75a651b..b87b04e17 100644
--- a/wled00/wled18_server.ino
+++ b/wled00/wled18_server.ino
@@ -158,7 +158,7 @@ void initServer()
     },[](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
       if(!index){
         DEBUG_PRINTLN("OTA Update Start");
-        #ifndef ARDUINO_ARCH_ESP32
+        #ifdef ESP8266
         Update.runAsync(true);
         #endif
         Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000);
@@ -312,7 +312,7 @@ String msgProcessor(const String& var)
 
 void serveMessage(AsyncWebServerRequest* request, uint16_t code, String headl, String subl="", byte optionT=255)
 {
-  #ifndef ARDUINO_ARCH_ESP32
+  #ifdef ESP8266
   char buf[256];
   obuf = buf;
   #endif
diff --git a/wled00/wled19_json.ino b/wled00/wled19_json.ino
index e6642e57e..20cdcfc40 100644
--- a/wled00/wled19_json.ino
+++ b/wled00/wled19_json.ino
@@ -238,7 +238,7 @@ void serializeInfo(JsonObject root)
   
   root["brand"] = "WLED";
   root["product"] = "DIY light";
-  root["btype"] = "src";
+  root["btype"] = "dev";
   root["mac"] = escapedMac;
 }