Compare commits

...

391 Commits
v4.1.3 ... dev

Author SHA1 Message Date
Johannes
6eab35ddd0 Update docs.yml 2023-11-28 21:43:07 +01:00
Johannes
495e63dacc Update docs.yml 2023-11-28 21:38:42 +01:00
Johannes
d965e7c7df Update docs.yml 2023-11-28 21:35:23 +01:00
Johannes
060f2bd8de Update mkdocs.yml 2023-11-28 21:35:19 +01:00
Johannes
17585f3c75 Update config.yaml 2023-11-28 16:42:36 +01:00
joBr99
79303ade8b Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-28 16:41:34 +01:00
joBr99
d7e417eaf7 implement cardunlock 2023-11-28 16:41:26 +01:00
Johannes
9622c65eb5 Update faq.md 2023-11-28 12:56:32 +01:00
Johannes
16ee1fb1c2 Update configure_mqtt.md 2023-11-28 12:51:19 +01:00
Johannes
fd7d4bca24 Update faq.md 2023-11-28 12:49:57 +01:00
joBr99
a4627e8589 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-11-27 23:29:02 +00:00
joBr99
51dd978c8c Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-28 00:25:40 +01:00
joBr99
1521a45dc1 hide btDetail 2023-11-28 00:25:31 +01:00
joBr99
03ac046feb hide elements on cardThermo (add nextion2text) 2023-11-27 23:21:45 +00:00
joBr99
ff9dc6c71e hide elements on cardThermo 2023-11-28 00:18:36 +01:00
Armilar
f8c6b80438 Update ioBroker_NSPanel_locales_beta.json 2023-11-27 22:10:16 +01:00
Armilar
56c8b07e2e Update ioBroker_NSPanel_locales.json 2023-11-27 22:09:54 +01:00
Armilar
cd628038b4 Update ioBroker_NSPanel_locales.json 2023-11-27 21:35:14 +01:00
Armilar
efeebe6a86 Merge pull request #1070 from joBr99/Armilar-patch-4
v4.3.3.14 - Update NsPanelTs.ts
2023-11-27 16:06:25 +01:00
Armilar
ce6717292a v4.3.3.14 - Update NsPanelTs.ts
- Refactoring Sonos-Player (with Playlist, Tracklist, Favorites, Eqalizer (if no Favorites))
- minor Fixes with other Media-Players
2023-11-27 15:58:08 +01:00
Armilar
c5b5002d27 v4.3.3.14 - Update NsPanelTs.ts
- Refactoring Sonos-Player (with Playlist, Tracklist, Favorites, Eqalizer (if no Favorites))
- minor Bug-Fixes
2023-11-27 15:52:52 +01:00
Armilar
4daa6dbb78 Update ioBroker_NSPanel_locales.json 2023-11-27 13:42:38 +01:00
joBr99
7ffe37117b . 2023-11-27 00:45:56 +01:00
joBr99
112fe16f29 . 2023-11-27 00:34:51 +01:00
joBr99
361a125118 merge 2023-11-27 00:29:20 +01:00
joBr99
6bd9b34f96 . 2023-11-27 00:28:48 +01:00
Johannes
4938b5794a Update config.yaml 2023-11-26 23:55:34 +01:00
joBr99
0e2e11655c Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-26 23:47:25 +01:00
joBr99
4c591ca8e1 . 2023-11-26 23:47:12 +01:00
Johannes
7b811ca0f8 Update config.yaml 2023-11-26 18:44:13 +01:00
Johannes
46e18d0954 Update panels.yaml.example 2023-11-26 18:35:21 +01:00
Johannes
9df7afbf01 Update config.yaml 2023-11-26 18:18:46 +01:00
joBr99
6d6ebb5ccc Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-26 18:17:49 +01:00
joBr99
41fe5ebd82 fix icon overwrite for internal entities 2023-11-26 18:17:37 +01:00
Armilar
1e2f4f4ca2 Merge pull request #1068 from joBr99/Armilar-patch-4
v4.3.3.13 - Update NsPanelTs.ts
2023-11-26 15:28:07 +01:00
Armilar
9a084c58bb v4.3.3.13 - Update NsPanelTs.ts
Version
2023-11-26 15:23:39 +01:00
Armilar
0d66a1f4f2 v4.3.3.13 - Update NsPanelTs.ts
- Separation of page creation and page updates in cardMedia
- Add alwaysOnDisplay to cardMedia - Leave display on if the alwaysOnDisplay parameter is "true"
- Fix Sonos Repeat/Shuffle
- Translations
2023-11-26 15:21:42 +01:00
joBr99
ad891115a9 . 2023-11-26 13:02:18 +01:00
joBr99
b38189d63e merge 2023-11-26 12:14:59 +01:00
joBr99
900e1aef46 add extended logging feats 2023-11-26 12:14:15 +01:00
Johannes
2a43a96f9a Update config.yaml 2023-11-25 22:03:12 +01:00
Johannes
11827bf68b Update ha_control.py 2023-11-25 22:01:35 +01:00
joBr99
bc3d58d406 bump version 2023-11-25 20:18:21 +01:00
joBr99
4aed6f672e Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-25 20:17:49 +01:00
joBr99
f40235bb2e fix 2023-11-25 20:17:43 +01:00
Johannes
67d323da42 bump version 2023-11-25 19:32:54 +01:00
joBr99
2801509215 bump version 2023-11-25 19:26:47 +01:00
joBr99
bb38dda0cb implement timer popup 2023-11-25 19:25:03 +01:00
joBr99
69830d82f7 implements #763 2023-11-25 19:05:02 +01:00
joBr99
b6c3444a55 implement cover and fan popup 2023-11-25 18:39:02 +01:00
joBr99
172f8d8ad4 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-25 18:17:56 +01:00
joBr99
5ab207504d implement homeassistant template caching 2023-11-25 18:17:21 +01:00
Armilar
ec0ffc3584 v4.3.3.12 - Update NsPanelTs.ts
- Separation of page creation and page updates in cardPower
- Add alwaysOnDisplay to cardPower - Leave display on if the alwaysOnDisplay parameter is "true"
- Some translations
2023-11-25 18:16:06 +01:00
Johannes
2303446958 Update config.yaml 2023-11-25 01:17:16 +01:00
joBr99
36f2c85ffe . 2023-11-25 01:12:50 +01:00
Johannes
655edc071f move each panel to it's own thread (#1066) 2023-11-25 01:04:09 +01:00
joBr99
2c3bd3a88e fix callbacks 2023-11-25 00:54:34 +01:00
joBr99
2944044a4a fix template icons without <I></I> 2023-11-24 23:51:52 +01:00
joBr99
e846ac4923 fix icon template rendering 2023-11-24 23:18:49 +01:00
joBr99
2f2bc406f2 fix icon rendering 2023-11-24 23:11:22 +01:00
joBr99
9a4a42f7ac send dimmode and timeout only on startup and update 2023-11-24 22:31:33 +01:00
joBr99
99ebaa0364 install python in devcontainer 2023-11-24 22:04:12 +01:00
Johannes
4b651db8dc Update config.yaml 2023-11-24 21:22:24 +01:00
Johannes
27f214c633 Update ha_cards.py 2023-11-24 21:22:07 +01:00
Johannes
c59107a137 Update config.yaml 2023-11-24 21:10:23 +01:00
Johannes
46a3c4b612 Update panel.py 2023-11-24 21:10:08 +01:00
joBr99
658348b4fd Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-11-24 20:03:19 +00:00
joBr99
896ffe1282 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-24 21:00:41 +01:00
joBr99
d82ffc3617 . 2023-11-24 21:00:35 +01:00
joBr99
8d83d727f3 . (add nextion2text) 2023-11-24 18:12:29 +00:00
joBr99
c6e49bbf80 . 2023-11-24 19:09:41 +01:00
joBr99
349db170a6 add event for page open (add nextion2text) 2023-11-24 17:58:17 +00:00
joBr99
3f2dac39a0 add event for page open 2023-11-24 18:55:41 +01:00
joBr99
439eb9309a . 2023-11-24 18:11:04 +01:00
joBr99
c49f214bec implement some local templates 2023-11-24 16:34:14 +01:00
Johannes
7fb347063c Update config.yaml 2023-11-24 16:27:05 +01:00
Johannes
da91c282b7 Update apparmor.txt 2023-11-24 16:26:50 +01:00
joBr99
ff5a9d2274 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-24 15:27:23 +01:00
joBr99
fce9265b5d do not force supervised settings in case env var is set and config is there 2023-11-24 15:27:10 +01:00
Armilar
7b39a5e2b1 v4.3.3.11 - Merge pull request #1064 from tt-tom17/main
v4.3.3.11 - Update NsPanelTS.ts
2023-11-24 10:24:43 +01:00
Armilar
7b513f901c v4.3.3.11 - Update NsPanelTs.ts 2023-11-24 10:22:35 +01:00
Thomas
6e6b70c89f v4.3.3.11 - Update NsPanelTS.ts
Add autoCreateALias to PageQR
2023-11-24 10:11:07 +01:00
joBr99
e0294195b9 . 2023-11-23 21:14:25 +01:00
joBr99
7ecad206dc . 2023-11-23 20:53:12 +01:00
joBr99
254aa2d043 . 2023-11-23 20:47:24 +01:00
joBr99
1b4c435fab some fixes 2023-11-23 20:40:16 +01:00
joBr99
55688549fa bump version 2023-11-23 19:28:00 +01:00
joBr99
fb69d05f06 implement status override 2023-11-23 19:27:19 +01:00
joBr99
cde1aeda0e Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-23 19:12:42 +01:00
joBr99
2816fa88e4 implement navigation up 2023-11-23 19:12:30 +01:00
joBr99
9cc31b6e5b error handling for invalid config file 2023-11-23 19:12:15 +01:00
Armilar
8f34fbf7a7 v4.3.3.10 - Merge pull request #1062 from tt-tom17/main
v4.3.3.10 - Code optimization in Config Area
2023-11-22 19:45:16 +01:00
Armilar
32df87d8bd v4.3.3.10 - Update NsPanelTs.ts
Code optimization in Config Area
2023-11-22 19:40:51 +01:00
Thomas
50302c1fd4 v4.3.3.10
Code optimization
2023-11-22 19:10:40 +01:00
Johannes
7f4bb973b1 Update config.yaml 2023-11-22 17:43:13 +01:00
joBr99
a542ba39aa implement status icons 2023-11-22 17:40:36 +01:00
joBr99
7f8b013381 implement cardalarm 2023-11-21 18:39:38 +01:00
joBr99
e455d50738 implement some more actions 2023-11-21 18:15:34 +01:00
joBr99
50533dd2a6 bump version 2023-11-21 17:22:15 +01:00
joBr99
f432e14f3e . 2023-11-21 17:21:33 +01:00
joBr99
7cc1c6ec77 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-20 21:38:33 +01:00
joBr99
3a8293d266 . 2023-11-20 21:38:18 +01:00
Johannes
b5bc19443a Update config.yaml 2023-11-20 21:08:39 +01:00
joBr99
d58bf81600 bump 2023-11-20 21:03:23 +01:00
joBr99
8398684cc6 move config file 2023-11-20 21:01:08 +01:00
joBr99
53deb3ab85 fix 2023-11-20 20:33:27 +01:00
joBr99
d86057ef76 fix 2023-11-20 20:18:39 +01:00
joBr99
66a3dab237 fix 2023-11-20 20:15:55 +01:00
joBr99
6e9bab3502 fix 2023-11-20 20:12:48 +01:00
joBr99
ebdb9bc2c1 implement sleepmodes 2023-11-20 20:03:13 +01:00
joBr99
694b231983 implement sleepmodes 2023-11-20 20:02:53 +01:00
joBr99
3e56cf7d8c Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-20 19:56:41 +01:00
Armilar
c1e8f7df04 v4.3.3.9 - Update NsPanelTs.ts
Add ScreensaverEntityOnColor, ...OffColor, ...OnText, ...OffText
2023-11-20 18:45:16 +01:00
joBr99
c0ebe4a397 implement sleeptimeout 2023-11-20 18:41:09 +01:00
joBr99
3dcb91b276 implement doubletaptounlock 2023-11-20 18:09:35 +01:00
joBr99
6a7606b3e0 . 2023-11-20 17:54:30 +01:00
joBr99
6af48209e6 implement name overwrite 2023-11-20 17:27:18 +01:00
joBr99
deefe6b33a . 2023-11-20 17:25:08 +01:00
joBr99
8a1b583794 implement icon overwrite 2023-11-20 17:18:22 +01:00
joBr99
b55d2b9c06 implement topic config 2023-11-20 16:57:25 +01:00
Armilar
891230144a Merge pull request #1056 from Armilar/main
These branches can be automatically merged.
2023-11-20 16:53:38 +01:00
Armilar
58ea667430 Merge branch 'joBr99:main' into main 2023-11-20 16:52:54 +01:00
Armilar
8ba8bb6488 v4.3.3.8 - Update NsPanelTs.ts
v4.3.3.8  Add Method dayjs (Multilingualism), some Minor Fixes
2023-11-20 16:51:57 +01:00
Armilar
4062b31b7d Merge pull request #4 from Armilar/Armilar-patch-4
v4.3.3.8 - Update NsPanelTs.ts
2023-11-20 16:47:55 +01:00
Armilar
59cc0fc887 v4.3.3.8 - Update NsPanelTs.ts
v4.3.3.8  Add Method dayjs (Multilingualism), some Minor Fixes
2023-11-20 16:46:56 +01:00
joBr99
521cbabee8 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-20 16:45:56 +01:00
joBr99
f897ae9b9d Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-20 16:45:25 +01:00
joBr99
55c554910b Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-20 16:43:00 +01:00
joBr99
c61f0c4906 . 2023-11-20 16:42:43 +01:00
Armilar
336a0b61a3 Merge pull request #1055 from Armilar/main
These branches can be automatically merged.
2023-11-20 14:25:00 +01:00
Armilar
ac7ca6d621 Merge pull request #3 from Armilar/Armilar-patch-3
v4.3.3.7 - Update NsPanelTs.ts
2023-11-20 14:21:12 +01:00
Armilar
6245a8e12f v4.3.3.7 - Update NsPanelTs.ts 2023-11-20 14:18:57 +01:00
Armilar
8897ec01ec Merge pull request #1054 from Armilar/main
Able to merge.
2023-11-20 14:12:14 +01:00
Armilar
1e79f6385b Merge branch 'joBr99:main' into main 2023-11-20 14:10:26 +01:00
Armilar
8d413cabb8 Update ioBroker_NSPanel_locales.json 2023-11-20 14:02:07 +01:00
Armilar
99d013c039 Update ioBroker_NSPanel_locales.json 2023-11-20 13:59:42 +01:00
Armilar
03f65daef3 Update ioBroker_NSPanel_locales.json 2023-11-20 13:51:35 +01:00
Armilar
f86768c95b Update ioBroker_NSPanel_locales.json 2023-11-20 13:42:12 +01:00
Armilar
1a7c9abb16 Update ioBroker_NSPanel_locales_beta.json 2023-11-20 13:41:51 +01:00
Armilar
c961cf9fde Update ioBroker_NSPanel_locales_beta.json 2023-11-20 13:40:25 +01:00
Armilar
acbaa43ee6 Update ioBroker_NSPanel_locales.json 2023-11-20 13:40:01 +01:00
Armilar
cbdc6f6f77 Merge pull request #1053 from tt-tom17/AlarmPage (add nextion2text) 2023-11-20 12:00:33 +00:00
Armilar
75b6a07995 Merge pull request #1053 from tt-tom17/AlarmPage
v4.3.3.6
2023-11-20 12:53:37 +01:00
Armilar
85e6eb6f73 4.3.3.6 - Update NsPanelTs.ts 2023-11-20 12:49:42 +01:00
Thomas
c2599ed4a3 v4.3.3.6
- Add autoCreateALias to PageAlarm
- Add actionStringArray to PageAlarm
2023-11-20 12:03:27 +01:00
Thomas
0fa7e8f562 v4.3.3.x
-auto create Alais for PageAlarm
-variable String for Button on PageAlarm
2023-11-20 11:51:00 +01:00
Thomas
b1d0ad8e16 v4.3.3.x
create Alias for PageAlarm
2023-11-20 10:43:08 +01:00
Stephan Leuschner
e0762f504e Minor cleanup relating to app restart code 2023-11-19 19:24:34 -05:00
Stephan Leuschner
453537ff68 restart app on config.yml change 2023-11-19 19:18:37 -05:00
joBr99
069087c48b . 2023-11-20 00:30:34 +01:00
joBr99
19eae41c33 . 2023-11-20 00:09:45 +01:00
joBr99
202260c1d6 . 2023-11-19 23:49:58 +01:00
joBr99
067b2bd75a implement screensaver 2023-11-19 23:28:54 +01:00
joBr99
2a6643eb68 . 2023-11-19 23:14:07 +01:00
joBr99
59390cc6ec Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-19 23:12:41 +01:00
joBr99
b20ba7a761 . 2023-11-19 23:12:35 +01:00
Stephan Leuschner
039043fe5b use timeZone from panel config 2023-11-19 17:00:55 -05:00
joBr99
116153e77b implement cardPower 2023-11-19 22:08:46 +01:00
joBr99
1552374ce7 implement cardqr 2023-11-19 22:00:04 +01:00
joBr99
21acb9115d implement some more actions 2023-11-19 21:03:42 +01:00
Stephan Leuschner
64ca6b9a41 fix permission of run.sh 2023-11-19 14:55:28 -05:00
Stephan Leuschner
c05f58fb5e attempt to fix addon on real instance, outside devcontainer 2023-11-19 14:50:04 -05:00
joBr99
6fe763c3ae Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-19 20:01:36 +01:00
joBr99
2777ce56ea . 2023-11-19 20:01:23 +01:00
Stephan Leuschner
1678dadcbe if home_assistant_token is in settings the use that for external HA server 2023-11-19 13:20:45 -05:00
joBr99
9ab66b741d Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-19 19:17:23 +01:00
joBr99
13ec7b606e . 2023-11-19 19:17:16 +01:00
Johannes
e96e5821d0 Update config.yaml 2023-11-19 19:07:08 +01:00
joBr99
6df63ea67e fix callback 2023-11-19 18:50:48 +01:00
joBr99
f0c0281ac2 . 2023-11-19 18:44:06 +01:00
joBr99
b9d9fc565e Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-19 18:43:31 +01:00
joBr99
6111c3530c upd 2023-11-19 18:43:22 +01:00
Stephan Leuschner
2ba9eae7e6 improve extraction of env variables 2023-11-19 12:37:21 -05:00
joBr99
431a93a7ff . 2023-11-19 18:29:12 +01:00
joBr99
5d3e836156 fix addon startup 2023-11-19 17:29:19 +01:00
joBr99
c1234e2c16 . 2023-11-19 16:13:25 +01:00
joBr99
aaf30e3bc2 add devcontainer 2023-11-19 16:07:20 +01:00
joBr99
aa5e935499 . 2023-11-19 15:55:59 +01:00
joBr99
77e9258bd7 . 2023-11-19 15:54:46 +01:00
Johannes
6ba94f49d4 Update config.yaml 2023-11-19 15:04:37 +01:00
joBr99
264fef1142 fix docker 2023-11-19 14:59:40 +01:00
joBr99
a8be9a46c8 merge 2023-11-19 14:21:55 +01:00
joBr99
e8366d438c Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-19 14:21:43 +01:00
joBr99
c915c72ef2 fix dockerfile 2023-11-19 14:21:04 +01:00
Johannes
656ced6a2f Update config.yaml 2023-11-19 13:49:37 +01:00
joBr99
cf0739b76a move req txt 2023-11-19 13:44:14 +01:00
joBr99
8a572f2961 add python to container 2023-11-19 13:42:15 +01:00
Johannes
d7ce6421a0 Update config.yaml 2023-11-19 13:02:25 +01:00
dependabot[bot]
60a59e6c63 Bump actions/setup-python from 2 to 4 (#1049)
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-19 12:50:35 +01:00
joBr99
5acaa0736d Bump stefanzweifel/git-auto-commit-action from 4 to 5 (#1048) (add nextion2text) 2023-11-19 11:50:10 +00:00
dependabot[bot]
640e7b231f Bump stefanzweifel/git-auto-commit-action from 4 to 5 (#1048)
Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4 to 5.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-19 12:46:57 +01:00
dependabot[bot]
6de40d53d7 Bump actions/checkout from 2 to 4 (#1050)
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-19 12:46:33 +01:00
Johannes
bdd838cadd Update config.yaml 2023-11-19 12:43:50 +01:00
joBr99
8fa3a11eb5 add initial dev version of ha addon 2023-11-19 12:40:49 +01:00
Thomas
3a1b9071f8 Update NsPanelTs.ts 2023-11-18 22:42:38 +01:00
Thomas
ed655d6596 v4.3.3.x
Create alias for Alarm Page
2023-11-18 22:36:43 +01:00
Thomas
8dc2e6cbe1 v4.3.3.x
Create Alias for PageAlarm
2023-11-18 22:18:10 +01:00
Thomas
cc21d555c5 v4.3.3.x
Create Alias for PageAlarm
2023-11-18 21:20:27 +01:00
Johannes
367bdaf8d6 Update configure_mqtt.md 2023-11-17 23:25:29 +01:00
Johannes
53042f376f Update configure_mqtt.md 2023-11-17 22:45:19 +01:00
Armilar
5d003f94e2 Merge pull request #1034 from joBr99/Armilar-patch-3
- 15.11.2023 - v4.3.3.4  New Service Page -> ioBroker Info 
- 16.11.2023 - v4.3.3.5  Add Multilingualism to Service Menu (39 languages)
- 17.11.2023 - v4.3.3.5  Add Multilingualism to cardQR, popupFan, popupTimer (39 languages)
2023-11-17 13:17:35 +01:00
Armilar
7e218b7a5a v4.3.3.5 - Update NsPanelTs.ts
v4.3.3.5  Add Multilingualism to cardQR, popupFan, popupTimer (39 languages)

Add ReleaseNotes
2023-11-17 13:10:18 +01:00
Armilar
1e1670aa22 v4.3.3.5 - Update NsPanelTs.ts
Translate cardQR, popupTimer, popupFan
2023-11-17 13:05:11 +01:00
Armilar
ab2853084a Update ioBroker_NSPanel_locales_beta.json 2023-11-17 12:53:13 +01:00
Armilar
07235ab583 Update ioBroker_NSPanel_locales.json 2023-11-17 12:52:50 +01:00
Armilar
c5e87d5fdc Update ioBroker_NSPanel_locales_service.json 2023-11-16 23:41:57 +01:00
Armilar
7a9288cd63 Update ioBroker_NSPanel_locales_service.json 2023-11-16 22:42:07 +01:00
joBr99
3347a054e0 fixes #1033 (add nextion2text) 2023-11-16 17:40:35 +00:00
joBr99
59aa703416 fixes #1033 2023-11-16 18:37:46 +01:00
Johannes
e50f068c93 fixes #1035 2023-11-16 18:32:14 +01:00
Johannes
f566031911 fixes #1035 2023-11-16 18:29:12 +01:00
Armilar
5b133483e8 Update ioBroker_NSPanel_locales_service.json 2023-11-16 15:44:30 +01:00
Armilar
f31d5090b9 Update ioBroker_NSPanel_locales_service.json 2023-11-16 14:59:13 +01:00
Armilar
9021ca7a57 v4.3.3.5 - Update NsPanelTs.ts
Add Multilingualism to Service Menu (39 languages)
2023-11-16 13:56:24 +01:00
Armilar
d891d4e5a2 Update ioBroker_NSPanel_locales_service.json 2023-11-16 13:45:21 +01:00
Armilar
dbcdf54e06 Update ioBroker_NSPanel_locales_service.json 2023-11-16 13:04:42 +01:00
Armilar
aea2b890df Update ioBroker_NSPanel_locales_service.json 2023-11-16 11:41:26 +01:00
Armilar
d66734607b Update ioBroker_NSPanel_locales_service.json 2023-11-16 11:23:09 +01:00
Armilar
c82e1673db Update ioBroker_NSPanel_locales_service.json 2023-11-16 11:11:56 +01:00
Armilar
66909990f5 Update ioBroker_NSPanel_locales_service.json 2023-11-16 01:44:46 +01:00
Armilar
138d91594d Update ioBroker_NSPanel_locales_service.json 2023-11-16 01:37:04 +01:00
Armilar
fa0f8d2a0c Update ioBroker_NSPanel_locales_service.json 2023-11-16 00:05:22 +01:00
Armilar
8f40363b2e Update ioBroker_NSPanel_locales_service.json 2023-11-16 00:04:42 +01:00
Armilar
c183840714 Create ioBroker_NSPanel_locales_service.json 2023-11-15 23:50:27 +01:00
Johannes
d24b9d08d9 Update nspanel-lovelace-ui.py 2023-11-15 23:42:19 +01:00
Armilar
eb5d62f778 v4.3.3.4 New Service Page -> ioBroker Info
Correction IoBroker --> ioBroker
2023-11-15 21:00:53 +01:00
Johannes
8eee88c9c5 Update configure_mqtt.md 2023-11-15 20:37:03 +01:00
Johannes
626e55ca65 Update prepare_ha.md 2023-11-15 20:35:59 +01:00
Armilar
a01bba76cb Merge pull request #1030 from tt-tom17/main
v4.3.3.4
2023-11-15 20:20:28 +01:00
Thomas
df6e147071 v4.3.3.4
New Service Page -> IoBroker Info
2023-11-15 19:56:16 +01:00
Johannes
6d2f028dae Update configure_mqtt.md 2023-11-15 19:33:06 +01:00
Johannes
a6807ba45b Update configure_mqtt.md 2023-11-15 19:31:05 +01:00
Johannes
10314859db Update prepare_ha.md 2023-11-15 19:25:21 +01:00
Jean Wasilewski
9e61476b06 add optional timezone parameter on screensaver time (#1027)
* add optional timezone parameter on screensaver time

Signed-off-by: Jean 'henyxia' Wasilewski <henyxia@revs0.com>

* change config name

* Update config-overview.md

* Update config-overview.md

---------

Signed-off-by: Jean 'henyxia' Wasilewski <henyxia@revs0.com>
Co-authored-by: Johannes <29555657+joBr99@users.noreply.github.com>
2023-11-14 17:43:21 +01:00
Armilar
43ab8e7922 4.3.3.3 - update NsPanelTs.ts
Change Header to 4.3.3.3
2023-11-13 09:58:28 +01:00
Armilar
ece0abc0c3 Merge pull request #1025 from joBr99/Armilar-patch-2
4.3.3.3 - Update NsPanelTs.ts
2023-11-13 09:54:12 +01:00
Armilar
0da81c4e37 4.3.3.3 - Update NsPanelTs.ts
v4.3.3.3  if setOption = false, do not create automatically Alias (Functional/Servicemenu) and Datapoints
2023-11-13 09:29:12 +01:00
Armilar
c46ea4026d Merge pull request #1024 from Armilar/main
Merge with Main
2023-11-13 09:17:54 +01:00
Armilar
03615d7b36 Merge branch 'joBr99:main' into main 2023-11-13 09:15:54 +01:00
Armilar
e6a3162ac8 Merge pull request #1023 from joBr99/Armilar-patch-1
4.3.3.2 - Update NsPanelTs.ts
2023-11-13 09:13:03 +01:00
Armilar
0c838111c8 4..3.3.2 - Update NsPanelTs.ts
Change parent/home to "Unlock_Service"
2023-11-13 08:14:48 +01:00
Armilar
412b508a6e 4.3.3.2 - Update NsPanelTs.ts
Extensions in the service menu
2023-11-13 08:12:08 +01:00
Armilar
8640e3d24e 4.3.3.2 - Update NsPanelTs.ts
Add autoCreateALias to cardUnlock
2023-11-12 22:23:17 +01:00
Armilar
3eec1f9713 Merge pull request #2 from Armilar/Armilar-patch-2
4.3.3.2 - Update NsPanelTs.ts
2023-11-12 22:19:11 +01:00
Armilar
da0dc823b8 4.3.3.2 - Update NsPanelTs.ts
Add autoCreateALias to cardUnlock
2023-11-12 22:15:54 +01:00
Armilar
d5f031b660 Merge pull request #1022 from tt-tom17/main
v4.3.3.1
2023-11-12 15:36:29 +01:00
Thomas
303ca2f691 v4.3.3.1
Fix for Issues #1020 HandleHardwareButton buttonConfig.mode -> 'toggle' and 'set'
2023-11-12 12:34:42 +01:00
Thomas
8dd18fa45b v$.3.3.1
Fix for Issues #1020 HandleHardwareButton buttonConfig.mode -> 'toggle' and 'set'
2023-11-11 18:44:16 +01:00
Armilar
7b330dd3e9 v4.3.3 - Update NsPanelTs.ts
const tft_version: string = 'v4.3.3';
2023-11-08 22:42:52 +01:00
Armilar
02aca6c23b Merge pull request #1015 from tt-tom17/main
Upgrade v4.3.3
2023-11-08 17:55:24 +01:00
Thomas
c6ccc0fb9c Upgrade v4.3.3
- Fix Issues #1013 by laluz742 -> Parameter count mismatch: screensaver color
- Upgrade TFT 53 / 4.3.3
2023-11-08 17:45:45 +01:00
Armilar
65a85f7bd8 Merge pull request #1014 from tt-tom17/main
v4.3.2.2
2023-11-07 22:09:55 +01:00
Thomas
3f8c65d654 v4.3.2.2
Fix Selection of screensaver layout (alternative / advanced)
2023-11-07 22:01:48 +01:00
Johannes
55447d724c Update pages.py 2023-11-06 00:18:01 +01:00
Johannes
ce129cd59f fix color 2023-11-05 22:33:36 +01:00
Johannes
7cef38f50e dummy implementation cardChart 2023-11-05 21:45:28 +01:00
Attila Farago
d6e5753dd2 [Feature Request] Consider using HomeAssistant API instead of MQTT (#1007)
* ha api improvements - device specific app filtering

* refactored request_berry_driver_version messaging

* improved ha api usage

* improve ha event naming
2023-11-04 22:17:22 +01:00
joBr99
0f88932669 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-04 21:36:17 +01:00
joBr99
1f4317856c change timer 2023-11-04 21:36:09 +01:00
joBr99
90f4253067 add test menu button (add nextion2text) 2023-11-04 20:34:44 +00:00
joBr99
8b44a61797 add test menu button 2023-11-04 21:30:09 +01:00
joBr99
eb1e5d2d85 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-11-04 20:26:17 +00:00
joBr99
25d169b14e Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-11-04 21:22:10 +01:00
joBr99
db14636c58 added test site for burn in 2023-11-04 21:21:54 +01:00
Armilar
33c6ddd250 v4.3.2.1 - Update NsPanelTs.ts
Add Release Nuber
2023-10-30 21:58:32 +01:00
Armilar
1bc042d126 v4.3.2.1 - Merge pull request #1004 from Armilar/Armilar-patch-1
v4.3.2.1 - Update NsPanelTs.ts
2023-10-30 20:02:18 +01:00
Armilar
31c2372520 v4.3.2.1 - Update
- Upgrade TFT 53 / 4.3.2
- Fix formatDate/Date.parse with moment.js
2023-10-30 13:03:29 +01:00
Armilar
f7f0349f39 Merge pull request #1 from Armilar/Armilar-patch-2
v4.3.2.1 - Update
2023-10-30 12:59:12 +01:00
Armilar
34181234e1 v4.3.2.1 - Update
- Upgrade TFT 53 / 4.3.2
- Fix formatDate/Date.parse with moment.js (Bugs in JS-Methodes)
2023-10-30 12:55:56 +01:00
Armilar
cded34fbd4 v4.3.2.1 - Update NsPanelTs.ts
- Upgrade TFT 53 / 4.3.2
- Fix formatDate/Date.parse with moment.js
2023-10-30 12:41:28 +01:00
Johannes
e2223ac7a6 fixed for HA 2023.11.0b1 2023-10-28 11:38:43 +02:00
Johannes
ffcd872f4a fixes #802 2023-10-25 21:16:34 +02:00
Marek
d34a835363 small update to sk.json for preset mode (#1000) 2023-10-24 20:12:02 +02:00
Armilar
40d17f9641 v 4.3.1.7 - Merge pull request #998 from tt-tom17/main
v 4.3.1.7
2023-10-22 16:29:03 +02:00
Thomas
9eb543467b v 4.3.1.7
Fix CreateEntity (navigate) role 'light' and 'socket' and 'temperature'
2023-10-22 15:24:47 +02:00
Armilar
86594de18d v4.3.1.6 - Update NsPanelTs.ts
- Add more Alias Device-Types to Navigation (createEntity) 
- Minor Fixes
2023-10-19 10:58:31 +02:00
joBr99
14efa10683 fixes #983 (add nextion2text) 2023-10-14 14:36:49 +00:00
joBr99
7f38c6b346 fixes #983 2023-10-14 16:32:37 +02:00
Armilar
17cf7d40c5 Merge pull request #989 from tt-tom17/main
v4.3.1.5
2023-10-12 15:40:09 +02:00
Thomas
9ff8506035 v4.3.1.5
Fix Datapoint for Role timetable -> Attention use new script from TT-Tom https://github.com/tt-tom17/MyScripts/blob/main/Sonoff_NSPanel/Fahrplan_to_NSPanel.ts
2023-10-12 15:22:25 +02:00
Johannes
757ffcd129 Update README.md 2023-10-06 21:56:02 +02:00
Armilar
ac96ff595a v4.3.1.4 - Move Examples 2 Wiki
https://github.com/joBr99/nspanel-lovelace-ui/wiki/NSPanel-Page-%E2%80%90-Typen_How-2_Beispiele
2023-10-03 13:48:01 +02:00
Armilar
7c1fe558f9 Delete ioBroker/NsPanelTs_without_Examples.ts 2023-10-03 13:26:49 +02:00
Armilar
98ec0aca45 v4.3.1.4 - Remove Examples
- Moving the examples from the NSPanelTs.ts --> https://github.com/joBr99/nspanel-lovelace-ui/wiki/NSPanel-Page-%E2%80%90-Typen_How-2_Beispiele
- Delete NsPanelTs_without_Examples.ts
2023-10-03 13:24:31 +02:00
Armilar
df105a2233 v4.3.1.3 - Update BerryDriver / Service Menu Fix
v4.3.1.2  Upgrade BerryDriver v9
v4.3.1.3  Fix - Change ServivceMenu from Fake-SSId to real Tasmota-SSIdParam
 
Todo:
v4.4.0    Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
2023-09-23 21:13:52 +02:00
Armilar
a33c58941c v4.3.1.3 - Update BerryDriver / Service Menu Fix
v4.3.1.2  Upgrade BerryDriver v9
v4.3.1.3  Fix - Change ServivceMenu from Fake-SSId to real Tasmota-SSIdParam
 
Todo:
v4.4.0    Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
2023-09-23 21:13:44 +02:00
Armilar
33c0c4402f v4.3.1.3 - Update BerryDriver / Service Menu Fix
v4.3.1.2  Upgrade BerryDriver v9
v4.3.1.3  Fix - Change ServivceMenu from Fake-SSId to real Tasmota-SSIdParam
 
Todo:
v4.4.0    Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
2023-09-23 21:09:03 +02:00
Armilar
1529115fb5 v4.3.1.3 - Update BerryDriver / Service Menu Fix
v4.3.1.2  Upgrade BerryDriver v9
v4.3.1.3  Fix - Change ServivceMenu from Fake-SSId to real Tasmota-SSIdParam
 
Todo:
v4.4.0    Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
2023-09-23 21:08:27 +02:00
Armilar
210b90ff8f v4.3.1.2 Upgrade BerryDriver v9
- 23.09.2023 - v4.3.1.2  Upgrade BerryDriver v9
2023-09-23 13:46:58 +02:00
Armilar
e9a69651d7 v4.3.1.2 Upgrade BerryDriver v9
- 23.09.2023 - v4.3.1.2  Upgrade BerryDriver v9
2023-09-23 13:46:52 +02:00
Johannes
e576af72b7 Update prepare_nspanel.md 2023-09-18 22:55:54 +02:00
joBr99
e5e88e3a5e Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-09-18 18:07:36 +02:00
joBr99
957cde8384 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-09-18 18:07:16 +02:00
joBr99
ddc8818aae Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-09-18 18:03:15 +02:00
joBr99
252339d36c update tasmota driver #972 2023-09-18 18:02:59 +02:00
Armilar
0803dd5214 v4.3.1.1
v4.2.1.6  Fix ServicePage Dimmode 'next' -> 'home'
v4.2.1.6  Fix Log '.USERICON' to Debug.log
v4.2.1.6  Fix Link PowerIcon to Alias (Thermocard)
v4.3.1    Upgrade TFT 53 / 4.3.1
v4.3.1.1  Add Parameter fontSize (0-4) to cardGrid (with useValue)
2023-09-17 13:36:34 +02:00
Armilar
586af0aac3 v4.3.1.1
v4.2.1.6  Fix ServicePage Dimmode 'next' -> 'home'
v4.2.1.6  Fix Log '.USERICON' to Debug.log
v4.2.1.6  Fix Link PowerIcon to Alias (Thermocard)
v4.3.1    Upgrade TFT 53 / 4.3.1
v4.3.1.1  Add Parameter fontSize (0-4) to cardGrid (with useValue)
2023-09-17 13:36:28 +02:00
Armilar
65032dc3a0 Merge branch 'main' into main 2023-09-17 13:25:26 +02:00
Armilar
a6c617fc44 Merge pull request #976 from tt-tom17/main
v4.2.1.6
2023-09-17 10:22:59 +02:00
Johannes
13b17dab00 bump version 2023-09-16 13:34:09 +02:00
Johannes
4600458da3 Update entities.md 2023-09-16 13:28:56 +02:00
joBr99
67bc1533bf bump tft version (add nextion2text) 2023-09-16 10:55:25 +00:00
joBr99
e5f5546352 bump tft version 2023-09-16 12:51:46 +02:00
Johannes
40896473b2 Update pages.py 2023-09-16 12:43:51 +02:00
Johannes
83e820d037 Update pages.py 2023-09-16 12:39:31 +02:00
Johannes
fb8a1003f9 Update config.py 2023-09-16 12:25:30 +02:00
Thomas
f0a3a04edb v4.2.1.6
- Fix ServicePage Dimmode 'next' -> 'home'
- Fix Log '.USERICON' to Debug.log
- Fix Link PowerIcon to Alias (Thermocard)
2023-09-15 19:20:53 +02:00
Armilar
df8e913831 Merge branch 'joBr99:main' into main 2023-09-14 23:35:36 +02:00
Armilar
1eef2bc96f Merge pull request #973 from tt-tom17/main
v4.2.1.5
2023-09-04 13:14:54 +02:00
Thomas
015d9c29c7 v4.2.1.5
- Fix Debug with 0_userdata.0
- Add minValue/maxValue to Blinds
2023-09-04 10:42:15 +02:00
Armilar
164467d435 v4.2.1.4 - Update NsPanelTs.ts
- 01.09.2023 - v4.2.1.4  Fix iconId2 in Alias door/window
- 02.09.2023 - v4.2.1.4  Add dynamically USERICON to Alias info

        Todo
        - XX.XX.XXXX - v4.3.0    Fix Debug with 0_userdata.0... 
        - XX.XX.XXXX - v4.3.0    Add minValue/maxValue to Blinds

        Next Release with TFT DEV (always implemented)
        - 25.08.2023 - v4.3.0    Add Parameter fontSize (0-4) to cardGrid (with useValue)
2023-09-02 12:46:35 +02:00
Armilar
e8e8b0fc29 v4.2.1.4 - Update NsPanelTs_without_Examples.ts
- 01.09.2023 - v4.2.1.4  Fix iconId2 in Alias door/window
- 02.09.2023 - v4.2.1.4  Add dynamically USERICON to Alias info

        Todo
        - XX.XX.XXXX - v4.3.0    Fix Debug with 0_userdata.0... 
        - XX.XX.XXXX - v4.3.0    Add minValue/maxValue to Blinds

        Next Release with TFT DEV (always implemented)
        - 25.08.2023 - v4.3.0    Add Parameter fontSize (0-4) to cardGrid (with useValue)
2023-09-02 12:46:29 +02:00
Armilar
d78a6c4ed7 Merge branch 'joBr99:main' into main 2023-08-27 21:35:48 +02:00
Armilar
b95b35f10c v4.2.1.3 - Add MQTT-Portcheck + Support Menu Item
- Add MQTT-Port-Check (use with exec) --> function CheckMQTTPorts()
- Add MQTT-Port-Check for ServiceMenu
2023-08-27 20:53:26 +02:00
Armilar
7d52df1f11 v4.2.1.3 - Add MQTT-Portcheck + Support Menu Item
- Add MQTT-Port-Check (use with exec) --> function CheckMQTTPorts()
- Add MQTT-Port-Check for ServiceMenu
2023-08-27 20:53:19 +02:00
Armilar
cb542f1e77 v4.2.1.2 - New pageItem-Parameter fontSize (add nextion2text) 2023-08-25 12:36:47 +00:00
Armilar
ff2208a646 v4.2.1.2 - New pageItem-Parameter fontSize
Use with DEV-Version
FlashNextion http://nspanel.pky.eu/lui.tft
2023-08-25 10:49:45 +02:00
Armilar
205f45ba48 v4.2.1.2 - New pageItem-Parameter fontSize
Use with DEV-Version
FlashNextion http://nspanel.pky.eu/lui.tft
2023-08-25 10:49:39 +02:00
joBr99
1712098f61 sync (add nextion2text) 2023-08-24 14:50:22 +00:00
joBr99
84585499d5 sync 2023-08-24 16:45:45 +02:00
joBr99
1a4f7a7754 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-08-24 14:39:55 +00:00
joBr99
632663cd9f Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-08-24 16:35:29 +02:00
joBr99
059619a636 implement way to change icon font changes on entities 2023-08-24 16:35:21 +02:00
Armilar
49352c7ca0 v4.2.1.1 - Add WINDOWOPEN to cardThermo (Thermostat)
Add WINDOWOPEN to cardThermo (Thermostat)
2023-08-24 09:51:08 +02:00
Armilar
a44573cfc9 v4.2.1.1 - Add WINDOWOPEN to cardThermo (Thermostat)
Add WINDOWOPEN to cardThermo (Thermostat)
2023-08-24 09:50:59 +02:00
Johannes
847546893f Update controller.py 2023-08-23 18:47:45 +02:00
Johannes
11106eb778 Update pages.py 2023-08-23 18:34:16 +02:00
Johannes
cf1acdefff Update pages.py #946 2023-08-23 18:30:33 +02:00
Armilar
5a07523a86 v4.2.0.2 - Add cardGrid2
* Add cardGrid2
2023-08-23 12:32:07 +02:00
Armilar
affb663579 v4.2.0.2 - Add cardGrid2
* Add cardGrid2
2023-08-23 12:32:01 +02:00
Armilar
d2695d993e v4.2.0.1 - Update NsPanelTs_without_Examples.ts
* v4.2.0    Upgrade TFT 52 / 4.2.0
 * v4.2.0    Add new alias state for iconcolor and buttontext for icon for subpages
* v4.2.0.1  Add iconArray to Alias "Klimaanlage" (airCondition)
2023-08-22 15:19:27 +02:00
Armilar
b3b24d4b8d v4.2.0.1 - Update NsPanelTs.ts
* v4.2.0    Upgrade TFT 52 / 4.2.0
 * v4.2.0    Add new alias state for iconcolor and buttontext for icon for subpages
* v4.2.0.1  Add iconArray to Alias "Klimaanlage" (airCondition)
2023-08-22 15:19:21 +02:00
Armilar
690a8f4279 v4.2.0 - Merge pull request #961 from tt-tom17/main
* v4.2.0 - upgrade 52 / 4.2.0
* Add new alias state for iconcolor and buttontext for icon for subpages
* Add Alias role 'warnings' for icon for subpages
2023-08-22 09:15:16 +02:00
Armilar
040119963a v4.2.0
* Update 52 / 4.2.0
* Add new alias state for iconcolor and buttontext for icon for subpages
* Add Alias role 'warnings' for icon for subpages
2023-08-22 09:07:00 +02:00
Armilar
fe44b008af v4.2.0
* Update 52 / 4.2.0
* Add new alias state for iconcolor and buttontext for icon for subpages
* Add Alias role 'warnings' for icon for subpages
2023-08-22 09:02:40 +02:00
Thomas
7d2503c66b v4.2.0
- Add new alias state for iconcolor and buttontext for icon for subpages
- Add Alias role 'warnings' for icon for subpages
2023-08-21 23:44:23 +02:00
Johannes
f0edaa36fb Update nspanel-lovelace-ui.py 2023-08-20 15:53:34 +02:00
joBr99
6d41c16eda add feature flag for new sliders 2023-08-20 15:43:20 +02:00
joBr99
337657fede fixes #955 2023-08-20 15:24:06 +02:00
joBr99
652dd0b157 fixes #933 (add nextion2text) 2023-08-20 13:07:23 +00:00
joBr99
e580333560 fixes #933 2023-08-20 15:03:27 +02:00
joBr99
8407171efb sync us-l 2023-08-20 14:50:48 +02:00
joBr99
291102971a Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-08-20 12:42:36 +00:00
joBr99
a1104b8f81 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-08-20 14:39:27 +02:00
joBr99
48e9d2c8a3 sync us-l 2023-08-20 14:39:20 +02:00
joBr99
306a189d79 fixes #957 (add nextion2text) 2023-08-20 12:32:17 +00:00
joBr99
98b40de8dc fixes #957 2023-08-20 14:27:54 +02:00
Armilar
2355ce9c82 Merge pull request #956 from kuckuckmann/main-2
Create Index-Jumpmenue_inSelpopup.xml
2023-08-17 00:11:05 +02:00
kuckuckmann
d743eb00db Create Index-Jumpmenue_inSelpopup.xml
Blockly Skript für das inSelpopup für das Index-Jumpmenü.
2023-08-16 22:07:11 +02:00
Armilar
c725defd30 Merge pull request #953 from kuckuckmann/main-1
Create ShellyDuo_inkl_InSel.xml
2023-08-14 22:53:53 +02:00
kuckuckmann
3b297607ff Create ShellyDuo_inkl_InSel.xml
Script for Wiki
2023-08-14 22:49:38 +02:00
Armilar
bb9e6b3799 Update v4.1.4.4 NsPanelTs.ts
- 12.08.2023 - v4.1.4    Upgrade TFT 51 / 4.1.4
- 12.08.2023 - v4.1.4.1  Fix Label CANCEL for popupTimer
- 12.08.2023 - v4.1.4.1  Fix TypeScript Error (JS-Adapter > 7.1.X) by Gargano
- 12.08.2023 - v4.1.4.1  CardGRid with maxItems = 8
- 12.08.2023 - v4.1.4.2  Add onStop function() to Schedules
- 13.08.2023 - v4.1.4.3  Add InSel to popUpLight
- 13.08.2023 - v4.1.4.4  Add Parameter inSel_ChoiceState to InSel to show/hide Focus
2023-08-13 23:28:01 +02:00
Armilar
7f73e28861 Update v4.1.4.4 NsPanelTs_without_Examples.ts
- 12.08.2023 - v4.1.4    Upgrade TFT 51 / 4.1.4
- 12.08.2023 - v4.1.4.1  Fix Label CANCEL for popupTimer
- 12.08.2023 - v4.1.4.1  Fix TypeScript Error (JS-Adapter > 7.1.X) by Gargano
- 12.08.2023 - v4.1.4.1  CardGRid with maxItems = 8
- 12.08.2023 - v4.1.4.2  Add onStop function() to Schedules
- 13.08.2023 - v4.1.4.3  Add InSel to popUpLight
- 13.08.2023 - v4.1.4.4  Add Parameter inSel_ChoiceState to InSel to show/hide Focus
2023-08-13 23:27:54 +02:00
Armilar
d81fc9e278 Update v4.1.4.3 NsPanelTs.ts
- 12.08.2023 - v4.1.4    Upgrade TFT 51 / 4.1.4
- 12.08.2023 - v4.1.4.1  Fix Label CANCEL for popupTimer
- 12.08.2023 - v4.1.4.1  Fix TypeScript Error (JS-Adapter > 7.1.X) by Gargano
- 12.08.2023 - v4.1.4.1  CardGRid with maxItems = 8
- 12.08.2023 - v4.1.4.2  Add onStop function() to Schedules
- 12.08.2023 - v4.1.4.3  Add InSel to popUpLight
2023-08-13 22:44:25 +02:00
Armilar
f4fa14eb16 Update v4.1.4.3 NsPanelTs_without_Examples.ts
- 12.08.2023 - v4.1.4    Upgrade TFT 51 / 4.1.4
- 12.08.2023 - v4.1.4.1  Fix Label CANCEL for popupTimer
- 12.08.2023 - v4.1.4.1  Fix TypeScript Error (JS-Adapter > 7.1.X) by Gargano
- 12.08.2023 - v4.1.4.1  CardGRid with maxItems = 8
- 12.08.2023 - v4.1.4.2  Add onStop function() to Schedules
- 12.08.2023 - v4.1.4.3  Add InSel to popUpLight
2023-08-13 22:44:02 +02:00
Armilar
5652387869 Update 4.1.4.2 NsPanelTs_without_Examples.ts
- 12.08.2023 - v4.1.4    Upgrade TFT 51 / 4.1.4
- 12.08.2023 - v4.1.4.1  Fix Label CANCEL for popupTimer
- 12.08.2023 - v4.1.4.1  Fix TypeScript Error (JS-Adapter > 7.1.X) by Gargano
 - 12.08.2023 - v4.1.4.1  CardGRid with maxItems = 8
 - 12.08.2023 - v4.1.4.2  Add onStop function() to Schedules
        
 - Todo       - v4.1.4.3  Add InSel to popUpLight
2023-08-12 22:03:37 +02:00
Armilar
cbd5a084af Update NsPanelTs.ts
- 12.08.2023 - v4.1.4    Upgrade TFT 51 / 4.1.4
- 12.08.2023 - v4.1.4.1  Fix Label CANCEL for popupTimer
- 12.08.2023 - v4.1.4.1  Fix TypeScript Error (JS-Adapter > 7.1.X) by Gargano
 - 12.08.2023 - v4.1.4.1  CardGRid with maxItems = 8
 - 12.08.2023 - v4.1.4.2  Add onStop function() to Schedules
        
 - Todo       - v4.1.4.3  Add InSel to popUpLight
2023-08-12 22:03:32 +02:00
Armilar
80a881c980 Update 4.1.4.1 NsPanelTs.ts
- 12.08.2023 - v4.1.4    Upgrade TFT 51 / 4.1.4
- 12.08.2023 - v4.1.4.1  Fix Label CANCEL for popupTimer
- 12.08.2023 - v4.1.4.1  Fix TypeScript Error (JS-Adapter > 7.1.X) by Gargano
- 12.08.2023 - v4.1.4.1  CardGRid with maxItems = 8
        
- Todo       - v4.1.4.2  Add InSel to popUpLight
- Todo       - v4.1.4.2  Add onStop (function() to Schedules
2023-08-12 14:39:06 +02:00
Armilar
7d58066448 Update Update 4.1.4.1 NsPanelTs_without_Examples.ts
- 12.08.2023 - v4.1.4    Upgrade TFT 51 / 4.1.4
- 12.08.2023 - v4.1.4.1  Fix Label CANCEL for popupTimer
- 12.08.2023 - v4.1.4.1  Fix TypeScript Error (JS-Adapter > 7.1.X) by Gargano
- 12.08.2023 - v4.1.4.1  CardGRid with maxItems = 8
        
- Todo       - v4.1.4.2  Add InSel to popUpLight
- Todo       - v4.1.4.2  Add onStop (function() to Schedules
2023-08-12 14:38:58 +02:00
joBr99
63cce74dbe Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-08-08 20:49:12 +00:00
joBr99
f4db5490ed Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-08-08 22:44:19 +02:00
joBr99
e8713881b6 set popupNotify permanent to 1 year 2023-08-08 22:44:09 +02:00
joBr99
43d21a4b6b Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-08-08 19:45:40 +00:00
joBr99
ce0215c1d2 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-08-08 21:41:39 +02:00
joBr99
498b90ad77 upd 2023-08-08 21:41:22 +02:00
Johannes
66cd7341c9 fixes #936 2023-08-08 19:38:34 +02:00
Johannes
cfbfd8c3e0 Disable detail update for now #945 2023-08-06 22:34:03 +02:00
joBr99
65a381cbac increase cooldown detail update & sync (add nextion2text) 2023-08-06 20:32:44 +00:00
joBr99
4a94526244 increase cooldown detail update & sync 2023-08-06 22:28:03 +02:00
joBr99
442f8ccdf0 fixes #949 2023-08-06 22:20:41 +02:00
joBr99
1b57cdbe62 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-07-31 16:25:33 +00:00
joBr99
3ddef89431 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-07-31 18:20:22 +02:00
joBr99
3f416ade44 hide new sliders behind feature flag 2023-07-31 18:20:08 +02:00
Armilar
832c9cd241 Merge pull request #944 from fre4242/main
Improved screensaver advanced icon handling: option to load from iobroker object
2023-07-30 22:02:56 +02:00
Armilar
2aa1e222aa Update NsPanelTs_without_Examples.ts
v4.0.5.15 - Improved screensaverAdvanced icon handling: option to load from iobroker object #944
2023-07-30 21:59:51 +02:00
Armilar
ec15e56728 Update NsPanelTs.ts
v4.0.5.15 - Improved screensaverAdvanced icon handling: option to load from iobroker object #944
2023-07-30 21:59:01 +02:00
fre4242
26cce9ac13 Improved screensaverAdvanced icon handling: option to load from iobroker object 2023-07-30 20:09:26 +02:00
Jan Čermák
8850e1d8cb fix cover tilt setting in AppDaemon backend (#939) 2023-07-24 21:43:02 +02:00
Marek
06174d3912 added ui card button translation #937 (#938)
Co-authored-by: Marek Vrana <m.vrana@cid.com>
2023-07-21 21:42:57 +02:00
joBr99
75d652e402 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-06-23 18:14:55 +00:00
joBr99
893714d569 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-06-23 20:10:42 +02:00
joBr99
fd7448c61d fixed #909 2023-06-23 20:10:13 +02:00
Johannes
6b04938a8a fixes #926 2023-06-14 15:32:08 +02:00
Johannes
35af3a778f fixes #925 2023-06-13 18:55:40 +02:00
joBr99
23beb90591 fixes #923 #922 #917 2023-06-11 00:58:15 +02:00
joBr99
e40017c66e Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) 2023-06-01 14:52:57 +00:00
joBr99
e94c57344a Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-06-01 16:48:58 +02:00
joBr99
df3105ac2b fixes #915 2023-06-01 16:48:51 +02:00
joBr99
04f7d026f4 add missing link from cardPower to cardLchart #907 (add nextion2text) 2023-05-23 19:26:00 +00:00
joBr99
f462780c08 add missing link from cardPower to cardLchart #907 2023-05-23 21:21:37 +02:00
Johannes
b7de710de5 Update pages.py 2023-05-21 13:47:48 +02:00
295 changed files with 225119 additions and 15751 deletions

26
.devcontainer.json Normal file
View File

@@ -0,0 +1,26 @@
{
"name": "NSPanel Lovelace UI Home Assistant add-on repository",
"image": "ghcr.io/home-assistant/devcontainer:addons",
"appPort": ["7123:8123", "7357:4357"],
"postCreateCommand": "apt install -y python3 python3-pip && pip install -r nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/requirements.txt --break-system-packages",
"postStartCommand": "bash devcontainer_bootstrap",
"runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"],
"remoteUser":"root",
"containerEnv": {
"WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
},
"extensions": ["timonwong.shellcheck", "esbenp.prettier-vscode"],
"mounts": ["type=volume,target=/var/lib/docker"],
"settings": {
"terminal.integrated.profiles.linux": {
"zsh": {
"path": "/usr/bin/zsh"
}
},
"terminal.integrated.defaultProfile.linux": "zsh",
"editor.formatOnPaste": false,
"editor.formatOnSave": true,
"editor.formatOnType": true,
"files.trimTrailingWhitespace": true
}
}

7
.github/dependabot.yaml vendored Normal file
View File

@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: weekly
time: "06:00"

111
.github/workflows/builder.yaml vendored Normal file
View File

@@ -0,0 +1,111 @@
name: Builder
env:
BUILD_ARGS: "--test"
MONITORED_FILES: "build.yaml config.yaml Dockerfile rootfs"
on:
push:
branches:
- main
pull_request:
branches:
- main
jobs:
init:
runs-on: ubuntu-latest
name: Initialize builds
outputs:
changed_addons: ${{ steps.changed_addons.outputs.addons }}
changed: ${{ steps.changed_addons.outputs.changed }}
steps:
- name: Check out the repository
uses: actions/checkout@v4
- name: Get changed files
id: changed_files
uses: jitterbit/get-changed-files@v1
- name: Find add-on directories
id: addons
uses: home-assistant/actions/helpers/find-addons@master
- name: Get changed add-ons
id: changed_addons
run: |
declare -a changed_addons
for addon in ${{ steps.addons.outputs.addons }}; do
if [[ "${{ steps.changed_files.outputs.all }}" =~ $addon ]]; then
for file in ${{ env.MONITORED_FILES }}; do
if [[ "${{ steps.changed_files.outputs.all }}" =~ $addon/$file ]]; then
if [[ ! "${changed_addons[@]}" =~ $addon ]]; then
changed_addons+=("\"${addon}\",");
fi
fi
done
fi
done
changed=$(echo ${changed_addons[@]} | rev | cut -c 2- | rev)
if [[ -n ${changed} ]]; then
echo "Changed add-ons: $changed";
echo "changed=true" >> $GITHUB_OUTPUT;
echo "addons=[$changed]" >> $GITHUB_OUTPUT;
else
echo "No add-on had any monitored files changed (${{ env.MONITORED_FILES }})";
fi
build:
needs: init
runs-on: ubuntu-latest
if: needs.init.outputs.changed == 'true'
name: Build ${{ matrix.arch }} ${{ matrix.addon }} add-on
strategy:
matrix:
addon: ${{ fromJson(needs.init.outputs.changed_addons) }}
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
steps:
- name: Check out repository
uses: actions/checkout@v4
- name: Get information
id: info
uses: home-assistant/actions/helpers/info@master
with:
path: "./${{ matrix.addon }}"
- name: Check if add-on should be built
id: check
run: |
if [[ "${{ steps.info.outputs.architectures }}" =~ ${{ matrix.arch }} ]]; then
echo "build_arch=true" >> $GITHUB_OUTPUT;
echo "image=$(echo ${{ steps.info.outputs.image }} | cut -d'/' -f3)" >> $GITHUB_OUTPUT;
if [[ -z "${{ github.head_ref }}" ]] && [[ "${{ github.event_name }}" == "push" ]]; then
echo "BUILD_ARGS=" >> $GITHUB_ENV;
fi
else
echo "${{ matrix.arch }} is not a valid arch for ${{ matrix.addon }}, skipping build";
echo "build_arch=false" >> $GITHUB_OUTPUT;
fi
- name: Login to GitHub Container Registry
if: env.BUILD_ARGS != '--test'
uses: docker/login-action@v3.0.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build ${{ matrix.addon }} add-on
if: steps.check.outputs.build_arch == 'true'
uses: home-assistant/builder@2023.09.0
with:
args: |
${{ env.BUILD_ARGS }} \
--${{ matrix.arch }} \
--target /data/${{ matrix.addon }} \
--image "${{ steps.check.outputs.image }}" \
--docker-hub "ghcr.io/${{ github.repository_owner }}" \
--addon

View File

@@ -43,7 +43,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL

View File

@@ -15,10 +15,21 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v4
with:
python-version: 3.x
- run: pip install mkdocs-material mkdocs-video markdown-include
- run: pip install mkdocs-material mkdocs-video markdown-include mike
- run: cp HMI/README.md docs/hmi-serial-protocol.md
- run: mkdocs gh-deploy --force
#- run: mkdocs gh-deploy --force
- run: git config --global user.name Docs deploy
- run: git config --global user.email docs@dummy.bot.com
- run: mike deploy --push --update-aliases dev

View File

@@ -11,7 +11,7 @@ jobs:
name: HACS Action
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v2"
- uses: "actions/checkout@v4"
- name: HACS Action
uses: "hacs/action@main"
with:

View File

@@ -18,7 +18,7 @@ jobs:
gen-ioBroker-localization:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
@@ -28,7 +28,7 @@ jobs:
python HMI/code_gen/localization/iobroker.py
mv ioBroker_NSPanel_locales.json ioBroker/ioBroker_NSPanel_locales.json
- uses: stefanzweifel/git-auto-commit-action@v4
- uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Update iobroker localization file
#file_pattern: "**.txt"

41
.github/workflows/lint.yaml vendored Normal file
View File

@@ -0,0 +1,41 @@
name: Lint
on:
push:
branches:
- main
pull_request:
branches:
- main
schedule:
- cron: "0 0 * * *"
jobs:
find:
name: Find add-ons
runs-on: ubuntu-latest
outputs:
addons: ${{ steps.addons.outputs.addons_list }}
steps:
- name: ⤵️ Check out code from GitHub
uses: actions/checkout@v4
- name: 🔍 Find add-on directories
id: addons
uses: home-assistant/actions/helpers/find-addons@master
lint:
name: Lint add-on ${{ matrix.path }}
runs-on: ubuntu-latest
needs: find
strategy:
matrix:
path: ${{ fromJson(needs.find.outputs.addons) }}
steps:
- name: ⤵️ Check out code from GitHub
uses: actions/checkout@v4
- name: 🚀 Run Home Assistant Add-on Lint
uses: frenck/action-addon-linter@v2.15
with:
path: "./${{ matrix.path }}"

View File

@@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
@@ -80,7 +80,7 @@ jobs:
find -name "**.txt"
rm Nextion2Text.py* ignore-id.py out.txt
- uses: stefanzweifel/git-auto-commit-action@v4
- uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: ${{ steps.last-commit-message.outputs.msg }} (add nextion2text)
#file_pattern: "**.txt"

3
.gitignore vendored
View File

@@ -2,5 +2,8 @@ __pycache__/
# don't add nextion2text
HMI/Nextion2Text.py
# dont add panels.yaml
panels.yaml
# don't add Webstorm project stuff
.idea

17
.vscode/launch.json vendored Normal file
View File

@@ -0,0 +1,17 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Python: Current File",
"type": "python",
"request": "launch",
"program": "main.py",
"cwd": "/workspaces/nspanel-lovelace-ui/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager",
"console": "integratedTerminal",
"justMyCode": true
}
]
}

19
.vscode/tasks.json vendored Normal file
View File

@@ -0,0 +1,19 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Start Home Assistant",
"type": "shell",
"command": "supervisor_run",
"group": {
"kind": "test",
"isDefault": true
},
"presentation": {
"reveal": "always",
"panel": "new"
},
"problemMatcher": []
}
]
}

View File

@@ -1,19 +1,100 @@
--- HMI/n2t-out
+++ HMI/US/landscape/n2t-out
├── file list
│ @@ -1,10 +1,9 @@
│ Program.s.txt
│ cardAlarm.txt
│ -cardBurnRec.txt
│ cardChart.txt
│ cardEntities.txt
│ cardGrid.txt
│ cardGrid2.txt
│ cardLChart.txt
│ cardMedia.txt
│ cardPower.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
│ @@ -11,10 +11,10 @@
│ // dim value
│ int dimValue=40
│ @@ -13,10 +13,10 @@
│ int dimValueNormal=100
│ //color vars
│ int defaultFontColor=65535
│ int defaultBcoColor=6371
│ //feature flags
│ int featNewSliders=0
│ // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ + //lcd_dev fffb 0002 0000 0020
│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
│ page pageStartup
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
│ @@ -20,15 +20,14 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
│ prints sys0,2
│ prints tSend.txt,0
│ prints crcval,2
│ dim=dimValueNormal
│ - dim=dimValueNormal
│ //wup=cardEntities
│ //remove background & activate reparse mode
│ vis p0,0
│ recmod=1
│ baud=115200
│ //debug stuff
│ vis tTmp,0
│ --- HMI/n2t-out/cardThermo.txt
├── +++ HMI/US/landscape/n2t-out/cardThermo.txt
│ @@ -28,14 +28,19 @@
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ vis xTempMin1,0
│ vis xTempMax1,0
│ vis xTempStep1,0
│ + vis xTempDest,0
│ + vis btUp,0
│ + vis btDown,0
│ + vis tCF,0
│ + vis btDetail,0
│ //tEntity.txt=tHeading.txt
│ // disable all buttons
│ vis bt0,0
│ vis bt1,0
│ vis bt2,0
│ vis bt3,0
│ vis bt4,0
│ @@ -1014,14 +1019,28 @@
│ vis xTempDest1,1
│ vis btDown1,1
│ vis tCF1,1
│ vis bUp2,1
│ vis xTempDest2,1
│ vis bDown2,1
│ vis tCF2,1
│ + }else
│ + {
│ + vis btUp,1
│ + vis xTempDest,1
│ + vis btDown,1
│ + vis tCF,1
│ + vis btUp1,0
│ + vis xTempDest1,0
│ + vis btDown1,0
│ + vis tCF1,0
│ + vis bUp2,0
│ + vis xTempDest2,0
│ + vis bDown2,0
│ + vis tCF2,0
│ }
│ //Show btDetail
│ spstr strCommand.txt,tTmp.txt,"~",58
│ if(tTmp.txt!="1")
│ {
│ vis btDetail,1
│ }else
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -164,15 +164,15 @@
@@ -35,7 +116,23 @@
│ //send cmd
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@
│ @@ -19,15 +19,14 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
│ prints sys0,2
│ prints tSend.txt,0
│ prints crcval,2
│ - dim=dimValueNormal
│ recmod=1
│ baud=115200
│ vis tInstruction,0
│ vis tTmp,0
│ vis p0,0
│ vis tNotifyHead,0
│ vis tNotifyText,0
│ @@ -41,17 +40,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
@@ -53,7 +150,7 @@
│ Max. Text Size: 600
│ Variable (string) strTmp
│ @@ -102,34 +99,14 @@
│ @@ -115,34 +111,14 @@
│ Value: 0
│ Variable (int32) ycR
@@ -88,9 +185,43 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : |
│ @@ -485,17 +461,14 @@
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ - }else
│ - {
│ - vis tAMPM,1
│ }
│ spstr strCommand.txt,tTimeAdd.txt,"~",2
│ ref tIcon1
│ ref tIcon2
│ }
│ if(tInstruction.txt=="date")
│ {
│ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@
│ @@ -19,15 +19,14 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
│ prints sys0,2
│ prints tSend.txt,0
│ prints crcval,2
│ - dim=dimValueNormal
│ recmod=1
│ baud=115200
│ vis tInstruction,0
│ vis tTmp,0
│ vis p0,0
│ vis tNotifyHead,0
│ vis tNotifyText,0
│ @@ -41,17 +40,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
@@ -108,7 +239,7 @@
│ Max. Text Size: 1979
│ Variable (string) strTmp
│ @@ -363,34 +360,14 @@
│ @@ -376,34 +372,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -143,7 +274,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : PM
│ @@ -572,15 +549,14 @@
│ @@ -585,15 +561,14 @@
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0

View File

@@ -14,6 +14,8 @@ Program.s
//color vars
int defaultFontColor=65535
int defaultBcoColor=6371
//feature flags
int featNewSliders=0
// fix touch offset
//lcd_dev fffb 0002 0000 0020
printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port

View File

@@ -19,6 +19,18 @@ Page cardAlarm
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -19,6 +19,18 @@ Page cardChart
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -19,6 +19,18 @@ Page cardEntities
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -1856,8 +1868,13 @@ Hotspot m0
}
if(type1.txt=="light")
{
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type1.txt=="fan")
{
@@ -1899,8 +1916,13 @@ Hotspot m1
}
if(type2.txt=="light")
{
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type2.txt=="fan")
{
@@ -1942,8 +1964,13 @@ Hotspot m2
}
if(type3.txt=="light")
{
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type3.txt=="fan")
{
@@ -1985,8 +2012,13 @@ Hotspot m3
}
if(type4.txt=="light")
{
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type4.txt=="fan")
{

View File

@@ -19,6 +19,18 @@ Page cardGrid
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -259,7 +271,7 @@ Text tEntity4
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 16
x coordinate : 22
y coordinate : 274
Width : 140
Height : 30
@@ -1052,7 +1064,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -1161,6 +1179,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -1182,6 +1211,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -1203,6 +1243,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -1224,6 +1275,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -1245,6 +1307,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -1266,6 +1339,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47

View File

@@ -19,6 +19,18 @@ Page cardGrid2
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -991,26 +1003,26 @@ Button bEntity7
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type7.txt
pageIcons.tTmp1.txt=tEntity7.txt
pageIcons.tTmp2.txt=entn7.txt
pageIcons.tTmp3.txt=bEntity7.txt
if(type7.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type7.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type7.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn7.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1057,26 +1069,26 @@ Button bEntity8
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type8.txt
pageIcons.tTmp1.txt=tEntity8.txt
pageIcons.tTmp2.txt=entn8.txt
pageIcons.tTmp3.txt=bEntity8.txt
if(type8.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type8.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type8.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn8.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1274,7 +1286,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -1383,6 +1401,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -1404,6 +1433,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -1425,6 +1465,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -1446,6 +1497,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -1467,6 +1529,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -1488,6 +1561,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47
@@ -1509,6 +1593,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity7.txt,"~",52
// way to get force font adjustment
strlen bEntity7.txt,sys0
//check 2nd last char for ¬
substr bEntity7.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity7.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity7.font=sys1
substr bEntity7.txt,bEntity7.txt,0,sys0-2
}
vis bEntity7,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",53
@@ -1530,6 +1625,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity8.txt,"~",58
// way to get force font adjustment
strlen bEntity8.txt,sys0
//check 2nd last char for ¬
substr bEntity8.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity8.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity8.font=sys1
substr bEntity8.txt,bEntity8.txt,0,sys0-2
}
vis bEntity8,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",59
@@ -1616,6 +1722,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -19,6 +19,18 @@ Page cardLChart
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -19,6 +19,18 @@ Page cardMedia
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -1485,6 +1497,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity1.txt,"~",25
vis bEntity1,1
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,sys0,0,0
@@ -1506,6 +1529,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity2.txt,"~",31
vis bEntity2,1
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,sys0,0,0
@@ -1527,6 +1561,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity3.txt,"~",37
vis bEntity3,1
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,sys0,0,0
@@ -1548,6 +1593,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity4.txt,"~",43
vis bEntity4,1
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,sys0,0,0
@@ -1569,6 +1625,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity5.txt,"~",49
vis bEntity5,1
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",50
covx tTmp.txt,sys0,0,0
@@ -1590,6 +1657,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity6.txt,"~",55
vis bEntity6,1
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",56
covx tTmp.txt,sys0,0,0

View File

@@ -19,6 +19,18 @@ Page cardPower
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -1652,6 +1664,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -19,6 +19,18 @@ Page cardQR
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -19,6 +19,18 @@ Page cardThermo
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -28,6 +40,11 @@ Page cardThermo
vis xTempMin1,0
vis xTempMax1,0
vis xTempStep1,0
vis xTempDest,0
vis btUp,0
vis btDown,0
vis tCF,0
vis btDetail,0
//tEntity.txt=tHeading.txt
// disable all buttons
vis bt0,0
@@ -1730,6 +1747,20 @@ Timer tmSerial
vis xTempDest2,1
vis bDown2,1
vis tCF2,1
}else
{
vis btUp,1
vis xTempDest,1
vis btDown,1
vis tCF,1
vis btUp1,0
vis xTempDest1,0
vis btDown1,0
vis tCF1,0
vis bUp2,0
vis xTempDest2,0
vis bDown2,0
vis tCF2,0
}
//Show btDetail
spstr strCommand.txt,tTmp.txt,"~",58

View File

@@ -1,7 +1,7 @@
Program.s
0 Component(s)
13 Line(s) of event code
13 Unique line(s) of event code
14 Line(s) of event code
14 Unique line(s) of event code
popupThermo
44 Component(s)
523 Line(s) of event code
@@ -10,30 +10,26 @@ pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
pageStartup
20 Component(s)
198 Line(s) of event code
137 Unique line(s) of event code
popupTimer
42 Component(s)
516 Line(s) of event code
257 Unique line(s) of event code
popupLight
23 Component(s)
410 Line(s) of event code
209 Unique line(s) of event code
cardChart
cardLChart
33 Component(s)
437 Line(s) of event code
296 Unique line(s) of event code
412 Line(s) of event code
267 Unique line(s) of event code
popupInSel
34 Component(s)
621 Line(s) of event code
297 Unique line(s) of event code
pageStartup
20 Component(s)
193 Line(s) of event code
135 Unique line(s) of event code
popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
pageTest
26 Component(s)
68 Line(s) of event code
@@ -46,53 +42,61 @@ popupFan
27 Component(s)
355 Line(s) of event code
206 Unique line(s) of event code
cardChart
33 Component(s)
447 Line(s) of event code
297 Unique line(s) of event code
cardQR
34 Component(s)
410 Line(s) of event code
238 Unique line(s) of event code
cardAlarm
43 Component(s)
500 Line(s) of event code
273 Unique line(s) of event code
cardGrid
44 Component(s)
523 Line(s) of event code
295 Unique line(s) of event code
screensaver
46 Component(s)
435 Line(s) of event code
309 Unique line(s) of event code
cardGrid2
52 Component(s)
611 Line(s) of event code
319 Unique line(s) of event code
cardLChart
33 Component(s)
402 Line(s) of event code
266 Unique line(s) of event code
cardThermo
57 Component(s)
540 Line(s) of event code
319 Unique line(s) of event code
cardMedia
59 Component(s)
649 Line(s) of event code
322 Unique line(s) of event code
420 Line(s) of event code
239 Unique line(s) of event code
popupLightNew
23 Component(s)
412 Line(s) of event code
209 Unique line(s) of event code
screensaver2
58 Component(s)
348 Line(s) of event code
245 Unique line(s) of event code
362 Line(s) of event code
248 Unique line(s) of event code
cardThermo
57 Component(s)
569 Line(s) of event code
337 Unique line(s) of event code
cardAlarm
43 Component(s)
510 Line(s) of event code
274 Unique line(s) of event code
cardMedia
59 Component(s)
713 Line(s) of event code
357 Unique line(s) of event code
screensaver
46 Component(s)
445 Line(s) of event code
310 Unique line(s) of event code
popupLight
28 Component(s)
412 Line(s) of event code
227 Unique line(s) of event code
cardGrid
44 Component(s)
593 Line(s) of event code
333 Unique line(s) of event code
cardPower
54 Component(s)
527 Line(s) of event code
347 Unique line(s) of event code
541 Line(s) of event code
350 Unique line(s) of event code
cardGrid2
52 Component(s)
703 Line(s) of event code
385 Unique line(s) of event code
cardEntities
67 Component(s)
1170 Line(s) of event code
532 Unique line(s) of event code
1204 Line(s) of event code
536 Unique line(s) of event code
Total
22 Page(s)
847 Component(s)
9920 Line(s) of event code
2360 Unique line(s) of event code
23 Page(s)
875 Component(s)
10707 Line(s) of event code
2466 Unique line(s) of event code

View File

@@ -396,7 +396,7 @@ Text tVersion
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 51
Text : 53
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
@@ -575,6 +575,12 @@ Timer tmSerial
{
covx tTmp.txt,defaultFontColor,0,0
}
// get feature flag popup
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
covx tTmp.txt,featNewSliders,0,0
}
}
if(tInstruction.txt=="timeout")
{

View File

@@ -24,12 +24,13 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
@@ -46,16 +47,16 @@ Page popupLight
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
vis t1,0
vis t2,0
vis hBrightness,0
//disable color temp by default
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis t0,0
vis pColorWheel,0
//vis t0,0
popupLight.bco=defaultBcoColor
@@ -74,83 +75,115 @@ Page popupLight
}
if(defaultBcoColor==0)
{
hBrightness.pic=24
hBrightness.pic1=25
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=16
hTempSlider.pic1=17
hTempSlider.pic2=15
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
ID : 18
Scope: local
Value: 65504
Variable (string) entn
Attributes
ID : 11
ID : 20
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
ID : 13
ID : 22
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
ID : 14
ID : 23
Scope: local
Value: 0
Variable (string) strCommand
Attributes
ID : 9
ID : 16
Scope : local
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
ID : 16
ID : 26
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Text t0
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 80
Text tEntity
Attributes
ID : 2
ID : 24
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 108
y coordinate : 21
Width : 263
x coordinate : 9
y coordinate : 80
Width : 64
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Color
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1
Attributes
ID : 6
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 226
Width : 211
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Brightness
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t2
Attributes
ID : 9
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 267
Width : 45
Height : 30
Effect : load
Effect Priority : 0
@@ -160,25 +193,244 @@ Text tEntity
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 65535
Font Color : 40147
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t3
Attributes
ID : 10
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 181
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 40147
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t4
Attributes
ID : 11
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 9
y coordinate : 143
Width : 242
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Temperature
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tEntity
Attributes
ID : 3
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 92
y coordinate : 21
Width : 263
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 25
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture pColorWheel
Text tIcon1
Attributes
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 11
y coordinate : 21
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tId
Attributes
ID : 18
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 290
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInstruction
Attributes
ID : 17
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 290
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp
Attributes
ID : 12
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 406
y coordinate : 277
Width : 34
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 80
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 249
y coordinate : 105
x coordinate : 0
y coordinate : 0
Width : 480
Height : 320
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 0
Picture pColorWheel
Attributes
ID : 2
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 167
y coordinate : 69
Width : 160
Height : 160
Effect : load
@@ -216,44 +468,30 @@ Picture pColorWheel
Slider hBrightness
Attributes
ID : 4
ID : 7
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 105
y coordinate : 64
Width : 100
Height : 250
x coordinate : 61
y coordinate : 261
Width : 335
Height : 43
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 1
Back. Picture ID : 65535
Slided Back. Picture ID: 65535
Cursor height : 255
Back. Picture ID : 5
Slided Back. Picture ID: 4
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
@@ -274,24 +512,24 @@ Slider hBrightness
Slider hTempSlider
Attributes
ID : 10
ID : 19
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 279
y coordinate : 64
Width : 100
Height : 250
x coordinate : 61
y coordinate : 178
Width : 335
Height : 44
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 7
Slided Back. Picture ID: 7
Back. Picture ID : 22
Slided Back. Picture ID: 23
Position : 50
Upper range limit : 100
Lower range limit : 0
@@ -318,12 +556,12 @@ Slider hTempSlider
Button b0
Attributes
ID : 3
ID : 5
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 413
x coordinate : 397
y coordinate : 8
Width : 50
Height : 50
@@ -364,13 +602,13 @@ Button b0
Button bColor
Attributes
ID : 12
ID : 21
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 30
y coordinate : 146
x coordinate : 93
y coordinate : 68
Width : 50
Height : 50
Effect : load
@@ -401,8 +639,8 @@ Button bColor
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
}else
{
@@ -412,21 +650,21 @@ Button bColor
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis t4,1
vis t3,1
vis hTempSlider,1
}
}
Button bEffect
Attributes
ID : 17
ID : 27
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 30
y coordinate : 213
x coordinate : 396
y coordinate : 95
Width : 50
Height : 50
Effect : load
@@ -453,17 +691,18 @@ Button bEffect
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
ID : 5
ID : 8
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 30
y coordinate : 77
x coordinate : 341
y coordinate : 95
Width : 50
Height : 50
Effect : load
@@ -502,43 +741,18 @@ Dual-state Button btOnOff1
Timer tmCooldown
Attributes
ID : 15
ID : 25
Scope : local
Period (ms): 100
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
ID : 22
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
ID : 8
ID : 15
Scope : local
Period (ms): 50
Enabled : yes
@@ -593,12 +807,11 @@ Timer tmSerial
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
tIcon1.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
@@ -607,26 +820,27 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis t1,0
vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis t1,1
vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
if(tmCooldown.en==0)
{
hBrightness.val=sys0
}
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
vis t3,0
vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
@@ -649,8 +863,8 @@ Timer tmSerial
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
vis t3,1
vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
@@ -669,12 +883,12 @@ Timer tmSerial
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
@@ -686,11 +900,11 @@ Timer tmSerial
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
@@ -825,7 +1039,7 @@ Timer tmSerial
Timer tmSleep
Attributes
ID : 7
ID : 14
Scope : local
Period (ms): 1000
Enabled : yes
@@ -845,7 +1059,7 @@ Timer tmSleep
TouchCap tc0
Attributes
ID : 6
ID : 13
Scope: local
Value: 0

View File

@@ -0,0 +1,855 @@
Page popupLightNew
Attributes
ID : 0
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
Width : 480
Effect : load
Effect Priority : 0
Effect Time : 300
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Fill : solid color
Back. Color : 6371
Events
Preinitialize Event
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
//disable color temp by default
//vis t4,0
//vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis pColorWheel,0
//vis t0,0
popupLightNew.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hTempSlider.pic=16
hTempSlider.pic1=16
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
ID : 18
Scope: local
Value: 65504
Variable (string) entn
Attributes
ID : 11
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
ID : 13
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
ID : 14
Scope: local
Value: 0
Variable (string) strCommand
Attributes
ID : 9
Scope : local
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
ID : 16
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 80
Text tEntity
Attributes
ID : 2
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 92
y coordinate : 21
Width : 263
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 25
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture pColorWheel
Attributes
ID : 1
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 233
y coordinate : 105
Width : 160
Height : 160
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 3
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel,"
sys0=tch0
sys0=sys0-pColorWheel.x
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
sys0=tch1
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx pColorWheel.h,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hBrightness
Attributes
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 89
y coordinate : 64
Width : 100
Height : 250
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Fill : image
Cursor width : auto
Cursor height : 1
Back. Picture ID : 65535
Slided Back. Picture ID: 65535
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
covx hBrightness.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hTempSlider
Attributes
ID : 10
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 263
y coordinate : 64
Width : 100
Height : 250
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 7
Slided Back. Picture ID: 7
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
Touch Release Event
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
covx hTempSlider.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button b0
Attributes
ID : 3
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 397
y coordinate : 8
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bColor
Attributes
ID : 12
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 146
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(mode.val==1)
{
mode.val=0
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis hTempSlider,0
}else
{
mode.val=1
//disable color wheel
vis pColorWheel,0
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis hTempSlider,1
}
}
Button bEffect
Attributes
ID : 17
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 213
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
ID : 5
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 77
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff,"
covx btOnOff1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Timer tmCooldown
Attributes
ID : 15
Scope : local
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
ID : 22
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
ID : 8
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
ucopy payloadLength,2,2,0
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
// calculate crc
crcrest 1,0xFFFF
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
//crcputu 3,u[2]
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
crcputu 0,payloadLength-1
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
// compare crc with recived value
if(crcval==recvCrc)
{
// crc is okay
// here is the location where acual code should be
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
// get Brightness value
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else if(tTmp.txt=="unknown") // temp supported, but not in color mode
{
mode_temp.val=1
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
hTempSlider.val=sys0
}
// mode == 0 is rgb controls currently shown
if(mode.val==0)
{
// switch mode
click bColor,1
click bColor,0
}
}
// get Color value
spstr strCommand.txt,tTmp.txt,"~",7
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
vis bColor,1
}
if(mode.val==0)
{
vis pColorWheel,1
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
{
vis bEffect,1
}else
{
vis bEffect,0
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="pageType")
{
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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=="cardGrid2")
{
page cardGrid2
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep
Attributes
ID : 7
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
click b0,1
click b0,0
}
}
TouchCap tc0
Attributes
ID : 6
Scope: local
Value: 0
Events
Touch Press Event
sleepValue=0

View File

@@ -581,7 +581,7 @@ Timer tmSerial
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
if(tInstruction.txt=="timeout2")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1

View File

@@ -19,6 +19,18 @@ Page screensaver
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
recmod=1
baud=115200
vis tInstruction,0

View File

@@ -19,6 +19,18 @@ Page screensaver2
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
recmod=1
baud=115200
vis tInstruction,0
@@ -1617,6 +1629,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="timeout")
{

View File

@@ -14,6 +14,8 @@ Program.s
//color vars
int defaultFontColor=65535
int defaultBcoColor=6371
//feature flags
int featNewSliders=0
// fix touch offset
//lcd_dev fffb 0002 0000 0020
printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port

View File

@@ -11,6 +11,18 @@ Page cardAlarm
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -11,6 +11,18 @@ Page cardChart
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -11,6 +11,18 @@ Page cardEntities
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -965,8 +977,13 @@ Hotspot m0
}
if(type1.txt=="light")
{
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type1.txt=="fan")
{
@@ -999,8 +1016,13 @@ Hotspot m1
}
if(type2.txt=="light")
{
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type2.txt=="fan")
{
@@ -1033,8 +1055,13 @@ Hotspot m2
}
if(type3.txt=="light")
{
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type3.txt=="fan")
{
@@ -1067,8 +1094,13 @@ Hotspot m3
}
if(type4.txt=="light")
{
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type4.txt=="fan")
{

View File

@@ -11,6 +11,18 @@ Page cardGrid
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -605,7 +617,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -713,6 +731,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -734,6 +763,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -755,6 +795,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -776,6 +827,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -797,6 +859,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -818,6 +891,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47

View File

@@ -11,6 +11,18 @@ Page cardGrid2
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -559,26 +571,26 @@ Button bEntity7
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type7.txt
pageIcons.tTmp1.txt=tEntity7.txt
pageIcons.tTmp2.txt=entn7.txt
pageIcons.tTmp3.txt=bEntity7.txt
if(type7.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type7.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type7.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn7.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -603,26 +615,26 @@ Button bEntity8
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type8.txt
pageIcons.tTmp1.txt=tEntity8.txt
pageIcons.tTmp2.txt=entn8.txt
pageIcons.tTmp3.txt=bEntity8.txt
if(type8.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type8.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type8.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn8.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -739,7 +751,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -847,6 +865,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -868,6 +897,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -889,6 +929,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -910,6 +961,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -931,6 +993,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -952,6 +1025,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47
@@ -973,6 +1057,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity7.txt,"~",52
// way to get force font adjustment
strlen bEntity7.txt,sys0
//check 2nd last char for ¬
substr bEntity7.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity7.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity7.font=sys1
substr bEntity7.txt,bEntity7.txt,0,sys0-2
}
vis bEntity7,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",53
@@ -994,6 +1089,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity8.txt,"~",58
// way to get force font adjustment
strlen bEntity8.txt,sys0
//check 2nd last char for ¬
substr bEntity8.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity8.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity8.font=sys1
substr bEntity8.txt,bEntity8.txt,0,sys0-2
}
vis bEntity8,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",59
@@ -1080,6 +1186,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -11,6 +11,18 @@ Page cardLChart
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -11,6 +11,18 @@ Page cardMedia
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -997,6 +1009,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity1.txt,"~",25
vis bEntity1,1
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,sys0,0,0
@@ -1018,6 +1041,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity2.txt,"~",31
vis bEntity2,1
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,sys0,0,0
@@ -1039,6 +1073,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity3.txt,"~",37
vis bEntity3,1
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,sys0,0,0
@@ -1060,6 +1105,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity4.txt,"~",43
vis bEntity4,1
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,sys0,0,0
@@ -1081,6 +1137,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity5.txt,"~",49
vis bEntity5,1
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",50
covx tTmp.txt,sys0,0,0
@@ -1102,6 +1169,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity6.txt,"~",55
vis bEntity6,1
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",56
covx tTmp.txt,sys0,0,0

View File

@@ -11,6 +11,18 @@ Page cardPower
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -964,6 +976,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -11,6 +11,18 @@ Page cardQR
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -11,6 +11,18 @@ Page cardThermo
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -20,6 +32,11 @@ Page cardThermo
vis xTempMin1,0
vis xTempMax1,0
vis xTempStep1,0
vis xTempDest,0
vis btUp,0
vis btDown,0
vis tCF,0
vis btDetail,0
//tEntity.txt=tHeading.txt
// disable all buttons
vis bt0,0
@@ -1006,6 +1023,20 @@ Timer tmSerial
vis xTempDest2,1
vis bDown2,1
vis tCF2,1
}else
{
vis btUp,1
vis xTempDest,1
vis btDown,1
vis tCF,1
vis btUp1,0
vis xTempDest1,0
vis btDown1,0
vis tCF1,0
vis bUp2,0
vis xTempDest2,0
vis bDown2,0
vis tCF2,0
}
//Show btDetail
spstr strCommand.txt,tTmp.txt,"~",58

View File

@@ -145,7 +145,7 @@ Text tVersion
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 51
Text : 53
Max. Text Size : 10
Picture p0
@@ -279,6 +279,12 @@ Timer tmSerial
{
covx tTmp.txt,defaultFontColor,0,0
}
// get feature flag popup
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
covx tTmp.txt,featNewSliders,0,0
}
}
if(tInstruction.txt=="timeout")
{

View File

@@ -16,12 +16,13 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
@@ -38,16 +39,16 @@ Page popupLight
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
vis t1,0
vis t2,0
vis hBrightness,0
//disable color temp by default
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis t0,0
vis pColorWheel,0
//vis t0,0
popupLight.bco=defaultBcoColor
@@ -66,18 +67,14 @@ Page popupLight
}
if(defaultBcoColor==0)
{
hBrightness.pic=24
hBrightness.pic1=25
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=16
hTempSlider.pic1=17
hTempSlider.pic2=15
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
Scope: local
Value: 65504
Variable (string) entn
Attributes
Scope : local
@@ -100,29 +97,56 @@ Variable (string) strCommand
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Text t0
Attributes
Scope : local
Text :
Max. Text Size: 80
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Color
Max. Text Size : 50
Text t1
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Brightness
Max. Text Size : 50
Text t2
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text t3
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text t4
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Temperature
Max. Text Size : 50
Text tEntity
Attributes
@@ -133,6 +157,48 @@ Text tEntity
Text : tEntity1
Max. Text Size : 25
Text tIcon1
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text tId
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 20
Text tInstruction
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 20
Text tTmp
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 80
Picture p0
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Picture pColorWheel
Attributes
Scope : local
@@ -178,20 +244,6 @@ Slider hBrightness
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
@@ -280,8 +332,8 @@ Button bColor
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
}else
{
@@ -291,8 +343,8 @@ Button bColor
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis t4,1
vis t3,1
vis hTempSlider,1
}
}
@@ -310,6 +362,7 @@ Button bEffect
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel
Dual-state Button btOnOff1
@@ -342,37 +395,13 @@ Dual-state Button btOnOff1
Timer tmCooldown
Attributes
Scope : local
Period (ms): 100
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
Scope : local
@@ -429,12 +458,11 @@ Timer tmSerial
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
tIcon1.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
@@ -443,26 +471,27 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis t1,0
vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis t1,1
vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
if(tmCooldown.en==0)
{
hBrightness.val=sys0
}
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
vis t3,0
vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
@@ -485,8 +514,8 @@ Timer tmSerial
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
vis t3,1
vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
@@ -505,12 +534,12 @@ Timer tmSerial
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
@@ -522,11 +551,11 @@ Timer tmSerial
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")

View File

@@ -0,0 +1,689 @@
Page popupLightNew
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Events
Preinitialize Event
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
//disable color temp by default
//vis t4,0
//vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis pColorWheel,0
//vis t0,0
popupLightNew.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hTempSlider.pic=16
hTempSlider.pic1=16
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
Scope: local
Value: 65504
Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
Scope: local
Value: 0
Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Attributes
Scope : local
Text :
Max. Text Size: 80
Text tEntity
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : tEntity1
Max. Text Size : 25
Picture pColorWheel
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel,"
sys0=tch0
sys0=sys0-pColorWheel.x
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
sys0=tch1
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx pColorWheel.h,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hBrightness
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Position : 50
Upper range limit: 100
Lower range limit: 0
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
covx hBrightness.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hTempSlider
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Position : 50
Upper range limit: 100
Lower range limit: 0
Events
Touch Release Event
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
covx hTempSlider.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button b0
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bColor
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
if(mode.val==1)
{
mode.val=0
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis hTempSlider,0
}else
{
mode.val=1
//disable color wheel
vis pColorWheel,0
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis hTempSlider,1
}
}
Button bEffect
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
State : unpressed
Text :
Max. Text Size : 10
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff,"
covx btOnOff1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Timer tmCooldown
Attributes
Scope : local
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
ucopy payloadLength,2,2,0
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
// calculate crc
crcrest 1,0xFFFF
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
//crcputu 3,u[2]
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
crcputu 0,payloadLength-1
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
// compare crc with recived value
if(crcval==recvCrc)
{
// crc is okay
// here is the location where acual code should be
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
// get Brightness value
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else if(tTmp.txt=="unknown") // temp supported, but not in color mode
{
mode_temp.val=1
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
hTempSlider.val=sys0
}
// mode == 0 is rgb controls currently shown
if(mode.val==0)
{
// switch mode
click bColor,1
click bColor,0
}
}
// get Color value
spstr strCommand.txt,tTmp.txt,"~",7
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
vis bColor,1
}
if(mode.val==0)
{
vis pColorWheel,1
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
{
vis bEffect,1
}else
{
vis bEffect,0
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="pageType")
{
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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=="cardGrid2")
{
page cardGrid2
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep
Attributes
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
click b0,1
click b0,0
}
}
TouchCap tc0
Attributes
Scope: local
Value: 0
Events
Touch Press Event
sleepValue=0

View File

@@ -352,7 +352,7 @@ Timer tmSerial
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
if(tInstruction.txt=="timeout2")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1

View File

@@ -11,6 +11,18 @@ Page screensaver
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
recmod=1
baud=115200
vis tInstruction,0

View File

@@ -11,6 +11,18 @@ Page screensaver2
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
recmod=1
baud=115200
vis tInstruction,0
@@ -804,6 +816,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="timeout")
{

Binary file not shown.

Binary file not shown.

View File

@@ -1,24 +1,122 @@
--- HMI/n2t-out
+++ HMI/US/portrait/n2t-out
├── file list
│ @@ -1,10 +1,9 @@
│ Program.s.txt
│ cardAlarm.txt
│ -cardBurnRec.txt
│ cardChart.txt
│ cardEntities.txt
│ cardGrid.txt
│ cardGrid2.txt
│ cardLChart.txt
│ cardMedia.txt
│ cardPower.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/portrait/n2t-out/Program.s.txt
│ @@ -10,11 +10,11 @@
│ int sleepValue=0
│ // dim value
│ @@ -12,11 +12,11 @@
│ int dimValue=40
│ int dimValueNormal=100
│ //color vars
│ int defaultFontColor=65535
│ int defaultBcoColor=6371
│ //feature flags
│ int featNewSliders=0
│ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020
│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
│ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt
│ @@ -7,26 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ vis arm1,0
│ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/portrait/n2t-out/cardChart.txt
│ @@ -7,26 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ vis bPrev,0
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
│ @@ -60,16 +60,36 @@
│ @@ -7,27 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - dim=dimValueNormal
│ dim=dimValueNormal
│ //wup=cardEntities
│ //remove background & activate reparse mode
│ vis p0,0
│ recmod=1
│ baud=115200
│ //debug stuff
│ @@ -73,16 +60,36 @@
│ vis tIcon4,0
│ vis tEntity4,0
│ vis bText4,0
@@ -56,7 +154,7 @@
│ b[sys0].pco=defaultFontColor
│ }
│ if(b[sys0].type==53&&defaultBcoColor==0)
│ @@ -85,45 +105,57 @@
│ @@ -98,45 +105,57 @@
│ }
│ }
@@ -65,54 +163,54 @@
│ Scope : local
│ Text :
│ - Max. Text Size: 80
│ + Max. Text Size: 65
│ + Max. Text Size: 64
│ Variable (string) entn2
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 80
│ + Max. Text Size: 65
│ + Max. Text Size: 64
│ Variable (string) entn3
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 80
│ + Max. Text Size: 65
│ + Max. Text Size: 64
│ Variable (string) entn4
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 80
│ + Max. Text Size: 65
│ + Max. Text Size: 64
│ +
│ +Variable (string) entn5
│ + Attributes
│ + Scope : local
│ + Text :
│ + Max. Text Size: 65
│ + Max. Text Size: 64
│ +
│ +Variable (string) entn6
│ + Attributes
│ + Scope : local
│ + Text :
│ + Max. Text Size: 65
│ + Max. Text Size: 64
│ Variable (string) nent1
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 80
│ + Max. Text Size: 40
│ + Max. Text Size: 38
│ Variable (string) nent2
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 80
│ + Max. Text Size: 40
│ + Max. Text Size: 38
│ Variable (string) strCommand
│ Attributes
@@ -120,7 +218,7 @@
│ Text :
│ Max. Text Size: 500
│ @@ -153,14 +185,26 @@
│ @@ -166,14 +185,26 @@
│ Variable (string) type4
│ Attributes
@@ -147,7 +245,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Value : 0
│ @@ -185,14 +229,30 @@
│ @@ -198,14 +229,30 @@
│ Attributes
│ Scope : local
│ Dragging : 0
@@ -178,7 +276,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : tEntity1
│ @@ -221,14 +281,32 @@
│ @@ -234,14 +281,32 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -211,7 +309,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -266,14 +344,32 @@
│ @@ -279,14 +344,32 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -244,7 +342,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -407,14 +503,68 @@
│ @@ -420,14 +503,68 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -290,9 +388,9 @@
│ +
│ + Events
│ + Touch Release Event
│ + nNum5.val=hSlider5.val
│ + nNum6.val=hSlider6.val
│ + tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
│ + covx nNum5.val,tTmp.txt,0,0
│ + covx nNum6.val,tTmp.txt,0,0
│ + tSend.txt+=tTmp.txt
│ + //send calc crc
│ + btlen tSend.txt,sys0
@@ -313,7 +411,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ @@ -503,14 +653,62 @@
│ @@ -516,14 +653,62 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -376,7 +474,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ @@ -647,14 +845,62 @@
│ @@ -660,14 +845,62 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -439,7 +537,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text :
│ @@ -743,14 +989,62 @@
│ @@ -756,14 +989,62 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -502,7 +600,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ @@ -839,14 +1133,62 @@
│ @@ -852,14 +1133,62 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -565,7 +663,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text :
│ @@ -943,14 +1285,66 @@
│ @@ -956,14 +1285,66 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -611,7 +709,7 @@
│ + Events
│ + Touch Press Event
│ + tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
│ + covx btOnOff5.val,tTmp.txt,0,0
│ + covx btOnOff6.val,tTmp.txt,0,0
│ + tSend.txt+=tTmp.txt
│ + //send calc crc
│ + btlen tSend.txt,sys0
@@ -632,7 +730,7 @@
│ Send Component ID: disabled
│ Events
│ @@ -1079,14 +1473,82 @@
│ @@ -1112,14 +1493,92 @@
│ page popupInSel
│ }
│ if(type4.txt=="timer")
@@ -658,8 +756,13 @@
│ + }
│ + if(type5.txt=="light")
│ + {
│ + //popupLight.tEntity.txt=tEntity5.txt
│ + page popupLight
│ + if(featNewSliders==1)
│ + {
│ + page popupLightNew
│ + }else
│ + {
│ + page popupLight
│ + }
│ + }
│ + if(type5.txt=="fan")
│ + {
@@ -692,8 +795,13 @@
│ + }
│ + if(type6.txt=="light")
│ + {
│ + //popupLight.tEntity.txt=tEntity5.txt
│ + page popupLight
│ + if(featNewSliders==1)
│ + {
│ + page popupLightNew
│ + }else
│ + {
│ + page popupLight
│ + }
│ + }
│ + if(type6.txt=="fan")
│ + {
@@ -715,7 +823,7 @@
│ Send Component ID: disabled
│ Events
│ @@ -1810,14 +2272,312 @@
│ @@ -1843,14 +2302,312 @@
│ covx tTmp.txt,sys0,0,0
│ hSlider4.minval=sys0
│ //third value is max value
@@ -1028,9 +1136,65 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/portrait/n2t-out/cardGrid.txt
│ @@ -7,26 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ dim=dimValueNormal
│ //remove background & activate reparse mode
│ vis p0,0
│ recmod=1
│ baud=115200
│ //debug stuff
│ vis tTmp,0
│ --- HMI/n2t-out/cardGrid2.txt
├── +++ HMI/US/portrait/n2t-out/cardGrid2.txt
│ @@ -25,26 +25,28 @@
│ @@ -7,26 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ dim=dimValueNormal
│ //remove background & activate reparse mode
│ vis p0,0
│ recmod=1
│ baud=115200
│ //debug stuff
│ vis tTmp,0
│ @@ -37,26 +25,28 @@
│ vis bEntity2,0
│ vis bEntity3,0
│ vis bEntity4,0
@@ -1060,7 +1224,7 @@
│ b[sys0].pco=defaultFontColor
│ }
│ }
│ @@ -93,14 +95,20 @@
│ @@ -105,14 +95,20 @@
│ Variable (string) entn8
│ Attributes
@@ -1081,7 +1245,7 @@
│ Max. Text Size: 80
│ Variable (string) nent2
│ @@ -165,14 +173,20 @@
│ @@ -177,14 +173,20 @@
│ Variable (string) type8
│ Attributes
@@ -1102,7 +1266,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : tEntity1
│ @@ -237,14 +251,23 @@
│ @@ -249,14 +251,23 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -1126,34 +1290,46 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -555,14 +578,58 @@
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
tmLP.en=1
│ + tTmp.txt=type2.txt
│ + pageIcons.tTmp1.txt=tEntity2.txt
│ + pageIcons.tTmp2.txt=entn2.txt
│ + pageIcons.tTmp3.txt=bEntity2.txt
│ + if(type2.txt=="shutter")
│ @@ -643,14 +654,58 @@
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
│ +Button bEntity9
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID: disabled
│ + State : unpressed
│ + Text : 
│ + Max. Text Size : 10
│ +
│ + Events
│ + Touch Press Event
│ + tmLP.en=1
│ + tTmp.txt=type9.txt
│ + pageIcons.tTmp1.txt=tEntity9.txt
│ + pageIcons.tTmp2.txt=entn9.txt
│ + pageIcons.tTmp3.txt=bEntity9.txt
│ + if(type9.txt=="shutter")
│ + {
│ + page popupShutter
│ + }
│ + if(type2.txt=="input_sel")
│ + if(type9.txt=="input_sel")
│ + {
│ + page popupInSel
│ + }
│ + if(type2.txt=="timer")
│ + if(type9.txt=="timer")
│ + {
│ + page popupTimer
│ + }
│ +
│ + Touch Release Event
│ + tmLP.en=0
│ + tSend.txt="event,buttonPress2,"+entn2.txt+",button"
│ + tSend.txt="event,buttonPress2,"+entn9.txt+",button"
│ + //send calc crc
│ + btlen tSend.txt,sys0
│ + crcrest 1,0xffff // reset CRC
@@ -1166,43 +1342,14 @@
│ + prints tSend.txt,0
│ + prints crcval,2
│ +
+Button bEntity8
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID: disabled
│ + State : unpressed
│ + Text : 
│ + Max. Text Size : 10
│ +
│ + Events
│ + Touch Press Event
│ + tmLP.en=1
│ tTmp.txt=type6.txt
│ pageIcons.tTmp1.txt=tEntity6.txt
│ pageIcons.tTmp2.txt=entn6.txt
│ pageIcons.tTmp3.txt=bEntity6.txt
│ if(type6.txt=="shutter")
│ {
│ page popupShutter
│ @@ -587,15 +654,15 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
│ prints sys0,2
│ prints tSend.txt,0
│ prints crcval,2
│ -Button bEntity8
│ +Button bEntity9
Button bNext
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
Max. Text Size : 10
│ @@ -999,14 +1066,35 @@
│ Text : 
@@ -1105,14 +1160,46 @@
│ spstr strCommand.txt,tTmp.txt,"~",59
│ covx tTmp.txt,sys0,0,0
│ bEntity8.pco=sys0
@@ -1222,6 +1369,17 @@
│ + {
│ + // change icon
│ + spstr strCommand.txt,bEntity9.txt,"~",64
│ + // way to get force font adjustment
│ + strlen bEntity9.txt,sys0
│ + //check 2nd last char for ¬
│ + substr bEntity9.txt,tTmp.txt,sys0-2,1
│ + if(tTmp.txt=="¬")
│ + {
│ + substr bEntity9.txt,tTmp.txt,sys0-1,1
│ + covx tTmp.txt,sys1,0,0
│ + bEntity9.font=sys1
│ + substr bEntity9.txt,bEntity9.txt,0,sys0-2
│ + }
│ + vis bEntity9,1
│ + // change icon color
│ + spstr strCommand.txt,tTmp.txt,"~",65
@@ -1238,9 +1396,94 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ --- HMI/n2t-out/cardLChart.txt
├── +++ HMI/US/portrait/n2t-out/cardLChart.txt
│ @@ -7,26 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ vis bPrev,0
│ --- HMI/n2t-out/cardMedia.txt
├── +++ HMI/US/portrait/n2t-out/cardMedia.txt
│ @@ -7,26 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ vis t5,0
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/portrait/n2t-out/cardPower.txt
│ @@ -45,16 +45,16 @@
│ @@ -7,26 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ vis bPrev,0
│ @@ -57,16 +45,16 @@
│ b[sys0].bco=defaultBcoColor
│ b[sys0].pco=defaultFontColor
│ }
@@ -1259,7 +1502,7 @@
│ Variable (string) nent1
│ Attributes
│ @@ -75,39 +75,75 @@
│ @@ -87,39 +75,75 @@
│ Max. Text Size: 1000
│ Variable (int32) t0Speed
@@ -1335,7 +1578,7 @@
│ Max. Text Size: 20
│ Variable (string) tInstruction
│ @@ -133,23 +169,14 @@
│ @@ -145,23 +169,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -1359,7 +1602,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -169,23 +196,14 @@
│ @@ -181,23 +196,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -1383,7 +1626,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -196,23 +214,14 @@
│ @@ -208,23 +214,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -1407,7 +1650,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -223,23 +232,14 @@
│ @@ -235,23 +232,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -1431,7 +1674,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -250,23 +250,14 @@
│ @@ -262,23 +250,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -1455,7 +1698,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -277,23 +268,14 @@
│ @@ -289,23 +268,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -1479,7 +1722,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -498,85 +480,79 @@
│ @@ -510,85 +480,79 @@
│ h0.val=h0.minval
│ }
│ if(sys0<h0.minval)
@@ -1565,6 +1808,81 @@
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│ @@ -974,15 +938,15 @@
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ if(tId.txt=="cardLChart")
│ {
│ - page cardLChart
│ + page cardChart
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -7,26 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ vis bPrev,0
│ --- HMI/n2t-out/cardThermo.txt
├── +++ HMI/US/portrait/n2t-out/cardThermo.txt
│ @@ -7,26 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tInstruction,0
│ vis tTmp,0
│ vis tId,0
│ vis xTempMin1,0
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -34,20 +34,14 @@
@@ -1622,9 +1940,113 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -282,15 +276,15 @@
│ // get feature flag popup
│ spstr strCommand.txt,tTmp.txt,"~",5
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,featNewSliders,0,0
│ }
│ }
│ - if(tInstruction.txt=="timeout")
│ + if(tInstruction.txt=="timeout2")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -48,33 +48,33 @@
│ vis hTempSlider,0
│ //disable color wheel components by default
│ vis bColor,0
│ vis t0,0
│ vis pColorWheel,0
│ //vis t0,0
│ popupLight.bco=defaultBcoColor
│ - for(sys0=0;sys0<27;sys0++)
│ + for(sys0=0;sys0<28;sys0++)
│ {
│ if(b[sys0].type==98||b[sys0].type==116)
│ {
│ b[sys0].bco=defaultBcoColor
│ b[sys0].pco=defaultFontColor
│ }
│ if(b[sys0].type==53&&defaultBcoColor==0)
│ {
│ b[sys0].pic=10
│ b[sys0].pic2=11
│ }
│ }
│ if(defaultBcoColor==0)
│ {
│ - hBrightness.pic=24
│ - hBrightness.pic1=25
│ + hBrightness.pic=14
│ + hBrightness.pic1=13
│ hBrightness.pic2=15
│ - hTempSlider.pic=16
│ + hTempSlider.pic=23
│ hTempSlider.pic1=17
│ hTempSlider.pic2=15
│ }
│ Variable (string) entn
│ Attributes
│ Scope : local
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -348,15 +348,15 @@
│ // get font color
│ spstr strCommand.txt,tTmp.txt,"~",4
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0
│ }
│ }
│ - if(tInstruction.txt=="timeout2")
│ + if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }
│ if(tInstruction.txt=="exitPopup")
│ {
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@
│ @@ -7,27 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - dim=dimValueNormal
│ recmod=1
│ baud=115200
│ vis tInstruction,0
│ vis tTmp,0
│ vis p0,0
│ vis tNotifyHead,0
│ vis tNotifyText,0
│ @@ -41,17 +28,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
@@ -1642,7 +2064,7 @@
│ Max. Text Size: 600
│ Variable (string) strTmp
│ @@ -102,34 +99,14 @@
│ @@ -115,34 +99,14 @@
│ Value: 0
│ Variable (int32) ycR
@@ -1677,7 +2099,25 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : |
│ @@ -596,20 +573,14 @@
│ @@ -485,17 +449,14 @@
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ - }else
│ - {
│ - vis tAMPM,1
│ }
│ spstr strCommand.txt,tTimeAdd.txt,"~",2
│ ref tIcon1
│ ref tIcon2
│ }
│ if(tInstruction.txt=="date")
│ {
│ @@ -612,20 +573,14 @@
│ {
│ vis tMainIcon,1
│ vis tMainIconAlt,0
@@ -1700,7 +2140,35 @@
│ if(tTime.bco!=screensaver.bco)
│ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@
│ @@ -7,27 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - dim=dimValueNormal
│ recmod=1
│ baud=115200
│ vis tInstruction,0
│ vis tTmp,0
│ vis p0,0
│ vis tNotifyHead,0
│ vis tNotifyText,0
│ @@ -41,17 +28,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
@@ -1718,7 +2186,7 @@
│ Max. Text Size: 1979
│ Variable (string) strTmp
│ @@ -363,34 +360,14 @@
│ @@ -376,34 +360,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -1753,7 +2221,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : PM
│ @@ -572,15 +549,14 @@
│ @@ -585,15 +549,14 @@
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0

View File

@@ -1,10 +1,110 @@
+++ /dev/fd/62 2023-05-21 07:42:40.316901599 +0000
+++ /dev/fd/62 2023-11-27 23:28:52.512823638 +0000
+le list
+ +1,9 @@
+.s.txt
+rm.txt
+nRec.txt
+rt.txt
+ities.txt
+d.txt
+d2.txt
+art.txt
+ia.txt
+er.txt
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,11 @@
+1 +12,11 @@
+eature flags
+ featNewSliders=0
+nth 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
+I/n2t-out/cardAlarm.txt
++ HMI/US/portrait/n2t-out/cardAlarm.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis arm1,0
+I/n2t-out/cardChart.txt
++ HMI/US/portrait/n2t-out/cardChart.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis bPrev,0
+I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ dim=dimValueNormal
+ //wup=cardEntities
+ //remove background & activate reparse mode
+ vis p0,0
+ recmod=1
+ baud=115200
+ //debug stuff
+6 +60,36 @@
+ //ui e6
+ vis btOnOff6,0
@@ -29,42 +129,42 @@
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 65
+ Max. Text Size: 64
+
+e (string) entn2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 65
+ Max. Text Size: 64
+
+e (string) entn3
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 65
+ Max. Text Size: 65
+ Max. Text Size: 65
+ Max. Text Size: 64
+ Max. Text Size: 64
+ Max. Text Size: 64
+
+e (string) entn6
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 65
+ Max. Text Size: 64
+
+e (string) nent1
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+ Max. Text Size: 38
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 40
+ Max. Text Size: 38
+14 +185,26 @@
+e (string) type6
+ributes
@@ -174,9 +274,9 @@
+
+nts
+ Touch Release Event
+ nNum5.val=hSlider5.val
+ nNum6.val=hSlider6.val
+ tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
+ covx nNum5.val,tTmp.txt,0,0
+ covx nNum6.val,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt
+ //send calc crc
+ btlen tSend.txt,sys0
@@ -358,7 +458,7 @@
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
+ covx btOnOff5.val,tTmp.txt,0,0
+ covx btOnOff6.val,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt
+ //send calc crc
+ btlen tSend.txt,sys0
@@ -376,13 +476,20 @@
+ Dragging : 0
+ Send Component ID: disabled
+nts
+,14 +1473,82 @@
+,14 +1493,92 @@
+ page popupInSel
+ if(type4.txt=="timer")
+ page popupTimer
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+ if(featNewSliders==1)
+ {
+ page popupLightNew
+ }else
+ {
+ page popupLight
+ }
+ if(type5.txt=="timer")
+ {
+ page popupTimer
@@ -406,8 +513,13 @@
+ }
+ if(type6.txt=="light")
+ {
+ //popupLight.tEntity.txt=tEntity5.txt
+ page popupLight
+ if(featNewSliders==1)
+ {
+ page popupLightNew
+ }else
+ {
+ page popupLight
+ }
+ }
+ if(type6.txt=="fan")
+ {
@@ -425,7 +537,7 @@
+ Dragging : 0
+ Send Component ID: disabled
+nts
+,14 +2272,312 @@
+,14 +2302,312 @@
+ spstr strCommand.txt,type5.txt,"~",38
+ spstr strCommand.txt,entn5.txt,"~",39
+ spstr strCommand.txt,tIcon5.txt,"~",40
@@ -593,8 +705,64 @@
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+I/n2t-out/cardGrid.txt
++ HMI/US/portrait/n2t-out/cardGrid.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ //remove background & activate reparse mode
+ vis p0,0
+ recmod=1
+ baud=115200
+ //debug stuff
+ vis tTmp,0
+I/n2t-out/cardGrid2.txt
++ HMI/US/portrait/n2t-out/cardGrid2.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ //remove background & activate reparse mode
+ vis p0,0
+ recmod=1
+ baud=115200
+ //debug stuff
+ vis tTmp,0
+6 +25,28 @@
+ vis bEntity2,0
+ vis bEntity3,0
@@ -625,7 +793,7 @@
+ b[sys0].pco=defaultFontColor
+ }
+ }
+4 +95,20 @@
+14 +95,20 @@
+
+e (string) entn8
+ributes
@@ -691,7 +859,19 @@
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text :
+14 +578,58 @@
+14 +654,58 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
+bEntity9
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
@@ -699,26 +879,26 @@
+nts
+ Touch Press Event
+ tmLP.en=1
+ tTmp.txt=type2.txt
+ pageIcons.tTmp1.txt=tEntity2.txt
+ pageIcons.tTmp2.txt=entn2.txt
+ pageIcons.tTmp3.txt=bEntity2.txt
+ if(type2.txt=="shutter")
+ tTmp.txt=type9.txt
+ pageIcons.tTmp1.txt=tEntity9.txt
+ pageIcons.tTmp2.txt=entn9.txt
+ pageIcons.tTmp3.txt=bEntity9.txt
+ if(type9.txt=="shutter")
+ {
+ page popupShutter
+ }
+ if(type2.txt=="input_sel")
+ if(type9.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type2.txt=="timer")
+ if(type9.txt=="timer")
+ {
+ page popupTimer
+ }
+
+ Touch Release Event
+ tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn2.txt+",button"
+ tSend.txt="event,buttonPress2,"+entn9.txt+",button"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
@@ -731,43 +911,14 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+bEntity8
+bNext
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tmLP.en=1
+ tTmp.txt=type6.txt
+ pageIcons.tTmp1.txt=tEntity6.txt
+ pageIcons.tTmp2.txt=entn6.txt
+ pageIcons.tTmp3.txt=bEntity6.txt
+ if(type6.txt=="shutter")
+ {
+ page popupShutter
+15 +654,15 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
+bEntity8
+bEntity9
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+14 +1066,35 @@
+ Text : 
+,14 +1160,46 @@
+ spstr strCommand.txt,tTmp.txt,"~",59
+ covx tTmp.txt,sys0,0,0
+ bEntity8.pco=sys0
@@ -787,6 +938,17 @@
+ {
+ // change icon
+ spstr strCommand.txt,bEntity9.txt,"~",64
+ // way to get force font adjustment
+ strlen bEntity9.txt,sys0
+ //check 2nd last char for ¬
+ substr bEntity9.txt,tTmp.txt,sys0-2,1
+ if(tTmp.txt=="¬")
+ {
+ substr bEntity9.txt,tTmp.txt,sys0-1,1
+ covx tTmp.txt,sys1,0,0
+ bEntity9.font=sys1
+ substr bEntity9.txt,bEntity9.txt,0,sys0-2
+ }
+ vis bEntity9,1
+ // change icon color
+ spstr strCommand.txt,tTmp.txt,"~",65
@@ -796,8 +958,93 @@
+ spstr strCommand.txt,tEntity9.txt,"~",66
+ vis tEntity9,1
+ }
+I/n2t-out/cardLChart.txt
++ HMI/US/portrait/n2t-out/cardLChart.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis bPrev,0
+I/n2t-out/cardMedia.txt
++ HMI/US/portrait/n2t-out/cardMedia.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis t5,0
+I/n2t-out/cardPower.txt
++ HMI/US/portrait/n2t-out/cardPower.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis bPrev,0
+6 +45,16 @@
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
@@ -1123,6 +1370,81 @@
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+15 +938,15 @@
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ page cardChart
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis bPrev,0
+I/n2t-out/cardThermo.txt
++ HMI/US/portrait/n2t-out/cardThermo.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis xTempMin1,0
+I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +34,14 @@
@@ -1160,8 +1482,112 @@
+ Send Component ID : disabled
+15 +158,15 @@
+ Max. Text Size : 10
+15 +276,15 @@
+ // get feature flag popup
+ spstr strCommand.txt,tTmp.txt,"~",5
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,featNewSliders,0,0
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ if(tInstruction.txt=="timeout2")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ }
+ if(tInstruction.txt=="pageType")
+ {
+I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt
+3 +48,33 @@
+ vis hTempSlider,0
+ //disable color wheel components by default
+ vis bColor,0
+ vis t0,0
+ vis pColorWheel,0
+ //vis t0,0
+ popupLight.bco=defaultBcoColor
+ for(sys0=0;sys0<27;sys0++)
+ for(sys0=0;sys0<28;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ hBrightness.pic=24
+ hBrightness.pic1=25
+ hBrightness.pic=14
+ hBrightness.pic1=13
+ hBrightness.pic2=15
+ hTempSlider.pic=16
+ hTempSlider.pic=23
+ hTempSlider.pic1=17
+ hTempSlider.pic2=15
+ }
+
+e (string) entn
+ributes
+ Scope : local
+I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt
+15 +348,15 @@
+ // get font color
+ spstr strCommand.txt,tTmp.txt,"~",4
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,defaultFontColor,0,0
+ }
+ }
+ if(tInstruction.txt=="timeout2")
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ }
+ if(tInstruction.txt=="exitPopup")
+ {
+I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ recmod=1
+ baud=115200
+ vis tInstruction,0
+ vis tTmp,0
+ vis p0,0
+ vis tNotifyHead,0
+ vis tNotifyText,0
+7 +28,14 @@
+ }
+ tDate.txt=pageIcons.vaDate.txt
@@ -1215,6 +1641,24 @@
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : |
+17 +449,14 @@
+ //get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
+ if(tAMPM.txt=="")
+ {
+ vis tAMPM,0
+ }else
+ {
+ vis tAMPM,1
+ }
+ spstr strCommand.txt,tTimeAdd.txt,"~",2
+ ref tIcon1
+ ref tIcon2
+ }
+ if(tInstruction.txt=="date")
+ {
+20 +573,14 @@
+ {
+ vis tMainIcon,1
@@ -1238,6 +1682,34 @@
+ if(tTime.bco!=screensaver.bco)
+I/n2t-out/screensaver2.txt
++ HMI/US/portrait/n2t-out/screensaver2.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ recmod=1
+ baud=115200
+ vis tInstruction,0
+ vis tTmp,0
+ vis p0,0
+ vis tNotifyHead,0
+ vis tNotifyText,0
+7 +28,14 @@
+ }
+ tDate.txt=pageIcons.vaDate.txt

View File

@@ -14,6 +14,8 @@ Program.s
//color vars
int defaultFontColor=65535
int defaultBcoColor=6371
//feature flags
int featNewSliders=0
// fix touch offset (Removed for US version)
//lcd_dev fffb 0002 0000 0020
printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port

View File

@@ -118,56 +118,56 @@ Variable (string) entn1
ID : 48
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn2
Attributes
ID : 49
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn3
Attributes
ID : 50
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn4
Attributes
ID : 51
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn5
Attributes
ID : 61
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn6
Attributes
ID : 88
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) nent1
Attributes
ID : 90
Scope : local
Text :
Max. Text Size: 40
Max. Text Size: 38
Variable (string) nent2
Attributes
ID : 89
Scope : local
Text :
Max. Text Size: 40
Max. Text Size: 38
Variable (string) strCommand
Attributes
@@ -1115,9 +1115,9 @@ Slider hSlider6
Events
Touch Release Event
nNum5.val=hSlider5.val
nNum6.val=hSlider6.val
tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
covx nNum5.val,tTmp.txt,0,0
covx nNum6.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
@@ -2577,7 +2577,7 @@ Dual-state Button btOnOff6
Events
Touch Press Event
tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
covx btOnOff5.val,tTmp.txt,0,0
covx btOnOff6.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
@@ -2618,8 +2618,13 @@ Hotspot m0
}
if(type1.txt=="light")
{
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type1.txt=="fan")
{
@@ -2661,8 +2666,13 @@ Hotspot m1
}
if(type2.txt=="light")
{
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type2.txt=="fan")
{
@@ -2704,8 +2714,13 @@ Hotspot m2
}
if(type3.txt=="light")
{
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type3.txt=="fan")
{
@@ -2747,8 +2762,13 @@ Hotspot m3
}
if(type4.txt=="light")
{
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type4.txt=="fan")
{
@@ -2790,8 +2810,13 @@ Hotspot m4
}
if(type5.txt=="light")
{
//popupLight.tEntity.txt=tEntity5.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type5.txt=="fan")
{
@@ -2833,8 +2858,13 @@ Hotspot m5
}
if(type6.txt=="light")
{
//popupLight.tEntity.txt=tEntity5.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type6.txt=="fan")
{

View File

@@ -1052,7 +1052,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -1161,6 +1167,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -1182,6 +1199,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -1203,6 +1231,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -1224,6 +1263,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -1245,6 +1295,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -1266,6 +1327,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47

View File

@@ -1036,26 +1036,26 @@ Button bEntity7
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type2.txt
pageIcons.tTmp1.txt=tEntity2.txt
pageIcons.tTmp2.txt=entn2.txt
pageIcons.tTmp3.txt=bEntity2.txt
if(type2.txt=="shutter")
tTmp.txt=type7.txt
pageIcons.tTmp1.txt=tEntity7.txt
pageIcons.tTmp2.txt=entn7.txt
pageIcons.tTmp3.txt=bEntity7.txt
if(type7.txt=="shutter")
{
page popupShutter
}
if(type2.txt=="input_sel")
if(type7.txt=="input_sel")
{
page popupInSel
}
if(type2.txt=="timer")
if(type7.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn2.txt+",button"
tSend.txt="event,buttonPress2,"+entn7.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1102,26 +1102,26 @@ Button bEntity8
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type8.txt
pageIcons.tTmp1.txt=tEntity8.txt
pageIcons.tTmp2.txt=entn8.txt
pageIcons.tTmp3.txt=bEntity8.txt
if(type8.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type8.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type8.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn8.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1168,26 +1168,26 @@ Button bEntity9
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type9.txt
pageIcons.tTmp1.txt=tEntity9.txt
pageIcons.tTmp2.txt=entn9.txt
pageIcons.tTmp3.txt=bEntity9.txt
if(type9.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type9.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type9.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn9.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1385,7 +1385,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -1494,6 +1500,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -1515,6 +1532,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -1536,6 +1564,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -1557,6 +1596,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -1578,6 +1628,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -1599,6 +1660,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47
@@ -1620,6 +1692,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity7.txt,"~",52
// way to get force font adjustment
strlen bEntity7.txt,sys0
//check 2nd last char for ¬
substr bEntity7.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity7.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity7.font=sys1
substr bEntity7.txt,bEntity7.txt,0,sys0-2
}
vis bEntity7,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",53
@@ -1641,6 +1724,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity8.txt,"~",58
// way to get force font adjustment
strlen bEntity8.txt,sys0
//check 2nd last char for ¬
substr bEntity8.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity8.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity8.font=sys1
substr bEntity8.txt,bEntity8.txt,0,sys0-2
}
vis bEntity8,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",59
@@ -1662,6 +1756,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity9.txt,"~",64
// way to get force font adjustment
strlen bEntity9.txt,sys0
//check 2nd last char for ¬
substr bEntity9.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity9.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity9.font=sys1
substr bEntity9.txt,bEntity9.txt,0,sys0-2
}
vis bEntity9,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",65
@@ -1748,6 +1853,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -1485,6 +1485,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity1.txt,"~",25
vis bEntity1,1
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,sys0,0,0
@@ -1506,6 +1517,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity2.txt,"~",31
vis bEntity2,1
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,sys0,0,0
@@ -1527,6 +1549,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity3.txt,"~",37
vis bEntity3,1
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,sys0,0,0
@@ -1548,6 +1581,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity4.txt,"~",43
vis bEntity4,1
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,sys0,0,0
@@ -1569,6 +1613,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity5.txt,"~",49
vis bEntity5,1
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",50
covx tTmp.txt,sys0,0,0
@@ -1590,6 +1645,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity6.txt,"~",55
vis bEntity6,1
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",56
covx tTmp.txt,sys0,0,0

View File

@@ -1514,6 +1514,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -1,7 +1,7 @@
Program.s
0 Component(s)
13 Line(s) of event code
13 Unique line(s) of event code
14 Line(s) of event code
14 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
@@ -14,38 +14,38 @@ popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
pageStartup
19 Component(s)
198 Line(s) of event code
137 Unique line(s) of event code
popupTimer
42 Component(s)
516 Line(s) of event code
257 Unique line(s) of event code
cardGrid2
56 Component(s)
657 Line(s) of event code
332 Unique line(s) of event code
popupLight
28 Component(s)
412 Line(s) of event code
227 Unique line(s) of event code
popupFan
27 Component(s)
355 Line(s) of event code
206 Unique line(s) of event code
pageStartup
19 Component(s)
193 Line(s) of event code
135 Unique line(s) of event code
popupLightNew
23 Component(s)
412 Line(s) of event code
209 Unique line(s) of event code
cardChart
33 Component(s)
437 Line(s) of event code
296 Unique line(s) of event code
cardMedia
59 Component(s)
649 Line(s) of event code
322 Unique line(s) of event code
cardGrid2
56 Component(s)
748 Line(s) of event code
410 Unique line(s) of event code
cardLChart
33 Component(s)
402 Line(s) of event code
266 Unique line(s) of event code
popupLight
23 Component(s)
410 Line(s) of event code
209 Unique line(s) of event code
popupShutter
25 Component(s)
402 Line(s) of event code
@@ -64,20 +64,12 @@ popupInSel
297 Unique line(s) of event code
cardGrid
44 Component(s)
523 Line(s) of event code
295 Unique line(s) of event code
583 Line(s) of event code
332 Unique line(s) of event code
cardAlarm
43 Component(s)
500 Line(s) of event code
273 Unique line(s) of event code
cardPower
54 Component(s)
521 Line(s) of event code
341 Unique line(s) of event code
screensaver2
58 Component(s)
348 Line(s) of event code
245 Unique line(s) of event code
cardThermo
57 Component(s)
540 Line(s) of event code
@@ -86,13 +78,25 @@ screensaver
46 Component(s)
429 Line(s) of event code
306 Unique line(s) of event code
cardPower
54 Component(s)
525 Line(s) of event code
342 Unique line(s) of event code
screensaver2
58 Component(s)
352 Line(s) of event code
247 Unique line(s) of event code
cardEntities
91 Component(s)
1630 Line(s) of event code
705 Unique line(s) of event code
1666 Line(s) of event code
711 Unique line(s) of event code
cardMedia
59 Component(s)
703 Line(s) of event code
356 Unique line(s) of event code
Total
22 Page(s)
862 Component(s)
10360 Line(s) of event code
2492 Unique line(s) of event code
23 Page(s)
890 Component(s)
11029 Line(s) of event code
2600 Unique line(s) of event code

View File

@@ -389,7 +389,7 @@ Text tVersion
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 51
Text : 53
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
@@ -568,8 +568,14 @@ Timer tmSerial
{
covx tTmp.txt,defaultFontColor,0,0
}
// get feature flag popup
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
covx tTmp.txt,featNewSliders,0,0
}
}
if(tInstruction.txt=="timeout")
if(tInstruction.txt=="timeout2")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1

View File

@@ -24,12 +24,13 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
@@ -46,20 +47,20 @@ Page popupLight
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
vis t1,0
vis t2,0
vis hBrightness,0
//disable color temp by default
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis t0,0
vis pColorWheel,0
//vis t0,0
popupLight.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
for(sys0=0;sys0<28;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
@@ -74,83 +75,115 @@ Page popupLight
}
if(defaultBcoColor==0)
{
hTempSlider.pic=16
hTempSlider.pic1=16
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=23
hTempSlider.pic1=17
hTempSlider.pic2=15
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
ID : 18
Scope: local
Value: 65504
Variable (string) entn
Attributes
ID : 11
ID : 20
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
ID : 13
ID : 22
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
ID : 14
ID : 23
Scope: local
Value: 0
Variable (string) strCommand
Attributes
ID : 9
ID : 16
Scope : local
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
ID : 16
ID : 26
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Text t0
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 80
Text tEntity
Attributes
ID : 2
ID : 24
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 19
y coordinate : 21
Width : 224
x coordinate : 12
y coordinate : 57
Width : 141
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Color
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1
Attributes
ID : 6
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 60
y coordinate : 374
Width : 251
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Brightness
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t2
Attributes
ID : 9
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 374
Width : 45
Height : 30
Effect : load
Effect Priority : 0
@@ -160,31 +193,250 @@ Text tEntity
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 65535
Font Color : 40147
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t3
Attributes
ID : 10
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 267
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 40147
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t4
Attributes
ID : 11
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 60
y coordinate : 266
Width : 250
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Temperature
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tEntity
Attributes
ID : 3
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 60
y coordinate : 21
Width : 200
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 25
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture pColorWheel
Text tIcon1
Attributes
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 11
y coordinate : 21
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tId
Attributes
ID : 18
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 450
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInstruction
Attributes
ID : 17
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 450
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp
Attributes
ID : 12
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 282
y coordinate : 446
Width : 34
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 80
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 150
y coordinate : 168
Width : 160
Height : 160
x coordinate : 0
y coordinate : 1
Width : 319
Height : 479
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 3
Picture ID : 0
Picture pColorWheel
Attributes
ID : 2
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 67
y coordinate : 89
Width : 245
Height : 245
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 20
Events
Touch Press Event
@@ -216,44 +468,30 @@ Picture pColorWheel
Slider hBrightness
Attributes
ID : 4
ID : 7
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 25
y coordinate : 127
Width : 100
Height : 250
x coordinate : 12
y coordinate : 409
Width : 300
Height : 44
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 1
Back. Picture ID : 65535
Slided Back. Picture ID: 65535
Cursor height : 255
Back. Picture ID : 5
Slided Back. Picture ID: 4
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
@@ -274,24 +512,24 @@ Slider hBrightness
Slider hTempSlider
Attributes
ID : 10
ID : 19
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 187
y coordinate : 127
Width : 100
Height : 250
x coordinate : 12
y coordinate : 304
Width : 300
Height : 44
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 7
Slided Back. Picture ID: 7
Back. Picture ID : 21
Slided Back. Picture ID: 22
Position : 50
Upper range limit : 100
Lower range limit : 0
@@ -318,13 +556,13 @@ Slider hTempSlider
Button b0
Attributes
ID : 3
ID : 5
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 256
y coordinate : 12
x coordinate : 266
y coordinate : 14
Width : 50
Height : 50
Effect : load
@@ -364,13 +602,13 @@ Button b0
Button bColor
Attributes
ID : 12
ID : 21
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 134
y coordinate : 407
x coordinate : 12
y coordinate : 89
Width : 50
Height : 50
Effect : load
@@ -401,8 +639,8 @@ Button bColor
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
}else
{
@@ -412,21 +650,21 @@ Button bColor
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis t4,1
vis t3,1
vis hTempSlider,1
}
}
Button bEffect
Attributes
ID : 17
ID : 27
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 60
y coordinate : 407
x coordinate : 12
y coordinate : 195
Width : 50
Height : 50
Effect : load
@@ -453,17 +691,18 @@ Button bEffect
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
ID : 5
ID : 8
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 208
y coordinate : 407
x coordinate : 12
y coordinate : 142
Width : 50
Height : 50
Effect : load
@@ -502,43 +741,18 @@ Dual-state Button btOnOff1
Timer tmCooldown
Attributes
ID : 15
ID : 25
Scope : local
Period (ms): 100
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
ID : 22
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
ID : 8
ID : 15
Scope : local
Period (ms): 50
Enabled : yes
@@ -593,12 +807,11 @@ Timer tmSerial
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
tIcon1.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
@@ -607,26 +820,27 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis t1,0
vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis t1,1
vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
if(tmCooldown.en==0)
{
hBrightness.val=sys0
}
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
vis t3,0
vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
@@ -649,8 +863,8 @@ Timer tmSerial
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
vis t3,1
vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
@@ -669,12 +883,12 @@ Timer tmSerial
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
@@ -686,11 +900,11 @@ Timer tmSerial
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
@@ -825,7 +1039,7 @@ Timer tmSerial
Timer tmSleep
Attributes
ID : 7
ID : 14
Scope : local
Period (ms): 1000
Enabled : yes
@@ -845,7 +1059,7 @@ Timer tmSleep
TouchCap tc0
Attributes
ID : 6
ID : 13
Scope: local
Value: 0

View File

@@ -0,0 +1,855 @@
Page popupLightNew
Attributes
ID : 0
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
Width : 320
Effect : load
Effect Priority : 0
Effect Time : 300
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Fill : solid color
Back. Color : 6371
Events
Preinitialize Event
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
//disable color temp by default
//vis t4,0
//vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis pColorWheel,0
//vis t0,0
popupLightNew.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hTempSlider.pic=16
hTempSlider.pic1=16
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
ID : 18
Scope: local
Value: 65504
Variable (string) entn
Attributes
ID : 11
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
ID : 13
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
ID : 14
Scope: local
Value: 0
Variable (string) strCommand
Attributes
ID : 9
Scope : local
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
ID : 16
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 80
Text tEntity
Attributes
ID : 2
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 19
y coordinate : 21
Width : 224
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 25
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture pColorWheel
Attributes
ID : 1
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 150
y coordinate : 168
Width : 160
Height : 160
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 3
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel,"
sys0=tch0
sys0=sys0-pColorWheel.x
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
sys0=tch1
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx pColorWheel.h,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hBrightness
Attributes
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 25
y coordinate : 127
Width : 100
Height : 250
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Fill : image
Cursor width : auto
Cursor height : 1
Back. Picture ID : 65535
Slided Back. Picture ID: 65535
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
covx hBrightness.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hTempSlider
Attributes
ID : 10
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 187
y coordinate : 127
Width : 100
Height : 250
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 7
Slided Back. Picture ID: 7
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
Touch Release Event
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
covx hTempSlider.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button b0
Attributes
ID : 3
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 256
y coordinate : 12
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bColor
Attributes
ID : 12
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 134
y coordinate : 407
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(mode.val==1)
{
mode.val=0
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis hTempSlider,0
}else
{
mode.val=1
//disable color wheel
vis pColorWheel,0
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis hTempSlider,1
}
}
Button bEffect
Attributes
ID : 17
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 60
y coordinate : 407
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
ID : 5
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 208
y coordinate : 407
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff,"
covx btOnOff1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Timer tmCooldown
Attributes
ID : 15
Scope : local
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
ID : 22
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
ID : 8
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
ucopy payloadLength,2,2,0
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
// calculate crc
crcrest 1,0xFFFF
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
//crcputu 3,u[2]
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
crcputu 0,payloadLength-1
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
// compare crc with recived value
if(crcval==recvCrc)
{
// crc is okay
// here is the location where acual code should be
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
// get Brightness value
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else if(tTmp.txt=="unknown") // temp supported, but not in color mode
{
mode_temp.val=1
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
hTempSlider.val=sys0
}
// mode == 0 is rgb controls currently shown
if(mode.val==0)
{
// switch mode
click bColor,1
click bColor,0
}
}
// get Color value
spstr strCommand.txt,tTmp.txt,"~",7
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
vis bColor,1
}
if(mode.val==0)
{
vis pColorWheel,1
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
{
vis bEffect,1
}else
{
vis bEffect,0
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="pageType")
{
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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=="cardGrid2")
{
page cardGrid2
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep
Attributes
ID : 7
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
click b0,1
click b0,0
}
}
TouchCap tc0
Attributes
ID : 6
Scope: local
Value: 0
Events
Touch Press Event
sleepValue=0

View File

@@ -1617,6 +1617,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="timeout")
{

View File

@@ -14,6 +14,8 @@ Program.s
//color vars
int defaultFontColor=65535
int defaultBcoColor=6371
//feature flags
int featNewSliders=0
// fix touch offset (Removed for US version)
//lcd_dev fffb 0002 0000 0020
printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port

View File

@@ -109,49 +109,49 @@ Variable (string) entn1
Attributes
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn2
Attributes
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn3
Attributes
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn4
Attributes
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn5
Attributes
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) entn6
Attributes
Scope : local
Text :
Max. Text Size: 65
Max. Text Size: 64
Variable (string) nent1
Attributes
Scope : local
Text :
Max. Text Size: 40
Max. Text Size: 38
Variable (string) nent2
Attributes
Scope : local
Text :
Max. Text Size: 40
Max. Text Size: 38
Variable (string) strCommand
Attributes
@@ -545,9 +545,9 @@ Slider hSlider6
Events
Touch Release Event
nNum5.val=hSlider5.val
nNum6.val=hSlider6.val
tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
covx nNum5.val,tTmp.txt,0,0
covx nNum6.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
@@ -1327,7 +1327,7 @@ Dual-state Button btOnOff6
Events
Touch Press Event
tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
covx btOnOff5.val,tTmp.txt,0,0
covx btOnOff6.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
@@ -1359,8 +1359,13 @@ Hotspot m0
}
if(type1.txt=="light")
{
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type1.txt=="fan")
{
@@ -1393,8 +1398,13 @@ Hotspot m1
}
if(type2.txt=="light")
{
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type2.txt=="fan")
{
@@ -1427,8 +1437,13 @@ Hotspot m2
}
if(type3.txt=="light")
{
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type3.txt=="fan")
{
@@ -1461,8 +1476,13 @@ Hotspot m3
}
if(type4.txt=="light")
{
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type4.txt=="fan")
{
@@ -1495,8 +1515,13 @@ Hotspot m4
}
if(type5.txt=="light")
{
//popupLight.tEntity.txt=tEntity5.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type5.txt=="fan")
{
@@ -1529,8 +1554,13 @@ Hotspot m5
}
if(type6.txt=="light")
{
//popupLight.tEntity.txt=tEntity5.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type6.txt=="fan")
{

View File

@@ -605,7 +605,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -713,6 +719,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -734,6 +751,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -755,6 +783,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -776,6 +815,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -797,6 +847,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -818,6 +879,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47

View File

@@ -582,26 +582,26 @@ Button bEntity7
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type2.txt
pageIcons.tTmp1.txt=tEntity2.txt
pageIcons.tTmp2.txt=entn2.txt
pageIcons.tTmp3.txt=bEntity2.txt
if(type2.txt=="shutter")
tTmp.txt=type7.txt
pageIcons.tTmp1.txt=tEntity7.txt
pageIcons.tTmp2.txt=entn7.txt
pageIcons.tTmp3.txt=bEntity7.txt
if(type7.txt=="shutter")
{
page popupShutter
}
if(type2.txt=="input_sel")
if(type7.txt=="input_sel")
{
page popupInSel
}
if(type2.txt=="timer")
if(type7.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn2.txt+",button"
tSend.txt="event,buttonPress2,"+entn7.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -626,26 +626,26 @@ Button bEntity8
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type8.txt
pageIcons.tTmp1.txt=tEntity8.txt
pageIcons.tTmp2.txt=entn8.txt
pageIcons.tTmp3.txt=bEntity8.txt
if(type8.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type8.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type8.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn8.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -670,26 +670,26 @@ Button bEntity9
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type9.txt
pageIcons.tTmp1.txt=tEntity9.txt
pageIcons.tTmp2.txt=entn9.txt
pageIcons.tTmp3.txt=bEntity9.txt
if(type9.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type9.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type9.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn9.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -806,7 +806,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -914,6 +920,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -935,6 +952,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -956,6 +984,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -977,6 +1016,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -998,6 +1048,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -1019,6 +1080,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47
@@ -1040,6 +1112,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity7.txt,"~",52
// way to get force font adjustment
strlen bEntity7.txt,sys0
//check 2nd last char for ¬
substr bEntity7.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity7.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity7.font=sys1
substr bEntity7.txt,bEntity7.txt,0,sys0-2
}
vis bEntity7,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",53
@@ -1061,6 +1144,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity8.txt,"~",58
// way to get force font adjustment
strlen bEntity8.txt,sys0
//check 2nd last char for ¬
substr bEntity8.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity8.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity8.font=sys1
substr bEntity8.txt,bEntity8.txt,0,sys0-2
}
vis bEntity8,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",59
@@ -1082,6 +1176,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity9.txt,"~",64
// way to get force font adjustment
strlen bEntity9.txt,sys0
//check 2nd last char for ¬
substr bEntity9.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity9.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity9.font=sys1
substr bEntity9.txt,bEntity9.txt,0,sys0-2
}
vis bEntity9,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",65
@@ -1168,6 +1273,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -997,6 +997,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity1.txt,"~",25
vis bEntity1,1
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,sys0,0,0
@@ -1018,6 +1029,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity2.txt,"~",31
vis bEntity2,1
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,sys0,0,0
@@ -1039,6 +1061,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity3.txt,"~",37
vis bEntity3,1
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,sys0,0,0
@@ -1060,6 +1093,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity4.txt,"~",43
vis bEntity4,1
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,sys0,0,0
@@ -1081,6 +1125,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity5.txt,"~",49
vis bEntity5,1
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",50
covx tTmp.txt,sys0,0,0
@@ -1102,6 +1157,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity6.txt,"~",55
vis bEntity6,1
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",56
covx tTmp.txt,sys0,0,0

View File

@@ -940,6 +940,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -139,7 +139,7 @@ Text tVersion
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 51
Text : 53
Max. Text Size : 10
Picture p0
@@ -273,8 +273,14 @@ Timer tmSerial
{
covx tTmp.txt,defaultFontColor,0,0
}
// get feature flag popup
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
covx tTmp.txt,featNewSliders,0,0
}
}
if(tInstruction.txt=="timeout")
if(tInstruction.txt=="timeout2")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1

View File

@@ -16,12 +16,13 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
@@ -38,20 +39,20 @@ Page popupLight
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
vis t1,0
vis t2,0
vis hBrightness,0
//disable color temp by default
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis t0,0
vis pColorWheel,0
//vis t0,0
popupLight.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
for(sys0=0;sys0<28;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
@@ -66,18 +67,14 @@ Page popupLight
}
if(defaultBcoColor==0)
{
hTempSlider.pic=16
hTempSlider.pic1=16
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=23
hTempSlider.pic1=17
hTempSlider.pic2=15
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
Scope: local
Value: 65504
Variable (string) entn
Attributes
Scope : local
@@ -100,29 +97,56 @@ Variable (string) strCommand
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Text t0
Attributes
Scope : local
Text :
Max. Text Size: 80
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Color
Max. Text Size : 50
Text t1
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Brightness
Max. Text Size : 50
Text t2
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text t3
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text t4
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Temperature
Max. Text Size : 50
Text tEntity
Attributes
@@ -133,6 +157,48 @@ Text tEntity
Text : tEntity1
Max. Text Size : 25
Text tIcon1
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text tId
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 20
Text tInstruction
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 20
Text tTmp
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 80
Picture p0
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Picture pColorWheel
Attributes
Scope : local
@@ -178,20 +244,6 @@ Slider hBrightness
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
@@ -280,8 +332,8 @@ Button bColor
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
}else
{
@@ -291,8 +343,8 @@ Button bColor
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis t4,1
vis t3,1
vis hTempSlider,1
}
}
@@ -310,6 +362,7 @@ Button bEffect
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel
Dual-state Button btOnOff1
@@ -342,37 +395,13 @@ Dual-state Button btOnOff1
Timer tmCooldown
Attributes
Scope : local
Period (ms): 100
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
Scope : local
@@ -429,12 +458,11 @@ Timer tmSerial
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
tIcon1.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
@@ -443,26 +471,27 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis t1,0
vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis t1,1
vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
if(tmCooldown.en==0)
{
hBrightness.val=sys0
}
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
vis t3,0
vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
@@ -485,8 +514,8 @@ Timer tmSerial
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
vis t3,1
vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
@@ -505,12 +534,12 @@ Timer tmSerial
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
@@ -522,11 +551,11 @@ Timer tmSerial
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")

View File

@@ -0,0 +1,689 @@
Page popupLightNew
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Events
Preinitialize Event
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
//disable color temp by default
//vis t4,0
//vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis pColorWheel,0
//vis t0,0
popupLightNew.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hTempSlider.pic=16
hTempSlider.pic1=16
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
Scope: local
Value: 65504
Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
Scope: local
Value: 0
Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Attributes
Scope : local
Text :
Max. Text Size: 80
Text tEntity
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : tEntity1
Max. Text Size : 25
Picture pColorWheel
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel,"
sys0=tch0
sys0=sys0-pColorWheel.x
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
sys0=tch1
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx pColorWheel.h,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hBrightness
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Position : 50
Upper range limit: 100
Lower range limit: 0
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
covx hBrightness.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hTempSlider
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Position : 50
Upper range limit: 100
Lower range limit: 0
Events
Touch Release Event
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
covx hTempSlider.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button b0
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bColor
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
if(mode.val==1)
{
mode.val=0
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis hTempSlider,0
}else
{
mode.val=1
//disable color wheel
vis pColorWheel,0
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis hTempSlider,1
}
}
Button bEffect
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
State : unpressed
Text :
Max. Text Size : 10
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff,"
covx btOnOff1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Timer tmCooldown
Attributes
Scope : local
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
ucopy payloadLength,2,2,0
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
// calculate crc
crcrest 1,0xFFFF
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
//crcputu 3,u[2]
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
crcputu 0,payloadLength-1
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
// compare crc with recived value
if(crcval==recvCrc)
{
// crc is okay
// here is the location where acual code should be
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
// get Brightness value
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else if(tTmp.txt=="unknown") // temp supported, but not in color mode
{
mode_temp.val=1
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
hTempSlider.val=sys0
}
// mode == 0 is rgb controls currently shown
if(mode.val==0)
{
// switch mode
click bColor,1
click bColor,0
}
}
// get Color value
spstr strCommand.txt,tTmp.txt,"~",7
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
vis bColor,1
}
if(mode.val==0)
{
vis pColorWheel,1
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
{
vis bEffect,1
}else
{
vis bEffect,0
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="pageType")
{
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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=="cardGrid2")
{
page cardGrid2
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep
Attributes
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
click b0,1
click b0,0
}
}
TouchCap tc0
Attributes
Scope: local
Value: 0
Events
Touch Press Event
sleepValue=0

View File

@@ -804,6 +804,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="timeout")
{

Binary file not shown.

Binary file not shown.

View File

@@ -7,7 +7,7 @@ head = sharedhead + """
""" + navigation
print(head)
start = 14
for i in range(1,7):
for i in range(1,9):
idxstart = start + (i-1)*6
item = f"""
// get Type
@@ -22,6 +22,19 @@ for i in range(1,7):
{{
// change icon
spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
// way to get force font adjustment
strlen bEntity{i}.txt,sys0
//check 2nd last char for ¬
substr bEntity{i}.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{{
substr bEntity{i}.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity{i}.font=sys1
substr bEntity{i}.txt,bEntity{i}.txt,0,sys0-2
}}
vis bEntity{i},1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}

View File

@@ -71,6 +71,19 @@ for i in range(1,7):
// change icon
spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2}
vis bEntity{i},1
// way to get force font adjustment
strlen bEntity{i}.txt,sys0
//check 2nd last char for ¬
substr bEntity{i}.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{{
substr bEntity{i}.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity{i}.font=sys1
substr bEntity{i}.txt,bEntity{i}.txt,0,sys0-2
}}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",{idxstart+3}
covx tTmp.txt,sys0,0,0
@@ -79,6 +92,7 @@ for i in range(1,7):
spstr strCommand.txt,tEntity{i}.txt,"~",{idxstart+4}
vis tEntity{i},1
}}
"""
print(item)
foot = """

View File

@@ -14,6 +14,8 @@ Program.s
//color vars
int defaultFontColor=65535
int defaultBcoColor=6371
//feature flags
int featNewSliders=0
// fix touch offset
lcd_dev fffb 0002 0000 0020
printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port

View File

@@ -19,6 +19,18 @@ Page cardAlarm
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -0,0 +1,63 @@
Page cardBurnRec
Attributes
ID : 0
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
Width : 480
Effect : load
Effect Priority : 0
Effect Time : 300
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Fill : solid color
Back. Color : 65535
Timer tm0
Attributes
ID : 1
Scope : local
Period (ms): 1001
Enabled : yes
Events
Timer Event
dim=100
sys0=0
sys1=0
if(sys2==WHITE)
{
sys2=BLACK
}else
{
sys2=WHITE
}
sya1=sys2
while(sys0<8)
{
sya0=sys0%2
if(sya1==WHITE)
{
sya1=BLACK
}else
{
sya1=WHITE
}
fill 0,40*sys0,480,40,sya1
sys0++
}
TouchCap tc0
Attributes
ID : 2
Scope: local
Value: 0
Events
Touch Press Event
page pageStartup

View File

@@ -19,6 +19,18 @@ Page cardChart
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -19,6 +19,19 @@ Page cardEntities
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -1856,8 +1869,13 @@ Hotspot m0
}
if(type1.txt=="light")
{
//popupLight.tEntity.txt=tEntity1.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type1.txt=="fan")
{
@@ -1899,8 +1917,13 @@ Hotspot m1
}
if(type2.txt=="light")
{
//popupLight.tEntity.txt=tEntity2.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type2.txt=="fan")
{
@@ -1942,8 +1965,13 @@ Hotspot m2
}
if(type3.txt=="light")
{
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type3.txt=="fan")
{
@@ -1985,8 +2013,13 @@ Hotspot m3
}
if(type4.txt=="light")
{
//popupLight.tEntity.txt=tEntity4.txt
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(type4.txt=="fan")
{

View File

@@ -19,6 +19,18 @@ Page cardGrid
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -1052,7 +1064,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -1161,6 +1179,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -1182,6 +1211,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -1203,6 +1243,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -1224,6 +1275,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -1245,6 +1307,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -1266,6 +1339,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47

View File

@@ -19,6 +19,18 @@ Page cardGrid2
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -991,26 +1003,26 @@ Button bEntity7
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type7.txt
pageIcons.tTmp1.txt=tEntity7.txt
pageIcons.tTmp2.txt=entn7.txt
pageIcons.tTmp3.txt=bEntity7.txt
if(type7.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type7.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type7.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn7.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1057,26 +1069,26 @@ Button bEntity8
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type8.txt
pageIcons.tTmp1.txt=tEntity8.txt
pageIcons.tTmp2.txt=entn8.txt
pageIcons.tTmp3.txt=bEntity8.txt
if(type8.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type8.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type8.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn8.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1274,7 +1286,13 @@ Timer tmLP
Timer Event
if(tTmp.txt=="light")
{
page popupLight
if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
}
if(tTmp.txt=="fan")
{
@@ -1383,6 +1401,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity1.txt,"~",16
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",17
@@ -1404,6 +1433,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity2.txt,"~",22
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",23
@@ -1425,6 +1465,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity3.txt,"~",28
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",29
@@ -1446,6 +1497,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity4.txt,"~",34
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",35
@@ -1467,6 +1529,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity5.txt,"~",40
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",41
@@ -1488,6 +1561,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity6.txt,"~",46
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",47
@@ -1509,6 +1593,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity7.txt,"~",52
// way to get force font adjustment
strlen bEntity7.txt,sys0
//check 2nd last char for ¬
substr bEntity7.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity7.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity7.font=sys1
substr bEntity7.txt,bEntity7.txt,0,sys0-2
}
vis bEntity7,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",53
@@ -1530,6 +1625,17 @@ Timer tmSerial
{
// change icon
spstr strCommand.txt,bEntity8.txt,"~",58
// way to get force font adjustment
strlen bEntity8.txt,sys0
//check 2nd last char for ¬
substr bEntity8.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity8.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity8.font=sys1
substr bEntity8.txt,bEntity8.txt,0,sys0-2
}
vis bEntity8,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",59
@@ -1616,6 +1722,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -19,6 +19,18 @@ Page cardLChart
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -19,6 +19,18 @@ Page cardMedia
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -1485,6 +1497,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity1.txt,"~",25
vis bEntity1,1
// way to get force font adjustment
strlen bEntity1.txt,sys0
//check 2nd last char for ¬
substr bEntity1.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity1.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity1.font=sys1
substr bEntity1.txt,bEntity1.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,sys0,0,0
@@ -1506,6 +1529,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity2.txt,"~",31
vis bEntity2,1
// way to get force font adjustment
strlen bEntity2.txt,sys0
//check 2nd last char for ¬
substr bEntity2.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity2.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity2.font=sys1
substr bEntity2.txt,bEntity2.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,sys0,0,0
@@ -1527,6 +1561,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity3.txt,"~",37
vis bEntity3,1
// way to get force font adjustment
strlen bEntity3.txt,sys0
//check 2nd last char for ¬
substr bEntity3.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity3.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity3.font=sys1
substr bEntity3.txt,bEntity3.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",38
covx tTmp.txt,sys0,0,0
@@ -1548,6 +1593,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity4.txt,"~",43
vis bEntity4,1
// way to get force font adjustment
strlen bEntity4.txt,sys0
//check 2nd last char for ¬
substr bEntity4.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity4.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity4.font=sys1
substr bEntity4.txt,bEntity4.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,sys0,0,0
@@ -1569,6 +1625,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity5.txt,"~",49
vis bEntity5,1
// way to get force font adjustment
strlen bEntity5.txt,sys0
//check 2nd last char for ¬
substr bEntity5.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity5.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity5.font=sys1
substr bEntity5.txt,bEntity5.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",50
covx tTmp.txt,sys0,0,0
@@ -1590,6 +1657,17 @@ Timer tmSerial
// change icon
spstr strCommand.txt,bEntity6.txt,"~",55
vis bEntity6,1
// way to get force font adjustment
strlen bEntity6.txt,sys0
//check 2nd last char for ¬
substr bEntity6.txt,tTmp.txt,sys0-2,1
if(tTmp.txt=="¬")
{
substr bEntity6.txt,tTmp.txt,sys0-1,1
covx tTmp.txt,sys1,0,0
bEntity6.font=sys1
substr bEntity6.txt,bEntity6.txt,0,sys0-2
}
// change icon color
spstr strCommand.txt,tTmp.txt,"~",56
covx tTmp.txt,sys0,0,0

View File

@@ -19,6 +19,18 @@ Page cardPower
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -1652,6 +1664,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -19,6 +19,18 @@ Page cardQR
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -19,6 +19,18 @@ Page cardThermo
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -1,83 +1,87 @@
Program.s
0 Component(s)
14 Line(s) of event code
14 Unique line(s) of event code
15 Line(s) of event code
15 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
pageTest
27 Component(s)
68 Line(s) of event code
66 Unique line(s) of event code
cardLChart
33 Component(s)
402 Line(s) of event code
266 Unique line(s) of event code
cardBurnRec
3 Component(s)
25 Line(s) of event code
21 Unique line(s) of event code
popupFan
27 Component(s)
355 Line(s) of event code
206 Unique line(s) of event code
popupLight
23 Component(s)
410 Line(s) of event code
209 Unique line(s) of event code
pageStartup
20 Component(s)
198 Line(s) of event code
137 Unique line(s) of event code
popupShutter
25 Component(s)
402 Line(s) of event code
220 Unique line(s) of event code
cardGrid
44 Component(s)
523 Line(s) of event code
295 Unique line(s) of event code
popupLightNew
23 Component(s)
412 Line(s) of event code
209 Unique line(s) of event code
popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
cardPower
54 Component(s)
527 Line(s) of event code
347 Unique line(s) of event code
pageStartup
20 Component(s)
193 Line(s) of event code
135 Unique line(s) of event code
cardQR
34 Component(s)
410 Line(s) of event code
238 Unique line(s) of event code
cardChart
33 Component(s)
437 Line(s) of event code
296 Unique line(s) of event code
pageTest
26 Component(s)
69 Line(s) of event code
67 Unique line(s) of event code
cardGrid2
52 Component(s)
703 Line(s) of event code
385 Unique line(s) of event code
cardAlarm
43 Component(s)
500 Line(s) of event code
273 Unique line(s) of event code
screensaver
47 Component(s)
444 Line(s) of event code
316 Unique line(s) of event code
510 Line(s) of event code
274 Unique line(s) of event code
cardChart
33 Component(s)
447 Line(s) of event code
297 Unique line(s) of event code
cardQR
34 Component(s)
420 Line(s) of event code
239 Unique line(s) of event code
cardLChart
33 Component(s)
412 Line(s) of event code
267 Unique line(s) of event code
popupLight
28 Component(s)
412 Line(s) of event code
227 Unique line(s) of event code
cardPower
54 Component(s)
541 Line(s) of event code
350 Unique line(s) of event code
cardThermo
57 Component(s)
540 Line(s) of event code
319 Unique line(s) of event code
screensaver2
59 Component(s)
358 Line(s) of event code
253 Unique line(s) of event code
cardMedia
59 Component(s)
649 Line(s) of event code
322 Unique line(s) of event code
550 Line(s) of event code
320 Unique line(s) of event code
cardGrid
44 Component(s)
593 Line(s) of event code
333 Unique line(s) of event code
popupInSel
34 Component(s)
621 Line(s) of event code
297 Unique line(s) of event code
cardGrid2
52 Component(s)
611 Line(s) of event code
319 Unique line(s) of event code
screensaver
47 Component(s)
458 Line(s) of event code
318 Unique line(s) of event code
cardMedia
59 Component(s)
713 Line(s) of event code
357 Unique line(s) of event code
popupTimer
42 Component(s)
516 Line(s) of event code
@@ -86,13 +90,17 @@ popupThermo
44 Component(s)
523 Line(s) of event code
276 Unique line(s) of event code
screensaver2
59 Component(s)
373 Line(s) of event code
256 Unique line(s) of event code
cardEntities
67 Component(s)
1170 Line(s) of event code
532 Unique line(s) of event code
1205 Line(s) of event code
536 Unique line(s) of event code
Total
22 Page(s)
850 Component(s)
9940 Line(s) of event code
2369 Unique line(s) of event code
24 Page(s)
880 Component(s)
10740 Line(s) of event code
2475 Unique line(s) of event code

View File

@@ -396,7 +396,7 @@ Text tVersion
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 51
Text : 53
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
@@ -575,6 +575,12 @@ Timer tmSerial
{
covx tTmp.txt,defaultFontColor,0,0
}
// get feature flag popup
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
covx tTmp.txt,featNewSliders,0,0
}
}
if(tInstruction.txt=="timeout")
{

View File

@@ -32,7 +32,7 @@ Variable (string) strCommand
Variable (string) strTmp
Attributes
ID : 25
ID : 24
Scope : local
Text :
Max. Text Size: 2
@@ -58,9 +58,9 @@ Text tBench
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 288
y coordinate : 90
Width : 152
x coordinate : 207
y coordinate : 287
Width : 88
Height : 30
Effect : load
Effect Priority : 0
@@ -82,14 +82,14 @@ Text tBench
Text tTmp
Attributes
ID : 24
ID : 23
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 49
y coordinate : 48
Width : 257
x coordinate : 212
y coordinate : 253
Width : 71
Height : 30
Effect : load
Effect Priority : 0
@@ -103,7 +103,7 @@ Text tTmp
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : test123test123
Text : x
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
@@ -135,7 +135,7 @@ Button b0
x coordinate : 0
y coordinate : 0
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -203,9 +203,9 @@ Button b10
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 98
y coordinate : 81
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -238,9 +238,9 @@ Button b11
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 145
y coordinate : 121
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -273,9 +273,9 @@ Button b12
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 242
y coordinate : 202
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -337,21 +337,21 @@ Button b13
Button b14
Attributes
ID : 21
ID : 25
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 100
Height : 50
x coordinate : 229
y coordinate : 188
Width : 106
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 0
Font ID : 1
Back. Color : 50712
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 1024
@@ -360,21 +360,25 @@ Button b14
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : newtxt
Text : burntest
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
page cardBurnRec
Button b15
Attributes
ID : 22
ID : 21
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 236
y coordinate : 263
x coordinate : 99
y coordinate : 270
Width : 100
Height : 50
Effect : load
@@ -403,13 +407,13 @@ Button b15
Button b16
Attributes
ID : 23
ID : 22
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 135
y coordinate : 263
x coordinate : 0
y coordinate : 270
Width : 100
Height : 50
Effect : load
@@ -444,9 +448,9 @@ Button b2
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 195
y coordinate : 162
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -514,9 +518,9 @@ Button b4
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 96
y coordinate : 82
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -551,7 +555,7 @@ Button b5
x coordinate : 100
y coordinate : 0
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -584,9 +588,9 @@ Button b6
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 49
y coordinate : 41
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -619,9 +623,9 @@ Button b7
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 49
y coordinate : 41
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -653,10 +657,10 @@ Button b8
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 341
y coordinate : 9
x coordinate : 94
y coordinate : 161
Width : 106
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -690,9 +694,9 @@ Button b9
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 146
y coordinate : 122
Width : 100
Height : 50
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -717,21 +721,6 @@ Button b9
Touch Press Event
page popupNotify
Hotspot m0
Attributes
ID : 26
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 213
y coordinate : 115
Width : 210
Height : 191
Effect : load
Effect Priority : 0
Effect Time : 300
Timer tmSerial
Attributes
ID : 14

View File

@@ -24,12 +24,13 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
@@ -46,16 +47,16 @@ Page popupLight
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
vis t1,0
vis t2,0
vis hBrightness,0
//disable color temp by default
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis t0,0
vis pColorWheel,0
//vis t0,0
popupLight.bco=defaultBcoColor
@@ -74,76 +75,195 @@ Page popupLight
}
if(defaultBcoColor==0)
{
hBrightness.pic=24
hBrightness.pic1=25
hBrightness.pic2=15
hTempSlider.pic=16
hTempSlider.pic1=16
hTempSlider.pic1=17
hTempSlider.pic2=15
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
ID : 18
Scope: local
Value: 65504
Variable (string) entn
Attributes
ID : 11
ID : 20
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
ID : 13
ID : 22
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
ID : 14
ID : 23
Scope: local
Value: 0
Variable (string) strCommand
Attributes
ID : 9
ID : 16
Scope : local
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
ID : 16
ID : 26
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Text t0
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 80
ID : 24
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 9
y coordinate : 80
Width : 64
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Color
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1
Attributes
ID : 6
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 226
Width : 211
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Brightness
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t2
Attributes
ID : 9
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 267
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 40147
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t3
Attributes
ID : 10
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 181
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 40147
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t4
Attributes
ID : 11
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 9
y coordinate : 143
Width : 242
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 : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Temperature
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tEntity
Attributes
ID : 2
ID : 3
Scope : local
Dragging : 0
Send Component ID : disabled
@@ -158,10 +278,10 @@ Text tEntity
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 2
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: center
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : tEntity1
@@ -170,15 +290,147 @@ Text tEntity
Horizontal Spacing : 0
Vertical Spacing : 0
Picture pColorWheel
Text tIcon1
Attributes
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 11
y coordinate : 21
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tId
Attributes
ID : 18
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 290
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInstruction
Attributes
ID : 17
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 290
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp
Attributes
ID : 12
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 406
y coordinate : 277
Width : 34
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 80
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 233
y coordinate : 105
x coordinate : 0
y coordinate : 0
Width : 480
Height : 320
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 0
Picture pColorWheel
Attributes
ID : 2
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 167
y coordinate : 69
Width : 160
Height : 160
Effect : load
@@ -216,44 +468,30 @@ Picture pColorWheel
Slider hBrightness
Attributes
ID : 4
ID : 7
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 89
y coordinate : 64
Width : 100
Height : 250
x coordinate : 61
y coordinate : 261
Width : 335
Height : 43
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 1
Back. Picture ID : 65535
Slided Back. Picture ID: 65535
Cursor height : 255
Back. Picture ID : 5
Slided Back. Picture ID: 4
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
@@ -274,24 +512,24 @@ Slider hBrightness
Slider hTempSlider
Attributes
ID : 10
ID : 19
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 263
y coordinate : 64
Width : 100
Height : 250
x coordinate : 61
y coordinate : 178
Width : 335
Height : 44
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 7
Slided Back. Picture ID: 7
Back. Picture ID : 22
Slided Back. Picture ID: 23
Position : 50
Upper range limit : 100
Lower range limit : 0
@@ -318,7 +556,7 @@ Slider hTempSlider
Button b0
Attributes
ID : 3
ID : 5
Scope : local
Dragging : 0
Send Component ID : disabled
@@ -364,13 +602,13 @@ Button b0
Button bColor
Attributes
ID : 12
ID : 21
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 146
x coordinate : 93
y coordinate : 68
Width : 50
Height : 50
Effect : load
@@ -401,8 +639,8 @@ Button bColor
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis t4,0
vis t3,0
vis hTempSlider,0
}else
{
@@ -412,21 +650,21 @@ Button bColor
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis t4,1
vis t3,1
vis hTempSlider,1
}
}
Button bEffect
Attributes
ID : 17
ID : 27
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 213
x coordinate : 396
y coordinate : 95
Width : 50
Height : 50
Effect : load
@@ -453,17 +691,18 @@ Button bEffect
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
ID : 5
ID : 8
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 77
x coordinate : 341
y coordinate : 95
Width : 50
Height : 50
Effect : load
@@ -502,43 +741,18 @@ Dual-state Button btOnOff1
Timer tmCooldown
Attributes
ID : 15
ID : 25
Scope : local
Period (ms): 100
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
ID : 22
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
ID : 8
ID : 15
Scope : local
Period (ms): 50
Enabled : yes
@@ -593,12 +807,11 @@ Timer tmSerial
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
tIcon1.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
@@ -607,26 +820,27 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis t1,0
vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis t1,1
vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
if(tmCooldown.en==0)
{
hBrightness.val=sys0
}
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
vis t3,0
vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
@@ -649,8 +863,8 @@ Timer tmSerial
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
vis t3,1
vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
@@ -669,12 +883,12 @@ Timer tmSerial
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
@@ -686,11 +900,11 @@ Timer tmSerial
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
@@ -825,7 +1039,7 @@ Timer tmSerial
Timer tmSleep
Attributes
ID : 7
ID : 14
Scope : local
Period (ms): 1000
Enabled : yes
@@ -845,7 +1059,7 @@ Timer tmSleep
TouchCap tc0
Attributes
ID : 6
ID : 13
Scope: local
Value: 0

View File

@@ -0,0 +1,855 @@
Page popupLightNew
Attributes
ID : 0
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
Width : 480
Effect : load
Effect Priority : 0
Effect Time : 300
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Fill : solid color
Back. Color : 6371
Events
Preinitialize Event
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
//get entity id
entn.txt=pageIcons.tTmp2.txt
vis tSend,0
vis tTmp,0
vis tInstruction,0
vis tId,0
vis bEffect,0
vis hBrightness,0
//page open event
// event,pageOpenDetail,typeOfPage,tEntityName
// craft command
tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
//disable brightness by default
//vis t1,0
//vis t2,0
vis hBrightness,1
//disable color temp by default
//vis t4,0
//vis t3,0
vis hTempSlider,0
//disable color wheel components by default
vis bColor,0
//vis t0,0
vis pColorWheel,0
//vis t0,0
popupLightNew.bco=defaultBcoColor
for(sys0=0;sys0<27;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
if(defaultBcoColor==0)
{
hTempSlider.pic=16
hTempSlider.pic1=16
}
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
ID : 18
Scope: local
Value: 65504
Variable (string) entn
Attributes
ID : 11
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
ID : 13
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
ID : 14
Scope: local
Value: 0
Variable (string) strCommand
Attributes
ID : 9
Scope : local
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
ID : 16
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 80
Text tEntity
Attributes
ID : 2
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 92
y coordinate : 21
Width : 263
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 2
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 25
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture pColorWheel
Attributes
ID : 1
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 233
y coordinate : 105
Width : 160
Height : 160
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 3
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel,"
sys0=tch0
sys0=sys0-pColorWheel.x
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
sys0=tch1
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
tSend.txt+="|"
covx pColorWheel.h,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hBrightness
Attributes
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 89
y coordinate : 64
Width : 100
Height : 250
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Fill : image
Cursor width : auto
Cursor height : 1
Back. Picture ID : 65535
Slided Back. Picture ID: 65535
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
covx hBrightness.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Slider hTempSlider
Attributes
ID : 10
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 263
y coordinate : 64
Width : 100
Height : 250
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : vertical
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 7
Slided Back. Picture ID: 7
Position : 50
Upper range limit : 100
Lower range limit : 0
Events
Touch Release Event
tmCooldown.en=1
tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
covx hTempSlider.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button b0
Attributes
ID : 3
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 397
y coordinate : 8
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bColor
Attributes
ID : 12
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 146
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(mode.val==1)
{
mode.val=0
//enable color wheel
vis pColorWheel,1
//disable color temp
//vis t4,0
//vis t3,0
vis hTempSlider,0
}else
{
mode.val=1
//disable color wheel
vis pColorWheel,0
if(mode_temp.val==1)
{
//enable color temp
//vis t4,1
//vis t3,1
vis hTempSlider,1
}
}
Button bEffect
Attributes
ID : 17
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 213
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed): 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
ID : 5
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 14
y coordinate : 77
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed): 1
Back. Picture ID (Pressed) : 2
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff,"
covx btOnOff1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Timer tmCooldown
Attributes
ID : 15
Scope : local
Period (ms): 300
Enabled : no
Events
Timer Event
tmCooldown.en=0
Timer tmDrawCooldown
Attributes
ID : 22
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial
Attributes
ID : 8
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
ucopy payloadLength,2,2,0
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
// calculate crc
crcrest 1,0xFFFF
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
//crcputu 3,u[2]
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
crcputu 0,payloadLength-1
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
// compare crc with recived value
if(crcval==recvCrc)
{
// crc is okay
// here is the location where acual code should be
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
spstr strCommand.txt,tTmp.txt,"~",1
if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
{
// change icon
//spstr strCommand.txt,tIcon1.txt,"~",2
//vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0
col.val=sys0
//tEntity.pco=sys0
// get Button State
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
// get Brightness value
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable")
{
//vis t1,0
//vis t2,0
vis hBrightness,0
}else
{
//vis t1,1
//vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
hBrightness.val=sys0
tmDrawCooldown.en=1
tmDrawCooldown.tim=500
}
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable")
{
vis hTempSlider,0
//vis t3,0
//vis t4,0
mode_temp.val=0
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else if(tTmp.txt=="unknown") // temp supported, but not in color mode
{
mode_temp.val=1
// mode == 1 is temp controls currently shown
if(mode.val==1)
{
// switch mode
click bColor,1
click bColor,0
}
}else
{
mode_temp.val=1
vis hTempSlider,1
//vis t3,1
//vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
hTempSlider.val=sys0
}
// mode == 0 is rgb controls currently shown
if(mode.val==0)
{
// switch mode
click bColor,1
click bColor,0
}
}
// get Color value
spstr strCommand.txt,tTmp.txt,"~",7
// disable -> isn't supported
if(tTmp.txt=="disable")
{
//vis t0,0
vis bColor,0
vis pColorWheel,0
}else
{
//vis t0,1
//only enable bColor button if color temp is also supported
if(mode_temp.val==1)
{
vis bColor,1
}
if(mode.val==0)
{
vis pColorWheel,1
}
}
// set t0 Color (Localization)
//spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization)
//spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
//spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
{
vis bEffect,1
}else
{
vis bEffect,0
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="pageType")
{
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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=="cardGrid2")
{
page cardGrid2
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep
Attributes
ID : 7
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
click b0,1
click b0,0
}
}
TouchCap tc0
Attributes
ID : 6
Scope: local
Value: 0
Events
Touch Press Event
sleepValue=0

View File

@@ -581,7 +581,7 @@ Timer tmSerial
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
if(tInstruction.txt=="timeout2")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1

View File

@@ -19,6 +19,19 @@ Page screensaver
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
recmod=1
baud=115200
vis tInstruction,0
@@ -1069,6 +1082,9 @@ Timer tmSerial
if(tAMPM.txt=="")
{
vis tAMPM,0
}else
{
vis tAMPM,1
}
spstr strCommand.txt,tTimeAdd.txt,"~",2
ref tIcon1

View File

@@ -19,6 +19,19 @@ Page screensaver2
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
recmod=1
baud=115200
vis tInstruction,0
@@ -1661,6 +1674,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="timeout")
{

View File

@@ -14,6 +14,8 @@ Program.s
//color vars
int defaultFontColor=65535
int defaultBcoColor=6371
//feature flags
int featNewSliders=0
// fix touch offset
lcd_dev fffb 0002 0000 0020
printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port

View File

@@ -11,6 +11,18 @@ Page cardAlarm
Events
Preinitialize Event
tSend.txt="event,renderCurrentPage"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
dim=dimValueNormal
vis p0,0
vis tSend,0

View File

@@ -0,0 +1,53 @@
Page cardBurnRec
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID: disabled
Timer tm0
Attributes
Scope : local
Period (ms): 1001
Enabled : yes
Events
Timer Event
dim=100
sys0=0
sys1=0
if(sys2==WHITE)
{
sys2=BLACK
}else
{
sys2=WHITE
}
sya1=sys2
while(sys0<8)
{
sya0=sys0%2
if(sya1==WHITE)
{
sya1=BLACK
}else
{
sya1=WHITE
}
fill 0,40*sys0,480,40,sya1
sys0++
}
TouchCap tc0
Attributes
Scope: local
Value: 0
Events
Touch Press Event
page pageStartup

Some files were not shown because too many files have changed in this diff Show More