Skip to content

Commit

Permalink
Merge remote-tracking branch 'ewowi/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ewoudwijma
ewoudwijma committed Oct 9, 2024
2 parents 14c3199 + b27b739 commit df72926
Show file tree
Hide file tree
Showing 11 changed files with 1,202 additions and 1,262 deletions.
6 changes: 3 additions & 3 deletions data/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ function genTableRowHTML(json, parentNode = null, rowNr = UINT8_MAX) {
trNode.appendChild(tdNode);
}
flushOnUICommands();
if (variable.pid == "Instances" && variable.id == "insTbl")
if (variable.pid == "Instances" && variable.id == "instances")
setInstanceTableColumns();
}

Expand Down Expand Up @@ -1026,7 +1026,7 @@ function changeHTML(variable, commandJson, rowNr = UINT8_MAX) {

flushOnUICommands(); //make sure onUIs of new elements are called

if (variable.pid == "Instances" && variable.id == "insTbl")
if (variable.pid == "Instances" && variable.id == "instances")
setInstanceTableColumns();
}
else
Expand Down Expand Up @@ -1602,7 +1602,7 @@ function uploadFileWithText(name, text)

function setInstanceTableColumns() {

let tbl = gId("Instances.insTbl");
let tbl = gId("Instances.instances");
if (!tbl) return;
let isDashView = gId("vDash").classList.contains("selected");
let thead = tbl.querySelector("thead");
Expand Down
86 changes: 50 additions & 36 deletions misc/model.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
"fun": 34
},
{
"id": "clLength",
"id": "length",
"type": "number",
"pid": "clients",
"ro": true,
Expand All @@ -376,7 +376,7 @@
"o": 77
},
{
"id": "wsSend",
"id": "WSSend",
"type": "text",
"ro": true,
"max": 16,
Expand All @@ -385,7 +385,7 @@
"fun": 58
},
{
"id": "wsRecv",
"id": "WSRecv",
"type": "text",
"ro": true,
"max": 16,
Expand All @@ -394,7 +394,7 @@
"fun": 59
},
{
"id": "udpSend",
"id": "UDPSend",
"type": "text",
"ro": true,
"max": 16,
Expand All @@ -403,7 +403,7 @@
"fun": 60
},
{
"id": "udpRecv",
"id": "UDPRecv",
"type": "text",
"ro": true,
"max": 16,
Expand Down Expand Up @@ -604,7 +604,7 @@
"max": 255,
"n": [
{
"id": "dun",
"id": "universe",
"type": "number",
"ro": false,
"max": 7,
Expand All @@ -615,7 +615,7 @@
"p": 1073463688
},
{
"id": "dch",
"id": "channel",
"type": "number",
"ro": false,
"min": 1,
Expand All @@ -628,13 +628,14 @@
"dash": true
},
{
"id": "e131Tbl",
"id": "watches",
"type": "table",
"ro": true,
"n": [
{
"id": "e131Channel",
"id": "channel",
"type": "number",
"pid": "watches",
"ro": true,
"min": 1,
"max": 512,
Expand All @@ -643,25 +644,27 @@
"fun": 86
},
{
"id": "e131Name",
"id": "variable",
"type": "text",
"pid": "watches",
"ro": true,
"max": 32,
"pid": "e131Tbl",
"o": 111,
"fun": 87
},
{
"id": "e131Max",
"id": "max",
"type": "number",
"pid": "watches",
"ro": true,
"pid": "e131Tbl",
"o": 112,
"fun": 88
"o": 76,
"fun": 61
},
{
"id": "e131Value",
"id": "value",
"type": "number",
"pid": "watches",
"ro": true,
"max": 255,
"pid": "e131Tbl",
Expand Down Expand Up @@ -798,101 +801,110 @@
"max": 255,
"n": [
{
"id": "insTbl",
"id": "instances",
"type": "table",
"ro": true,
"n": [
{
"id": "insName",
"id": "name",
"type": "text",
"pid": "instances",
"ro": false,
"max": 32,
"pid": "insTbl",
"o": 130,
"fun": 101
},
{
"id": "insShow",
"id": "show",
"type": "url",
"pid": "instances",
"ro": true,
"pid": "insTbl",
"o": 131,
"fun": 102
"o": 93,
"fun": 74
},
{
"id": "insLink",
"id": "link",
"type": "number",
"pid": "instances",
"ro": true,
"pid": "insTbl",
"o": 132,
"fun": 103
"o": 94,
"fun": 75
},
{
"id": "insIp",
"id": "IP",
"type": "text",
"pid": "instances",
"ro": true,
"max": 16,
"pid": "insTbl",
"o": 133,
"fun": 104
},
{
"id": "insType",
"id": "type",
"type": "text",
"pid": "instances",
"ro": true,
"max": 16,
"pid": "insTbl",
"o": 134,
"fun": 105
},
{
"id": "insVersion",
"id": "version",
"type": "number",
"pid": "instances",
"ro": true,
"max": -1,
"pid": "insTbl",
"o": 135,
"fun": 106
},
{
"id": "insUp",
"id": "uptime",
"type": "number",
"pid": "instances",
"ro": true,
"max": -1,
"pid": "insTbl",
"o": 136,
"fun": 107
},
{
"id": "insNow",
"id": "now",
"type": "number",
"pid": "instances",
"ro": true,
"max": -1,
"pid": "insTbl",
"o": 137,
"fun": 108
},
{
"id": "insTS",
"id": "timestamp",
"type": "number",
"pid": "instances",
"ro": true,
"max": -1,
"pid": "insTbl",
"o": 138,
"fun": 109
},
{
"id": "insTT",
"id": "time",
"type": "number",
"pid": "instances",
"ro": true,
"max": -1,
"pid": "insTbl",
"o": 139,
"fun": 110
},
{
"id": "insTM",
"id": "ms",
"type": "number",
"pid": "instances",
"ro": true,
"max": -1,
"pid": "insTbl",
Expand All @@ -902,14 +914,15 @@
{
"id": "inson",
"type": "checkbox",
"pid": "instances",
"ro": false,
"pid": "insTbl",
"o": 142,
"fun": 113
"o": 104,
"fun": 85
},
{
"id": "insbrightness",
"type": "range",
"pid": "instances",
"ro": false,
"max": 255,
"log": true,
Expand All @@ -920,6 +933,7 @@
{
"id": "insdch",
"type": "number",
"pid": "instances",
"ro": false,
"min": 1,
"max": 512,
Expand Down
Loading

0 comments on commit df72926

Please sign in to comment.