diff --git a/HMI/code_gen/pages/cardEntitiesSerial.py b/HMI/code_gen/pages/cardEntitiesSerial.py index e35321a4..23155670 100644 --- a/HMI/code_gen/pages/cardEntitiesSerial.py +++ b/HMI/code_gen/pages/cardEntitiesSerial.py @@ -7,7 +7,7 @@ head = sharedhead + """ """ + navigation print(head) start = 3 -for i in range(1,6): +for i in range(1,5): idxstart = start + (i-1)*6 item = f""" // get Type @@ -48,6 +48,30 @@ for i in range(1,6): vis bText{i},0 vis hSlider{i},0 vis nNum{i},0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",{idxstart+5} + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="0") + {{ + bUp{i}.bco2=27501 + tsw bUp{i},0 + }} + else + {{ + bUp{i}.bco2=14823 + tsw bUp{i},1 + }} + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="0") + {{ + bDown{i}.bco2=27501 + tsw bDown{i},0 + }} + else + {{ + bDown{i}.bco2=14823 + tsw bDown{i},1 + }} }} if(type{i}.txt=="light") {{ diff --git a/HMI/code_gen/pages/shared.py b/HMI/code_gen/pages/shared.py index ecc54e82..e0d61ece 100644 --- a/HMI/code_gen/pages/shared.py +++ b/HMI/code_gen/pages/shared.py @@ -99,6 +99,10 @@ sharedfoot = """ { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index a4e43163..0870f2f4 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 430fb3b8..8d7c9dce 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ