mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-20 13:14:44 +01:00
Compare commits
5 Commits
38526890cc
...
760b25b7a2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
760b25b7a2 | ||
|
|
eccfad5615 | ||
|
|
27034e4bae | ||
|
|
99376c8fc2 | ||
|
|
17e7ba1ef2 |
@@ -314,7 +314,7 @@
|
||||
│ Value: 0
|
||||
│
|
||||
│ Variable (int32) xc1
|
||||
│ @@ -370,159 +336,50 @@
|
||||
│ @@ -370,145 +336,50 @@
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -361,20 +361,6 @@
|
||||
│ - prints tSend.txt,0
|
||||
│ - prints crcval,2
|
||||
│ -
|
||||
│ - Touch Release Event
|
||||
│ - tSend.txt="event,buttonPress2,"+entn1.txt+",button"
|
||||
│ - //send calc crc
|
||||
│ - btlen tSend.txt,sys0
|
||||
│ - crcrest 1,0xffff // reset CRC
|
||||
│ - crcputh 55 bb
|
||||
│ - crcputs sys0,2
|
||||
│ - crcputs tSend.txt,0
|
||||
│ - //send cmd
|
||||
│ - printh 55 bb
|
||||
│ - prints sys0,2
|
||||
│ - prints tSend.txt,0
|
||||
│ - prints crcval,2
|
||||
│ -
|
||||
│ Text f3Icon
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
@@ -474,7 +460,7 @@
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard: none
|
||||
│ Text : PM
|
||||
│ @@ -704,15 +561,14 @@
|
||||
│ @@ -690,15 +561,14 @@
|
||||
│ if(tTmp.txt!="")
|
||||
│ {
|
||||
│ covx tTmp.txt,defaultFontColor,0,0
|
||||
@@ -490,7 +476,7 @@
|
||||
│ if(tAMPM.txt=="")
|
||||
│ {
|
||||
│ vis tAMPM,0
|
||||
│ @@ -833,44 +689,34 @@
|
||||
│ @@ -819,44 +689,34 @@
|
||||
│ //e6Val
|
||||
│ spstr strCommand.txt,e6Val.txt,"~",60
|
||||
│ //f1Icon
|
||||
@@ -535,7 +521,7 @@
|
||||
│ spstr strCommand.txt,tNotifyText.txt,"~",2
|
||||
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||
│ {
|
||||
│ @@ -966,14 +812,18 @@
|
||||
│ @@ -952,14 +812,18 @@
|
||||
│ {
|
||||
│ page cardPower
|
||||
│ }
|
||||
|
||||
@@ -2259,7 +2259,7 @@
|
||||
│ Value: 0
|
||||
│
|
||||
│ Variable (int32) xc1
|
||||
│ @@ -370,159 +324,50 @@
|
||||
│ @@ -370,145 +324,50 @@
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Send Component ID : disabled
|
||||
@@ -2306,20 +2306,6 @@
|
||||
│ - prints tSend.txt,0
|
||||
│ - prints crcval,2
|
||||
│ -
|
||||
│ - Touch Release Event
|
||||
│ - tSend.txt="event,buttonPress2,"+entn1.txt+",button"
|
||||
│ - //send calc crc
|
||||
│ - btlen tSend.txt,sys0
|
||||
│ - crcrest 1,0xffff // reset CRC
|
||||
│ - crcputh 55 bb
|
||||
│ - crcputs sys0,2
|
||||
│ - crcputs tSend.txt,0
|
||||
│ - //send cmd
|
||||
│ - printh 55 bb
|
||||
│ - prints sys0,2
|
||||
│ - prints tSend.txt,0
|
||||
│ - prints crcval,2
|
||||
│ -
|
||||
│ Text f3Icon
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
@@ -2419,7 +2405,7 @@
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard: none
|
||||
│ Text : PM
|
||||
│ @@ -704,15 +549,14 @@
|
||||
│ @@ -690,15 +549,14 @@
|
||||
│ if(tTmp.txt!="")
|
||||
│ {
|
||||
│ covx tTmp.txt,defaultFontColor,0,0
|
||||
@@ -2435,7 +2421,7 @@
|
||||
│ if(tAMPM.txt=="")
|
||||
│ {
|
||||
│ vis tAMPM,0
|
||||
│ @@ -833,44 +677,34 @@
|
||||
│ @@ -819,44 +677,34 @@
|
||||
│ //e6Val
|
||||
│ spstr strCommand.txt,e6Val.txt,"~",60
|
||||
│ //f1Icon
|
||||
@@ -2480,7 +2466,7 @@
|
||||
│ spstr strCommand.txt,tNotifyText.txt,"~",2
|
||||
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
|
||||
│ {
|
||||
│ @@ -966,14 +800,18 @@
|
||||
│ @@ -952,14 +800,18 @@
|
||||
│ {
|
||||
│ page cardPower
|
||||
│ }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
+++ /dev/fd/62 2024-01-19 22:12:27.279807389 +0000
|
||||
+++ /dev/fd/62 2024-01-20 19:56:08.135834636 +0000
|
||||
+I/n2t-out/Program.s.txt
|
||||
++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+1 +12,11 @@
|
||||
@@ -1801,7 +1801,7 @@
|
||||
+ Value: 0
|
||||
+
|
||||
+e (int32) xc1
|
||||
+159 +324,50 @@
|
||||
+145 +324,50 @@
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Send Component ID : disabled
|
||||
@@ -1848,20 +1848,6 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+ Touch Release Event
|
||||
+ tSend.txt="event,buttonPress2,"+entn1.txt+",button"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,2
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Icon
|
||||
+ributes
|
||||
+ Scope : local
|
||||
|
||||
@@ -66,6 +66,10 @@ cardThermo
|
||||
57 Component(s)
|
||||
550 Line(s) of event code
|
||||
320 Unique line(s) of event code
|
||||
screensaver2
|
||||
64 Component(s)
|
||||
424 Line(s) of event code
|
||||
264 Unique line(s) of event code
|
||||
popupInSel
|
||||
34 Component(s)
|
||||
621 Line(s) of event code
|
||||
@@ -86,10 +90,6 @@ popupThermo
|
||||
44 Component(s)
|
||||
523 Line(s) of event code
|
||||
276 Unique line(s) of event code
|
||||
screensaver2
|
||||
64 Component(s)
|
||||
434 Line(s) of event code
|
||||
264 Unique line(s) of event code
|
||||
cardEntities
|
||||
67 Component(s)
|
||||
1205 Line(s) of event code
|
||||
@@ -98,5 +98,5 @@ cardEntities
|
||||
Total
|
||||
23 Page(s)
|
||||
881 Component(s)
|
||||
10779 Line(s) of event code
|
||||
10769 Line(s) of event code
|
||||
2466 Unique line(s) of event code
|
||||
|
||||
@@ -959,20 +959,6 @@ Text f2Icon
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
Touch Release Event
|
||||
tSend.txt="event,buttonPress2,"+entn1.txt+",button"
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
crcputh 55 bb
|
||||
crcputs sys0,2
|
||||
crcputs tSend.txt,0
|
||||
//send cmd
|
||||
printh 55 bb
|
||||
prints sys0,2
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
Text f3Icon
|
||||
Attributes
|
||||
ID : 55
|
||||
|
||||
@@ -413,20 +413,6 @@ Text f2Icon
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
Touch Release Event
|
||||
tSend.txt="event,buttonPress2,"+entn1.txt+",button"
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
crcputh 55 bb
|
||||
crcputs sys0,2
|
||||
crcputs tSend.txt,0
|
||||
//send cmd
|
||||
printh 55 bb
|
||||
prints sys0,2
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
Text f3Icon
|
||||
Attributes
|
||||
Scope : local
|
||||
|
||||
BIN
HMI/nspanel.HMI
BIN
HMI/nspanel.HMI
Binary file not shown.
BIN
HMI/nspanel.tft
BIN
HMI/nspanel.tft
Binary file not shown.
@@ -104,6 +104,8 @@ ReleaseNotes:
|
||||
- 17.01.2024 - v4.3.3.38 Add: ScreensaverEntityIconSelect for MRIcons is like common.states for states.
|
||||
- 17.01.2024 - v4.3.3.38 Add: Changing the ScreensaverEntityValue value updates the screensaver.
|
||||
- 19.01.2024 - v4.3.3.38 Change: yAxisTicks parameter is not required in cardLChart PageItem
|
||||
- 20.01.2024 - v4.3.3.38 Add: click on indicatorIcon navigate to Page
|
||||
|
||||
|
||||
Todo:
|
||||
- XX.XX.XXXX - v5.0.0 Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
|
||||
@@ -6492,6 +6494,18 @@ function HandleButtonEvent(words: any): void {
|
||||
}
|
||||
break;
|
||||
case 'button':
|
||||
if (['f1Icon', 'f2Icon', 'f3Icon', 'f4Icon', 'f5Icon'].indexOf(words[2]) != -1) {
|
||||
const fNumber = parseInt(words[2].substring(1, 2)) - 1;
|
||||
const indicatorScreensaverEntity = config.indicatorScreensaverEntity[fNumber];
|
||||
if (indicatorScreensaverEntity != null && indicatorScreensaverEntity !== undefined && indicatorScreensaverEntity.ScreensaverEntityNaviToPage !== undefined) {
|
||||
if (Debug) log('NaviToPage: ' + words[2]);
|
||||
GeneratePage(indicatorScreensaverEntity.ScreensaverEntityNaviToPage);
|
||||
} else {
|
||||
const value = ['event','buttonPress2','screensaver','bExit',2];
|
||||
HandleButtonEvent(value);
|
||||
}
|
||||
}
|
||||
|
||||
if (existsObject(id)) {
|
||||
let action = false;
|
||||
if (words[4] == '1')
|
||||
@@ -8847,7 +8861,7 @@ function HandleScreensaverUpdate(): void {
|
||||
iconColor = getState(temp).val;
|
||||
}
|
||||
payloadString += '~' +
|
||||
'~' +
|
||||
'f'+ (i+1) + 'Icon~' +
|
||||
icon + '~' +
|
||||
iconColor + '~' +
|
||||
indicatorScreensaverEntity.ScreensaverEntityText + '~' +
|
||||
@@ -9861,7 +9875,7 @@ namespace NSPanel {
|
||||
| 'positionSlider' | 'tiltOpen' | 'tiltStop' | 'tiltSlider' | 'tiltClose' | 'brightnessSlider' | 'colorTempSlider' | 'colorWheel' | 'tempUpd' | 'tempUpdHighLow' | 'media-back'
|
||||
| 'media-pause' | 'media-next' | 'media-shuffle' | 'volumeSlider' | 'mode-speakerlist' | 'mode-playlist' | 'mode-tracklist' | 'mode-repeat' | 'mode-equalizer' | 'mode-seek' | 'mode-crossfade'
|
||||
| 'mode-favorites' | 'mode-insel' | 'media-OnOff' | 'timer-start' | 'timer-pause' | 'timer-cancle' | 'timer-finish' | 'hvac_action' | 'mode-modus1' | 'mode-modus2' | 'mode-modus3' | 'number-set'
|
||||
| 'mode-preset_modes' | 'A1' | 'A2' | 'A3' | 'A4' | 'D1' | 'U1'
|
||||
| 'mode-preset_modes' | 'A1' | 'A2' | 'A3' | 'A4' | 'D1' | 'U1' | 'f1Icon' | 'f2Icon' | 'f3Icon' | 'f4Icon' | 'f5Icon'
|
||||
|
||||
|
||||
|
||||
@@ -10081,6 +10095,7 @@ namespace NSPanel {
|
||||
ScreensaverEntityOffColor?: RGB
|
||||
ScreensaverEntityOnText?: string | null,
|
||||
ScreensaverEntityOffText?: string | null,
|
||||
ScreensaverEntityNaviToPage?: PageType
|
||||
}
|
||||
|
||||
export type ScreenSaverMRElement = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user