fix energy double loading

Merge branch 'main' of https://git.siwatsystem.com/ise-senior-iot/ise-iot-oop-v2
Update main.cpp
2024-06-28 22:37:44 +07:00 · 2024-06-28 21:47:59 +07:00 · 2024-06-28 21:47:37 +07:00 · 2024-06-28 12:29:59 +07:00 · 2024-06-24 08:01:34 +07:00 · 2024-06-22 06:22:53 +07:00
179 changed files with 2050 additions and 938 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,3 +3,5 @@
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/ipch
+/.vscode
+/.vscode
--- a/ise-display/fonts/BaiJ-48-ascii.zi
+++ b/ise-display/fonts/BaiJ-48-ascii.zi
--- a/ise-display/fonts/BaiJ-B-24-ascii.zi
+++ b/ise-display/fonts/BaiJ-B-24-ascii.zi
--- a/ise-display/fonts/BaiJ-B-40.zi
+++ b/ise-display/fonts/BaiJ-B-40.zi
--- a/ise-display/fonts/BaiJ-B-48-ascii.zi
+++ b/ise-display/fonts/BaiJ-B-48-ascii.zi
--- a/ise-display/fonts/BaiJ-sb-24-ascii.zi
+++ b/ise-display/fonts/BaiJ-sb-24-ascii.zi
--- a/ise-display/fonts/BaiJ-sb-72-ascii.zi
+++ b/ise-display/fonts/BaiJ-sb-72-ascii.zi
--- a/ise-display/fonts/BaiJ-sb-80-ascii.zi
+++ b/ise-display/fonts/BaiJ-sb-80-ascii.zi
--- a/ise-display/fonts/BaiJ-sb-86-ascii.zi
+++ b/ise-display/fonts/BaiJ-sb-86-ascii.zi
--- a/ise-display/fonts/baiJ-B-32-ascii.zi
+++ b/ise-display/fonts/baiJ-B-32-ascii.zi
--- a/ise-display/fonts/baiJ-sb-32-ascii.zi
+++ b/ise-display/fonts/baiJ-sb-32-ascii.zi
--- a/ise-display/images/ac/ac-light-off.png
+++ b/ise-display/images/ac/ac-light-off.png
--- a/ise-display/images/ac/ac-light-on.png
+++ b/ise-display/images/ac/ac-light-on.png
--- a/ise-display/images/ac/ac-minus-p.png
+++ b/ise-display/images/ac/ac-minus-p.png
--- a/ise-display/images/ac/ac-minus.png
+++ b/ise-display/images/ac/ac-minus.png
--- a/ise-display/images/ac/ac-off-p.png
+++ b/ise-display/images/ac/ac-off-p.png
--- a/ise-display/images/ac/ac-off.png
+++ b/ise-display/images/ac/ac-off.png
--- a/ise-display/images/ac/ac-on-p.png
+++ b/ise-display/images/ac/ac-on-p.png
--- a/ise-display/images/ac/ac-on.png
+++ b/ise-display/images/ac/ac-on.png
--- a/ise-display/images/ac/ac-plus-p.png
+++ b/ise-display/images/ac/ac-plus-p.png
--- a/ise-display/images/ac/ac-plus.png
+++ b/ise-display/images/ac/ac-plus.png
--- a/ise-display/images/ac/fanspeed/fanAuto-p.png
+++ b/ise-display/images/ac/fanspeed/fanAuto-p.png
--- a/ise-display/images/ac/fanspeed/fanAuto.png
+++ b/ise-display/images/ac/fanspeed/fanAuto.png
--- a/ise-display/images/ac/fanspeed/fanHigh-p.png
+++ b/ise-display/images/ac/fanspeed/fanHigh-p.png
--- a/ise-display/images/ac/fanspeed/fanHigh.png
+++ b/ise-display/images/ac/fanspeed/fanHigh.png
--- a/ise-display/images/ac/fanspeed/fanLow-p.png
+++ b/ise-display/images/ac/fanspeed/fanLow-p.png
--- a/ise-display/images/ac/fanspeed/fanLow.png
+++ b/ise-display/images/ac/fanspeed/fanLow.png
--- a/ise-display/images/ac/fanspeed/fanMid-p.png
+++ b/ise-display/images/ac/fanspeed/fanMid-p.png
--- a/ise-display/images/ac/fanspeed/fanMid.png
+++ b/ise-display/images/ac/fanspeed/fanMid.png
--- a/ise-display/images/ac/mode/modeCool-p.png
+++ b/ise-display/images/ac/mode/modeCool-p.png
--- a/ise-display/images/ac/mode/modeCool.png
+++ b/ise-display/images/ac/mode/modeCool.png
--- a/ise-display/images/ac/mode/modeDry-p.png
+++ b/ise-display/images/ac/mode/modeDry-p.png
--- a/ise-display/images/ac/mode/modeDry.png
+++ b/ise-display/images/ac/mode/modeDry.png
--- a/ise-display/images/ac/mode/modeFan-p.png
+++ b/ise-display/images/ac/mode/modeFan-p.png
--- a/ise-display/images/ac/mode/modeFan.png
+++ b/ise-display/images/ac/mode/modeFan.png
--- a/ise-display/images/background/bg-off-v.png
+++ b/ise-display/images/background/bg-off-v.png
--- a/ise-display/images/background/bg-off.png
+++ b/ise-display/images/background/bg-off.png
--- a/ise-display/images/background/full-ref.png
+++ b/ise-display/images/background/full-ref.png
--- a/ise-display/images/boot/OPEN-bg.png
+++ b/ise-display/images/boot/OPEN-bg.png
--- a/ise-display/images/boot/OPEN-ref.png
+++ b/ise-display/images/boot/OPEN-ref.png
--- a/ise-display/images/boot/bg.png
+++ b/ise-display/images/boot/bg.png
--- a/ise-display/images/boot/ref.png
+++ b/ise-display/images/boot/ref.png
--- a/ise-display/images/light/light-level0.png
+++ b/ise-display/images/light/light-level0.png
--- a/ise-display/images/light/light-level1.png
+++ b/ise-display/images/light/light-level1.png
--- a/ise-display/images/light/light-level2.png
+++ b/ise-display/images/light/light-level2.png
--- a/ise-display/images/light/light-level3.png
+++ b/ise-display/images/light/light-level3.png
--- a/ise-display/images/light/master-off-p.png
+++ b/ise-display/images/light/master-off-p.png
--- a/ise-display/images/light/master-off.png
+++ b/ise-display/images/light/master-off.png
--- a/ise-display/images/light/master-on-p.png
+++ b/ise-display/images/light/master-on-p.png
--- a/ise-display/images/light/master-on.png
+++ b/ise-display/images/light/master-on.png
--- a/ise-display/images/main/C-degree/C
+++ b/ise-display/images/main/C-degree/C
--- a/ise-display/images/main/C-degree/C
+++ b/ise-display/images/main/C-degree/C
--- a/ise-display/images/main/ac/AC-off-pressed.png
+++ b/ise-display/images/main/ac/AC-off-pressed.png
--- a/ise-display/images/main/ac/AC-off.png
+++ b/ise-display/images/main/ac/AC-off.png
--- a/ise-display/images/main/ac/AC-on-pressed.png
+++ b/ise-display/images/main/ac/AC-on-pressed.png
--- a/ise-display/images/main/ac/AC-on.png
+++ b/ise-display/images/main/ac/AC-on.png
--- a/ise-display/images/main/background/Background-c.png
+++ b/ise-display/images/main/background/Background-c.png
--- a/ise-display/images/main/background/Background.png
+++ b/ise-display/images/main/background/Background.png
--- a/ise-display/images/main/background/Reference
+++ b/ise-display/images/main/background/Reference
--- a/ise-display/images/main/fan/Fan-speed-Auto-off-pressed.png
+++ b/ise-display/images/main/fan/Fan-speed-Auto-off-pressed.png
--- a/ise-display/images/main/fan/Fan-speed-Auto-off.png
+++ b/ise-display/images/main/fan/Fan-speed-Auto-off.png
--- a/ise-display/images/main/fan/Fan-speed-Auto-on-pressed.png
+++ b/ise-display/images/main/fan/Fan-speed-Auto-on-pressed.png
--- a/ise-display/images/main/fan/Fan-speed-Auto-on.png
+++ b/ise-display/images/main/fan/Fan-speed-Auto-on.png
--- a/ise-display/images/main/fan/Fan-speed-High-off-pressed.png
+++ b/ise-display/images/main/fan/Fan-speed-High-off-pressed.png
--- a/ise-display/images/main/fan/Fan-speed-High-off.png
+++ b/ise-display/images/main/fan/Fan-speed-High-off.png
--- a/ise-display/images/main/fan/Fan-speed-High-on-pressed.png
+++ b/ise-display/images/main/fan/Fan-speed-High-on-pressed.png
--- a/ise-display/images/main/fan/Fan-speed-High-on.png
+++ b/ise-display/images/main/fan/Fan-speed-High-on.png
--- a/ise-display/images/main/fan/Fan-speed-Low-off-pressed.png
+++ b/ise-display/images/main/fan/Fan-speed-Low-off-pressed.png
--- a/ise-display/images/main/fan/Fan-speed-Low-off.png
+++ b/ise-display/images/main/fan/Fan-speed-Low-off.png
--- a/ise-display/images/main/fan/Fan-speed-Low-on-pressed.png
+++ b/ise-display/images/main/fan/Fan-speed-Low-on-pressed.png
--- a/ise-display/images/main/fan/Fan-speed-Low-on.png
+++ b/ise-display/images/main/fan/Fan-speed-Low-on.png
--- a/ise-display/images/main/fan/Fan-speed-Mid-off-pressed.png
+++ b/ise-display/images/main/fan/Fan-speed-Mid-off-pressed.png
--- a/ise-display/images/main/fan/Fan-speed-Mid-off.png
+++ b/ise-display/images/main/fan/Fan-speed-Mid-off.png
--- a/ise-display/images/main/fan/Fan-speed-Mid-on-pressed.png
+++ b/ise-display/images/main/fan/Fan-speed-Mid-on-pressed.png
--- a/ise-display/images/main/fan/Fan-speed-Mid-on.png
+++ b/ise-display/images/main/fan/Fan-speed-Mid-on.png
--- a/ise-display/images/main/light/light-button-off-prressed.png
+++ b/ise-display/images/main/light/light-button-off-prressed.png
--- a/ise-display/images/main/light/light-button-off.png
+++ b/ise-display/images/main/light/light-button-off.png
--- a/ise-display/images/main/light/light-button-on-pressed.png
+++ b/ise-display/images/main/light/light-button-on-pressed.png
--- a/ise-display/images/main/light/light-button-on.png
+++ b/ise-display/images/main/light/light-button-on.png
--- a/ise-display/images/main/light/light-state-0.png
+++ b/ise-display/images/main/light/light-state-0.png
--- a/ise-display/images/main/light/light-state-1.png
+++ b/ise-display/images/main/light/light-state-1.png
--- a/ise-display/images/main/light/light-state-2.png
+++ b/ise-display/images/main/light/light-state-2.png
--- a/ise-display/images/main/light/light-state-3.png
+++ b/ise-display/images/main/light/light-state-3.png
--- a/ise-display/images/main/lock/lock.png
+++ b/ise-display/images/main/lock/lock.png
--- a/ise-display/images/main/lock/no
+++ b/ise-display/images/main/lock/no
--- a/ise-display/images/main/master-light/Master-light-all.png
+++ b/ise-display/images/main/master-light/Master-light-all.png
--- a/ise-display/images/main/master-light/Master-light-state0.png
+++ b/ise-display/images/main/master-light/Master-light-state0.png
--- a/ise-display/images/main/master-light/Master-light-state1.png
+++ b/ise-display/images/main/master-light/Master-light-state1.png
--- a/ise-display/images/main/master-light/Master-light-state2.png
+++ b/ise-display/images/main/master-light/Master-light-state2.png
--- a/ise-display/images/main/master-light/Master-light-state3.png
+++ b/ise-display/images/main/master-light/Master-light-state3.png
--- a/ise-display/images/main/master-light/master-light-button-off-pressed.png
+++ b/ise-display/images/main/master-light/master-light-button-off-pressed.png
--- a/ise-display/images/main/master-light/master-light-button-off.png
+++ b/ise-display/images/main/master-light/master-light-button-off.png
--- a/ise-display/images/main/master-light/master-light-button-on.png
+++ b/ise-display/images/main/master-light/master-light-button-on.png
--- a/ise-display/images/main/master-light/master-light-button-pressed.png
+++ b/ise-display/images/main/master-light/master-light-button-pressed.png
--- a/ise-display/images/main/mode/Mode-cool-off-pressed.png
+++ b/ise-display/images/main/mode/Mode-cool-off-pressed.png
--- a/ise-display/images/main/mode/Mode-cool-off.png
+++ b/ise-display/images/main/mode/Mode-cool-off.png
--- a/ise-display/images/main/mode/Mode-cool-on-pressed.png
+++ b/ise-display/images/main/mode/Mode-cool-on-pressed.png
--- a/ise-display/images/main/mode/Mode-cool-on.png
+++ b/ise-display/images/main/mode/Mode-cool-on.png
--- a/ise-display/images/main/mode/Mode-dry-off-pressed.png
+++ b/ise-display/images/main/mode/Mode-dry-off-pressed.png
--- a/ise-display/images/main/mode/Mode-dry-off.png
+++ b/ise-display/images/main/mode/Mode-dry-off.png
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Siwat Sirichai	29209ac08a	fix energy double loading	2024-06-28 22:37:44 +07:00
Siwat Sirichai	3cd7cdaaef	Merge branch 'main' of https://git.siwatsystem.com/ise-senior-iot/ise-iot-oop-v2	2024-06-28 21:47:59 +07:00
Siwat Sirichai	fff7fdffc8	Update main.cpp	2024-06-28 21:47:37 +07:00
Siwat Sirichai	181c1937ee	energy auto save	2024-06-28 12:29:59 +07:00
reaw55	a294430c0a	debugged for AC to work	2024-06-24 08:01:34 +07:00
reaw55	32c4af34f1	adjust lock check	2024-06-22 06:22:53 +07:00
reaw55	f249dfe314	Merge branch 'all-toggle-fix'	2024-06-22 06:19:04 +07:00
Siwat Sirichai	7bda72a930	update library & change debounce	2024-06-21 23:18:40 +07:00
reaw55	f93dbe65f2	changed behavior of system toggle	2024-06-21 21:58:39 +07:00
reaw55	29fc7a054f	uncomment switch, add debounce, i to 16	2024-06-21 21:49:58 +07:00
reaw55	d25d16f181	comment out switch again	2024-06-21 13:55:04 +07:00
reaw55	49f6ca0994	add input loop	2024-06-17 21:55:16 +07:00
reaw55	c0867a6f9d	un comment switch case	2024-06-17 13:01:21 +07:00
reaw55	afcc360eeb	change build flag	2024-06-17 12:57:10 +07:00
reaw55	2fd969fa93	clean up and update time on startup	2024-05-22 01:52:57 +07:00
reaw55	94ed11c335	Merge branch 'lastest-confrimed-working'	2024-05-22 01:42:57 +07:00
reaw55	64adf6dcd5	change standby name	2024-05-22 01:42:01 +07:00
reaw55	50ef9df58f	change standby button apperance	2024-05-09 14:05:57 +07:00
reaw55	2fe7dfeb5f	comment out switch	2024-05-07 22:31:58 +07:00
reaw55	257a226f0e	noise reject	2024-05-07 22:14:33 +07:00
reaw55	b25c472854	changed debounce	2024-05-07 22:09:58 +07:00
reaw55	0ac6551cdd	change fan speed setting	2024-05-07 22:03:26 +07:00
reaw55	559d3b0b53	update dashboard display to not show grey square	2024-04-25 01:04:33 +07:00
reaw55	27156e945f	change function name	2024-04-22 22:57:14 +07:00
reaw55	980687b154	update time from NTP	2024-04-22 22:55:51 +07:00
reaw55	553eae0566	change AC behavior; comfirmed work	2024-04-22 14:26:40 +07:00
reaw55	d4b36336cd	update CT to be with current on old main	2024-04-20 14:31:37 +07:00
reaw55	88931f3001	add toogle; adjust code behavior	2024-04-20 14:25:12 +07:00
reaw55	d4604d28c3	adjust IR behaviour	2024-04-07 17:30:34 +07:00
reaw55	6a15d99e52	edit nextion display	2024-04-06 04:07:20 +07:00
reaw55	2eb06c1c25	complied now	2024-04-06 04:06:17 +07:00
reaw55	ac4316d659	add new UI picture + add it to nextion display	2024-04-04 04:30:49 +07:00
reaw55	9d27cc8b60	remove old display picture	2024-04-03 19:30:22 +07:00
reaw55	7e0e06f335	change york pin	2024-04-01 14:09:02 +07:00
Siwat Sirichai	0e614c960a	change CT behavior	2024-04-01 13:55:57 +07:00
Siwat Sirichai	b5689804b6	change debouce	2024-04-01 13:34:45 +07:00
reaw55	89c4043faa	change mode to correctly display	2024-03-31 23:50:59 +07:00
reaw55	7e7a0b9709	change mode to be correct	2024-03-30 15:16:13 +07:00
reaw55	a727962a53	resolve CT merge conflict	2024-03-30 15:11:12 +07:00
Siwat Sirichai	63107ce0f2	preload inputs	2024-03-25 14:29:03 +07:00
Siwat Sirichai	3c04d435f1	ct loop static bug	2024-03-25 14:14:47 +07:00
Siwat Sirichai	aee16a31a5	ct1 working	2024-03-25 13:54:49 +07:00
Siwat Sirichai	3a75276d5c	Update platformio.ini	2024-03-25 11:29:26 +07:00
Siwat Sirichai	6e6a516560	Update ise_display.cpp	2024-03-25 07:16:24 +07:00
Siwat Sirichai	cdaeb70a8d	change york's behavior	2024-03-25 07:12:40 +07:00
Siwat Sirichai	ba59b32999	update library	2024-03-23 20:18:17 +07:00
Siwat Sirichai	97de79456a	move internal display init	2024-03-16 23:19:35 +07:00
Siwat Sirichai	5cf8c70483	remove fixed monitor port	2024-03-16 23:06:57 +07:00
Siwat Sirichai	e5b0ac9f04	slightly cleanup code	2024-03-16 22:55:25 +07:00
reaw55	1a9cbd34db	change ACs limit to sync	2024-03-13 11:15:06 +07:00
reaw55	10d9e9a669	change york FRAM to 5005	2024-03-13 11:08:55 +07:00
reaw55	6f44a68ba3	Merge branch 'add-climate-card-y'	2024-03-13 11:07:22 +07:00
reaw55	d859d61462	Merge branch 'main' of https://git.siwatsystem.com/ise-senior-iot/ise-iot-oop	2024-03-13 10:58:21 +07:00
Siwat Sirichai	7f82967f84	CT analog avail awareness	2024-03-10 01:12:00 +07:00
Siwat Sirichai	439dc7480e	CT state saving	2024-03-10 01:08:32 +07:00
Siwat Sirichai	29a975a1af	better handle interaction between CT and analog card	2024-03-10 01:07:23 +07:00
Siwat Sirichai	fe75c3aceb	fix bug regarding analog card call error	2024-03-10 00:52:56 +07:00
Siwat Sirichai	03d8dc9c8b	rebase and reverse ct	2024-03-10 00:28:37 +07:00
reaw55	02b14d2187	revert	2024-03-09 19:28:44 +07:00
reaw55	e17b295849	revert to before change	2024-03-09 17:10:24 +07:00
reaw55	564f10f6ef	remove daikin reference	2024-03-09 17:06:03 +07:00
reaw55	9a0c4ab58f	Revert "update library, CT now compiles" This reverts commit `89aac84cf8`.	2024-03-09 16:21:25 +07:00