kopia lustrzana https://github.com/Aircoookie/WLED
Merge branch 'master' into dev
commit
1d833419aa
|
@ -16,11 +16,7 @@
|
||||||
}
|
}
|
||||||
DMXMap = "";
|
DMXMap = "";
|
||||||
for (i=0;i<512;i++) {
|
for (i=0;i<512;i++) {
|
||||||
isstart = "";
|
DMXMap += "<div class=\"anytype type" + dmxchans[i] + "\">" + String(i+1) + "<br />" + dmxlabels[dmxchans[i]] + "</div>";
|
||||||
if ((i+1) % 10 == 0) {
|
|
||||||
isstart="S"
|
|
||||||
}
|
|
||||||
DMXMap += "<div class=\"anytype " + isstart + " type" + dmxchans[i] + "\">" + String(i+1) + "<br />" + dmxlabels[dmxchans[i]] + "</div>";
|
|
||||||
}
|
}
|
||||||
document.getElementById("map").innerHTML = DMXMap;
|
document.getElementById("map").innerHTML = DMXMap;
|
||||||
}</script>
|
}</script>
|
||||||
|
|
|
@ -24,7 +24,7 @@ function B(){window.history.back()}function RS(){window.location="/settings"}fun
|
||||||
const char PAGE_dmxmap[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta content="width=device-width" name="viewport">
|
const char PAGE_dmxmap[] PROGMEM = R"=====(<!DOCTYPE html><html><head><meta content="width=device-width" name="viewport">
|
||||||
<title>DMX Map</title><script>
|
<title>DMX Map</title><script>
|
||||||
function B(){window.history.back()}function RS(){window.location="/settings"}function RP(){top.location.href="/"}function FM() {%DMXVARS%
|
function B(){window.history.back()}function RS(){window.location="/settings"}function RP(){top.location.href="/"}function FM() {%DMXVARS%
|
||||||
var t=["SET 0","RED","GREEN","BLUE","WHITE","SHUTTER","SET 255","DISABLED"],n=[];for(i=0;i<512;i++)n.push(7);for(i=0;i<LC;i++)for(FS=CS+CG*i,j=0;j<CN;j++)DA=FS+j,n[DA-1]=CH[j];for(DMXMap="",i=0;i<512;i++)isstart="",(i+1)%10==0&&(isstart="S"),DMXMap+='<div class="anytype '+isstart+" type"+n[i]+'">'+String(i+1)+"<br />"+t[n[i]]+"</div>";document.getElementById("map").innerHTML=DMXMap}
|
var n=["SET 0","RED","GREEN","BLUE","WHITE","SHUTTER","SET 255","DISABLED"],o=[];for(i=0;i<512;i++)o.push(7);for(i=0;i<LC;i++)for(FS=CS+CG*i,j=0;j<CN;j++)DA=FS+j,o[DA-1]=CH[j];for(DMXMap="",i=0;i<512;i++)DMXMap+='<div class="anytype type'+o[i]+'">'+String(i+1)+"<br />"+n[o[i]]+"</div>";document.getElementById("map").innerHTML=DMXMap}
|
||||||
</script><style>
|
</script><style>
|
||||||
.anytype{border:1px solid #fff;margin:1px;float:left;width:100px;height:100px}.S{margin:0;border:2px solid #fff}.type7{color:#888;border:1px dotted grey}.type6{color:#fff}.type4{color:#fff;font-weight:700}.type3{color:#00f;font-weight:700}.type2{color:#0f0;font-weight:700}.type1{color:red;font-weight:700}.bt{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:8px;margin-top:12px}body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%%;margin:0}
|
.anytype{border:1px solid #fff;margin:1px;float:left;width:100px;height:100px}.S{margin:0;border:2px solid #fff}.type7{color:#888;border:1px dotted grey}.type6{color:#fff}.type4{color:#fff;font-weight:700}.type3{color:#00f;font-weight:700}.type2{color:#0f0;font-weight:700}.type1{color:red;font-weight:700}.bt{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:8px;margin-top:12px}body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%%;margin:0}
|
||||||
</style></head><body onload="FM()"><div id="map">...</div></body></html>)=====";
|
</style></head><body onload="FM()"><div id="map">...</div></body></html>)=====";
|
||||||
|
|
|
@ -101,7 +101,7 @@ void ESPAsyncE131::parsePacket(AsyncUDPPacket _packet) {
|
||||||
bool error = false;
|
bool error = false;
|
||||||
uint8_t protocol = P_E131;
|
uint8_t protocol = P_E131;
|
||||||
|
|
||||||
sbuff = reinterpret_cast<e131_packet_t *>(_packet.data());
|
e131_packet_t *sbuff = reinterpret_cast<e131_packet_t *>(_packet.data());
|
||||||
|
|
||||||
//E1.31 packet identifier ("ACS-E1.17")
|
//E1.31 packet identifier ("ACS-E1.17")
|
||||||
if (memcmp(sbuff->acn_id, ESPAsyncE131::ACN_ID, sizeof(sbuff->acn_id)))
|
if (memcmp(sbuff->acn_id, ESPAsyncE131::ACN_ID, sizeof(sbuff->acn_id)))
|
||||||
|
|
|
@ -163,7 +163,6 @@ class ESPAsyncE131 {
|
||||||
static const uint32_t VECTOR_FRAME = 2;
|
static const uint32_t VECTOR_FRAME = 2;
|
||||||
static const uint8_t VECTOR_DMP = 2;
|
static const uint8_t VECTOR_DMP = 2;
|
||||||
|
|
||||||
e131_packet_t *sbuff; // Pointer to scratch packet buffer
|
|
||||||
AsyncUDP udp; // AsyncUDP
|
AsyncUDP udp; // AsyncUDP
|
||||||
|
|
||||||
// Internal Initializers
|
// Internal Initializers
|
||||||
|
|
|
@ -190,7 +190,7 @@ void extractPin(JsonObject &obj, const char *key) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// oappens used pins by recursively scanning JsonObject
|
// oappend used pins by scanning JsonObject (1 level deep)
|
||||||
void fillUMPins(JsonObject &mods)
|
void fillUMPins(JsonObject &mods)
|
||||||
{
|
{
|
||||||
for (JsonPair kv : mods) {
|
for (JsonPair kv : mods) {
|
||||||
|
|
Ładowanie…
Reference in New Issue