Compare commits

...

171 Commits

Author SHA1 Message Date
Johannes
1e4f72762c Bump to 2.8.0/33 2022-05-07 11:50:46 +02:00
joBr99
76492f4211 fixed model in us-l (add nextion2text) 2022-05-07 09:49:51 +00:00
Johannes
83fda3eae9 fixed model in us-l 2022-05-07 11:49:25 +02:00
Johannes
4e92767462 update icon cheatsheet to upcoming mdi font 2022-05-07 10:52:22 +02:00
Johannes
cfba91e023 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-07 10:43:44 +02:00
Johannes
57e4b8a55d . 2022-05-07 10:43:37 +02:00
joBr99
dcfdab4ba9 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-07 08:40:24 +00:00
Johannes
e80ae8af43 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-07 10:39:50 +02:00
Johannes
3193cd089c bumped version to 33 2022-05-07 10:39:39 +02:00
joBr99
b19bbe0427 fix number in US-P Firmware #175 (add nextion2text) 2022-05-07 08:29:47 +00:00
Johannes
843828eeb7 fix number in US-P Firmware #175 2022-05-07 10:29:24 +02:00
Johannes
035f03fd49 add color for #175 2022-05-07 10:22:29 +02:00
Johannes
ea7b2ae09d try to fix fans 2022-05-07 09:41:16 +02:00
Johannes
5f8b6f3212 updated known good 2022-05-06 21:36:24 +02:00
joBr99
c42dbd6a48 fix crc (add nextion2text) 2022-05-06 19:28:29 +00:00
Johannes
8c7bdf7eba fix crc 2022-05-06 21:28:03 +02:00
joBr99
0b660e96b1 sync (add nextion2text) 2022-05-06 16:25:27 +00:00
Johannes
57f25cada2 sync 2022-05-06 18:25:02 +02:00
joBr99
4cef55e560 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:21:35 +00:00
Johannes
8f82f470f0 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:21:13 +02:00
Johannes
600c447136 sync 2022-05-06 18:20:27 +02:00
joBr99
7bb069d1e2 sync (add nextion2text) 2022-05-06 16:15:47 +00:00
Johannes
d734adefce sync 2022-05-06 18:15:23 +02:00
Johannes
a633a8e286 sync 2022-05-06 18:13:34 +02:00
joBr99
6f2e6498c0 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:09:55 +00:00
Johannes
55c7d6c67f Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:09:31 +02:00
Johannes
b3964e8b0d sync media page 2022-05-06 18:09:23 +02:00
joBr99
c7255e0b5e Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:05:12 +00:00
Johannes
b309881487 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:04:47 +02:00
Johannes
2542a1e40f sync cardAlarm 2022-05-06 18:04:41 +02:00
joBr99
12114e560a Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:01:54 +00:00
Johannes
ed65bcf961 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:01:26 +02:00
Johannes
f646c24641 add localizationto popup pages 2022-05-06 18:01:11 +02:00
joBr99
eb1f4779f2 Merge pull request #179 from jmbinette/main (add nextion2text) 2022-05-06 15:56:24 +00:00
Johannes
8c1e1817e3 Merge pull request #179 from jmbinette/main
US-P Update
2022-05-06 17:56:04 +02:00
Johannes
319a2a429c Merge branch 'main' into pr/179 2022-05-06 17:55:39 +02:00
joBr99
e0ed65ea50 Merge branch 'main' into pr/179 (add nextion2text) 2022-05-06 15:52:05 +00:00
Johannes
57a3984de3 Merge branch 'main' into pr/179 2022-05-06 17:51:23 +02:00
joBr99
cff204b38e merge cardThermo into PR (add nextion2text) 2022-05-06 15:50:20 +00:00
Johannes
f3948d86c2 merge cardThermo into PR 2022-05-06 17:49:51 +02:00
joBr99
ac23ed80ea Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 15:41:34 +00:00
Johannes
40b46f02c7 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 17:41:11 +02:00
Johannes
281ea04959 add text for addional info on popupShutter #145 2022-05-06 17:41:02 +02:00
joBr99
ee47d331f1 syned cardThermo (add nextion2text) 2022-05-06 15:23:54 +00:00
Johannes
25c67de9d2 syned cardThermo 2022-05-06 17:23:28 +02:00
joBr99
e0b66e606e synced popupShutter, popupLight and pageIcons (add nextion2text) 2022-05-06 15:18:25 +00:00
Johannes
b932cf5e69 synced popupShutter, popupLight and pageIcons 2022-05-06 17:17:54 +02:00
joBr99
cf5afe3ede synced popup shutter (add nextion2text) 2022-05-06 15:15:13 +00:00
Johannes
fa0e68e68e synced popup shutter 2022-05-06 17:14:46 +02:00
Johannes
5aedd699ec Update README.md 2022-05-06 17:08:16 +02:00
Johannes
8f82d9465f Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 17:07:14 +02:00
Johannes
ab3301ffbd implemented fan #175 2022-05-06 17:07:05 +02:00
joBr99
cbb875cc1b Synced US-P (#178) (add nextion2text) 2022-05-06 15:00:34 +00:00
jmbinette
fa24d04c3d Synced US-P (#178)
* synced us-p version

* synced us-p version (add nextion2text)

Co-authored-by: jmbinette <jmbinette@users.noreply.github.com>
2022-05-06 16:59:42 +02:00
jmbinette
8718f80c9a synced us-p version (add nextion2text) 2022-05-06 14:54:03 +00:00
jmbinette
8375ae9682 synced us-p version 2022-05-06 10:53:22 -04:00
joBr99
058bc25b82 fixed some more crcs (add nextion2text) 2022-05-06 14:02:55 +00:00
Johannes
c3c02f584b fixed some more crcs 2022-05-06 16:02:29 +02:00
Johannes
e0427db2f1 fixed some more crcs 2022-05-06 16:01:59 +02:00
joBr99
48d540dd78 sync entn length (add nextion2text) 2022-05-06 13:57:22 +00:00
Johannes
77a9d38db7 sync entn length 2022-05-06 15:56:57 +02:00
joBr99
e830b46b49 fix some of the crc erros in us-p version (add nextion2text) 2022-05-06 13:54:07 +00:00
Johannes
f5345c5d2a fix some of the crc erros in us-p version 2022-05-06 15:53:43 +02:00
Johannes
41662984f4 Update README.md 2022-05-06 15:46:04 +02:00
Johannes
d6ecb04c87 fix lock button text 2022-05-06 15:40:56 +02:00
Johannes
ded9bebd4c added color for lock 2022-05-06 07:16:25 +00:00
Johannes
6b695106a5 add lock to controller 2022-05-06 09:08:03 +02:00
Johannes
16e70c390a add lock to pages.py 2022-05-06 09:03:40 +02:00
Johannes
73c06a742e fixed stats for lock icon 2022-05-06 08:47:43 +02:00
Johannes
27f8143a63 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 08:46:03 +02:00
Johannes
e5af261f89 add translation for #174 2022-05-06 08:45:51 +02:00
joBr99
8d6d31a05d Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 06:41:01 +00:00
Johannes
eeb43c2994 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 08:40:35 +02:00
Johannes
f7cccc8a3a sync us-l 2022-05-06 08:40:27 +02:00
joBr99
30e9c8afc9 hide nav buttons (add nextion2text) 2022-05-06 06:39:16 +00:00
Johannes
130209535c hide nav buttons 2022-05-06 08:38:53 +02:00
Johannes
08b5024da4 Update icons.py 2022-05-05 21:21:06 +02:00
britzelpuf
a686bfc6e8 Merge pull request #170 from Armilar/patch-9
Added - Bulb-Color-Functions (ioBroker)
2022-05-04 21:54:11 +02:00
britzelpuf
16bbb9893c Merge pull request #171 from Armilar/patch-10
Added - Attributes if defined in alias - cardThermo (ioBroker)
2022-05-04 21:53:50 +02:00
Johannes
72e687cc84 Update README.md 2022-04-29 09:52:18 -07:00
Johannes
fac92a5d4f Update README.md 2022-04-29 09:51:58 -07:00
Armilar
de58d4062b Added - Dynamically add attributes if defined in alias - cardThermo (ioBroker)
If the attributes (error, maintain, humidity, power, ...) are filled in the alias thermostat, then this is also visualized in the NSPanel cardThermo
2022-04-26 18:57:58 +02:00
Armilar
42438ac3e9 Added - Bulb-Color-Functions (ioBroker)
Add - Intro for possible ioBroker-Alias-Types
Add - Alias CT (ColorTemperatur)
Add - Alias RGB-Light for Red/Green/Blue Datapoints
Add - Alias RGB-Light-single for Hex-Color-Value in Datapoint
Add - Alias HUE-Light for HUE in Datapoint
Add - Color-Temp-Slider
Add - Color-Wheel
Fix - Scale-Function (Add Offset/for Example 500-6500K in Tempslider)
Fix - wrong Delimiter in Shutter again
2022-04-26 12:57:38 +02:00
britzelpuf
bab53279cb Merge pull request #167 from Armilar/patch-8
Added ALIAS Door, Window, Humitity in ioBroker
2022-04-25 14:50:01 +02:00
britzelpuf
cd4db8ebfe Merge branch 'main' into patch-8 2022-04-25 14:49:53 +02:00
britzelpuf
3c8cb9275a Merge pull request #166 from Armilar/patch-7
Added Weather Forcast in Screensaver (ioBroker)
2022-04-25 14:49:20 +02:00
britzelpuf
1931384625 Merge branch 'main' into patch-7 2022-04-25 14:48:56 +02:00
britzelpuf
84e61b5662 Merge pull request #164 from Armilar/patch-6
Added pageMedia to ioBroker
2022-04-25 14:48:14 +02:00
britzelpuf
c2a04d8e0b Merge branch 'main' into patch-6 2022-04-25 14:47:34 +02:00
Johannes
fe64f2f822 Remove collapse stuff for config tables 2022-04-24 09:28:08 +02:00
Johannes
a969fb5ad6 Fix Timezone for Weather on Screensaver 2022-04-23 00:11:39 +02:00
Armilar
8c782101cb Added ALIAS Door, Window, Humitity in ioBroker 2022-04-22 20:49:50 +02:00
britzelpuf
994afea924 Merge pull request #163 from Armilar/patch-3
Shutter Fix in GenerateDetailPage
2022-04-22 20:49:05 +02:00
britzelpuf
9671fe6ecb Merge pull request #162 from Armilar/patch-4
Added - send message to screensaver
2022-04-22 20:46:43 +02:00
joBr99
38a94b2659 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-04-22 17:26:34 +00:00
Johannes
50defec6ba Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-04-22 19:26:07 +02:00
Johannes
6c8d684419 synced us-l version 2022-04-22 19:26:00 +02:00
joBr99
31e8b969e4 fixed all crcs (add nextion2text) 2022-04-22 17:18:24 +00:00
Johannes
46826399d7 fixed all crcs 2022-04-22 19:17:58 +02:00
joBr99
69c54f530e fixed some more crcs (add nextion2text) 2022-04-22 17:14:38 +00:00
Johannes
37892b5708 fixed some more crcs 2022-04-22 19:12:52 +02:00
joBr99
74d3826a98 fix more crcs (add nextion2text) 2022-04-22 17:08:02 +00:00
Johannes
fa5086cff6 fix more crcs 2022-04-22 19:07:37 +02:00
joBr99
e7f470e354 fixed more bad checksums (add nextion2text) 2022-04-22 17:03:53 +00:00
Johannes
00b310f568 fixed more bad checksums 2022-04-22 19:03:25 +02:00
joBr99
33293dd2ed fix a bunch of wrong checksums (add nextion2text) 2022-04-22 16:56:34 +00:00
Johannes
8a776e5cf2 fix a bunch of wrong checksums 2022-04-22 18:56:10 +02:00
Armilar
f246a6a22b Added Weather Forcast in Screensaver
Ability to choose between Accu-Weather Forcast or self-defined values in the screensaver

Using the switch, the alias can also be filled
2022-04-22 18:10:06 +02:00
Armilar
72e47b620c Added pageMedia to ioBroker 2022-04-22 17:44:32 +02:00
Johannes
045252d259 Update README.md 2022-04-22 17:30:39 +02:00
Johannes
734f638d2b Update README.md 2022-04-22 17:29:19 +02:00
Armilar
31d411dbd5 Send message to screensaver
Via the 2 ioBroker data points:

   var popupNotifyHeading = "0_userdata.0.NSPanel.1.popupNotifyHeading";
   var popupNotifyText = "0_userdata.0.NSPanel.1.popupNotifyText";

messages can be sent directly to the screensaver
2022-04-22 16:57:09 +02:00
Armilar
3fae6adb97 Shutter Fix in GenerateDetailPage
- Wrong delimiter in payload
- Added RegisterDetailEntityWatcher
2022-04-22 16:48:22 +02:00
joBr99
69acd46e69 fix some of the messages send by the panel #160 (add nextion2text) 2022-04-21 23:04:26 +00:00
Johannes
e03f4875fe fix some of the messages send by the panel #160 2022-04-22 01:03:59 +02:00
Johannes
f362b46fb3 Update README.md 2022-04-22 01:00:04 +02:00
Johannes
ab03be4b01 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-04-22 00:58:18 +02:00
Johannes
07c214fb69 collapse config 2022-04-22 00:58:12 +02:00
Johannes
ce26aef912 Update README.md 2022-04-22 00:47:15 +02:00
Johannes
1488805044 Update README.md 2022-04-22 00:45:40 +02:00
Johannes
120fa1eaa3 cleanup readme a bit 2022-04-22 00:29:48 +02:00
Johannes
b5f0174013 Update README.md 2022-04-21 23:44:01 +02:00
Johannes
6ffad28a8e Simplify Readme, remove manual install 2022-04-21 20:33:16 +02:00
Johannes
82f2b697cc Update README.md 2022-04-20 21:47:12 +02:00
Johannes
2d5e012a4f add input_text to entities page 2022-04-20 20:29:41 +02:00
Johannes
d9016c4df4 Update icons.py 2022-04-20 17:55:35 +02:00
joBr99
0d5451cd21 increase char limit of speaker list (add nextion2text) 2022-04-20 06:06:41 +00:00
Johannes
0ed7882985 increase char limit of speaker list 2022-04-20 08:06:15 +02:00
Johannes
6b8491c53c fix mapping 2022-04-20 00:26:43 +02:00
Johannes
20ffd7c1ab Update icon_mapping.py 2022-04-20 00:10:18 +02:00
Johannes
ce3b4301cc Update icons.py 2022-04-19 23:49:23 +02:00
Johannes
502fcde9b8 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-04-19 23:44:11 +02:00
Johannes
f31f49d2b9 updated icon libs 2022-04-19 23:44:03 +02:00
joBr99
823a1d85fd fix us-l sync (add nextion2text) 2022-04-19 18:31:23 +00:00
Johannes
6895f04458 fix us-l sync 2022-04-19 20:30:56 +02:00
joBr99
a54041d9f0 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-04-19 18:11:28 +00:00
Johannes
3c6d20994c Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-04-19 20:10:32 +02:00
Johannes
a0781e1ea5 replace fonts in us-p 2022-04-19 20:10:20 +02:00
Johannes
e2e17fb9d3 synced us-l 2022-04-19 20:10:06 +02:00
Johannes
c2155fee4d replaced fonts 2022-04-19 20:09:52 +02:00
Johannes
7c6b6738be Update README.md 2022-04-19 18:05:42 +02:00
Johannes
067b981749 Implement #158 2022-04-19 15:28:26 +02:00
joBr99
1a41fdca57 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-04-18 20:12:48 +00:00
Johannes
577d0c0cfd Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-04-18 22:12:22 +02:00
Johannes
d294f7ad12 increase entn to 80 2022-04-18 22:12:12 +02:00
Johannes
1d5fa9de6e Update pages.py 2022-04-18 17:47:17 +02:00
Johannes
42d406d1b6 change same day check for forecast 2022-04-18 16:52:26 +02:00
britzelpuf
fdb2ae59e0 Merge pull request #154 from Armilar/patch-2
Update NsPanelTs.ts
2022-04-18 12:19:07 +02:00
Armilar
1af0061437 Update NsPanelTs.ts
With the change, the offColor can also be used if, for example, the sockets are to be displayed in red and green
2022-04-18 11:57:05 +02:00
Johannes
367012d2aa Update README.md 2022-04-17 23:48:41 +02:00
Johannes
2d7ab5e5db Check interval between forecast items 2022-04-17 23:14:06 +02:00
joBr99
7bb2742926 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-04-17 18:40:51 +00:00
Johannes
c16f71980e Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-04-17 20:40:28 +02:00
Johannes
f62dcca582 remove notiy on touch 2022-04-17 20:40:16 +02:00
joBr99
84291e0c4f Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-04-17 18:33:13 +00:00
Johannes
24f62ca7fa Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-04-17 20:32:47 +02:00
Johannes
5f3d84f843 added notify on screensaver 2022-04-17 20:32:37 +02:00
Johannes
56a905d51f Update localization.py 2022-04-17 09:34:23 +02:00
Johannes
0aad345ce1 Update localization.py 2022-04-17 09:32:41 +02:00
Johannes
6de47d8792 remove unused imports 2022-04-17 09:24:37 +02:00
Johannes
27baa398de remove unused var 2022-04-17 09:24:02 +02:00
scoobee81
29cf1390a2 Added note about configuration of the appdaemon yaml (#151) 2022-04-17 09:18:50 +02:00
Johannes
8b27397fac Update updater.py 2022-04-16 20:07:57 +02:00
Johannes
961cc98c17 Update README.md 2022-04-16 09:53:42 +02:00
Johannes
718be2be89 Update README.md 2022-04-16 09:44:28 +02:00
Johannes
7bc478bb84 Update README.md 2022-04-16 09:42:59 +02:00
Johannes
d0fbf36f79 added lang list 2022-04-16 09:39:50 +02:00
Johannes
69e52c3c20 bump version 2022-04-16 09:06:53 +02:00
Johannes
7a88eb1baa fix config override bug 2022-04-16 09:02:25 +02:00
Johannes
1ec7558ec0 remove custom logging stuff 2022-04-16 08:29:40 +02:00
joBr99
660007f188 bump version (add nextion2text) 2022-04-15 16:21:25 +00:00
97 changed files with 34506 additions and 63159 deletions

View File

@@ -79,6 +79,8 @@ change the page type:
`color~background~time~timeAMPM~date~tMainIcon~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tF1Icon~tF2Icon~tF3Icon~tF4Icon~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainIconAlt~tMainTextAlt~tMRIcon~tMR` `color~background~time~timeAMPM~date~tMainIcon~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tF1Icon~tF2Icon~tF3Icon~tF4Icon~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainIconAlt~tMainTextAlt~tMRIcon~tMR`
`notify~heading~text`
### cardEntities Page ### cardEntities Page
The following message can be used to update the content on the cardEntities Page The following message can be used to update the content on the cardEntities Page
@@ -97,6 +99,8 @@ The following message can be used to update the content on the cardEntities Page
`~switch~switch.entityName~4~17299~Switch1~0` `~switch~switch.entityName~4~17299~Switch1~0`
`~number~input_number.entityName~4~17299~Number123~value|min|max`
### popupLight Page ### popupLight Page
`entityUpdateDetail~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*` `entityUpdateDetail~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*`

View File

@@ -1,18 +1,16 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-13 20:21:34.698226402 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:21:35.478242275 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 09:49:50.284371694 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
int dimValueNormal=100 int dimValueNormal=100
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
+ // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:21:34.698226402 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:21:35.478242275 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 09:49:50.284371694 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -22,105 +20,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:21:35.478242275 +0000
@@ -570,43 +570,25 @@
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
+ if(tId.txt=="cardMedia")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
+ page cardMedia
}
- if(tId.txt=="popupShutter")
+ if(tId.txt=="pageStartup")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
+ page pageStartup
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
- if(tId.txt=="cardThermo")
- {
- page cardThermo
- }
- if(tId.txt=="cardMedia")
+ if(tId.txt=="cardGrid")
{
- page cardMedia
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:21:35.478242275 +0000
@@ -48,18 +48,6 @@
Scope: local
Value: 0
-Variable (string) tInstruction
- Attributes
- Scope : local
- Text :
- Max. Text Size: 50
-
-Variable (string) tTmp
- Attributes
- Scope : local
- Text :
- Max. Text Size: 50
-
Text tTime
Attributes
Scope : local
@@ -290,6 +278,26 @@
Text :
Max. Text Size : 10
+Text tTmp
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+
+Text tInstruction
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+
Picture p0
Attributes
Scope : local

View File

@@ -11,6 +11,4 @@ Program.s
// dim value // dim value
int dimValue=40 int dimValue=40
int dimValueNormal=100 int dimValueNormal=100
// fix touch offset (Removed for US version)
//lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup

View File

@@ -41,6 +41,8 @@ Page cardAlarm
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis tCode,0 vis tCode,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -54,7 +56,7 @@ Variable (string) entn
ID : 9 ID : 9
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) tSend Variable (string) tSend
Attributes Attributes
@@ -297,7 +299,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -351,7 +353,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -822,7 +824,7 @@ Button arm1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -876,7 +878,7 @@ Button arm3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -930,7 +932,7 @@ Button arm2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -984,7 +986,7 @@ Button arm4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1266,7 +1268,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -70,6 +70,8 @@ Page cardEntities
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
vis nNum4,0 vis nNum4,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -111,28 +113,28 @@ Variable (string) entn1
ID : 49 ID : 49
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 50 ID : 50
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 51 ID : 51
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 52 ID : 52
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Number nNum1 Number nNum1
Attributes Attributes
@@ -696,7 +698,7 @@ Slider hSlider1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -739,7 +741,7 @@ Slider hSlider2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -782,7 +784,7 @@ Slider hSlider3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -825,7 +827,7 @@ Slider hSlider4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -872,7 +874,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -919,7 +921,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -966,7 +968,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1013,7 +1015,7 @@ Button bStop2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1060,7 +1062,7 @@ Button bDown2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1107,7 +1109,7 @@ Button bUp2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1154,7 +1156,7 @@ Button bStop3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1201,7 +1203,7 @@ Button bDown3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1248,7 +1250,7 @@ Button bUp3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1295,7 +1297,7 @@ Button bStop4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1342,7 +1344,7 @@ Button bDown4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1389,7 +1391,7 @@ Button bUp4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1443,7 +1445,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1490,7 +1492,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1537,7 +1539,7 @@ Button bText1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1584,7 +1586,7 @@ Button bText2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1631,7 +1633,7 @@ Button bText3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1678,7 +1680,7 @@ Button bText4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1723,7 +1725,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1768,7 +1770,7 @@ Dual-state Button btOnOff2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1813,7 +1815,7 @@ Dual-state Button btOnOff3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1858,7 +1860,7 @@ Dual-state Button btOnOff4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -2698,7 +2700,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -42,6 +42,8 @@ Page cardGrid
vis tEntity4,0 vis tEntity4,0
vis tEntity5,0 vis tEntity5,0
vis tEntity6,0 vis tEntity6,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -83,28 +85,28 @@ Variable (string) entn1
ID : 18 ID : 18
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 19 ID : 19
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 20 ID : 20
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 21 ID : 21
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) type5 Variable (string) type5
Attributes Attributes
@@ -125,14 +127,14 @@ Variable (string) entn5
ID : 36 ID : 36
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) entn6 Variable (string) entn6
Attributes Attributes
ID : 37 ID : 37
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Text tHeading Text tHeading
Attributes Attributes
@@ -527,7 +529,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -574,7 +576,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -632,7 +634,7 @@ Button bEntity1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -690,7 +692,7 @@ Button bEntity2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -748,7 +750,7 @@ Button bEntity3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -806,7 +808,7 @@ Button bEntity4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -864,7 +866,7 @@ Button bEntity5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -922,7 +924,7 @@ Button bEntity6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1276,7 +1278,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -26,28 +26,29 @@ Page cardMedia
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
vis t5,0 vis t5,0
//vis nPageDisp,0 vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
ID : 7 ID : 7
Scope : local Scope : local
Text : Text :
Max. Text Size: 500 Max. Text Size: 750
Variable (string) entn Variable (string) entn
Attributes Attributes
ID : 18 ID : 18
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) vaSpeakerList Variable (string) vaSpeakerList
Attributes Attributes
ID : 27 ID : 27
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (int32) vaSpeakerPos Variable (int32) vaSpeakerPos
Attributes Attributes
@@ -306,7 +307,7 @@ Text t2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -355,7 +356,7 @@ Text tPlayPause
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -404,7 +405,7 @@ Text t0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -484,7 +485,7 @@ Text t1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -534,7 +535,7 @@ Text t3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -613,7 +614,7 @@ Text tSpeaker
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -704,7 +705,7 @@ Text t5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -767,7 +768,7 @@ Slider hVolume
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -814,7 +815,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -868,7 +869,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1120,7 +1121,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -39,6 +39,8 @@ Page cardThermo
vis bt6,0 vis bt6,0
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -52,7 +54,7 @@ Variable (string) entn
ID : 21 ID : 21
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) va0 Variable (string) va0
Attributes Attributes
@@ -533,7 +535,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -587,7 +589,7 @@ Button bDown
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -641,7 +643,7 @@ Button bUp
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -695,7 +697,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -744,7 +746,7 @@ Dual-state Button bt0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -793,7 +795,7 @@ Dual-state Button bt1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -842,7 +844,7 @@ Dual-state Button bt2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -891,7 +893,7 @@ Dual-state Button bt3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -940,7 +942,7 @@ Dual-state Button bt4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -989,7 +991,7 @@ Dual-state Button bt5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1038,7 +1040,7 @@ Dual-state Button bt6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1087,7 +1089,7 @@ Dual-state Button bt7
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1136,7 +1138,7 @@ Dual-state Button bt8
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1502,7 +1504,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -10,49 +10,49 @@ pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
13 Unique line(s) of event code 13 Unique line(s) of event code
cardMedia
30 Component(s)
329 Line(s) of event code
169 Unique line(s) of event code
popupNotify
17 Component(s)
196 Line(s) of event code
123 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
113 Unique line(s) of event code 113 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
popupShutter popupShutter
19 Component(s) 20 Component(s)
191 Line(s) of event code 193 Line(s) of event code
107 Unique line(s) of event code 109 Unique line(s) of event code
cardGrid
39 Component(s)
418 Line(s) of event code
244 Unique line(s) of event code
cardThermo
41 Component(s)
442 Line(s) of event code
247 Unique line(s) of event code
cardEntities
62 Component(s)
964 Line(s) of event code
410 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
320 Line(s) of event code 341 Line(s) of event code
173 Unique line(s) of event code 185 Unique line(s) of event code
popupNotify
17 Component(s)
196 Line(s) of event code
123 Unique line(s) of event code
cardThermo
41 Component(s)
444 Line(s) of event code
249 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
171 Unique line(s) of event code
cardAlarm
35 Component(s)
345 Line(s) of event code
216 Unique line(s) of event code
screensaver screensaver
33 Component(s) 35 Component(s)
266 Line(s) of event code 292 Line(s) of event code
218 Unique line(s) of event code 235 Unique line(s) of event code
cardGrid
39 Component(s)
420 Line(s) of event code
246 Unique line(s) of event code
cardEntities
62 Component(s)
966 Line(s) of event code
412 Unique line(s) of event code
Total Total
12 Page(s) 12 Page(s)
341 Component(s) 344 Component(s)
3642 Line(s) of event code 3701 Line(s) of event code
1001 Unique line(s) of event code 1024 Unique line(s) of event code

View File

@@ -57,7 +57,7 @@ Text tTmp1
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -87,7 +87,7 @@ Text tTmp2
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

View File

@@ -296,7 +296,7 @@ Text tMsg1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 52 x coordinate : 57
y coordinate : 223 y coordinate : 223
Width : 375 Width : 375
Height : 30 Height : 30
@@ -326,7 +326,7 @@ Text tMsg2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 35 x coordinate : 40
y coordinate : 256 y coordinate : 256
Width : 408 Width : 408
Height : 25 Height : 25
@@ -356,7 +356,7 @@ Text tMsg3
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 35 x coordinate : 40
y coordinate : 278 y coordinate : 278
Width : 408 Width : 408
Height : 25 Height : 25
@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 31 Text : 33
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -418,8 +418,8 @@ Picture p0
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 0 y coordinate : 0
Width : 479 Width : 480
Height : 319 Height : 320
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -467,7 +467,7 @@ Button bSendStartup
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -483,7 +483,7 @@ Hotspot mSpinner
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 164 x coordinate : 169
y coordinate : 49 y coordinate : 49
Width : 140 Width : 140
Height : 140 Height : 140

View File

@@ -37,7 +37,7 @@ Page popupLight
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -69,8 +69,8 @@ Variable (string) entn
Attributes Attributes
ID : 21 ID : 21
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (int32) mode Variable (int32) mode
Attributes Attributes
@@ -465,7 +465,7 @@ Picture pColorWheel
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -510,7 +510,7 @@ Slider hBrightness
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -555,7 +555,7 @@ Slider hTempSlider
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -602,7 +602,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -705,7 +705,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -881,6 +881,12 @@ Timer tmSerial
vis pColorWheel,1 vis pColorWheel,1
} }
} }
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7
// set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -916,25 +922,43 @@ Timer tmSerial
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
if(tId.txt=="pageStartup")
{
page pageStartup
}
if(tId.txt=="screensaver")
{
page screensaver
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities
} }
if(tId.txt=="cardMedia") if(tId.txt=="cardGrid")
{ {
page cardMedia page cardGrid
} }
if(tId.txt=="pageStartup") if(tId.txt=="popupLight")
{ {
page pageStartup pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
} }
if(tId.txt=="popupNotify") if(tId.txt=="popupNotify")
{ {
page popupNotify page popupNotify
} }
if(tId.txt=="cardGrid") if(tId.txt=="cardThermo")
{ {
page cardGrid page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
} }
if(tId.txt=="cardAlarm") if(tId.txt=="cardAlarm")
{ {

View File

@@ -283,7 +283,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -332,7 +332,7 @@ Button b2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -381,7 +381,7 @@ Button b1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -37,7 +37,7 @@ Page popupShutter
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -56,8 +56,8 @@ Variable (string) entn
Attributes Attributes
ID : 18 ID : 18
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Text tEntity Text tEntity
Attributes Attributes
@@ -68,7 +68,7 @@ Text tEntity
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 80 x coordinate : 80
y coordinate : 108 y coordinate : 94
Width : 195 Width : 195
Height : 30 Height : 30
Effect : load Effect : load
@@ -98,7 +98,7 @@ Text tIcon1
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 27 x coordinate : 27
y coordinate : 109 y coordinate : 108
Width : 45 Width : 45
Height : 30 Height : 30
Effect : load Effect : load
@@ -239,7 +239,7 @@ Text tId
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text t1 Text tPosHeading
Attributes Attributes
ID : 17 ID : 17
Scope : local Scope : local
@@ -269,6 +269,36 @@ Text t1
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tInfo1
Attributes
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 80
y coordinate : 122
Width : 195
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 38066
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -322,7 +352,7 @@ Slider hPosition
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -369,7 +399,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -416,7 +446,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -463,7 +493,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -510,7 +540,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -596,6 +626,10 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

View File

@@ -25,6 +25,8 @@ Page screensaver
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons //load gloabl time string from pageIcons
//tTime.txt=vaTime.txt //tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -59,6 +61,20 @@ Variable (int32) vaTap
Scope: local Scope: local
Value: 0 Value: 0
Variable (string) tInstruction
Attributes
ID : 31
Scope : local
Text :
Max. Text Size: 50
Variable (string) tTmp
Attributes
ID : 32
Scope : local
Text :
Max. Text Size: 50
Text tTime Text tTime
Attributes Attributes
ID : 5 ID : 5
@@ -127,7 +143,7 @@ Text tSend
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 405 x coordinate : 420
y coordinate : 2 y coordinate : 2
Width : 29 Width : 29
Height : 30 Height : 30
@@ -749,48 +765,48 @@ Text tMR
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tTmp Text tNotifyHead
Attributes Attributes
ID : 31 ID : 33
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 368 x coordinate : 15
y coordinate : 0 y coordinate : 201
Width : 25 Width : 450
Height : 30 Height : 58
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 0 Font ID : 3
Back. Color : 65535 Back. Color : 0
Font Color : 0 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : top
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 35
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tInstruction Text tNotifyText
Attributes Attributes
ID : 32 ID : 34
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 335 x coordinate : 15
y coordinate : 0 y coordinate : 258
Width : 27 Width : 450
Height : 30 Height : 47
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -798,13 +814,13 @@ Text tInstruction
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 0 Font ID : 0
Back. Color : 65535 Back. Color : 0
Font Color : 0 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : top
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 35
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1051,6 +1067,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0 covx tTmp.txt,tMR.pco,0,0
} }
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100
@@ -1142,6 +1172,16 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal dim=dimValueNormal
vaTap.val+=1 vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
@@ -1150,7 +1190,7 @@ TouchCap tc0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -11,6 +11,4 @@ Program.s
// dim value // dim value
int dimValue=40 int dimValue=40
int dimValueNormal=100 int dimValueNormal=100
// fix touch offset (Removed for US version)
//lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup

View File

@@ -33,6 +33,8 @@ Page cardAlarm
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis tCode,0 vis tCode,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -44,7 +46,7 @@ Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) tSend Variable (string) tSend
Attributes Attributes
@@ -150,7 +152,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -182,7 +184,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -365,7 +367,7 @@ Button arm1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -395,7 +397,7 @@ Button arm3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -425,7 +427,7 @@ Button arm2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -455,7 +457,7 @@ Button arm4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -735,7 +737,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -62,6 +62,8 @@ Page cardEntities
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
vis nNum4,0 vis nNum4,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -97,25 +99,25 @@ Variable (string) entn1
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Number nNum1 Number nNum1
Attributes Attributes
@@ -310,7 +312,7 @@ Slider hSlider1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -338,7 +340,7 @@ Slider hSlider2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -366,7 +368,7 @@ Slider hSlider3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -394,7 +396,7 @@ Slider hSlider4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -419,7 +421,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -444,7 +446,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -469,7 +471,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -494,7 +496,7 @@ Button bStop2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -519,7 +521,7 @@ Button bDown2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -544,7 +546,7 @@ Button bUp2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -569,7 +571,7 @@ Button bStop3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -594,7 +596,7 @@ Button bDown3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -619,7 +621,7 @@ Button bUp3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -644,7 +646,7 @@ Button bStop4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -669,7 +671,7 @@ Button bDown4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -694,7 +696,7 @@ Button bUp4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -726,7 +728,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -751,7 +753,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -776,7 +778,7 @@ Button bText1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -801,7 +803,7 @@ Button bText2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -826,7 +828,7 @@ Button bText3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -851,7 +853,7 @@ Button bText4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -878,7 +880,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -905,7 +907,7 @@ Dual-state Button btOnOff2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -932,7 +934,7 @@ Dual-state Button btOnOff3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -959,7 +961,7 @@ Dual-state Button btOnOff4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1752,7 +1754,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -34,6 +34,8 @@ Page cardGrid
vis tEntity4,0 vis tEntity4,0
vis tEntity5,0 vis tEntity5,0
vis tEntity6,0 vis tEntity6,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -69,25 +71,25 @@ Variable (string) entn1
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) type5 Variable (string) type5
Attributes Attributes
@@ -105,13 +107,13 @@ Variable (string) entn5
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) entn6 Variable (string) entn6
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Text tHeading Text tHeading
Attributes Attributes
@@ -254,7 +256,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -279,7 +281,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -315,7 +317,7 @@ Button bEntity1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -351,7 +353,7 @@ Button bEntity2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -387,7 +389,7 @@ Button bEntity3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -423,7 +425,7 @@ Button bEntity4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -459,7 +461,7 @@ Button bEntity5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -495,7 +497,7 @@ Button bEntity6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -838,7 +840,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -18,25 +18,26 @@ Page cardMedia
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
vis t5,0 vis t5,0
//vis nPageDisp,0 vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 500 Max. Text Size: 750
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) vaSpeakerList Variable (string) vaSpeakerList
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (int32) vaSpeakerPos Variable (int32) vaSpeakerPos
Attributes Attributes
@@ -134,7 +135,7 @@ Text t2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -163,7 +164,7 @@ Text tPlayPause
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -192,7 +193,7 @@ Text t0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -232,7 +233,7 @@ Text t1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -262,7 +263,7 @@ Text t3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -301,7 +302,7 @@ Text tSpeaker
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -352,7 +353,7 @@ Text t5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -390,7 +391,7 @@ Slider hVolume
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -415,7 +416,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -447,7 +448,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -697,7 +698,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -31,6 +31,8 @@ Page cardThermo
vis bt6,0 vis bt6,0
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -42,7 +44,7 @@ Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) va0 Variable (string) va0
Attributes Attributes
@@ -237,7 +239,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -273,7 +275,7 @@ Button bDown
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -309,7 +311,7 @@ Button bUp
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -341,7 +343,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -368,7 +370,7 @@ Dual-state Button bt0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -395,7 +397,7 @@ Dual-state Button bt1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -422,7 +424,7 @@ Dual-state Button bt2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -449,7 +451,7 @@ Dual-state Button bt3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -476,7 +478,7 @@ Dual-state Button bt4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -503,7 +505,7 @@ Dual-state Button bt5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -530,7 +532,7 @@ Dual-state Button bt6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -557,7 +559,7 @@ Dual-state Button bt7
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -584,7 +586,7 @@ Dual-state Button bt8
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -948,7 +950,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -30,7 +30,7 @@ Text tTmp1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Text tTmp2 Text tTmp2
Attributes Attributes
@@ -40,7 +40,7 @@ Text tTmp2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Picture p0 Picture p0
Attributes Attributes

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 31 Text : 33
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0
@@ -182,7 +182,7 @@ Button bSendStartup
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -29,7 +29,7 @@ Page popupLight
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -59,8 +59,8 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (int32) mode Variable (int32) mode
Attributes Attributes
@@ -213,7 +213,7 @@ Picture pColorWheel
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -243,7 +243,7 @@ Slider hBrightness
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -273,7 +273,7 @@ Slider hTempSlider
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -298,7 +298,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -361,7 +361,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -535,6 +535,12 @@ Timer tmSerial
vis pColorWheel,1 vis pColorWheel,1
} }
} }
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7
// set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -570,25 +576,43 @@ Timer tmSerial
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
if(tId.txt=="pageStartup")
{
page pageStartup
}
if(tId.txt=="screensaver")
{
page screensaver
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities
} }
if(tId.txt=="cardMedia") if(tId.txt=="cardGrid")
{ {
page cardMedia page cardGrid
} }
if(tId.txt=="pageStartup") if(tId.txt=="popupLight")
{ {
page pageStartup pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
} }
if(tId.txt=="popupNotify") if(tId.txt=="popupNotify")
{ {
page popupNotify page popupNotify
} }
if(tId.txt=="cardGrid") if(tId.txt=="cardThermo")
{ {
page cardGrid page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
} }
if(tId.txt=="cardAlarm") if(tId.txt=="cardAlarm")
{ {

View File

@@ -120,7 +120,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -147,7 +147,7 @@ Button b2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -174,7 +174,7 @@ Button b1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -29,7 +29,7 @@ Page popupShutter
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -46,8 +46,8 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Text tEntity Text tEntity
Attributes Attributes
@@ -109,7 +109,7 @@ Text tId
Text : Text :
Max. Text Size : 20 Max. Text Size : 20
Text t1 Text tPosHeading
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -119,6 +119,16 @@ Text t1
Text : Position Text : Position
Max. Text Size : 15 Max. Text Size : 15
Text tInfo1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 40
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -147,7 +157,7 @@ Slider hPosition
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -172,7 +182,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -197,7 +207,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -222,7 +232,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -247,7 +257,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -331,6 +341,10 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

View File

@@ -17,6 +17,8 @@ Page screensaver
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons //load gloabl time string from pageIcons
//tTime.txt=vaTime.txt //tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -48,6 +50,18 @@ Variable (int32) vaTap
Scope: local Scope: local
Value: 0 Value: 0
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 50
Variable (string) tTmp
Attributes
Scope : local
Text :
Max. Text Size: 50
Text tTime Text tTime
Attributes Attributes
Scope : local Scope : local
@@ -278,7 +292,7 @@ Text tMR
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
Text tTmp Text tNotifyHead
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -286,9 +300,9 @@ Text tTmp
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 35
Text tInstruction Text tNotifyText
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -296,7 +310,7 @@ Text tInstruction
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 35
Picture p0 Picture p0
Attributes Attributes
@@ -529,6 +543,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0 covx tTmp.txt,tMR.pco,0,0
} }
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100
@@ -618,6 +646,16 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal dim=dimValueNormal
vaTap.val+=1 vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
@@ -626,7 +664,7 @@ TouchCap tc0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

Binary file not shown.

Binary file not shown.

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-01 04:54:12.884151859 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-06 19:28:27.798491086 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 04:54:13.372185922 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 19:28:28.182497193 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,9 +11,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-01 04:54:12.888152138 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-06 19:28:27.798491086 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 04:54:13.372185922 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 19:28:28.186497256 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
vis nNum4,0 vis nNum4,0
@@ -27,20 +27,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ vis bText5,0 + vis bText5,0
+ vis hSlider5,0 + vis hSlider5,0
+ vis nNum5,0 + vis nNum5,0
vis bPrev,0
vis bNext,0
@@ -119,6 +129,18 @@
Variable (string) strCommand
Attributes
@@ -117,6 +137,30 @@
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
+Variable (string) entn5 +Variable (string) entn5
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 70 + Max. Text Size: 80
+
+ +
+Variable (string) type5 +Variable (string) type5
+ Attributes + Attributes
@@ -51,7 +49,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1 Number nNum1
Attributes Attributes
Scope : local Scope : local
@@ -153,6 +197,24 @@ @@ -155,6 +177,15 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -64,11 +62,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Associated Keyboard : none + Associated Keyboard : none
+ Value : 0 + Value : 0
+ +
Text tHeading Text tHeading
Attributes Attributes
Scope : local Scope : local
@@ -283,6 +345,46 @@ @@ -285,6 +316,26 @@
Text : Text :
Max. Text Size : 50 Max. Text Size : 50
@@ -92,11 +89,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Text :  + Text : 
+ Max. Text Size : 5 + Max. Text Size : 5
+ +
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -402,6 +504,62 @@ @@ -404,6 +455,34 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -120,7 +116,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -128,11 +124,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
Button bDown1 Button bDown1
Attributes Attributes
Scope : local Scope : local
@@ -857,6 +1015,206 @@ @@ -861,6 +940,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -153,7 +148,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -178,7 +173,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -203,7 +198,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -228,7 +223,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -236,11 +231,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
@@ -965,6 +1323,60 @@ @@ -969,6 +1148,33 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -263,7 +257,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -271,11 +265,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
+ +
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
Scope : local Scope : local
@@ -1070,6 +1482,50 @@ @@ -1074,6 +1280,28 @@
page popupLight page popupLight
} }
@@ -301,11 +294,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ page popupLight + page popupLight
+ } + }
+ +
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local
@@ -1642,6 +2098,250 @@ @@ -1644,6 +1872,128 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -431,10 +423,12 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ hSlider5.maxval=sys0 + hSlider5.maxval=sys0
+ } + }
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-01 04:54:12.884151859 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-06 19:28:27.798491086 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 04:54:13.372185922 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 19:28:28.182497193 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-13 20:21:34.698226402 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:21:35.070233972 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:21:34.698226402 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:21:35.070233972 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -27,18 +27,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ vis bText5,0 + vis bText5,0
+ vis hSlider5,0 + vis hSlider5,0
+ vis nNum5,0 + vis nNum5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand @@ -119,6 +129,18 @@
Attributes
@@ -117,6 +127,18 @@
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
+Variable (string) entn5 +Variable (string) entn5
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 70 + Max. Text Size: 80
+ +
+Variable (string) type5 +Variable (string) type5
+ Attributes + Attributes
@@ -49,7 +49,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1 Number nNum1
Attributes Attributes
Scope : local Scope : local
@@ -153,6 +175,15 @@ @@ -155,6 +177,15 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -65,7 +65,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading Text tHeading
Attributes Attributes
Scope : local Scope : local
@@ -283,6 +314,26 @@ @@ -285,6 +316,26 @@
Text : Text :
Max. Text Size : 50 Max. Text Size : 50
@@ -92,7 +92,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -402,6 +453,34 @@ @@ -404,6 +455,34 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -116,7 +116,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -127,7 +127,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1 Button bDown1
Attributes Attributes
Scope : local Scope : local
@@ -859,6 +938,106 @@ @@ -861,6 +940,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -148,7 +148,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -173,7 +173,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -198,7 +198,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -223,7 +223,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -234,7 +234,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
@@ -967,6 +1146,33 @@ @@ -969,6 +1148,33 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -257,7 +257,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+ crcputh 55 bb + crcputh 55 bb
+ crcputs sys0,1 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -268,7 +268,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
Scope : local Scope : local
@@ -1072,6 +1278,28 @@ @@ -1074,6 +1280,28 @@
page popupLight page popupLight
} }
@@ -297,7 +297,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local
@@ -1642,6 +1870,128 @@ @@ -1644,6 +1872,128 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:21:34.698226402 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:21:35.070233972 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

View File

@@ -1,19 +1,7 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 20:21:35.094234461 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 09:49:49.808377439 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-13 20:21:34.698226402 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:21:35.070233972 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:21:34.698226402 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:21:35.070233972 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000
+@@ -62,6 +62,16 @@ +--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000
+@@ -117,6 +127,18 @@ ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000
+@@ -153,6 +175,15 @@
+@@ -283,6 +314,26 @@
+@@ -402,6 +453,34 @@
+@@ -859,6 +938,106 @@
+@@ -967,6 +1146,33 @@
+@@ -1072,6 +1278,28 @@
+@@ -1642,6 +1870,128 @@
+ }
+ if(tInstruction.txt=="pageType")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:21:34.698226402 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:21:35.070233972 +0000

View File

@@ -41,6 +41,8 @@ Page cardAlarm
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis tCode,0 vis tCode,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -54,7 +56,7 @@ Variable (string) entn
ID : 9 ID : 9
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) tSend Variable (string) tSend
Attributes Attributes
@@ -297,7 +299,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -351,7 +353,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -822,7 +824,7 @@ Button arm1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -876,7 +878,7 @@ Button arm3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -930,7 +932,7 @@ Button arm2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -984,7 +986,7 @@ Button arm4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1266,7 +1268,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -80,6 +80,8 @@ Page cardEntities
vis bText5,0 vis bText5,0
vis hSlider5,0 vis hSlider5,0
vis nNum5,0 vis nNum5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -121,35 +123,35 @@ Variable (string) entn1
ID : 49 ID : 49
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 50 ID : 50
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 51 ID : 51
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 52 ID : 52
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn5 Variable (string) entn5
Attributes Attributes
ID : 62 ID : 62
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) type5 Variable (string) type5
Attributes Attributes
@@ -783,7 +785,7 @@ Slider hSlider1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 100 y coordinate : 100
Width : 100 Width : 100
Height : 43 Height : 43
@@ -810,7 +812,7 @@ Slider hSlider1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -826,7 +828,7 @@ Slider hSlider2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 180 y coordinate : 180
Width : 100 Width : 100
Height : 43 Height : 43
@@ -853,7 +855,7 @@ Slider hSlider2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -869,7 +871,7 @@ Slider hSlider3
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 260 y coordinate : 260
Width : 100 Width : 100
Height : 43 Height : 43
@@ -896,7 +898,7 @@ Slider hSlider3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -912,7 +914,7 @@ Slider hSlider4
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 340 y coordinate : 340
Width : 100 Width : 100
Height : 43 Height : 43
@@ -939,7 +941,7 @@ Slider hSlider4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -955,7 +957,7 @@ Slider hSlider5
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 420 y coordinate : 420
Width : 100 Width : 100
Height : 43 Height : 43
@@ -982,7 +984,7 @@ Slider hSlider5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1029,7 +1031,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1076,7 +1078,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1123,7 +1125,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1170,7 +1172,7 @@ Button bStop2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1217,7 +1219,7 @@ Button bDown2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1264,7 +1266,7 @@ Button bUp2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1311,7 +1313,7 @@ Button bStop3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1358,7 +1360,7 @@ Button bDown3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1405,7 +1407,7 @@ Button bUp3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1452,7 +1454,7 @@ Button bStop4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1499,7 +1501,7 @@ Button bDown4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1546,7 +1548,7 @@ Button bUp4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1600,7 +1602,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1647,7 +1649,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1694,7 +1696,7 @@ Button bText1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1741,7 +1743,7 @@ Button bText2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1788,7 +1790,7 @@ Button bText3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1835,7 +1837,7 @@ Button bText4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1882,7 +1884,7 @@ Button bStop5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1929,7 +1931,7 @@ Button bDown5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1976,7 +1978,7 @@ Button bUp5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -2023,7 +2025,7 @@ Button bText5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -2068,7 +2070,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -2113,7 +2115,7 @@ Dual-state Button btOnOff2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -2158,7 +2160,7 @@ Dual-state Button btOnOff3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -2203,7 +2205,7 @@ Dual-state Button btOnOff4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -2248,7 +2250,7 @@ Dual-state Button btOnOff5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -3241,7 +3243,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -42,6 +42,8 @@ Page cardGrid
vis tEntity4,0 vis tEntity4,0
vis tEntity5,0 vis tEntity5,0
vis tEntity6,0 vis tEntity6,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -83,28 +85,28 @@ Variable (string) entn1
ID : 18 ID : 18
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 19 ID : 19
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 20 ID : 20
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 21 ID : 21
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) type5 Variable (string) type5
Attributes Attributes
@@ -125,14 +127,14 @@ Variable (string) entn5
ID : 36 ID : 36
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) entn6 Variable (string) entn6
Attributes Attributes
ID : 37 ID : 37
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Text tHeading Text tHeading
Attributes Attributes
@@ -527,7 +529,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -574,7 +576,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -632,7 +634,7 @@ Button bEntity1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -690,7 +692,7 @@ Button bEntity2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -748,7 +750,7 @@ Button bEntity3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -806,7 +808,7 @@ Button bEntity4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -864,7 +866,7 @@ Button bEntity5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -922,7 +924,7 @@ Button bEntity6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1276,7 +1278,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -26,28 +26,29 @@ Page cardMedia
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
vis t5,0 vis t5,0
//vis nPageDisp,0 vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
ID : 7 ID : 7
Scope : local Scope : local
Text : Text :
Max. Text Size: 500 Max. Text Size: 750
Variable (string) entn Variable (string) entn
Attributes Attributes
ID : 17 ID : 17
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) vaSpeakerList Variable (string) vaSpeakerList
Attributes Attributes
ID : 26 ID : 26
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (int32) vaSpeakerPos Variable (int32) vaSpeakerPos
Attributes Attributes
@@ -306,7 +307,7 @@ Text t2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -355,7 +356,7 @@ Text tPlayPause
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -404,7 +405,7 @@ Text t0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -484,7 +485,7 @@ Text t1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -534,7 +535,7 @@ Text t3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -613,7 +614,7 @@ Text tSpeaker
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -704,7 +705,7 @@ Text t5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -767,7 +768,7 @@ Slider hVolume
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -814,7 +815,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -868,7 +869,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1120,7 +1121,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -39,6 +39,8 @@ Page cardThermo
vis bt6,0 vis bt6,0
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -52,7 +54,7 @@ Variable (string) entn
ID : 21 ID : 21
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) va0 Variable (string) va0
Attributes Attributes
@@ -533,7 +535,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -587,7 +589,7 @@ Button bDown
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -641,7 +643,7 @@ Button bUp
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -695,7 +697,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -744,7 +746,7 @@ Dual-state Button bt0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -793,7 +795,7 @@ Dual-state Button bt1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -842,7 +844,7 @@ Dual-state Button bt2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -891,7 +893,7 @@ Dual-state Button bt3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -940,7 +942,7 @@ Dual-state Button bt4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -989,7 +991,7 @@ Dual-state Button bt5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1038,7 +1040,7 @@ Dual-state Button bt6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1087,7 +1089,7 @@ Dual-state Button bt7
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1136,7 +1138,7 @@ Dual-state Button bt8
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1502,7 +1504,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -14,45 +14,45 @@ popupNotify
17 Component(s) 17 Component(s)
196 Line(s) of event code 196 Line(s) of event code
123 Unique line(s) of event code 123 Unique line(s) of event code
popupShutter
19 Component(s)
191 Line(s) of event code
107 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
113 Unique line(s) of event code 113 Unique line(s) of event code
popupLight popupShutter
27 Component(s) 20 Component(s)
338 Line(s) of event code 193 Line(s) of event code
182 Unique line(s) of event code 109 Unique line(s) of event code
screensaver
33 Component(s)
266 Line(s) of event code
218 Unique line(s) of event code
cardMedia
30 Component(s)
329 Line(s) of event code
169 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
418 Line(s) of event code 420 Line(s) of event code
244 Unique line(s) of event code 246 Unique line(s) of event code
screensaver
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
171 Unique line(s) of event code
cardAlarm
35 Component(s)
345 Line(s) of event code
216 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardThermo cardThermo
41 Component(s) 41 Component(s)
442 Line(s) of event code 444 Line(s) of event code
247 Unique line(s) of event code 249 Unique line(s) of event code
cardEntities cardEntities
74 Component(s) 74 Component(s)
1157 Line(s) of event code 1159 Line(s) of event code
479 Unique line(s) of event code 481 Unique line(s) of event code
Total Total
12 Page(s) 12 Page(s)
353 Component(s) 356 Component(s)
3853 Line(s) of event code 3894 Line(s) of event code
1057 Unique line(s) of event code 1080 Unique line(s) of event code

View File

@@ -57,7 +57,7 @@ Text tTmp1
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -87,7 +87,7 @@ Text tTmp2
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 31 Text : 33
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -467,7 +467,7 @@ Button bSendStartup
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -37,7 +37,7 @@ Page popupLight
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -69,8 +69,8 @@ Variable (string) entn
Attributes Attributes
ID : 21 ID : 21
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (int32) mode Variable (int32) mode
Attributes Attributes
@@ -465,7 +465,7 @@ Picture pColorWheel
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -510,7 +510,7 @@ Slider hBrightness
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -555,7 +555,7 @@ Slider hTempSlider
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -602,7 +602,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -705,7 +705,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -881,6 +881,12 @@ Timer tmSerial
vis pColorWheel,1 vis pColorWheel,1
} }
} }
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7
// set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -283,7 +283,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -332,7 +332,7 @@ Button b2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -381,7 +381,7 @@ Button b1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -37,7 +37,7 @@ Page popupShutter
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -56,8 +56,8 @@ Variable (string) entn
Attributes Attributes
ID : 18 ID : 18
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Text tEntity Text tEntity
Attributes Attributes
@@ -98,7 +98,7 @@ Text tIcon1
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 11 x coordinate : 11
y coordinate : 21 y coordinate : 35
Width : 45 Width : 45
Height : 30 Height : 30
Effect : load Effect : load
@@ -239,7 +239,7 @@ Text tId
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text t1 Text tPosHeading
Attributes Attributes
ID : 17 ID : 17
Scope : local Scope : local
@@ -269,6 +269,36 @@ Text t1
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tInfo1
Attributes
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 61
y coordinate : 51
Width : 195
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 38066
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -322,7 +352,7 @@ Slider hPosition
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -369,7 +399,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -416,7 +446,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -463,7 +493,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -510,7 +540,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -596,6 +626,10 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

View File

@@ -25,6 +25,8 @@ Page screensaver
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons //load gloabl time string from pageIcons
//tTime.txt=vaTime.txt //tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -763,6 +765,66 @@ Text tMR
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tNotifyHead
Attributes
ID : 33
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 240
Width : 320
Height : 58
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 3
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 35
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tNotifyText
Attributes
ID : 34
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 298
Width : 320
Height : 58
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 3
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 35
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -1005,6 +1067,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0 covx tTmp.txt,tMR.pco,0,0
} }
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100
@@ -1096,6 +1172,16 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal dim=dimValueNormal
vaTap.val+=1 vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
@@ -1104,7 +1190,7 @@ TouchCap tc0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -33,6 +33,8 @@ Page cardAlarm
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis tCode,0 vis tCode,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -44,7 +46,7 @@ Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) tSend Variable (string) tSend
Attributes Attributes
@@ -150,7 +152,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -182,7 +184,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -365,7 +367,7 @@ Button arm1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -395,7 +397,7 @@ Button arm3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -425,7 +427,7 @@ Button arm2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -455,7 +457,7 @@ Button arm4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -735,7 +737,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -72,6 +72,8 @@ Page cardEntities
vis bText5,0 vis bText5,0
vis hSlider5,0 vis hSlider5,0
vis nNum5,0 vis nNum5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -107,31 +109,31 @@ Variable (string) entn1
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn5 Variable (string) entn5
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) type5 Variable (string) type5
Attributes Attributes
@@ -361,7 +363,7 @@ Slider hSlider1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -389,7 +391,7 @@ Slider hSlider2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -417,7 +419,7 @@ Slider hSlider3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -445,7 +447,7 @@ Slider hSlider4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -473,7 +475,7 @@ Slider hSlider5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -498,7 +500,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -523,7 +525,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -548,7 +550,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -573,7 +575,7 @@ Button bStop2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -598,7 +600,7 @@ Button bDown2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -623,7 +625,7 @@ Button bUp2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -648,7 +650,7 @@ Button bStop3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -673,7 +675,7 @@ Button bDown3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -698,7 +700,7 @@ Button bUp3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -723,7 +725,7 @@ Button bStop4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -748,7 +750,7 @@ Button bDown4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -773,7 +775,7 @@ Button bUp4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -805,7 +807,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -830,7 +832,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -855,7 +857,7 @@ Button bText1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -880,7 +882,7 @@ Button bText2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -905,7 +907,7 @@ Button bText3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -930,7 +932,7 @@ Button bText4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -955,7 +957,7 @@ Button bStop5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -980,7 +982,7 @@ Button bDown5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1005,7 +1007,7 @@ Button bUp5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1030,7 +1032,7 @@ Button bText5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1057,7 +1059,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1084,7 +1086,7 @@ Dual-state Button btOnOff2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1111,7 +1113,7 @@ Dual-state Button btOnOff3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1138,7 +1140,7 @@ Dual-state Button btOnOff4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1165,7 +1167,7 @@ Dual-state Button btOnOff5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -2102,7 +2104,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -34,6 +34,8 @@ Page cardGrid
vis tEntity4,0 vis tEntity4,0
vis tEntity5,0 vis tEntity5,0
vis tEntity6,0 vis tEntity6,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -69,25 +71,25 @@ Variable (string) entn1
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) type5 Variable (string) type5
Attributes Attributes
@@ -105,13 +107,13 @@ Variable (string) entn5
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) entn6 Variable (string) entn6
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Text tHeading Text tHeading
Attributes Attributes
@@ -254,7 +256,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -279,7 +281,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -315,7 +317,7 @@ Button bEntity1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -351,7 +353,7 @@ Button bEntity2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -387,7 +389,7 @@ Button bEntity3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -423,7 +425,7 @@ Button bEntity4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -459,7 +461,7 @@ Button bEntity5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -495,7 +497,7 @@ Button bEntity6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -838,7 +840,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -18,25 +18,26 @@ Page cardMedia
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
vis t5,0 vis t5,0
//vis nPageDisp,0 vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 500 Max. Text Size: 750
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) vaSpeakerList Variable (string) vaSpeakerList
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (int32) vaSpeakerPos Variable (int32) vaSpeakerPos
Attributes Attributes
@@ -134,7 +135,7 @@ Text t2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -163,7 +164,7 @@ Text tPlayPause
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -192,7 +193,7 @@ Text t0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -232,7 +233,7 @@ Text t1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -262,7 +263,7 @@ Text t3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -301,7 +302,7 @@ Text tSpeaker
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -352,7 +353,7 @@ Text t5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -390,7 +391,7 @@ Slider hVolume
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -415,7 +416,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -447,7 +448,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -697,7 +698,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -31,6 +31,8 @@ Page cardThermo
vis bt6,0 vis bt6,0
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -42,7 +44,7 @@ Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) va0 Variable (string) va0
Attributes Attributes
@@ -237,7 +239,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -273,7 +275,7 @@ Button bDown
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -309,7 +311,7 @@ Button bUp
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -341,7 +343,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -368,7 +370,7 @@ Dual-state Button bt0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -395,7 +397,7 @@ Dual-state Button bt1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -422,7 +424,7 @@ Dual-state Button bt2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -449,7 +451,7 @@ Dual-state Button bt3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -476,7 +478,7 @@ Dual-state Button bt4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -503,7 +505,7 @@ Dual-state Button bt5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -530,7 +532,7 @@ Dual-state Button bt6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -557,7 +559,7 @@ Dual-state Button bt7
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -584,7 +586,7 @@ Dual-state Button bt8
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -948,7 +950,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -30,7 +30,7 @@ Text tTmp1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Text tTmp2 Text tTmp2
Attributes Attributes
@@ -40,7 +40,7 @@ Text tTmp2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Picture p0 Picture p0
Attributes Attributes

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 31 Text : 33
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0
@@ -182,7 +182,7 @@ Button bSendStartup
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -29,7 +29,7 @@ Page popupLight
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -59,8 +59,8 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (int32) mode Variable (int32) mode
Attributes Attributes
@@ -213,7 +213,7 @@ Picture pColorWheel
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -243,7 +243,7 @@ Slider hBrightness
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -273,7 +273,7 @@ Slider hTempSlider
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -298,7 +298,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -361,7 +361,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -535,6 +535,12 @@ Timer tmSerial
vis pColorWheel,1 vis pColorWheel,1
} }
} }
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7
// set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -120,7 +120,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -147,7 +147,7 @@ Button b2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -174,7 +174,7 @@ Button b1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -29,7 +29,7 @@ Page popupShutter
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -46,8 +46,8 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Text tEntity Text tEntity
Attributes Attributes
@@ -109,7 +109,7 @@ Text tId
Text : Text :
Max. Text Size : 20 Max. Text Size : 20
Text t1 Text tPosHeading
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -119,6 +119,16 @@ Text t1
Text : Position Text : Position
Max. Text Size : 15 Max. Text Size : 15
Text tInfo1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 40
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -147,7 +157,7 @@ Slider hPosition
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -172,7 +182,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -197,7 +207,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -222,7 +232,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -247,7 +257,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -331,6 +341,10 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

View File

@@ -17,6 +17,8 @@ Page screensaver
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons //load gloabl time string from pageIcons
//tTime.txt=vaTime.txt //tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -290,6 +292,26 @@ Text tMR
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
Text tNotifyHead
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 35
Text tNotifyText
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 35
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -521,6 +543,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0 covx tTmp.txt,tMR.pco,0,0
} }
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100
@@ -610,6 +646,16 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal dim=dimValueNormal
vaTap.val+=1 vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
@@ -618,7 +664,7 @@ TouchCap tc0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -41,6 +41,8 @@ Page cardAlarm
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis tCode,0 vis tCode,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -54,7 +56,7 @@ Variable (string) entn
ID : 9 ID : 9
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) tSend Variable (string) tSend
Attributes Attributes
@@ -297,7 +299,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -351,7 +353,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -822,7 +824,7 @@ Button arm1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -876,7 +878,7 @@ Button arm3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -930,7 +932,7 @@ Button arm2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -984,7 +986,7 @@ Button arm4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1266,7 +1268,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -70,6 +70,8 @@ Page cardEntities
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
vis nNum4,0 vis nNum4,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -111,28 +113,28 @@ Variable (string) entn1
ID : 49 ID : 49
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 50 ID : 50
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 51 ID : 51
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 52 ID : 52
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Number nNum1 Number nNum1
Attributes Attributes
@@ -696,7 +698,7 @@ Slider hSlider1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -739,7 +741,7 @@ Slider hSlider2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -782,7 +784,7 @@ Slider hSlider3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -825,7 +827,7 @@ Slider hSlider4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -872,7 +874,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -919,7 +921,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -966,7 +968,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1013,7 +1015,7 @@ Button bStop2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1060,7 +1062,7 @@ Button bDown2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1107,7 +1109,7 @@ Button bUp2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1154,7 +1156,7 @@ Button bStop3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1201,7 +1203,7 @@ Button bDown3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1248,7 +1250,7 @@ Button bUp3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1295,7 +1297,7 @@ Button bStop4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1342,7 +1344,7 @@ Button bDown4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1389,7 +1391,7 @@ Button bUp4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1443,7 +1445,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1490,7 +1492,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1537,7 +1539,7 @@ Button bText1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1584,7 +1586,7 @@ Button bText2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1631,7 +1633,7 @@ Button bText3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1678,7 +1680,7 @@ Button bText4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1723,7 +1725,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1768,7 +1770,7 @@ Dual-state Button btOnOff2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1813,7 +1815,7 @@ Dual-state Button btOnOff3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1858,7 +1860,7 @@ Dual-state Button btOnOff4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -2698,7 +2700,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -42,6 +42,8 @@ Page cardGrid
vis tEntity4,0 vis tEntity4,0
vis tEntity5,0 vis tEntity5,0
vis tEntity6,0 vis tEntity6,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -83,28 +85,28 @@ Variable (string) entn1
ID : 18 ID : 18
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 19 ID : 19
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 20 ID : 20
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 21 ID : 21
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) type5 Variable (string) type5
Attributes Attributes
@@ -125,14 +127,14 @@ Variable (string) entn5
ID : 36 ID : 36
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) entn6 Variable (string) entn6
Attributes Attributes
ID : 37 ID : 37
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Text tHeading Text tHeading
Attributes Attributes
@@ -527,7 +529,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -574,7 +576,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -632,7 +634,7 @@ Button bEntity1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -690,7 +692,7 @@ Button bEntity2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -748,7 +750,7 @@ Button bEntity3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -806,7 +808,7 @@ Button bEntity4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -864,7 +866,7 @@ Button bEntity5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -922,7 +924,7 @@ Button bEntity6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1276,7 +1278,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -26,28 +26,29 @@ Page cardMedia
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
vis t5,0 vis t5,0
//vis nPageDisp,0 vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
ID : 7 ID : 7
Scope : local Scope : local
Text : Text :
Max. Text Size: 500 Max. Text Size: 750
Variable (string) entn Variable (string) entn
Attributes Attributes
ID : 18 ID : 18
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) vaSpeakerList Variable (string) vaSpeakerList
Attributes Attributes
ID : 27 ID : 27
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (int32) vaSpeakerPos Variable (int32) vaSpeakerPos
Attributes Attributes
@@ -306,7 +307,7 @@ Text t2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -355,7 +356,7 @@ Text tPlayPause
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -404,7 +405,7 @@ Text t0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -484,7 +485,7 @@ Text t1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -534,7 +535,7 @@ Text t3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -613,7 +614,7 @@ Text tSpeaker
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -704,7 +705,7 @@ Text t5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -767,7 +768,7 @@ Slider hVolume
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -814,7 +815,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -868,7 +869,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1120,7 +1121,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -39,6 +39,8 @@ Page cardThermo
vis bt6,0 vis bt6,0
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -52,7 +54,7 @@ Variable (string) entn
ID : 21 ID : 21
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) va0 Variable (string) va0
Attributes Attributes
@@ -533,7 +535,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -587,7 +589,7 @@ Button bDown
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -641,7 +643,7 @@ Button bUp
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -695,7 +697,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -744,7 +746,7 @@ Dual-state Button bt0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -793,7 +795,7 @@ Dual-state Button bt1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -842,7 +844,7 @@ Dual-state Button bt2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -891,7 +893,7 @@ Dual-state Button bt3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -940,7 +942,7 @@ Dual-state Button bt4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -989,7 +991,7 @@ Dual-state Button bt5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1038,7 +1040,7 @@ Dual-state Button bt6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1087,7 +1089,7 @@ Dual-state Button bt7
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1136,7 +1138,7 @@ Dual-state Button bt8
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1502,7 +1504,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -10,49 +10,49 @@ pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
13 Unique line(s) of event code 13 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
171 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
113 Unique line(s) of event code 113 Unique line(s) of event code
popupLight screensaver
27 Component(s) 35 Component(s)
338 Line(s) of event code 292 Line(s) of event code
182 Unique line(s) of event code 235 Unique line(s) of event code
popupShutter cardGrid
19 Component(s) 39 Component(s)
191 Line(s) of event code 420 Line(s) of event code
107 Unique line(s) of event code 246 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
196 Line(s) of event code 196 Line(s) of event code
123 Unique line(s) of event code 123 Unique line(s) of event code
cardMedia popupShutter
30 Component(s) 20 Component(s)
329 Line(s) of event code 193 Line(s) of event code
169 Unique line(s) of event code 109 Unique line(s) of event code
cardThermo popupLight
41 Component(s) 27 Component(s)
442 Line(s) of event code 341 Line(s) of event code
247 Unique line(s) of event code 185 Unique line(s) of event code
cardGrid
39 Component(s)
418 Line(s) of event code
244 Unique line(s) of event code
screensaver
33 Component(s)
266 Line(s) of event code
218 Unique line(s) of event code
cardAlarm cardAlarm
35 Component(s) 35 Component(s)
343 Line(s) of event code 345 Line(s) of event code
214 Unique line(s) of event code 216 Unique line(s) of event code
cardEntities cardEntities
62 Component(s) 62 Component(s)
964 Line(s) of event code 966 Line(s) of event code
410 Unique line(s) of event code 412 Unique line(s) of event code
cardThermo
41 Component(s)
444 Line(s) of event code
249 Unique line(s) of event code
Total Total
12 Page(s) 12 Page(s)
341 Component(s) 344 Component(s)
3661 Line(s) of event code 3702 Line(s) of event code
1002 Unique line(s) of event code 1025 Unique line(s) of event code

View File

@@ -57,7 +57,7 @@ Text tTmp1
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -87,7 +87,7 @@ Text tTmp2
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 31 Text : 33
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -467,7 +467,7 @@ Button bSendStartup
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -37,7 +37,7 @@ Page popupLight
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -69,8 +69,8 @@ Variable (string) entn
Attributes Attributes
ID : 21 ID : 21
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (int32) mode Variable (int32) mode
Attributes Attributes
@@ -465,7 +465,7 @@ Picture pColorWheel
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -510,7 +510,7 @@ Slider hBrightness
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -555,7 +555,7 @@ Slider hTempSlider
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -602,7 +602,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -705,7 +705,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -881,6 +881,12 @@ Timer tmSerial
vis pColorWheel,1 vis pColorWheel,1
} }
} }
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7
// set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -283,7 +283,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -332,7 +332,7 @@ Button b2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -381,7 +381,7 @@ Button b1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -37,7 +37,7 @@ Page popupShutter
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -56,8 +56,8 @@ Variable (string) entn
Attributes Attributes
ID : 18 ID : 18
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Text tEntity Text tEntity
Attributes Attributes
@@ -68,7 +68,7 @@ Text tEntity
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 65 x coordinate : 65
y coordinate : 108 y coordinate : 94
Width : 195 Width : 195
Height : 30 Height : 30
Effect : load Effect : load
@@ -98,7 +98,7 @@ Text tIcon1
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
y coordinate : 109 y coordinate : 108
Width : 45 Width : 45
Height : 30 Height : 30
Effect : load Effect : load
@@ -239,7 +239,7 @@ Text tId
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text t1 Text tPosHeading
Attributes Attributes
ID : 17 ID : 17
Scope : local Scope : local
@@ -269,6 +269,36 @@ Text t1
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tInfo1
Attributes
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 65
y coordinate : 122
Width : 195
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 38066
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -322,7 +352,7 @@ Slider hPosition
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -369,7 +399,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -416,7 +446,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -463,7 +493,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -510,7 +540,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -596,6 +626,10 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

View File

@@ -25,6 +25,8 @@ Page screensaver
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons //load gloabl time string from pageIcons
//tTime.txt=vaTime.txt //tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -763,6 +765,66 @@ Text tMR
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tNotifyHead
Attributes
ID : 33
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 201
Width : 450
Height : 58
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 3
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : top
Input Type : character
Text :
Max. Text Size : 35
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tNotifyText
Attributes
ID : 34
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 258
Width : 450
Height : 47
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : top
Input Type : character
Text :
Max. Text Size : 35
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -1005,6 +1067,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0 covx tTmp.txt,tMR.pco,0,0
} }
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100
@@ -1096,6 +1172,16 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal dim=dimValueNormal
vaTap.val+=1 vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
@@ -1104,7 +1190,7 @@ TouchCap tc0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -33,6 +33,8 @@ Page cardAlarm
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis tCode,0 vis tCode,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -44,7 +46,7 @@ Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) tSend Variable (string) tSend
Attributes Attributes
@@ -150,7 +152,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -182,7 +184,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -365,7 +367,7 @@ Button arm1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -395,7 +397,7 @@ Button arm3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -425,7 +427,7 @@ Button arm2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -455,7 +457,7 @@ Button arm4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -735,7 +737,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -62,6 +62,8 @@ Page cardEntities
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
vis nNum4,0 vis nNum4,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -97,25 +99,25 @@ Variable (string) entn1
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Number nNum1 Number nNum1
Attributes Attributes
@@ -310,7 +312,7 @@ Slider hSlider1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -338,7 +340,7 @@ Slider hSlider2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -366,7 +368,7 @@ Slider hSlider3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -394,7 +396,7 @@ Slider hSlider4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -419,7 +421,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -444,7 +446,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -469,7 +471,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -494,7 +496,7 @@ Button bStop2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -519,7 +521,7 @@ Button bDown2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -544,7 +546,7 @@ Button bUp2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -569,7 +571,7 @@ Button bStop3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -594,7 +596,7 @@ Button bDown3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -619,7 +621,7 @@ Button bUp3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -644,7 +646,7 @@ Button bStop4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -669,7 +671,7 @@ Button bDown4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -694,7 +696,7 @@ Button bUp4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -726,7 +728,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -751,7 +753,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -776,7 +778,7 @@ Button bText1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -801,7 +803,7 @@ Button bText2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -826,7 +828,7 @@ Button bText3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -851,7 +853,7 @@ Button bText4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -878,7 +880,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -905,7 +907,7 @@ Dual-state Button btOnOff2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -932,7 +934,7 @@ Dual-state Button btOnOff3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -959,7 +961,7 @@ Dual-state Button btOnOff4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1752,7 +1754,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -34,6 +34,8 @@ Page cardGrid
vis tEntity4,0 vis tEntity4,0
vis tEntity5,0 vis tEntity5,0
vis tEntity6,0 vis tEntity6,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -69,25 +71,25 @@ Variable (string) entn1
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 70 Max. Text Size: 80
Variable (string) type5 Variable (string) type5
Attributes Attributes
@@ -105,13 +107,13 @@ Variable (string) entn5
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) entn6 Variable (string) entn6
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Text tHeading Text tHeading
Attributes Attributes
@@ -254,7 +256,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -279,7 +281,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -315,7 +317,7 @@ Button bEntity1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -351,7 +353,7 @@ Button bEntity2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -387,7 +389,7 @@ Button bEntity3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -423,7 +425,7 @@ Button bEntity4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -459,7 +461,7 @@ Button bEntity5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -495,7 +497,7 @@ Button bEntity6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -838,7 +840,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -18,25 +18,26 @@ Page cardMedia
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
vis t5,0 vis t5,0
//vis nPageDisp,0 vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 500 Max. Text Size: 750
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) vaSpeakerList Variable (string) vaSpeakerList
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (int32) vaSpeakerPos Variable (int32) vaSpeakerPos
Attributes Attributes
@@ -134,7 +135,7 @@ Text t2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -163,7 +164,7 @@ Text tPlayPause
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -192,7 +193,7 @@ Text t0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -232,7 +233,7 @@ Text t1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -262,7 +263,7 @@ Text t3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -301,7 +302,7 @@ Text tSpeaker
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -352,7 +353,7 @@ Text t5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -390,7 +391,7 @@ Slider hVolume
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -415,7 +416,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -447,7 +448,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -697,7 +698,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -31,6 +31,8 @@ Page cardThermo
vis bt6,0 vis bt6,0
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -42,7 +44,7 @@ Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (string) va0 Variable (string) va0
Attributes Attributes
@@ -237,7 +239,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -273,7 +275,7 @@ Button bDown
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -309,7 +311,7 @@ Button bUp
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -341,7 +343,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -368,7 +370,7 @@ Dual-state Button bt0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -395,7 +397,7 @@ Dual-state Button bt1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -422,7 +424,7 @@ Dual-state Button bt2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -449,7 +451,7 @@ Dual-state Button bt3
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -476,7 +478,7 @@ Dual-state Button bt4
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -503,7 +505,7 @@ Dual-state Button bt5
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -530,7 +532,7 @@ Dual-state Button bt6
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -557,7 +559,7 @@ Dual-state Button bt7
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -584,7 +586,7 @@ Dual-state Button bt8
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -948,7 +950,7 @@ Timer tmSleep
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -30,7 +30,7 @@ Text tTmp1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Text tTmp2 Text tTmp2
Attributes Attributes
@@ -40,7 +40,7 @@ Text tTmp2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Picture p0 Picture p0
Attributes Attributes

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 31 Text : 33
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0
@@ -182,7 +182,7 @@ Button bSendStartup
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -29,7 +29,7 @@ Page popupLight
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -59,8 +59,8 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (int32) mode Variable (int32) mode
Attributes Attributes
@@ -213,7 +213,7 @@ Picture pColorWheel
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -243,7 +243,7 @@ Slider hBrightness
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -273,7 +273,7 @@ Slider hTempSlider
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -298,7 +298,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -361,7 +361,7 @@ Dual-state Button btOnOff1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -535,6 +535,12 @@ Timer tmSerial
vis pColorWheel,1 vis pColorWheel,1
} }
} }
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7
// set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -120,7 +120,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -147,7 +147,7 @@ Button b2
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -174,7 +174,7 @@ Button b1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

View File

@@ -29,7 +29,7 @@ Page popupShutter
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -46,8 +46,8 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Text tEntity Text tEntity
Attributes Attributes
@@ -109,7 +109,7 @@ Text tId
Text : Text :
Max. Text Size : 20 Max. Text Size : 20
Text t1 Text tPosHeading
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
@@ -119,6 +119,16 @@ Text t1
Text : Position Text : Position
Max. Text Size : 15 Max. Text Size : 15
Text tInfo1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 40
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -147,7 +157,7 @@ Slider hPosition
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -172,7 +182,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -197,7 +207,7 @@ Button bDown1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -222,7 +232,7 @@ Button bStop1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -247,7 +257,7 @@ Button bUp1
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -331,6 +341,10 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hPosition.val=sys0 hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3
} }
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {

View File

@@ -17,6 +17,8 @@ Page screensaver
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons //load gloabl time string from pageIcons
//tTime.txt=vaTime.txt //tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -290,6 +292,26 @@ Text tMR
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
Text tNotifyHead
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 35
Text tNotifyText
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 35
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -521,6 +543,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0 covx tTmp.txt,tMR.pco,0,0
} }
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100
@@ -610,6 +646,16 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal dim=dimValueNormal
vaTap.val+=1 vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
@@ -618,7 +664,7 @@ TouchCap tc0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

Binary file not shown.

Binary file not shown.

178
README.md
View File

@@ -8,17 +8,25 @@ If you like this project consider buying me a pizza 🍕 <a href="https://paypal
NsPanel Lovelace UI is a Firmware for the nextion screen inside of NSPanel in the Design of [HomeAssistant](https://www.home-assistant.io/)'s Lovelace UI Design. NsPanel Lovelace UI is a Firmware for the nextion screen inside of NSPanel in the Design of [HomeAssistant](https://www.home-assistant.io/)'s Lovelace UI Design.
EU Model and US Model supported (in portrait and landscape orientation) **EU Model and US Model supported (in portrait and landscape orientation)**
Content of the screen is controlled by a AppDaemon Python Script installed on your HomeAssistant Instance.
Or an TypeScript on your ioBroker Instance in case you are an ioBroker User.
NsPanel needs to be flashed with Tasmota (or upcoming with ESPHome)
## Features ## Features
- Entities Page with support for cover, switch, input_boolean, binary_sensor, sensor, button, number, scenes, script, input_button and light - Entities Page with support for cover, switch, input_boolean, binary_sensor, sensor, button, number, scenes, script, input_button and light, input_text (read-only), lock, fan
- Grid Page with support for cover, switch, input_boolean, button, scenes, and light - Grid Page with support for cover, switch, input_boolean, button, scenes, light and lock
- Detail Pages for Lights (Brightness, Temperature and Color of the Light) and for Covers (Position) - Detail Pages for Lights (Brightness, Temperature and Color of the Light) and for Covers (Position)
- Thermostat Page - Thermostat Page
- Media Player Card - Media Player Card
- Alarm Control Panel - Alarm Control Panel
- Screensaver Page with Time, Date and Weather Information - Screensaver Page with Time, Date and Weather Information
- Localization possible (currently 38 languages)
- **Everything is dynamically configurable by a yaml config, no need to code or touch Nextion Editor**
It works with [Tasmota](https://tasmota.github.io/docs/) and MQTT. It works with [Tasmota](https://tasmota.github.io/docs/) and MQTT.
To control the panel and update it with content from HomeAssistant there is an [AppDaemon](https://github.com/AppDaemon/appdaemon) App. To control the panel and update it with content from HomeAssistant there is an [AppDaemon](https://github.com/AppDaemon/appdaemon) App.
@@ -39,26 +47,13 @@ Some (not all) screenshots from the US Portrait Version:
For more detailed Instructions see the following Sections: For more detailed Instructions see the following Sections:
- [How It Works](#how-it-works)
- [Requirements](#requirements) - [Requirements](#requirements)
- [Installation - Home Automation Part (Homeassistant)](#installation---home-automation-part-home-assistant) - [Installation - Home Automation Part (Home Assistant)](#installation---home-automation-part-home-assistant)
- [Installing AppDaemon](#installing-appdaemon)
- [Installing Studio Code Server (optional, recommended)](#installing-studio-code-server-optional-recommended)
- [Installing HACS (optional, recommended)](#installing-hacs-optional-recommended)
- [Installing AppDeamon Backend Application](#installing-appdeamon-backend-application)
- [With HACS (recommended)](#with-hacs-recommended)
- [Manually](#manually)
- [Installing Tasmota to your NSPanel](#installing---tasmota-to-your-nspanel)
- [Installation - Home Automation Part (IoBroker)](#installation---home-automation-part-iobroker) - [Installation - Home Automation Part (IoBroker)](#installation---home-automation-part-iobroker)
- [Installation - NSPanel Part](#installation-nspanel-part) - [Installation - NSPanel Part (Firmware)](#installation---nspanel-part)
- [Flash Tasmota to your NSPanel](#flash-tasmota-to-your-nspanel)
- [Configure Tasmota Template for NSPanel](#configure-tasmota-template-for-nspanel)
- [Setup your MQTT Server in Tasmota](#setup-your-mqtt-server-in-tasmota)
- [Upload Berry Driver to Tasmota](#upload-berry-driver-to-tasmota)
- [Flash Firmware to Nextion Screen](#flash-firmware-to-nextion-screen)
- [Configuration](#configuration) - [Configuration](#configuration)
- [Configuring the MQTT integration in AppDaemon](#configuring-the-mqtt-integration-in-appdaemon) - [Configuring the MQTT integration in AppDaemon](#configuring-the-mqtt-integration-in-appdaemon)
@@ -67,27 +62,28 @@ For more detailed Instructions see the following Sections:
- [FAQ](#faq---frequently-asked-questions) - [FAQ](#faq---frequently-asked-questions)
## How It Works
The NSPanel has two components an esp32 which runs Tasmota in this project and the nextion display, which is controlled by the esp32 via serial.
This project contains a display firmware, which can be controlled over serial/mqtt.
It's controlled by an AppDaemon Application, which crafts the required commands from your HomeAssistant Instance.
For more details on how the display firmware works see the [README File in the HMI Folder](HMI/README.md)
## Requirements ## Requirements
- NSPanel - NSPanel
- USB to Serial TTL Adapter - USB to Serial TTL Adapter
- Running [Home Assistant Instance](https://www.home-assistant.io/installation/) - Running Instance of the Home Automation Platform of your Choise
- Installed [MQTT Broker](https://www.home-assistant.io/docs/mqtt/broker) alongside Homeassistant - Running [Home Assistant Instance](https://www.home-assistant.io/installation/)
- with installed [MQTT Broker](https://www.home-assistant.io/docs/mqtt/broker)
- Running [ioBroker Instance](https://www.iobroker.net/#en/documentation)
- with installed MQTT Broker
## Installation - Home Automation Part (Home Assistant) ## Installation - Home Automation Part (Home Assistant)
This section describes the Installation Steps for HomeAssistant, follow each step.
<details><summary>1. Installing HomeAssiant Add-Ons</summary>
<p>
### Installing AppDaemon ### Installing AppDaemon
The recommended backend application for this firmware is written in a python for [AppDaemon](https://github.com/AppDaemon/appdaemon).
This means it requires a working and running version of AppDaemon. The backend application for HomeAssistant is written in a python for [AppDaemon](https://github.com/AppDaemon/appdaemon).
This means it requires a working and running installation of AppDaemon.
The easiest way to install it is through Home Assistant's Supervisor Add-on Store, it will be automaticly connected to your Home Assistant Instance. The easiest way to install it is through Home Assistant's Supervisor Add-on Store, it will be automaticly connected to your Home Assistant Instance.
@@ -105,7 +101,13 @@ For localisation (date in your local language) you need to add the python packag
You will need a way to edit the `apps.yaml` config file in the Appdaemon folder. You will need a way to edit the `apps.yaml` config file in the Appdaemon folder.
Install Studio Code Server from Home Assistant's Supervisor Add-on Store to easily edit configuration Files on your HomeAssistant Instance. Install Studio Code Server from Home Assistant's Supervisor Add-on Store to easily edit configuration Files on your HomeAssistant Instance.
### Installing HACS (optional, recommended) </p>
</details>
<details><summary>2. Installing HomeAssiant Community Store</summary>
<p>
### Installing HACS
HACS is the Home Assistant Community Store and allows for community integrations and HACS is the Home Assistant Community Store and allows for community integrations and
automations to be updated cleanly and easily from the Home Assistant web user interface. automations to be updated cleanly and easily from the Home Assistant web user interface.
@@ -115,9 +117,13 @@ can be installed by a click on a button.
If you want to use HACS, you will have to follow [their documentation on how to install HACS](https://hacs.xyz/docs/setup/download). If you want to use HACS, you will have to follow [their documentation on how to install HACS](https://hacs.xyz/docs/setup/download).
### Installing AppDaemon Backend Application </p>
</details>
#### With HACS (recommended) <details><summary>3. Installing Lovelace AppDaemon Backend Application </summary>
<p>
### Installing AppDaemon Backend Application
To install Lovelace UI Backend App with HACS, you will need to make sure that you enabled To install Lovelace UI Backend App with HACS, you will need to make sure that you enabled
AppDaemon automations in HACS, as these are not enabled by default: AppDaemon automations in HACS, as these are not enabled by default:
@@ -143,24 +149,28 @@ Now, to install NSPanel Lovelace UI Backend with HACS, follow these steps:
`Download this repository with HACS` `Download this repository with HACS`
6. A confirmation panel will appear, click on `Download`, and wait for HACS to 6. A confirmation panel will appear, click on `Download`, and wait for HACS to
proceed with the download proceed with the download
6. The Backend Application is now installed, and HACS will inform you when updates are available 7. The Backend Application is now installed, and HACS will inform you when updates are available
#### Manually
Installing the Backend Application manually can be summarized by putting the content of the
`apps/` directory of this repository (the `nspanel-lovelace-ui/` directory) into the `apps/`
directory of your AppDaemon installation.
</p>
</details>
## Installation - Home Automation Part (IoBroker) ## Installation - Home Automation Part (IoBroker)
If you are looking for an ioBroker Integration instead of HomeAssistant take a look into the [Readme](ioBroker/README.md) of the iobroker folder. If you are looking for an ioBroker Integration instead of HomeAssistant take a look into the [Readme](ioBroker/README.md) of the iobroker folder.
Thanks to [britzelpuf](https://github.com/britzelpuf) for this integration. Thanks to [britzelpuf](https://github.com/britzelpuf) for this integration.
## Installation - NSPanel Part ## Installation - NSPanel Part
This section describes how to free your nspanel from stock firmware and get it ready for Lovelace UI 🎉 This section describes how to free your nspanel from stock firmware and get it ready for Lovelace UI 🎉
You only need to do one **Tasmota** OR **ESPHome**
<details><summary>Installation Instructions for Tasmota (Recommended)</summary>
<p>
### Flash Tasmota to your NSPanel ### Flash Tasmota to your NSPanel
You need to connect to your nspanel via serial and flash the [tasmota32-nspanel.bin](https://github.com/tasmota/install/raw/main/firmware/unofficial/tasmota32-nspanel.bin) to your NSPanel. You need to connect to your nspanel via serial and flash the [tasmota32-nspanel.bin](https://github.com/tasmota/install/raw/main/firmware/unofficial/tasmota32-nspanel.bin) to your NSPanel.
@@ -218,12 +228,27 @@ US Version Portrait: `FlashNextion http://nspanel.pky.eu/lui-us-p-release.tft`
US Version Landscape: `FlashNextion http://nspanel.pky.eu/lui-us-l-release.tft` US Version Landscape: `FlashNextion http://nspanel.pky.eu/lui-us-l-release.tft`
</p>
</details>
<details><summary>Installation Instructions for ESPHome</summary>
<p>
Support for ESPHome is WIP, see this third-party [ESPHome component](https://github.com/sairon/esphome-nspanel-lovelace-ui) which allows using ESPHome instead of Tasmota.
</p>
</details>
## Configuration ## Configuration
### Configuring the MQTT integration in AppDaemon ### Configuring the MQTT integration in AppDaemon
For the app to work you need a working MQTT Configuration in AppDaemon. Please add the configuration of your mqtt server, user and password to your existing `appdaemon.yaml` For the app to work you need a working MQTT Configuration in AppDaemon. Please add the configuration of your mqtt server, user and password to your existing `appdaemon.yaml`
NOTE: This are not the options of the AppDaemon Addon in HomeAssistant. You will find this file under: `config/appdaemon/appdeamon.yaml`
```yaml ```yaml
--- ---
secrets: /config/secrets.yaml secrets: /config/secrets.yaml
@@ -330,7 +355,9 @@ key | optional | type | default | description
`class` | False | string | | The name of the Class. `class` | False | string | | The name of the Class.
`config` | False | complex | | Config/Mapping between Homeassistant and your NsPanel `config` | False | complex | | Config/Mapping between Homeassistant and your NsPanel
Possible configuration values for config key:
### Possible configuration values for config key
key | optional | type | default | description key | optional | type | default | description
-- | -- | -- | -- | -- -- | -- | -- | -- | --
@@ -340,7 +367,7 @@ key | optional | type | default | description
`model` | True | string | `eu` | Model; Possible values: "eu", "us-l" and "us-p" `model` | True | string | `eu` | Model; Possible values: "eu", "us-l" and "us-p"
`sleepTimeout` | True | integer | `20` | Timeout for the screen to enter screensaver, to disable screensaver use 0 `sleepTimeout` | True | integer | `20` | Timeout for the screen to enter screensaver, to disable screensaver use 0
`sleepBrightness` | True | integer/complex | `20` | Brightness for the screen to enter screensaver, see example below for complex/scheduled config. `sleepBrightness` | True | integer/complex | `20` | Brightness for the screen to enter screensaver, see example below for complex/scheduled config.
`sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home, can be a group, person or device_tracker entity. `sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home or off, can be a group, person or device_tracker entity.
`locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization. `locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization.
`dateFormatBabel` | True | string | `full` | formatting options on https://babel.pocoo.org/en/latest/dates.html?highlight=name%20of%20day#date-fields `dateFormatBabel` | True | string | `full` | formatting options on https://babel.pocoo.org/en/latest/dates.html?highlight=name%20of%20day#date-fields
`timeFormat` | True | string | `%H:%M` | Time Format on screensaver. Substring after `?` is displayed in a seperate smaller textbox. Useful for 12h time format with AM/PM `"%I:%M ?%p"` `timeFormat` | True | string | `%H:%M` | Time Format on screensaver. Substring after `?` is displayed in a seperate smaller textbox. Useful for 12h time format with AM/PM `"%I:%M ?%p"`
@@ -349,7 +376,55 @@ key | optional | type | default | description
`screensaver` | True | complex | | configuration for screensaver `screensaver` | True | complex | | configuration for screensaver
`hiddenCards` | True | complex | | configuration for cards that can be accessed though navigate items `hiddenCards` | True | complex | | configuration for cards that can be accessed though navigate items
Possible configuration values for a card in card config:
<details><summary>Possible languages for locale config key</summary>
<p>
- `af_xx` - Afrikaans
- `ar_xx` - Arabic
- `bg_xx` - Bulgarian
- `ca_xx` - Catalan
- `cs_xx` - Czech
- `da_xx` - Danish
- `de_xx` - German
- `el_xx` - Greek
- `en_xx` - English
- `es_xx` - Spanish
- `et_xx` - Estonian
- `fa_xx` - Persian
- `fi_xx` - Finnish
- `fr_xx` - French
- `he_xx` - Hebrew
- `hr_xx` - Croatian
- `hu_xx` - Hungarian
- `hy_xx` - Armenian
- `id_xx` - Indonesian
- `is_xx` - Icelandic
- `it_xx` - Italian
- `lb_xx` - Luxembourgish
- `lt_xx` - Lithuanian
- `lv_xx` - Latvian
- `nb_xx` - Norwegian
- `nl_xx` - Dutch
- `nn_xx` - Norwegian
- `pl_xx` - Polish
- `pt_xx` - Portuguese
- `ro_xx` - Romanian
- `ru_xx` - Russian
- `sk_xx` - Slovak
- `sl_xx` - Slovenian
- `sv_xx` - Swedish
- `th_xx` - Thai
- `tr_xx` - Turkish
- `uk_xx` - Ukrainian
- `vi_xx` - Vietnamese
</p>
</details>
#### Possible configuration values for a card in card config</summary>
key | optional | type | default | description key | optional | type | default | description
-- | -- | -- | -- | -- -- | -- | -- | -- | --
@@ -359,7 +434,8 @@ key | optional | type | default | description
`entity` | False | string | `None` | contains the entity of the current card, valid for cardThermo, cardAlarm and cardMedia `entity` | False | string | `None` | contains the entity of the current card, valid for cardThermo, cardAlarm and cardMedia
`key` | True | string | `None` | Used by navigate items `key` | True | string | `None` | Used by navigate items
Possible configuration values for screensaver config:
#### Possible configuration values for screensaver config
key | optional | type | default | description key | optional | type | default | description
-- | -- | -- | -- | -- -- | -- | -- | -- | --
@@ -395,6 +471,15 @@ It is possible to schedule a brightness change for the screen at specific times.
value: 0 value: 0
``` ```
```yaml
sleepBrightness:
- time: "sunrise"
value: 10
- time: "sunset + 1:00:00"
value: 0
```
#### Override Icons or Names #### Override Icons or Names
To override Icons or Names of entities you can configure an icon and/or name in your configuration, please see the following example. To override Icons or Names of entities you can configure an icon and/or name in your configuration, please see the following example.
@@ -426,6 +511,11 @@ will allow you to navigate to a cardGrid page with the configured key testKey
key: testKey key: testKey
``` ```
## How to update ## How to update
Updating involves mainly already descriped steps from installation, so this is a short summary. Updating involves mainly already descriped steps from installation, so this is a short summary.

View File

@@ -1,14 +1,7 @@
from helper import dict_recursive_update
import logging
LOGGER = logging.getLogger(__name__)
HA_API = None
class Entity(object): class Entity(object):
def __init__(self, entity_input_config): def __init__(self, entity_input_config):
if type(entity_input_config) is not dict: if type(entity_input_config) is not dict:
LOGGER.error("Config error, not a dict check your entity configs") #self._ha_api.log("Config error, not a dict check your entity configs")
self.entityId = "error" self.entityId = "error"
self.nameOverride = None self.nameOverride = None
self.iconOverride = None self.iconOverride = None
@@ -33,7 +26,7 @@ class Card(object):
for e in card_input_config.get("entities", []): for e in card_input_config.get("entities", []):
self.entities.append(Entity(e)) self.entities.append(Entity(e))
self.id = f"{self.cardType}_{self.key}".replace(".","_").replace("~","_").replace(" ","_") self.id = f"{self.cardType}_{self.key}".replace(".","_").replace("~","_").replace(" ","_")
LOGGER.info(f"Created Card {self.cardType} with pos {pos} and id {self.id}") #self._ha_api.log(f"Created Card {self.cardType} with pos {pos} and id {self.id}")
def get_entity_list(self): def get_entity_list(self):
entityIds = [] entityIds = []
@@ -52,71 +45,80 @@ class Card(object):
class LuiBackendConfig(object): class LuiBackendConfig(object):
_DEFAULT_CONFIG = { def dict_recursive_update(self, source: dict, target: dict) -> dict:
'panelRecvTopic': "tele/tasmota_your_mqtt_topic/RESULT", for sk, sv in source.items():
'panelSendTopic': "cmnd/tasmota_your_mqtt_topic/CustomSend", if sk in target and isinstance(target[sk], dict):
'updateMode': "auto-notify", target[sk] = self.dict_recursive_update(sv, target[sk])
'model': "eu", else:
'sleepTimeout': 20, target[sk] = sv
'sleepBrightness': 20, return target
'sleepTracking': None,
'locale': "en_US",
'timeFormat': "%H:%M",
'dateFormatBabel': "full",
'dateFormat': "%A, %d. %B %Y",
'cards': [{
'type': 'cardEntities',
'entities': [{
'entity': 'switch.test_item',
'name': 'Test Item'
}, {
'entity': 'switch.test_item'
}],
'title': 'Example Entities Page'
}, {
'type': 'cardGrid',
'entities': [{
'entity': 'switch.test_item'
}, {
'entity': 'switch.test_item'
}, {
'entity': 'switch.test_item'
}
],
'title': 'Example Grid Page'
}, {
'type': 'climate',
'entity': 'climate.test_item',
}],
'screensaver': {
'type': 'screensaver',
'entity': 'weather.example',
'weatherUnit': 'celsius',
'weatherOverrideForecast1': None,
'weatherOverrideForecast2': None,
'weatherOverrideForecast3': None,
'weatherOverrideForecast4': None,
'doubleTapToUnlock': False,
'alternativeLayout': False,
'defaultCard': None,
'key': 'screensaver'
},
'hiddenCards': []
}
def __init__(self, ha_api, config_in): def __init__(self, ha_api, config_in):
global HA_API self._ha_api = ha_api
HA_API = ha_api
self._config = {} self._config = {}
self._config_cards = [] self._config_cards = []
self._config_screensaver = None self._config_screensaver = None
self._config_hidden_cards = [] self._config_hidden_cards = []
self._DEFAULT_CONFIG = {
'panelRecvTopic': "tele/tasmota_your_mqtt_topic/RESULT",
'panelSendTopic': "cmnd/tasmota_your_mqtt_topic/CustomSend",
'updateMode': "auto-notify",
'model': "eu",
'sleepTimeout': 20,
'sleepBrightness': 20,
'sleepTracking': None,
'locale': "en_US",
'timeFormat': "%H:%M",
'dateFormatBabel': "full",
'dateFormat': "%A, %d. %B %Y",
'cards': [{
'type': 'cardEntities',
'entities': [{
'entity': 'switch.test_item',
'name': 'Test Item'
}, {
'entity': 'switch.test_item'
}],
'title': 'Example Entities Page'
}, {
'type': 'cardGrid',
'entities': [{
'entity': 'switch.test_item'
}, {
'entity': 'switch.test_item'
}, {
'entity': 'switch.test_item'
}
],
'title': 'Example Grid Page'
}, {
'type': 'climate',
'entity': 'climate.test_item',
}],
'screensaver': {
'type': 'screensaver',
'entity': 'weather.example',
'weatherUnit': 'celsius',
'forecastSkip': 0,
'weatherOverrideForecast1': None,
'weatherOverrideForecast2': None,
'weatherOverrideForecast3': None,
'weatherOverrideForecast4': None,
'doubleTapToUnlock': False,
'alternativeLayout': False,
'defaultCard': None,
'key': 'screensaver'
},
'hiddenCards': []
}
self.load(config_in) self.load(config_in)
def load(self, inconfig): def load(self, inconfig):
self._config = dict_recursive_update(inconfig, self._DEFAULT_CONFIG) self._ha_api.log("Input config: %s", inconfig)
LOGGER.info(f"Loaded config: {self._config}") self._config = self.dict_recursive_update(inconfig, self._DEFAULT_CONFIG)
self._ha_api.log("Loaded config: %s", self._config)
# parse cards displayed on panel # parse cards displayed on panel
pos = 0 pos = 0

View File

@@ -1,11 +1,8 @@
import logging
import datetime import datetime
from helper import scale, pos_to_color from helper import scale, pos_to_color
from pages import LuiPagesGen from pages import LuiPagesGen
LOGGER = logging.getLogger(__name__)
class LuiController(object): class LuiController(object):
def __init__(self, ha_api, config, send_mqtt_msg): def __init__(self, ha_api, config, send_mqtt_msg):
@@ -40,13 +37,19 @@ class LuiController(object):
# calculate current brightness # calculate current brightness
self.current_screensaver_brightness = self.calc_current_screensaver_brightness() self.current_screensaver_brightness = self.calc_current_screensaver_brightness()
# call update_screensaver_brightness on changes of entity configured in brightnessScreensaverTracking # call update_screensaver_brightness on changes of entity configured in brightnessScreensaverTracking
bst = self._config.get("sleepTracking") bst = self._config.get("sleepTracking")
if bst is not None and self._ha_api.entity_exists(bst): if bst is not None and self._ha_api.entity_exists(bst):
self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=bst) self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=bst)
# register callback for state changes on tracked value
sleep_brightness_config = self._config.get("sleepBrightness")
if type(sleep_brightness_config) == str and self._ha_api.entity_exists(sleep_brightness_config):
self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=sleep_brightness_config)
def startup(self): def startup(self):
LOGGER.info(f"Startup Event") self._ha_api.log(f"Startup Event")
# send time and date on startup # send time and date on startup
self._pages_gen.update_time("") self._pages_gen.update_time("")
self._pages_gen.update_date("") self._pages_gen.update_date("")
@@ -63,12 +66,14 @@ class LuiController(object):
def update_screensaver_brightness_state_callback(self, entity, attribute, old, new, kwargs): def update_screensaver_brightness_state_callback(self, entity, attribute, old, new, kwargs):
if type(self._config.get("sleepBrightness")) == str:
self.current_screensaver_brightness = self.calc_current_screensaver_brightness()
self.update_screensaver_brightness(kwargs={"value": self.current_screensaver_brightness}) self.update_screensaver_brightness(kwargs={"value": self.current_screensaver_brightness})
def update_screensaver_brightness(self, kwargs): def update_screensaver_brightness(self, kwargs):
bst = self._config.get("sleepTracking") bst = self._config.get("sleepTracking")
brightness = 0 brightness = 0
if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state == "not_home": if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in ["not_home", "off"]:
brightness = 0 brightness = 0
else: else:
self.current_screensaver_brightness = kwargs['value'] self.current_screensaver_brightness = kwargs['value']
@@ -77,19 +82,22 @@ class LuiController(object):
def calc_current_screensaver_brightness(self): def calc_current_screensaver_brightness(self):
current_screensaver_brightness = 20 current_screensaver_brightness = 20
sleep_brightness_config = self._config.get("sleepBrightness")
# set brightness of screensaver # set brightness of screensaver
if type(self._config.get("sleepBrightness")) == int: if type(sleep_brightness_config) == int:
current_screensaver_brightness = self._config.get("sleepBrightness") current_screensaver_brightness = sleep_brightness_config
elif type(self._config.get("sleepBrightness")) == list: elif type(sleep_brightness_config) == str:
sorted_timesets = sorted(self._config.get("sleepBrightness"), key=lambda d: self._ha_api.parse_time(d['time'])) current_screensaver_brightness = int(float(self._ha_api.get_state(sleep_brightness_config)))
elif type(sleep_brightness_config) == list:
sorted_timesets = sorted(sleep_brightness_config, key=lambda d: self._ha_api.parse_time(d['time']))
# calc current screensaver brightness # calc current screensaver brightness
found_current_dim_value = False found_current_dim_value = False
for index, timeset in enumerate(sorted_timesets): for index, timeset in enumerate(sorted_timesets):
LOGGER.info("Current time %s", self._ha_api.get_now().time()) self._ha_api.log("Current time %s", self._ha_api.get_now().time())
if self._ha_api.parse_time(timeset["time"]) > self._ha_api.get_now().time() and not found_current_dim_value: if self._ha_api.parse_time(timeset["time"]) > self._ha_api.get_now().time() and not found_current_dim_value:
# first time after current time, set dim value # first time after current time, set dim value
current_screensaver_brightness = sorted_timesets[index-1]["value"] current_screensaver_brightness = sorted_timesets[index-1]["value"]
LOGGER.info("Setting dim value to %s", sorted_timesets[index-1]) self._ha_api.log("Setting dim value to %s", sorted_timesets[index-1])
found_current_dim_value = True found_current_dim_value = True
# still no dim value # still no dim value
if not found_current_dim_value: if not found_current_dim_value:
@@ -98,16 +106,16 @@ class LuiController(object):
def register_callbacks(self): def register_callbacks(self):
items = self._config.get_all_entity_names() items = self._config.get_all_entity_names()
LOGGER.info(f"Registering callbacks for the following items: {items}") self._ha_api.log(f"Registering callbacks for the following items: {items}")
for item in items: for item in items:
if self._ha_api.entity_exists(item): if self._ha_api.entity_exists(item):
self._ha_api.listen_state(self.state_change_callback, entity_id=item, attribute="all") self._ha_api.listen_state(self.state_change_callback, entity_id=item, attribute="all")
def state_change_callback(self, entity, attribute, old, new, kwargs): def state_change_callback(self, entity, attribute, old, new, kwargs):
LOGGER.debug(f"Got callback for: {entity}") self._ha_api.log(f"Got callback for: {entity}", level="DEBUG")
LOGGER.debug(f"Current page has the following items: {self._current_card.get_entity_list()}") self._ha_api.log(f"Current page has the following items: {self._current_card.get_entity_list()}", level="DEBUG")
if entity in self._current_card.get_entity_list(): if entity in self._current_card.get_entity_list():
LOGGER.debug(f"Callback Entity is on current page: {entity}") self._ha_api.log(f"Callback Entity is on current page: {entity}", level="DEBUG")
self._pages_gen.render_card(self._current_card, send_page_type=False) self._pages_gen.render_card(self._current_card, send_page_type=False)
# send detail page update, just in case # send detail page update, just in case
if self._current_card.cardType in ["cardGrid", "cardEntities"]: if self._current_card.cardType in ["cardGrid", "cardEntities"]:
@@ -124,7 +132,7 @@ class LuiController(object):
self._pages_gen.generate_light_detail_page(entity_id) self._pages_gen.generate_light_detail_page(entity_id)
def button_press(self, entity_id, button_type, value): def button_press(self, entity_id, button_type, value):
LOGGER.info(f"Button Press Event; entity_id: {entity_id}; button_type: {button_type}; value: {value} ") self._ha_api.log(f"Button Press Event; entity_id: {entity_id}; button_type: {button_type}; value: {value} ")
# internal buttons # internal buttons
if entity_id == "screensaver" and button_type == "bExit": if entity_id == "screensaver" and button_type == "bExit":
# get default card if there is one # get default card if there is one
@@ -174,7 +182,10 @@ class LuiController(object):
self._ha_api.turn_off(entity_id) self._ha_api.turn_off(entity_id)
if button_type == "number-set": if button_type == "number-set":
self._ha_api.get_entity(entity_id).call_service("set_value", value=value) if entity_id.startswith('fan'):
self._ha_api.get_entity(entity_id).call_service("set_percentage", percentage=value)
else:
self._ha_api.get_entity(entity_id).call_service("set_value", value=value)
# for shutter / covers # for shutter / covers
if button_type == "up": if button_type == "up":
@@ -199,6 +210,11 @@ class LuiController(object):
self._ha_api.get_entity(entity_id).call_service("turn_on") self._ha_api.get_entity(entity_id).call_service("turn_on")
elif entity_id.startswith('light') or entity_id.startswith('switch') or entity_id.startswith('input_boolean'): elif entity_id.startswith('light') or entity_id.startswith('switch') or entity_id.startswith('input_boolean'):
self._ha_api.get_entity(entity_id).call_service("toggle") self._ha_api.get_entity(entity_id).call_service("toggle")
elif entity_id.startswith('lock'):
if self._ha_api.get_entity(entity_id).state == "locked":
self._ha_api.get_entity(entity_id).call_service("unlock")
else:
self._ha_api.get_entity(entity_id).call_service("lock")
else: else:
self._ha_api.get_entity(entity_id).call_service("press") self._ha_api.get_entity(entity_id).call_service("press")

View File

@@ -55,11 +55,3 @@ def get_attr_safe(entity, attr, default):
if res is None: if res is None:
res = default res = default
return res return res
def dict_recursive_update(source: dict, target: dict) -> dict:
for sk, sv in source.items():
if sk in target and isinstance(target[sk], dict):
target[sk] = dict_recursive_update(sv, target[sk])
else:
target[sk] = sv
return target

File diff suppressed because it is too large Load Diff

View File

@@ -42,15 +42,19 @@ def map_to_mdi_name(ha_type, state=None, device_class=None):
if ha_type == "script": if ha_type == "script":
return "script-text" return "script-text"
if ha_type == "switch": if ha_type == "switch":
return "flash" return "light-switch"
if ha_type == "number": if ha_type == "number":
return "ray-vertex" return "ray-vertex"
if ha_type == "light": if ha_type == "light":
return "lightbulb" return "lightbulb"
if ha_type == "fan":
return "fan"
if ha_type == "input_boolean": if ha_type == "input_boolean":
return "check-circle-outline" if state == "on" else "close-circle-outline" return "check-circle-outline" if state == "on" else "close-circle-outline"
if ha_type == "cover": if ha_type == "cover":
return "window-open" if state == "open" else "window-closed" return "window-open" if state == "open" else "window-closed"
if ha_type == "lock":
return "lock-open" if state == "unlocked" else "lock"
elif ha_type == "sensor": elif ha_type == "sensor":
if state == "on": if state == "on":

View File

@@ -15,6 +15,8 @@ translations = {
'code': "Kode", 'code': "Kode",
'disarm': "Skakel Af", 'disarm': "Skakel Af",
'run': "Hardloop", 'run': "Hardloop",
'lock': "Sluit toe",
'unlock': "Sluit oop",
}, },
'ar': { 'ar': {
'ACTIVATE': "تفعيل", 'ACTIVATE': "تفعيل",
@@ -32,6 +34,8 @@ translations = {
'code': "الرمز", 'code': "الرمز",
'disarm': "تعطيل", 'disarm': "تعطيل",
'run': "تشغيل", 'run': "تشغيل",
'lock': "قفل",
'unlock': "فتح",
}, },
'bg': { 'bg': {
'ACTIVATE': "Активирай", 'ACTIVATE': "Активирай",
@@ -50,6 +54,8 @@ translations = {
'code': "Код", 'code': "Код",
'disarm': "Деактивире", 'disarm': "Деактивире",
'run': "Изпълни", 'run': "Изпълни",
'lock': "Заключване",
'unlock': "Отключване",
}, },
'ca': { 'ca': {
'PRESS': "Prem", 'PRESS': "Prem",
@@ -69,6 +75,8 @@ translations = {
'code': "Codi", 'code': "Codi",
'disarm': "Desactivar", 'disarm': "Desactivar",
'run': "Executa", 'run': "Executa",
'lock': "Bloquejar",
'unlock': "Desbloquejar",
}, },
'cs': { 'cs': {
'PRESS': "Stisknutí", 'PRESS': "Stisknutí",
@@ -88,6 +96,8 @@ translations = {
'code': "Kód", 'code': "Kód",
'disarm': "Odbezpečit", 'disarm': "Odbezpečit",
'run': "Spustit", 'run': "Spustit",
'lock': "Zamknout",
'unlock': "Odemknout",
}, },
'da': { 'da': {
'PRESS': "Tryk", 'PRESS': "Tryk",
@@ -107,6 +117,8 @@ translations = {
'code': "Kode", 'code': "Kode",
'disarm': "Frakobl", 'disarm': "Frakobl",
'run': "Kør", 'run': "Kør",
'lock': "Lås",
'unlock': "Lås op",
}, },
'de': { 'de': {
'PRESS': "Drücken", 'PRESS': "Drücken",
@@ -126,6 +138,8 @@ translations = {
'code': "Code", 'code': "Code",
'disarm': "Deaktivieren", 'disarm': "Deaktivieren",
'run': "Ausführen", 'run': "Ausführen",
'lock': "Verriegeln",
'unlock': "Entriegeln",
}, },
'el': { 'el': {
'PRESS': "Πατήστε", 'PRESS': "Πατήστε",
@@ -145,6 +159,8 @@ translations = {
'code': "Κωδικός", 'code': "Κωδικός",
'disarm': "Αφοπλισμός", 'disarm': "Αφοπλισμός",
'run': "Εκτέλεση", 'run': "Εκτέλεση",
'lock': "Κλείδωμα",
'unlock': "Ξεκλείδωμα",
}, },
'en': { 'en': {
'PRESS': "Press", 'PRESS': "Press",
@@ -164,6 +180,8 @@ translations = {
'code': "Code", 'code': "Code",
'disarm': "Disarm", 'disarm': "Disarm",
'run': "Run", 'run': "Run",
'lock': "Lock",
'unlock': "Unlock",
}, },
'es': { 'es': {
'PRESS': "Pulsa", 'PRESS': "Pulsa",
@@ -183,6 +201,8 @@ translations = {
'code': "Código", 'code': "Código",
'disarm': "Desarmar", 'disarm': "Desarmar",
'run': "Ejecutar", 'run': "Ejecutar",
'lock': "Bloquear",
'unlock': "Desbloquear",
}, },
'et': { 'et': {
'PRESS': "Vajuta nuppu", 'PRESS': "Vajuta nuppu",
@@ -202,6 +222,8 @@ translations = {
'code': "Kood", 'code': "Kood",
'disarm': "Valvest maha", 'disarm': "Valvest maha",
'run': "Käivita", 'run': "Käivita",
'lock': "Lukusta",
'unlock': "Ava",
}, },
'fa': { 'fa': {
'ACTIVATE': "فعال سازی", 'ACTIVATE': "فعال سازی",
@@ -219,6 +241,8 @@ translations = {
'code': "کد", 'code': "کد",
'disarm': "دزدگیر خاموش", 'disarm': "دزدگیر خاموش",
'run': "اجرا", 'run': "اجرا",
'lock': "قفل",
'unlock': "باز کردن",
}, },
'fi': { 'fi': {
'PRESS': "Paina", 'PRESS': "Paina",
@@ -238,6 +262,8 @@ translations = {
'code': "Koodi", 'code': "Koodi",
'disarm': "Poista hälytys", 'disarm': "Poista hälytys",
'run': "Suorita", 'run': "Suorita",
'lock': "Lukitse",
'unlock': "Avaa lukitus",
}, },
'fr': { 'fr': {
'PRESS': "Appui", 'PRESS': "Appui",
@@ -257,6 +283,8 @@ translations = {
'code': "Code", 'code': "Code",
'disarm': "Désarmer", 'disarm': "Désarmer",
'run': "Exécuter", 'run': "Exécuter",
'lock': "Verrouiller",
'unlock': "Déverrouiller",
}, },
'he': { 'he': {
'PRESS': "לחיצה", 'PRESS': "לחיצה",
@@ -276,6 +304,8 @@ translations = {
'code': "קוד", 'code': "קוד",
'disarm': "לא דרוך", 'disarm': "לא דרוך",
'run': "רוץ", 'run': "רוץ",
'lock': "נעילה",
'unlock': "ביטול נעילה",
}, },
'hr': { 'hr': {
'ACTIVATE': "Aktivirati", 'ACTIVATE': "Aktivirati",
@@ -293,6 +323,8 @@ translations = {
'code': "Kod", 'code': "Kod",
'disarm': "Deaktiviraj", 'disarm': "Deaktiviraj",
'run': "Pokreni", 'run': "Pokreni",
'lock': "zaključati",
'unlock': "Otključati",
}, },
'hu': { 'hu': {
'PRESS': "Gombnyomás", 'PRESS': "Gombnyomás",
@@ -312,6 +344,8 @@ translations = {
'code': "Kód", 'code': "Kód",
'disarm': "Hatástalanít", 'disarm': "Hatástalanít",
'run': "Futtatás", 'run': "Futtatás",
'lock': "Bezár",
'unlock': "Kinyit",
}, },
'hy': { 'hy': {
'ACTIVATE': "Ակտիվացնել", 'ACTIVATE': "Ակտիվացնել",
@@ -328,6 +362,8 @@ translations = {
'clear_code': "Մաքրել", 'clear_code': "Մաքրել",
'code': "Կոդ", 'code': "Կոդ",
'disarm': "Զինաթափել", 'disarm': "Զինաթափել",
'lock': "Կողպեք",
'unlock': "Բացել",
}, },
'id': { 'id': {
'PRESS': "Tekan", 'PRESS': "Tekan",
@@ -347,6 +383,8 @@ translations = {
'code': "Kode", 'code': "Kode",
'disarm': "Nonaktifkan", 'disarm': "Nonaktifkan",
'run': "Jalankan", 'run': "Jalankan",
'lock': "Kunci",
'unlock': "Buka",
}, },
'is': { 'is': {
'PRESS': "Ýttu á", 'PRESS': "Ýttu á",
@@ -365,6 +403,8 @@ translations = {
'code': "Kóði", 'code': "Kóði",
'disarm': "Taka af verði", 'disarm': "Taka af verði",
'run': "Keyra", 'run': "Keyra",
'lock': "Læsa",
'unlock': "Aflæsa",
}, },
'it': { 'it': {
'PRESS': "Premi", 'PRESS': "Premi",
@@ -384,6 +424,8 @@ translations = {
'code': "Codice", 'code': "Codice",
'disarm': "Disattiva", 'disarm': "Disattiva",
'run': "Esegui", 'run': "Esegui",
'lock': "Blocca",
'unlock': "Sblocca",
}, },
'lb': { 'lb': {
'ACTIVATE': "Aktivéieren", 'ACTIVATE': "Aktivéieren",
@@ -401,6 +443,8 @@ translations = {
'code': "Code", 'code': "Code",
'disarm': "Desaktivéieren", 'disarm': "Desaktivéieren",
'run': "Ausféieren", 'run': "Ausféieren",
'lock': "Spären",
'unlock': "Entspären",
}, },
'lt': { 'lt': {
'ACTIVATE': "Suaktyvinti", 'ACTIVATE': "Suaktyvinti",
@@ -417,6 +461,8 @@ translations = {
'code': "Kodas", 'code': "Kodas",
'disarm': "Atrakinti", 'disarm': "Atrakinti",
'run': "Paleisti", 'run': "Paleisti",
'lock': "Užrakinti",
'unlock': "Atrakinti",
}, },
'lv': { 'lv': {
'ACTIVATE': "Aktivizēt", 'ACTIVATE': "Aktivizēt",
@@ -433,6 +479,8 @@ translations = {
'clear_code': "Notīrīt", 'clear_code': "Notīrīt",
'code': "Kods", 'code': "Kods",
'disarm': "Atslēgt", 'disarm': "Atslēgt",
'lock': "Aizslēgt",
'unlock': "Atslēgt",
}, },
'nb': { 'nb': {
'PRESS': "trykk", 'PRESS': "trykk",
@@ -452,6 +500,8 @@ translations = {
'code': "Kode", 'code': "Kode",
'disarm': "Deaktivere", 'disarm': "Deaktivere",
'run': "Kjør", 'run': "Kjør",
'lock': "Lås",
'unlock': "Lås opp",
}, },
'nl': { 'nl': {
'PRESS': "Klik", 'PRESS': "Klik",
@@ -471,6 +521,8 @@ translations = {
'code': "Code", 'code': "Code",
'disarm': "Uitschakelen", 'disarm': "Uitschakelen",
'run': "Uitvoeren", 'run': "Uitvoeren",
'lock': "Vergrendelen",
'unlock': "Ontgrendelen",
}, },
'nn': { 'nn': {
'ACTIVATE': "Aktiver", 'ACTIVATE': "Aktiver",
@@ -489,6 +541,8 @@ translations = {
'code': "Kode", 'code': "Kode",
'disarm': "Skru av", 'disarm': "Skru av",
'run': "Køyr", 'run': "Køyr",
'lock': "Lås",
'unlock': "Lås opp",
}, },
'pl': { 'pl': {
'PRESS': "Naciśnij", 'PRESS': "Naciśnij",
@@ -508,25 +562,8 @@ translations = {
'code': "Kod", 'code': "Kod",
'disarm': "Rozbrój", 'disarm': "Rozbrój",
'run': "Uruchom", 'run': "Uruchom",
}, 'lock': "Zablokuj",
'pt': { 'unlock': "Odblokuj",
'PRESS': "Pressione",
'ACTIVATE': "Ativar",
'aux_heat': "Aquecedor aux",
'cooling': "Resfriando",
'drying': "Secando",
'fan': "Ventilando",
'idle': "Oscioso",
'off': "Desligado",
'arm_away': "Armar ausente",
'arm_custom_bypass': "Bypass personalizado",
'arm_home': "Armar em casa",
'arm_night': "Acionamento noturno",
'arm_vacation': "Armar férias",
'clear_code': "Limpar",
'code': "Código",
'disarm': "Desarmar",
'run': "Executar",
}, },
'pt': { 'pt': {
'PRESS': "Pressione", 'PRESS': "Pressione",
@@ -545,6 +582,8 @@ translations = {
'code': "Código", 'code': "Código",
'disarm': "Desarmar", 'disarm': "Desarmar",
'run': "Executar", 'run': "Executar",
'lock': "Bloquear",
'unlock': "Desbloquear",
}, },
'ro': { 'ro': {
'ACTIVATE': "Activați", 'ACTIVATE': "Activați",
@@ -563,6 +602,8 @@ translations = {
'code': "Cod", 'code': "Cod",
'disarm': "Dezarmat", 'disarm': "Dezarmat",
'run': "Rulați", 'run': "Rulați",
'lock': "Blocat",
'unlock': "Deblocare",
}, },
'ru': { 'ru': {
'PRESS': "Нажать", 'PRESS': "Нажать",
@@ -582,6 +623,8 @@ translations = {
'code': "Код", 'code': "Код",
'disarm': "Снять с охраны", 'disarm': "Снять с охраны",
'run': "Запустить", 'run': "Запустить",
'lock': "Закрыть",
'unlock': "Открыть",
}, },
'sk': { 'sk': {
'ACTIVATE': "Aktivovať", 'ACTIVATE': "Aktivovať",
@@ -600,6 +643,8 @@ translations = {
'code': "Kód", 'code': "Kód",
'disarm': "Odkódovať", 'disarm': "Odkódovať",
'run': "Spustiť", 'run': "Spustiť",
'lock': "Zamknúť",
'unlock': "Odomknúť",
}, },
'sl': { 'sl': {
'PRESS': "Pritisnite", 'PRESS': "Pritisnite",
@@ -618,6 +663,8 @@ translations = {
'code': "Koda", 'code': "Koda",
'disarm': "Izklopi", 'disarm': "Izklopi",
'run': "Poženi", 'run': "Poženi",
'lock': "Zakleni",
'unlock': "Odkleni",
}, },
'sv': { 'sv': {
'PRESS': "Tryck", 'PRESS': "Tryck",
@@ -637,6 +684,8 @@ translations = {
'code': "Kod", 'code': "Kod",
'disarm': "Larma från", 'disarm': "Larma från",
'run': "Kör", 'run': "Kör",
'lock': "Lås",
'unlock': "Lås upp",
}, },
'th': { 'th': {
'PRESS': "กด", 'PRESS': "กด",
@@ -654,6 +703,8 @@ translations = {
'clear_code': "ล้าง", 'clear_code': "ล้าง",
'code': "รหัส", 'code': "รหัส",
'disarm': "ปิดระบบสัญญาณกันขโมย", 'disarm': "ปิดระบบสัญญาณกันขโมย",
'lock': "ล็อค",
'unlock': "ปลดล็อค",
}, },
'tr': { 'tr': {
'PRESS': "Basınız", 'PRESS': "Basınız",
@@ -673,6 +724,8 @@ translations = {
'code': "Kod", 'code': "Kod",
'disarm': "Etkisiz hale getir", 'disarm': "Etkisiz hale getir",
'run': "Çalıştır", 'run': "Çalıştır",
'lock': "Kilitle",
'unlock': "Kilidi aç",
}, },
'uk': { 'uk': {
'PRESS': "Натисніть", 'PRESS': "Натисніть",
@@ -691,6 +744,8 @@ translations = {
'code': "Код", 'code': "Код",
'disarm': "DISARM", 'disarm': "DISARM",
'run': "Запустити", 'run': "Запустити",
'lock': "Блокувати",
'unlock': "Розблокувати",
}, },
'vi': { 'vi': {
'ACTIVATE': "Kích hoạt", 'ACTIVATE': "Kích hoạt",
@@ -708,13 +763,15 @@ translations = {
'code': "Mã số", 'code': "Mã số",
'disarm': "Vô hiệu hoá", 'disarm': "Vô hiệu hoá",
'run': "Chạy", 'run': "Chạy",
'lock': "Khóa",
'unlock': "Mở khóa",
}, },
} }
def get_translation(locale, input): def get_translation(locale, input):
locale = locale.split("_")[0]
en_fallback_res = translations.get("en").get(input, input) en_fallback_res = translations.get("en").get(input, input)
if locale in translations: if locale in translations:
return translations.get(locale).get(input, en_fallback_res) return translations.get(locale).get(input, en_fallback_res)
else: else:
return en_fallback_res return en_fallback_res

View File

@@ -1,21 +1,18 @@
import json import json
import logging
LOGGER = logging.getLogger(__name__)
class LuiMqttListener(object): class LuiMqttListener(object):
def __init__(self, mqtt_api, topic, controller, updater): def __init__(self, mqtt_api, topic, controller, updater):
self._controller = controller self._controller = controller
self._updater = updater self._updater = updater
self._mqtt_api = mqtt_api
# Setup, mqtt subscription and callback # Setup, mqtt subscription and callback
mqtt_api.mqtt_subscribe(topic=topic) mqtt_api.mqtt_subscribe(topic=topic)
mqtt_api.listen_event(self.mqtt_event_callback, "MQTT_MESSAGE", topic=topic, namespace='mqtt') mqtt_api.listen_event(self.mqtt_event_callback, "MQTT_MESSAGE", topic=topic, namespace='mqtt')
def mqtt_event_callback(self, event_name, data, kwargs): def mqtt_event_callback(self, event_name, data, kwargs):
LOGGER.debug(f'MQTT callback for: {data}') self._mqtt_api.log(f'MQTT callback for: {data}')
# Parse Json Message from Tasmota and strip out message from nextion display # Parse Json Message from Tasmota and strip out message from nextion display
data = json.loads(data["payload"]) data = json.loads(data["payload"])
if("nlui_driver_version" in data): if("nlui_driver_version" in data):
@@ -25,7 +22,7 @@ class LuiMqttListener(object):
if("CustomRecv" not in data): if("CustomRecv" not in data):
return return
msg = data["CustomRecv"] msg = data["CustomRecv"]
LOGGER.info(f"Received Message from Screen: {msg}") self._mqtt_api.log(f"Received Message from Screen: {msg}")
# Split message into parts seperated by "," # Split message into parts seperated by ","
msg = msg.split(",") msg = msg.split(",")
# run action based on received command # run action based on received command

View File

@@ -1,4 +1,3 @@
import logging
import datetime import datetime
import dateutil.parser as dp import dateutil.parser as dp
@@ -13,8 +12,6 @@ babel_spec = importlib.util.find_spec("babel")
if babel_spec is not None: if babel_spec is not None:
import babel.dates import babel.dates
LOGGER = logging.getLogger(__name__)
class LuiPagesGen(object): class LuiPagesGen(object):
def __init__(self, ha_api, config, send_mqtt_msg): def __init__(self, ha_api, config, send_mqtt_msg):
@@ -27,7 +24,7 @@ class LuiPagesGen(object):
attr = entity.attributes attr = entity.attributes
default_color_on = rgb_dec565([253, 216, 53]) default_color_on = rgb_dec565([253, 216, 53])
default_color_off = rgb_dec565([68, 115, 158]) default_color_off = rgb_dec565([68, 115, 158])
icon_color = default_color_on if entity.state == "on" else default_color_off icon_color = default_color_on if entity.state in ["on", "unlocked"] else default_color_off
if "rgb_color" in attr: if "rgb_color" in attr:
color = attr.rgb_color color = attr.rgb_color
@@ -64,27 +61,43 @@ class LuiPagesGen(object):
if self._ha_api.entity_exists(we_name): if self._ha_api.entity_exists(we_name):
we = self._ha_api.get_entity(we_name) we = self._ha_api.get_entity(we_name)
else: else:
LOGGER.error(f"Skipping Weather Update, entity {we_name} not found") self._ha_api.error(f"Skipping Weather Update, entity {we_name} not found")
return return
icon_cur = get_icon_id_ha("weather", state=we.state) icon_cur = get_icon_id_ha("weather", state=we.state)
text_cur = convert_temperature(we.attributes.temperature, unit) text_cur = convert_temperature(we.attributes.temperature, unit)
forecastSkip = self._config._config_screensaver.raw_config.get(f"forecastSkip")+1
# check if the difference between the first 2 forecast items is less than 24h
difference = (dp.parse(we.attributes.forecast[forecastSkip]['datetime']) - dp.parse(we.attributes.forecast[0]['datetime']))
total_seconds = difference.total_seconds()
same_day = total_seconds < 86400
weather_res = "" weather_res = ""
for i in range(1,5): for i in range(1,5):
wOF = self._config._config_screensaver.raw_config.get(f"weatherOverrideForecast{i}") wOF = self._config._config_screensaver.raw_config.get(f"weatherOverrideForecast{i}")
if wOF is None: if wOF is None:
up = we.attributes.forecast[i-1]['datetime'] fid = (i-1)*forecastSkip
#up = datetime.datetime.fromisoformat(up) if len(we.attributes.forecast) >= fid:
up = dp.parse(up) up = we.attributes.forecast[fid]['datetime']
if babel_spec is not None: up = dp.parse(up).astimezone()
up = babel.dates.format_date(up, "E", locale=self._locale) if babel_spec is not None:
if same_day:
up = babel.dates.format_time(up, "H:mm", locale=self._locale)
else:
up = babel.dates.format_date(up, "E", locale=self._locale)
else:
if same_day:
up = up.strftime('%H:%M')
else:
up = up.strftime('%a')
icon = get_icon_id_ha("weather", state=we.attributes.forecast[fid]['condition'])
down = convert_temperature(we.attributes.forecast[fid]['temperature'], unit)
else: else:
up = up.strftime("%a") up = ""
icon = get_icon_id_ha("weather", state=we.attributes.forecast[i-1]['condition']) icon = ""
down = convert_temperature(we.attributes.forecast[i-1]['temperature'], unit) down = ""
else: else:
LOGGER.info(f"Forecast {i} is overriden with {wOF}") self._ha_api.log(f"Forecast {i} is overriden with {wOF}")
icon = wOF.get("icon") icon = wOF.get("icon")
name = wOF.get("name") name = wOF.get("name")
entity = self._ha_api.get_entity(wOF.get("entity")) entity = self._ha_api.get_entity(wOF.get("entity"))
@@ -107,7 +120,7 @@ class LuiPagesGen(object):
# type of the item is the string before the "." in the entityId # type of the item is the string before the "." in the entityId
entityType = entityId.split(".")[0] entityType = entityId.split(".")[0]
LOGGER.debug(f"Generating item for {entityId} with type {entityType}",) self._ha_api.log(f"Generating item for {entityId} with type {entityType}", level="DEBUG")
# Internal types # Internal types
if entityType == "delete": if entityType == "delete":
return f"~{entityType}~~~~~" return f"~{entityType}~~~~~"
@@ -158,11 +171,24 @@ class LuiPagesGen(object):
icon_id = get_icon_id_ha("script", overwrite=icon) icon_id = get_icon_id_ha("script", overwrite=icon)
text = get_translation(self._locale,"run") text = get_translation(self._locale,"run")
return f"~button~{entityId}~{icon_id}~17299~{name}~{text}" return f"~button~{entityId}~{icon_id}~17299~{name}~{text}"
if entityType == "lock":
icon_id = get_icon_id_ha("lock", state=entity.state, overwrite=icon)
icon_color = self.get_entity_color(entity)
text = get_translation(self._locale,"lock") if entity.state == "unlocked" else get_translation(self._locale,"unlock")
return f"~button~{entityId}~{icon_id}~{icon_color}~{name}~{text}"
if entityType == "number": if entityType == "number":
icon_id = get_icon_id_ha("number", overwrite=icon) icon_id = get_icon_id_ha("number", overwrite=icon)
min_v = entity.attributes.get("min", 0) min_v = entity.attributes.get("min", 0)
max_v = entity.attributes.get("max", 100) max_v = entity.attributes.get("max", 100)
return f"~number~{entityId}~{icon_id}~17299~{name}~{entity.state}|{min_v}|{max_v}" return f"~number~{entityId}~{icon_id}~17299~{name}~{entity.state}|{min_v}|{max_v}"
if entityType == "fan":
icon_id = get_icon_id_ha("fan", overwrite=icon)
icon_color = self.get_entity_color(entity)
return f"~number~{entityId}~{icon_id}~{icon_color}~{name}~{entity.attributes.percentage}|0|100"
if entityType == "input_text":
icon_id = get_icon_id_ha("input_text", overwrite=icon)
value = entity.state
return f"~text~{entityId}~{icon_id}~17299~{name}~{value}"
return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~error~" return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~error~"
def generate_entities_page(self, navigation, heading, items): def generate_entities_page(self, navigation, heading, items):
@@ -326,7 +352,7 @@ class LuiPagesGen(object):
self._send_mqtt_msg(command) self._send_mqtt_msg(command)
def render_card(self, card, send_page_type=True): def render_card(self, card, send_page_type=True):
LOGGER.info(f"Started rendering of page {card.pos} with type {card.cardType}") self._ha_api.log(f"Started rendering of page {card.pos} with type {card.cardType}")
if len(self._config._config_cards) == 1: if len(self._config._config_cards) == 1:
navigation = "0|0" navigation = "0|0"
else: else:

View File

@@ -1,9 +1,8 @@
import logging
LOGGER = logging.getLogger(__name__)
class Updater: class Updater:
def __init__(self, send_mqtt_msg, topic_send, mode, desired_display_firmware_version, desired_display_firmware_model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url): def __init__(self, log, send_mqtt_msg, topic_send, mode, desired_display_firmware_version, desired_display_firmware_model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url):
self._log = log
self.desired_display_firmware_version = desired_display_firmware_version self.desired_display_firmware_version = desired_display_firmware_version
self.desired_display_firmware_model = desired_display_firmware_model self.desired_display_firmware_model = desired_display_firmware_model
self.desired_display_firmware_url = desired_display_firmware_url self.desired_display_firmware_url = desired_display_firmware_url
@@ -43,10 +42,10 @@ class Updater:
# return's true if a notification was send to the panel # return's true if a notification was send to the panel
# run pre req check # run pre req check
if self.check_pre_req(): if self.check_pre_req():
LOGGER.info("Update Pre-Check sucessful Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version) self._log("Update Pre-Check sucessful Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version)
# check if tasmota driver needs update # check if tasmota driver needs update
if self.current_tasmota_driver_version < self.desired_tasmota_driver_version: if self.current_tasmota_driver_version < self.desired_tasmota_driver_version:
LOGGER.info("Update of Tasmota Driver needed") self._log("Update of Tasmota Driver needed")
# in auto mode just do the update # in auto mode just do the update
if self.mode == "auto": if self.mode == "auto":
self.update_berry_driver() self.update_berry_driver()
@@ -59,26 +58,26 @@ class Updater:
return False return False
# check if model has changed # check if model has changed
if self.current_display_model is not None and self.current_display_model != self.desired_display_firmware_model: if self.current_display_model is not None and self.current_display_model != self.desired_display_firmware_model:
LOGGER.info(f"Mismatch between Display Firmware ({self.current_display_model}) and configured model ({self.desired_display_firmware_model})") self._log(f"Mismatch between Display Firmware ({self.current_display_model}) and configured model ({self.desired_display_firmware_model})")
update_msg = f"The configured display firmware model has changed, do you want to start the update now? Current Model: {self.current_display_model} Configured Model: {self.desired_display_firmware_model} If the update fails check the installation manual and flash your version again over the Tasmota console. Be patient, the update will take a while." update_msg = f"The configured display firmware model has changed, do you want to start the update now? Current Model: {self.current_display_model} Configured Model: {self.desired_display_firmware_model} If the update fails check the installation manual and flash your version again over the Tasmota console. Be patient, the update will take a while."
self.send_message_page("updateDisplayNoYes", "Display Update available!", update_msg, "Dismiss", "Yes") self.send_message_page("updateDisplayNoYes", "Display Update available!", update_msg, "Dismiss", "Yes")
return True return True
# check if display firmware needs an update # check if display firmware needs an update
if self.current_display_firmware_version < self.desired_display_firmware_version: if self.current_display_firmware_version < self.desired_display_firmware_version:
LOGGER.info("Update of Display Firmware needed") self._log("Update of Display Firmware needed")
# in auto mode just do the update # in auto mode just do the update
if self.mode == "auto": if self.mode == "auto":
self.update_panel_driver() self.update_panel_driver()
return False return False
# send notification about the update # send notification about the update
if self.mode == "auto-notify": if self.mode == "auto-notify":
update_msg = "There's a firmware update available for the Nextion screen of the NSPanel. Do you want tostart the update now? If the update fails check the installation manual and flash again over the Tasmota console. Be patient, the update will take a while." update_msg = "There's a firmware update available for the Nextion screen of the NSPanel. Do you want tostart the update now? If the update fails check the installation manual and flash again over the Tasmota console. Be patient, the update will take a while."
self.send_message_page("updateDisplayNoYes", "Display Update available!", update_msg, "Dismiss", "Yes") self.send_message_page("updateDisplayNoYes", "Display Update available!", update_msg, "Dismiss", "Yes")
return True return True
return False return False
else: else:
LOGGER.info("Update Pre-Check failed Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version) self._log("Update Pre-Check failed Tasmota Driver Version: %s Panel Version: %s", self.current_tasmota_driver_version, self.current_display_firmware_version)
return False return False
def request_berry_driver_version(self): def request_berry_driver_version(self):

View File

@@ -1,6 +1,3 @@
import logging
import traceback
import hassapi as hass import hassapi as hass
from luibackend.config import LuiBackendConfig from luibackend.config import LuiBackendConfig
@@ -8,46 +5,10 @@ from luibackend.controller import LuiController
from luibackend.mqttListener import LuiMqttListener from luibackend.mqttListener import LuiMqttListener
from luibackend.updater import Updater from luibackend.updater import Updater
LOGGER = logging.getLogger(__name__)
class AppDaemonLoggingHandler(logging.Handler):
def __init__(self, app):
super().__init__()
self._app = app
def emit(self, record):
message = record.getMessage()
if record.exc_info:
message += '\nTraceback (most recent call last):\n'
message += '\n'.join(traceback.format_tb(record.exc_info[2]))
message += f'{record.exc_info[0].__name__}: {record.exc_info[1]}'
self._app.log(message, level=record.levelname)
class NsPanelLovelaceUIManager(hass.Hass): class NsPanelLovelaceUIManager(hass.Hass):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._redirect_logging()
def _redirect_logging(self):
# Add a handler for the logging module that will convert the
# calls to AppDaemon's logger with the self instance, so that
# we can simply use logging in the rest of the application
rlogger = logging.getLogger()
rlogger.handlers = [
h for h in rlogger.handlers
if type(h).__name__ != AppDaemonLoggingHandler.__name__
]
rlogger.addHandler(AppDaemonLoggingHandler(self))
# We want to grab all the logs, AppDaemon will
# then care about filtering those we asked for
rlogger.setLevel(logging.DEBUG)
def initialize(self): def initialize(self):
LOGGER.info('Starting') self.log('Starting')
mqtt_api = self._mqtt_api = self.get_plugin_api("MQTT") mqtt_api = self._mqtt_api = self.get_plugin_api("MQTT")
cfg = self._cfg = LuiBackendConfig(self, self.args["config"]) cfg = self._cfg = LuiBackendConfig(self, self.args["config"])
@@ -55,7 +16,7 @@ class NsPanelLovelaceUIManager(hass.Hass):
def send_mqtt_msg(msg, topic=None): def send_mqtt_msg(msg, topic=None):
if topic is None: if topic is None:
topic = topic_send topic = topic_send
LOGGER.info(f"Sending MQTT Message: {msg}") self.log(f"Sending MQTT Message: {msg}")
mqtt_api.mqtt_publish(topic, msg) mqtt_api.mqtt_publish(topic, msg)
# Request Tasmota Driver Version # Request Tasmota Driver Version
@@ -63,8 +24,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
controller = LuiController(self, cfg, send_mqtt_msg) controller = LuiController(self, cfg, send_mqtt_msg)
desired_display_firmware_version = 32 desired_display_firmware_version = 33
version = "v2.7.2" version = "v2.8.0"
model = cfg.get("model") model = cfg.get("model")
if model == "us-l": if model == "us-l":
@@ -82,9 +43,9 @@ class NsPanelLovelaceUIManager(hass.Hass):
mode = cfg.get("updateMode") mode = cfg.get("updateMode")
topic_send = cfg.get("panelSendTopic") topic_send = cfg.get("panelSendTopic")
updater = Updater(send_mqtt_msg, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url) updater = Updater(self.log, send_mqtt_msg, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url)
topic_recv = cfg.get("panelRecvTopic") topic_recv = cfg.get("panelRecvTopic")
LuiMqttListener(mqtt_api, topic_recv, controller, updater) LuiMqttListener(mqtt_api, topic_recv, controller, updater)
LOGGER.info('Started') self.log('Started')

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff