Fix node type

This commit is contained in:
cschwinne 2021-03-09 17:21:19 +01:00
parent ea3358ecb2
commit 91d885eae4
7 changed files with 2090 additions and 2077 deletions

View File

@ -8,9 +8,9 @@
#include <map> #include <map>
#include <IPAddress.h> #include <IPAddress.h>
#define NODE_TYPE_ID_UNDEFINED 0 #define NODE_TYPE_ID_UNDEFINED 0
#define NODE_TYPE_ID_ESP8266 8266 #define NODE_TYPE_ID_ESP8266 82
#define NODE_TYPE_ID_ESP32 32 #define NODE_TYPE_ID_ESP32 32
/*********************************************************************************************\ /*********************************************************************************************\
* NodeStruct * NodeStruct

View File

@ -408,6 +408,10 @@ button {
display: inline-block; display: inline-block;
} }
#kn td {
padding-bottom: 12px;
}
#lv { #lv {
max-width: 600px; max-width: 600px;
display: inline-block; display: inline-block;

View File

@ -184,7 +184,7 @@
</div> </div>
<div id="nodes" class="modal"> <div id="nodes" class="modal">
<div id="ndlt">Other WLED instances on network</div> <div id="ndlt">WLED instances</div>
<div id="kn">Loading...</div><br> <div id="kn">Loading...</div><br>
<button class="btn infobtn" onclick="loadNodes()">Refresh</button> <button class="btn infobtn" onclick="loadNodes()">Refresh</button>
<button class="btn infobtn" onclick="toggleNodes()">Close list</button><br> <button class="btn infobtn" onclick="toggleNodes()">Close list</button><br>

View File

@ -568,9 +568,8 @@ function populateSegments(s)
function btype(b){ function btype(b){
switch (b) { switch (b) {
case 1: return "ESP8266";
case 32: return "ESP32"; case 32: return "ESP32";
case 8266: return "ESP8266"; case 82: return "ESP8266";
} }
return "?"; return "?";
} }
@ -598,7 +597,7 @@ function populateNodes(i,n)
if (nnodes == 0) cn += `No other instances found.`; if (nnodes == 0) cn += `No other instances found.`;
cn += `<table class="infot"> cn += `<table class="infot">
${urows} ${urows}
${inforow("Current node:",i.name)} ${inforow("Current instance:",i.name)}
</table>`; </table>`;
d.getElementById('kn').innerHTML = cn; d.getElementById('kn').innerHTML = cn;
} }

View File

@ -188,7 +188,7 @@ void realtimeLock(uint32_t timeoutMs, byte md = REALTIME_MODE_GENERIC);
void handleNotifications(); void handleNotifications();
void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w); void setRealtimePixel(uint16_t i, byte r, byte g, byte b, byte w);
void refreshNodeList(); void refreshNodeList();
void sendSysInfoUDP(uint8_t repeats=1); void sendSysInfoUDP();
//um_manager.cpp //um_manager.cpp
class Usermod { class Usermod {

File diff suppressed because it is too large Load Diff

View File

@ -407,11 +407,9 @@ void refreshNodeList()
/*********************************************************************************************\ /*********************************************************************************************\
Broadcast system info to other nodes. (to update node lists) Broadcast system info to other nodes. (to update node lists)
\*********************************************************************************************/ \*********************************************************************************************/
void sendSysInfoUDP(uint8_t repeats) void sendSysInfoUDP()
{ {
if (!udpConnected || !repeats) { if (!udp2Connected) return;
return;
}
IPAddress ip = Network.localIP(); IPAddress ip = Network.localIP();