896 Commits

Author SHA1 Message Date
Proddy
2b2c86ba5a Merge pull request #2665 from proddy/dev
optimize WebUI and finally remove lint warnings
2025-10-22 22:37:47 +02:00
proddy
2b2217e8ce updated 2025-10-22 22:24:37 +02:00
proddy
08d3e8bab6 package update 2025-10-22 22:24:31 +02:00
Proddy
ded3552873 Merge branch 'dev' into dev 2025-10-22 22:17:08 +02:00
proddy
9a7893e99f package update 2025-10-22 18:34:15 +02:00
proddy
307ef4e285 fix lint warnings 2025-10-22 18:34:00 +02:00
proddy
f75deb3505 fix missing notification after save 2025-10-22 15:37:04 +02:00
proddy
6281f9cfe1 package update 2025-10-22 15:36:52 +02:00
proddy
70810b5e71 formatting 2025-10-20 22:27:13 +02:00
proddy
82cc91cb63 fix lint warnings 2025-10-20 22:24:56 +02:00
proddy
48a3fc5656 fix broken fork URL 2025-10-20 22:24:48 +02:00
proddy
9d20eef12d fix warnings, correctly show abort text when cancelling 2025-10-20 22:20:30 +02:00
proddy
d59e183415 update eslint 2025-10-20 22:20:09 +02:00
proddy
50396a5def package update 2025-10-20 22:19:58 +02:00
proddy
ab92d07716 add REINSTALL 2025-10-20 22:19:49 +02:00
proddy
9172dd9181 embed css 2025-10-20 22:19:33 +02:00
proddy
0852502f52 show re-install firmware button 2025-10-20 22:19:19 +02:00
proddy
c3d066650c fix lint warnings 2025-10-20 22:19:05 +02:00
proddy
172e8d0028 fix msgpack 2025-10-20 22:18:55 +02:00
proddy
812c6ac475 optimized 2025-10-20 22:18:43 +02:00
Proddy
f7c1f0b0d0 Merge pull request #2666 from MichaelDvP/dev
some small fixes
2025-10-20 17:49:41 +02:00
MichaelDvP
125190a0ac formatting 2025-10-20 15:54:44 +02:00
MichaelDvP
35c7349e5c update test expected results 2025-10-20 12:07:49 +02:00
MichaelDvP
d7e916269d add missing modbus tags 2025-10-20 11:13:36 +02:00
MichaelDvP
f5f78182b6 fix display setting FW200 2025-10-20 11:12:58 +02:00
proddy
87bcd4598a 3.7.3-dev.21 2025-10-19 16:25:12 +02:00
proddy
21a814b5ec fix lint warnings 2025-10-19 16:24:52 +02:00
proddy
687d9a40c9 add lazy loading for components 2025-10-19 16:24:37 +02:00
proddy
9d01791fcb add useCallbacks for caching and speed 2025-10-19 16:24:17 +02:00
proddy
028afbe85d optimized 2025-10-19 16:23:53 +02:00
proddy
4bdea56d78 use Memo for caching 2025-10-19 16:23:34 +02:00
proddy
bf0737aab8 optimized 2025-10-19 16:23:09 +02:00
proddy
42d879a87b move catch-all path to end 2025-10-19 16:22:53 +02:00
proddy
79b5671533 remove aggressive compression 2025-10-19 16:22:21 +02:00
proddy
f48d67d9e7 optimize code for speed and size 2025-10-19 16:21:52 +02:00
proddy
16f7a454db use vector instead of dequeue for memory optimization 2025-10-19 16:10:15 +02:00
proddy
02b486ea80 updated dictionary 2025-10-19 16:09:56 +02:00
proddy
61d50e2c79 optimizations 2025-10-18 17:17:41 +02:00
proddy
a5af36e15b use 3.7.3 as latest version 2025-10-18 17:17:17 +02:00
proddy
e11ba9e657 formatting 2025-10-18 17:17:04 +02:00
proddy
878f0702b2 typo 2025-10-18 17:16:53 +02:00
proddy
fa711373f2 replace 9 with DeviceValueTAG::TAG_DHW1 2025-10-18 17:16:43 +02:00
proddy
e9a4a33942 auto-generated 2025-10-18 17:16:19 +02:00
proddy
f445f36eb1 extend CharToUpper for all languages 2025-10-18 17:16:10 +02:00
proddy
148124ef04 typo 2025-10-18 17:15:50 +02:00
proddy
27fbafbe62 add missing controller/datetime 2025-10-18 17:15:26 +02:00
proddy
a949673539 update packages 2025-10-18 17:15:07 +02:00
proddy
32193e3c62 optimizations 2025-10-18 17:14:53 +02:00
proddy
5f79f0848f auto-generated 2025-10-18 17:14:33 +02:00
proddy
4d91128aed update dictionary 2025-10-18 17:14:23 +02:00
MichaelDvP
6f1d507df9 SRC modes: off, manual auto 2025-10-18 09:08:05 +02:00
MichaelDvP
9b50306172 set ecodifftemp min to 4 degree 2025-10-18 09:07:10 +02:00
MichaelDvP
0fbc8e2420 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-10-17 11:14:30 +02:00
MichaelDvP
f0d162554b SRC plus: allow only ascii names, pkg update 2025-10-17 10:55:37 +02:00
MichaelDvP
d92361a8bb fix use after free 2025-10-17 10:41:32 +02:00
MichaelDvP
13bf2c44e7 publish connect device 2025-10-16 20:59:56 +02:00
Proddy
cd155ba680 Merge pull request #2660 from MichaelDvP/dev
add dhw modetype #2659, complete SRC plus entities
2025-10-16 16:07:47 +02:00
MichaelDvP
2a565dc677 fix standalone 2025-10-15 20:17:44 +02:00
MichaelDvP
9bf57c3e22 dev20, remove obj_id again 2025-10-15 15:09:22 +02:00
MichaelDvP
766281d8d2 add dhw modetype #2659 2025-10-15 14:32:44 +02:00
MichaelDvP
bd128072c0 fix childlock setting 2025-10-15 10:49:46 +02:00
MichaelDvP
88e4ba7ecf update pkg 2025-10-15 09:03:45 +02:00
MichaelDvP
96e5251050 typo 2025-10-15 07:58:14 +02:00
MichaelDvP
187b163ffd add testdata, use selRoomTemp for climate 2025-10-14 18:56:19 +02:00
MichaelDvP
9d04058984 add back obj_id for HA test 2025-10-14 08:30:52 +02:00
MichaelDvP
12b06aa657 fix mqtt climatefor SRC 2025-10-13 21:46:22 +02:00
MichaelDvP
47b3e4bf00 fix srcx/seltemp 2025-10-13 19:58:25 +02:00
MichaelDvP
f0f40bbcac fix src commands, icon 2025-10-13 08:46:22 +02:00
MichaelDvP
036e2917a5 SRC plus: mqtt subscribe, modbus 2025-10-12 11:35:24 +02:00
MichaelDvP
d294c418c1 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-10-11 10:12:20 +02:00
Proddy
40da7572cd Merge pull request #2656 from proddy/dev
fix NL translation - https://github.com/emsesp/EMS-ESP32/pull/2655
2025-10-11 07:44:42 +02:00
proddy
532dc66282 fix NL translation - https://github.com/emsesp/EMS-ESP32/pull/2655 2025-10-11 07:43:46 +02:00
MichaelDvP
8913f38fd0 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-10-10 19:25:18 +02:00
MichaelDvP
11782eef8b SRC #2636, add childlock, icons, fix long names 2025-10-09 13:25:09 +02:00
Proddy
b5f4eb6c62 Merge pull request #2652 from proddy/dev
fix HA obj_id/default_entity_id fix
2025-10-08 21:42:48 +02:00
proddy
ee4f58ce20 HA obj_id/default_entity_id fix - #2640 2025-10-08 21:38:56 +02:00
proddy
0fe0ee77b3 package update 2025-10-08 21:38:26 +02:00
Proddy
74e58aaa3d Merge pull request #2651 from MichaelDvP/dev
add SRC tags,no remote for Junkers_old
2025-10-08 16:49:18 +02:00
MichaelDvP
d39d6c7f1f Junkers old does not support remote thermostats 2025-10-08 12:03:21 +02:00
MichaelDvP
4043eaf271 add tag for SRC plus SingleRoomControllers 2025-10-08 12:02:55 +02:00
Proddy
73ac60a8b2 Merge pull request #2650 from proddy/dev
auto-update
2025-10-08 09:11:21 +02:00
proddy
1d6b283033 auto-gen files 2025-10-08 09:10:27 +02:00
proddy
08ca4e44e8 auto-update 2025-10-08 09:10:18 +02:00
Proddy
255c173469 Merge pull request #2647 from MichaelDvP/dev
fixes and additions, see description
2025-10-07 17:38:33 +02:00
MichaelDvP
aeee318cca skip frequ-measurement in standalone build 2025-10-07 12:38:19 +02:00
MichaelDvP
eb14e89c35 fix writing calIntTemp for remote thermostats #2646 2025-10-07 10:36:48 +02:00
MichaelDvP
8411ea6773 fix forceheatingoff ems+ 2025-10-07 09:35:53 +02:00
MichaelDvP
015110a72e changelog, dev19 2025-10-07 09:00:27 +02:00
MichaelDvP
dae345f359 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-10-07 08:15:07 +02:00
MichaelDvP
4cfd9b699c fix misuse of forceheatingoff 2025-10-07 07:23:27 +02:00
Proddy
bd6371fd9d Merge pull request #2630 from proddy/dev
API changes
2025-10-06 23:23:54 +02:00
proddy
7507596869 update tests 2025-10-06 22:17:38 +02:00
proddy
5d99bd923b remove comment 2025-10-06 22:17:32 +02:00
proddy
7402776248 fix string compare for value 2025-10-06 22:17:23 +02:00
proddy
8b5cc82df9 package update 2025-10-06 22:17:07 +02:00
MichaelDvP
7c5351f15f add Greenstar 2000 boiler #2645 2025-10-06 18:28:14 +02:00
MichaelDvP
b29f02e5dd remove scan deep 2025-10-06 18:22:12 +02:00
MichaelDvP
e9e7162bcd typos, update 2025-10-06 08:59:16 +02:00
proddy
b24aae9123 Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2025-10-05 21:18:29 +02:00
proddy
9dbd634322 reduce brightness of RGB LED (bbqkees request) 2025-10-05 21:18:28 +02:00
proddy
daffc94c7f add message api example 2025-10-05 20:09:43 +02:00
proddy
93de0e2f42 clear old sensors when testing standalone 2025-10-05 15:36:30 +02:00
proddy
145172b6e9 have system/message API parse logic via shuntingyard 2025-10-05 15:36:11 +02:00
proddy
c4a2f8bac8 don't check mqtt if not using 2025-10-05 15:35:34 +02:00
proddy
0c0c928efc init list 2025-10-05 15:35:17 +02:00
proddy
4d829b0b78 add nullptr check 2025-10-05 15:35:03 +02:00
proddy
01e7d9b027 add consts 2025-10-05 15:34:52 +02:00
proddy
439da1d1e9 add comment 2025-10-05 15:34:41 +02:00
proddy
ac45c17204 merge Michael's changes 2025-10-05 15:34:30 +02:00
proddy
cd24c7815b merge Michael's change 2025-10-05 15:33:55 +02:00
proddy
9665efbf38 add checks, add a const, clear old scheduler items when testing standalone 2025-10-05 15:33:37 +02:00
proddy
d8aafdbfd4 code cleaning 2025-10-05 15:33:01 +02:00
proddy
0c6aef5b60 clean up standalone tests 2025-10-05 15:32:38 +02:00
proddy
48a1bd0fe6 dev.18 2025-10-05 15:32:18 +02:00
proddy
44cfffe8a4 add 2 more tests 2025-10-05 15:32:09 +02:00
proddy
e75bf8871e update tests 2025-10-05 15:32:00 +02:00
proddy
22703f4100 bump asynctcp, increase asynctcp stack from 6 to 8KB 2025-10-05 15:31:39 +02:00
proddy
c066ab8400 update dictionary 2025-10-05 15:17:16 +02:00
proddy
4a0625e31c fix debug section for S3 2025-10-05 15:16:30 +02:00
proddy
9aaaba5bb7 package update 2025-10-05 15:16:16 +02:00
MichaelDvP
689a3a9a69 selflowtemp and forceheatingoff for ems+ telegrams (2E0 command) 2025-10-05 09:22:46 +02:00
MichaelDvP
391a312f0c add CR11 calinttemp 2025-10-05 07:45:24 +02:00
MichaelDvP
f782eac0cf rename HA dev_i, SRC: do not fetch inactive circuits, long names, HA climated 2025-10-02 11:49:53 +02:00
MichaelDvP
d88513d789 SRC thermostat test, update1 2025-09-30 08:48:56 +02:00
MichaelDvP
59d07e81d6 test SRC Plus implementation, #2636 2025-09-29 12:47:08 +02:00
MichaelDvP
419fe8ef5d dev 18, changelog 2025-09-26 08:47:48 +02:00
MichaelDvP
4cfcba18ee analogsensors pulse output #2624 and frequncy input #2631 2025-09-26 08:47:31 +02:00
MichaelDvP
b1d6ab3c96 ventilation bypass state from 0x55C, #1197 2025-09-26 08:46:11 +02:00
MichaelDvP
ae26754bc8 update pkg 2025-09-26 08:44:58 +02:00
MichaelDvP
61c3b47269 fix display partition name, remove double quotes in shuntingyard 2025-09-25 17:11:21 +02:00
proddy
50bedb2b39 some refactoring 2025-09-21 19:20:04 +02:00
proddy
13db83a6de support plain text POSTs to APIs 2025-09-21 19:19:25 +02:00
proddy
ec43a07866 add shuntingyard tests 2025-09-21 19:18:58 +02:00
proddy
fbc11b8ef8 update unit tests 2025-09-21 19:18:32 +02:00
proddy
f1c5a911f9 special checks for message command 2025-09-21 19:18:19 +02:00
proddy
76c0aa6be8 shuntingyard as a class library 2025-09-21 19:16:55 +02:00
proddy
61bf2332bb update words 2025-09-21 19:16:16 +02:00
proddy
39ca956e1f update libs 2025-09-21 19:16:05 +02:00
proddy
0683b77437 remove TODOs 2025-09-21 19:15:43 +02:00
proddy
5da2760dc6 fix sonar checks 2025-09-21 19:15:29 +02:00
proddy
3fabaf900f auto-update 2025-09-21 19:15:09 +02:00
MichaelDvP
b2a8738672 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-09-16 17:19:44 +02:00
MichaelDvP
c3b9c1ef98 revert commit 4b2468d61 to fix wifi issue with tasmota core 2025-09-16 14:52:30 +02:00
Proddy
aef6b6e92d Merge pull request #2620 from nename0/scheduler-nested-json
Nested JSON structured in Scheduler HTTP fetch
2025-09-11 13:14:37 +02:00
Proddy
dc46dac02a Merge pull request #2623 from MichaelDvP/dev
fix link, #2622
2025-09-09 15:56:40 +02:00
MichaelDvP
025c430611 fix link, #2622 2025-09-09 15:49:57 +02:00
nename0
995ab7233d Add "keys" for nested values in scheduler HTTP response 2025-09-07 11:50:38 +02:00
Proddy
1507989ca3 Merge pull request #2617 from MichaelDvP/dev 2025-09-02 17:13:27 +02:00
MichaelDvP
022e808b14 allow API post single value (with content-Type:application/json) 2025-09-02 12:12:26 +02:00
Proddy
9b604e9c78 Merge pull request #2615 from MichaelDvP/dev 2025-08-31 14:36:40 +02:00
MichaelDvP
cd3cc09386 fix board from fuse for S32S3 2025-08-30 09:54:07 +02:00
MichaelDvP
0df21a7843 do not mention fuse in board details 2025-08-29 10:45:48 +02:00
MichaelDvP
9225ad2ad9 workaround for platform 6.12 2025-08-29 09:06:32 +02:00
MichaelDvP
227b1ac59b revert to platform 6.11, GH action fails with 6.12 2025-08-28 10:53:19 +02:00
MichaelDvP
a9a6e32dd1 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-08-28 10:43:09 +02:00
MichaelDvP
3c4278029f BBQKees board settings/fuse, remove esp32 cpu temperature, dev17 2025-08-28 09:40:01 +02:00
MichaelDvP
3b4e09208e CR11 mode setting, FW200 display settings 2025-08-28 09:12:55 +02:00
Proddy
e9e0688737 Merge pull request #2614 from proddy/dev
lib updates
2025-08-28 07:27:43 +02:00
proddy
7bb1b7bb91 update library and re-gen files 2025-08-28 07:23:51 +02:00
proddy
4302bc9978 added dev-15 updates 2025-08-28 07:23:42 +02:00
proddy
60d884df88 auto-format 2025-08-28 07:23:26 +02:00
proddy
177c635bc1 add c6 (experimental), upgrade AsyncWebServer 2025-08-28 07:23:11 +02:00
Proddy
9a97c28bf0 Merge pull request #2613 from MichaelDvP/dev
dev16
2025-08-24 10:22:20 +02:00
MichaelDvP
deb87cf5d7 fix standalone 2025-08-23 19:25:59 +02:00
MichaelDvP
a50227638b fix boiler wwMaxPower and ww_disinfect, dev16 2025-08-18 17:34:16 +02:00
MichaelDvP
92b1515c8a update pkg 2025-08-14 07:52:12 +02:00
MichaelDvP
0c5cf0475c Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-08-05 18:45:10 +02:00
Proddy
f26e937514 Update sonar 2025-08-04 20:48:55 +02:00
Proddy
1e4ca8b57f Merge pull request #2603 from proddy/dev
small updates
2025-08-04 17:38:28 +02:00
proddy
4d88bbd28f package update 2025-08-04 17:36:35 +02:00
proddy
0ce110df9e add back factory reset after long button press - we missed in pull/1969 2025-08-04 17:36:30 +02:00
proddy
3759fc81ba asynctcp 3.4.7 2025-08-04 17:35:46 +02:00
MichaelDvP
7965ecd856 NTC parameters for E32V2.2 P2B 2025-08-04 10:30:40 +02:00
MichaelDvP
7b0169bb68 update to eModbus 1.7.4 2025-08-04 10:16:50 +02:00
MichaelDvP
f10f3d5305 esp32: some pins have no internal pullup 2025-08-04 10:15:59 +02:00
MichaelDvP
ed9e2704b0 syslog, changing level is not a fail 2025-08-04 10:15:15 +02:00
proddy
c47dd0e523 add option for Arduino Core 3.3 2025-08-03 10:57:09 +02:00
proddy
80c75bae77 package update 2025-08-03 10:56:56 +02:00
MichaelDvP
cfa973b08b fix standalone 2025-08-02 16:07:27 +02:00
MichaelDvP
83987b71e0 MM100 flow and pressure 2025-08-02 13:08:09 +02:00
MichaelDvP
a318f34988 update packages 2025-08-02 13:04:24 +02:00
MichaelDvP
5cc1660675 update AsyncTCP 3.4.7 2025-08-02 13:03:45 +02:00
MichaelDvP
8a48da38b8 revert to fetch mixer config 2025-07-31 18:56:17 +02:00
MichaelDvP
d514e67eb8 update pkg 2025-07-31 18:55:37 +02:00
MichaelDvP
69964482f8 AsyncTCP 3.4.6, check log queue for overflow 2025-07-31 18:55:23 +02:00
MichaelDvP
2aa691212c add command system/fuse/mfg, board E32V2.2, check systemvolatage >2.6V 2025-07-28 14:16:10 +02:00
MichaelDvP
c27134f185 fix gpio for core voltage detect 2025-07-23 20:39:24 +02:00
MichaelDvP
c8033692b1 update pkg 2025-07-23 20:36:22 +02:00
MichaelDvP
c537d0ab8b add gateway E32V3, autodetect by gpio39 core voltage 2025-07-23 18:47:33 +02:00
MichaelDvP
bee703eb1f test: fetch MM100 config only once 2025-07-23 11:56:27 +02:00
MichaelDvP
5d2bd6a2af set climate action cooling 2025-07-23 11:55:11 +02:00
MichaelDvP
67f0f40a8a Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-07-14 07:33:47 +02:00
Proddy
e796fbef7a Merge pull request #2594 from proddy/dev
bump to 3.7.3-dev.14
2025-07-10 21:01:13 +02:00
proddy
da7ef04741 3.7.3-dev.14 2025-07-10 21:00:14 +02:00
proddy
ddb318dfc6 package update 2025-07-10 20:59:36 +02:00
proddy
88643dc8e3 update 2025-07-10 20:59:31 +02:00
MichaelDvP
cf3854563d Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-07-10 12:12:28 +02:00
MichaelDvP
4b2468d616 some checks 2025-07-10 12:09:17 +02:00
Proddy
4b08aba9c4 Merge pull request #2593 from proddy/dev
minor updates and ESP32Async/AsyncTCP back to v3.4.2
2025-07-08 22:08:50 +02:00
proddy
0a18add447 show ems device details in MQTT HA screen 2025-07-08 22:05:45 +02:00
proddy
ca8d23ff3a package update 2025-07-08 22:05:28 +02:00
proddy
c7e833194f ESP32Async/AsyncTCP @ 3.4.2 2025-07-08 22:05:15 +02:00
Proddy
f63f658421 Merge pull request #2588 from misa1515/patch-25
Update locale_translations.h
2025-07-01 07:34:41 +02:00
misa1515
13fcf09470 Update locale_translations.h 2025-06-30 21:51:18 +02:00
Proddy
f560cbd60c Merge pull request #2587 from proddy/dev
package updates
2025-06-30 15:46:08 +02:00
proddy
38ead7e10f update arduinojson, espressif-platform and web packages 2025-06-30 15:42:38 +02:00
proddy
326bba9b42 package update 2025-06-29 13:39:36 +02:00
proddy
d9a18bf255 auto-gen 2025-06-29 13:39:31 +02:00
MichaelDvP
6c42cbfb4b make task cores configurable in platformio.ini 2025-06-28 13:00:53 +02:00
MichaelDvP
6691c81956 test for #2585 2025-06-25 17:46:38 +02:00
MichaelDvP
2f95ef305d roll back to asyncTCP 3.4.2, add CS6800 mixer 2025-06-25 13:33:44 +02:00
proddy
7afde0ce6e auto-update 2025-06-14 09:30:54 +02:00
proddy
f3cdafe7d0 ESPAsyncWebServer 3.7.8 support 2025-06-14 09:30:47 +02:00
Proddy
4bf23e1bda Merge pull request #2582 from MichaelDvP/dev
hybrid csh5800iG and fix crashes
2025-06-13 18:53:16 +02:00
MichaelDvP
aca66457f9 fixes crashs: revert to platform 6.10.0 2025-06-13 08:52:02 +02:00
MichaelDvP
121887bdce Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-06-11 11:35:29 +02:00
MichaelDvP
32d7cf4e9c fix possible crash 2025-06-11 11:35:01 +02:00
Proddy
3f8227e95e Merge pull request #2580 from proddy/dev
MQTT HA discovery refactoring
2025-06-10 21:59:25 +02:00
proddy
10d84261da add another version test for downgrading 2025-06-10 11:19:39 +02:00
proddy
51848d8347 auto translate 2025-06-10 11:19:26 +02:00
proddy
1c0669144f update docs 2025-06-10 11:19:16 +02:00
proddy
41a2ba6e5d fixes #2579 2025-06-09 16:07:26 +02:00
proddy
b6fe9e7569 package update 2025-06-09 16:07:00 +02:00
MichaelDvP
faa2c5f1aa set CS5800iG as gas boiler and HP, #2569 2025-06-07 11:57:53 +02:00
MichaelDvP
c71034ff12 analog counter save to nvs on command and update 2025-06-07 11:57:01 +02:00
proddy
71be615bbe add HP CS5800iG #2569 2025-06-06 17:24:11 +02:00
Proddy
ce53fd1d04 Merge pull request #2575 from proddy/dev
some minor fixes and updates
2025-06-05 19:31:29 +02:00
proddy
1772876f9e 3.7.3-dev.12 2025-06-05 19:31:04 +02:00
proddy
cd5dbebea9 package update 2025-06-05 19:30:47 +02:00
proddy
6c67b78a1c package update 2025-06-05 10:46:29 +02:00
proddy
9b4deb271b update async lib 2025-06-04 08:35:59 +02:00
proddy
0e9283af5c add test for hpmode over mqtt 2025-06-04 08:35:53 +02:00
proddy
58011700fe package update 2025-06-04 08:35:39 +02:00
proddy
079a08ff7b upercase mqtt 2025-06-01 21:34:09 +02:00
proddy
b64a55e460 https://github.com/emsesp/EMS-ESP32/discussions/2550 - publish sensor when interval is set to 0(auto) 2025-06-01 18:51:02 +02:00
proddy
2b7ef5b6ba AsyncTCP @ 3.4.3 2025-06-01 17:40:15 +02:00
proddy
d62eef4eca 3.7.3-dev.12 2025-06-01 12:48:56 +02:00
proddy
0f6d6e69f5 package update 2025-06-01 12:43:27 +02:00
proddy
97f689b8a7 add comment for reference 2025-06-01 12:41:52 +02:00
proddy
be9b4a070c remove duplicate no-watch 2025-06-01 12:41:27 +02:00
proddy
bc15dd4463 lib updates 2025-06-01 12:41:10 +02:00
proddy
1613caea86 MQTT Command Topic with slashes #2571 2025-06-01 12:40:53 +02:00
proddy
4b39ab76ab MQTT Command Topic with slashes #2571 2025-06-01 12:40:42 +02:00
Proddy
d04c882590 Merge pull request #2566 from proddy/dev
pnpm mods
2025-05-25 11:08:25 +02:00
proddy
a199bf21e1 pnpm mods 2025-05-25 11:07:11 +02:00
Proddy
3ae8722ece Merge branch 'emsesp:dev' into dev 2025-05-24 10:11:39 +02:00
Proddy
6a6cef57cf Merge pull request #2565 from MichaelDvP/dev
remove optimistic option #2551
2025-05-23 17:04:11 +02:00
MichaelDvP
090491aab6 remove optimistic option #2551 2025-05-23 07:42:21 +02:00
MichaelDvP
ca81a02a8c masked enums with single mask, update seltemp in advance 2025-05-23 07:41:43 +02:00
proddy
f64188bd5d update pkg 2025-05-22 22:08:45 +02:00
Proddy
d3e0f180c5 Merge pull request #2559 from emsesp/alert-autofix-36
Potential fix for code scanning alert no. 36: Workflow does not contain permissions
2025-05-18 21:26:38 +02:00
Proddy
3f4d87a1d2 Merge pull request #2560 from emsesp/alert-autofix-35
Potential fix for code scanning alert no. 35: Workflow does not contain permissions
2025-05-18 21:26:30 +02:00
Proddy
1d89e651a4 Merge pull request #2561 from emsesp/alert-autofix-34
Potential fix for code scanning alert no. 34: Workflow does not contain permissions
2025-05-18 21:26:24 +02:00
Proddy
fad67b4ef9 Potential fix for code scanning alert no. 34: Workflow does not contain permissions
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
2025-05-18 18:25:34 +02:00
Proddy
ce1c22ee35 Potential fix for code scanning alert no. 35: Workflow does not contain permissions
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
2025-05-18 18:25:10 +02:00
Proddy
169b5f34ea Potential fix for code scanning alert no. 36: Workflow does not contain permissions
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
2025-05-18 18:24:36 +02:00
Proddy
131c03714f Merge pull request #2558 from proddy/dev
replace yarn with pnpm
2025-05-18 18:02:18 +02:00
proddy
024c4a0c21 replace yarn with pnpm 2025-05-18 18:00:46 +02:00
proddy
b0d111d86f test pnpm 2025-05-18 17:36:08 +02:00
proddy
faeef9c821 remove yarn 2025-05-18 17:36:01 +02:00
proddy
60a5b28a21 pnpm 2025-05-18 16:25:22 +02:00
proddy
f4b5cf04a0 update asyncweb mention 2025-05-18 16:24:02 +02:00
proddy
d69f26acac upgrade yarn to pnpm because why not 2025-05-18 15:53:38 +02:00
Proddy
2a50701107 Merge pull request #2557 from proddy/dev
mqtt tidy up and shower active fixed for HA
2025-05-18 11:48:59 +02:00
proddy
ab099c45b8 updated 2025-05-18 11:48:13 +02:00
proddy
47f21019a0 clean-up publish retain functions 2025-05-18 11:47:22 +02:00
proddy
5c473c2b3d shower active is shown in HA on EMS-ESP boot 2025-05-18 11:47:04 +02:00
proddy
9ddc587334 add comment 2025-05-18 11:46:45 +02:00
proddy
9b0a7a4872 AsyncTCP 3.4.1 2025-05-18 11:46:28 +02:00
Proddy
97528e9df6 Merge pull request #2556 from proddy/dev
minor updates
2025-05-17 11:17:47 +02:00
proddy
b797e1e2bb eslint update 2025-05-17 11:01:27 +02:00
proddy
bb52d35c99 add comments 2025-05-17 10:24:25 +02:00
proddy
4c9026e11a fix standalone osx 2025-05-16 19:34:54 +02:00
proddy
6cd4e8a5b6 run update_all 2025-05-16 09:22:58 +02:00
Proddy
dfe037a7d3 Merge pull request #2547 from vmonkey/patch-6
Small update-Czech
2025-05-16 08:03:20 +02:00
Proddy
b87622185d Merge pull request #2554 from MichaelDvP/dev
fixes and additions
2025-05-16 08:03:03 +02:00
MichaelDvP
0318f8156d fix standalone 2025-05-12 19:10:59 +02:00
MichaelDvP
0c03fa1308 mqtt publish_time sensors instead of temperature sensors 2025-05-12 16:49:33 +02:00
MichaelDvP
2d6e02171f Typo 2025-05-12 16:47:33 +02:00
MichaelDvP
2da312bf15 optimistic only for writable values 2025-05-12 16:29:36 +02:00
MichaelDvP
52f59a7b1d fix set chargeoptimization #2543 2025-05-12 08:00:14 +02:00
MichaelDvP
6c8624298c devices entity search case-independend, #2553 2025-05-11 18:47:21 +02:00
MichaelDvP
ce2d2fb867 search entities case independend #2553 2025-05-11 15:01:34 +02:00
MichaelDvP
ba2ad4e175 typo 2025-05-11 15:00:41 +02:00
MichaelDvP
b3320c3e48 ha optimistic, cs6800 changes, custom entity hide 2025-05-10 16:14:54 +02:00
MichaelDvP
dc1094b6ba show ntp connect in log 2025-05-10 13:36:40 +02:00
MichaelDvP
bb60568d83 update pkg 2025-05-10 13:36:11 +02:00
MichaelDvP
67b5c5dd26 chargeOptimization #2543, charging pump #2544 2025-05-06 19:14:31 +02:00
MichaelDvP
6866d5b7a9 update pkg 2025-05-05 18:29:06 +02:00
Marek Tyburec
b4e9af89ee Small update-Czech
Fix Czech grammar in dashboard
2025-05-04 07:12:32 +02:00
Proddy
775ed99b22 Merge pull request #2539 from proddy/dev
add back formidable to fix build without mock-api
2025-04-25 18:29:08 +02:00
proddy
2ec13273fd update lock file 2025-04-25 18:27:12 +02:00
proddy
a846b01103 auto-generate 2025-04-25 18:27:00 +02:00
proddy
6dffb08545 add back formidable 2025-04-25 18:26:52 +02:00
Proddy
16f7cc148d Merge pull request #2538 from MichaelDvP/dev
use messagetime in WebLogService::show() #2533
2025-04-25 18:18:24 +02:00
MichaelDvP
568431ada4 use messagetime in WebLogService::show() 2025-04-25 12:16:33 +02:00
Proddy
6034c1e5eb Merge pull request #2535 from MichaelDvP/dev
show console log with ISO date/time, #2533
2025-04-25 09:18:06 +02:00
MichaelDvP
e3566feefb show console log with ISO date/time, #2533 2025-04-25 08:05:15 +02:00
MichaelDvP
ea46c79278 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-04-24 10:25:16 +02:00
MichaelDvP
a02831e04e read only first error log message 2025-04-24 10:23:54 +02:00
MichaelDvP
3b8c973f2a fix debug message in console help 2025-04-24 10:23:34 +02:00
MichaelDvP
2c65936b3e update pkg 2025-04-24 10:23:11 +02:00
Proddy
bc04c34d58 Merge pull request #2532 from proddy/dev
add tests for custom commands
2025-04-23 21:43:38 +02:00
proddy
5047f1752e add tests for custom entities 2025-04-23 21:30:02 +02:00
proddy
1fa7a6c549 package update 2025-04-23 21:29:30 +02:00
MichaelDvP
f9ebe33a7d read thermostat errorlog 0xC0 on 0xBF 2025-04-23 09:36:00 +02:00
Proddy
e719dd963d Merge pull request #2530 from proddy/dev
updated libs and fix for domoticz discovery warnings
2025-04-22 16:08:16 +02:00
proddy
c6b0099581 domoticz warnings on custom entities - https://github.com/emsesp/EMS-ESP32/discussions/2408#discussioncomment-12896868 2025-04-22 16:07:22 +02:00
proddy
71726530c0 auto-generated 2025-04-22 16:06:49 +02:00
proddy
a749ecb298 ArduinoJson 7.4.1 and updated AsyncWS libs 2025-04-22 16:06:41 +02:00
proddy
7e963529c4 package update 2025-04-22 16:06:18 +02:00
Proddy
c76409cf3f Merge pull request #2529 from MichaelDvP/dev
dev.9: fix writing auxHeaterSource #2489
2025-04-22 11:05:34 +02:00
MichaelDvP
efd0872690 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-04-22 07:23:28 +02:00
MichaelDvP
57098b578f fix writing auxHeaterSource #2489 2025-04-22 06:58:23 +02:00
Proddy
6472e9e224 run at 1:30am 2025-04-21 09:06:37 +02:00
Proddy
026828efc7 Merge pull request #2528 from MichaelDvP/dev
fix GH build
2025-04-20 21:43:38 +02:00
MichaelDvP
fe6e9be4d3 fix GH build 2025-04-20 18:12:59 +02:00
Proddy
7745a6f9a1 Merge pull request #2527 from MichaelDvP/dev 2025-04-20 17:56:56 +02:00
MichaelDvP
c523a379fe add C6 telegram, fixes #1963 2025-04-20 17:07:30 +02:00
MichaelDvP
2854e9cbe9 IPM DHW module, fixes #2524 2025-04-20 17:03:03 +02:00
Proddy
4985f104c7 Merge pull request #2526 from proddy/dev
small changes
2025-04-19 12:54:28 +02:00
proddy
a0ea5f7ea1 clean-up unused packages 2025-04-19 12:52:58 +02:00
proddy
efc35d0594 update react-table-library for React 19 2025-04-19 11:46:42 +02:00
proddy
ccd6c6f8ad workarond for missing package 2025-04-19 09:08:35 +02:00
proddy
b426e0eb45 move NTP set time to Settings page 2025-04-18 16:19:07 +02:00
proddy
c53e1de569 update translations 2025-04-18 16:18:54 +02:00
proddy
8058e98748 update packages 2025-04-18 16:18:41 +02:00
proddy
ba419d09eb add Michael's https://github.com/emsesp/EMS-ESP32/pull/2522# 2025-04-18 16:18:08 +02:00
proddy
c701247652 auto-generate 2025-04-18 16:17:35 +02:00
proddy
12754d1c07 https://github.com/emsesp/EMS-ESP32/discussions/2523 2025-04-18 16:17:21 +02:00
Proddy
9a4daba31a Merge pull request #2521 from misa1515/patch-24
Update index.ts
2025-04-16 15:06:07 +02:00
misa1515
a2aa2dccdd Update index.ts 2025-04-15 21:46:19 +02:00
Proddy
25af51a8e8 Merge pull request #2517 from proddy/dev
update packages
2025-04-12 09:10:13 +02:00
proddy
ddc597ff03 update packages 2025-04-12 09:09:52 +02:00
Proddy
75310afd63 Merge pull request #2515 from MichaelDvP/dev
FB100 controls hc1, fixes #2510
2025-04-12 09:06:04 +02:00
MichaelDvP
3095323c93 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-04-10 12:57:40 +02:00
Proddy
4667718f12 Merge pull request #2513 from proddy/dev
arduinojson 7.4 and package update
2025-04-10 08:18:00 +02:00
proddy
2cb1c5d7e7 arduinojson 7.4 and package update 2025-04-10 08:16:33 +02:00
MichaelDvP
d7b9754ddb do not create hc on empty message 2025-04-09 17:38:58 +02:00
MichaelDvP
99b769626e check dv.hasValue for commands 2025-04-09 13:30:40 +02:00
MichaelDvP
70035b059c comment out HA config of shower timestamp 2025-04-08 17:59:01 +02:00
MichaelDvP
b252c2f95a FB100 controls hc1, fixes #2510 2025-04-08 17:53:06 +02:00
Proddy
baa4f2eb39 Merge pull request #2508 from proddy/dev
fixes #2507 - download based on tasmota builds
2025-04-05 10:56:03 +02:00
proddy
c7b970b5b0 auto-generated 2025-04-05 10:55:01 +02:00
proddy
3ed5b65191 fixes #2507 2025-04-05 10:54:55 +02:00
Proddy
6e01c00d46 Merge pull request #2506 from MichaelDvP/dev
remove wifi full scan
2025-04-04 10:30:23 +02:00
MichaelDvP
e72afc9065 remove wifi full scan, dev.6 2025-04-04 08:24:59 +02:00
MichaelDvP
de2f3e712d updte pkg 2025-04-04 08:20:00 +02:00
Proddy
cacb92cd47 Merge pull request #2504 from MichaelDvP/dev
some smaller fixes
2025-04-03 09:51:26 +02:00
MichaelDvP
3eb20fa700 add some HA config on mqtt reconnect 2025-04-02 17:49:22 +02:00
MichaelDvP
d35574d494 update pkg 2025-04-02 17:48:27 +02:00
MichaelDvP
3cb29220ab fetch first c0 telegram #2501 2025-04-01 18:58:59 +02:00
MichaelDvP
d91812ab8f add thermostat C0 message #2501 2025-04-01 12:41:21 +02:00
MichaelDvP
856f8efd25 update scheduler if there is pending change #2502 2025-04-01 12:34:02 +02:00
MichaelDvP
d32378ccd4 do not scan methode for arduino 3 2025-04-01 12:33:04 +02:00
MichaelDvP
f5006d1a11 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-31 10:50:23 +02:00
Proddy
c3468e6308 Merge pull request #2498 from proddy/dev
fixes #2497
2025-03-31 10:19:13 +02:00
proddy
9f4de56099 switch between dev and stable 2025-03-31 10:18:32 +02:00
proddy
78738de811 version update text changes 2025-03-31 10:18:21 +02:00
proddy
e64596ad61 updated comments 2025-03-31 10:17:33 +02:00
proddy
024357ae80 bump 3.7.3-dev.4 2025-03-31 10:17:19 +02:00
proddy
3f07d3b75f ignore local yarn 2025-03-31 10:17:05 +02:00
proddy
cb7c695c67 tidy up 2025-03-30 15:13:52 +02:00
proddy
912a764c2d package update 2025-03-30 15:13:40 +02:00
proddy
c9c0f55b64 remove optimizer 2025-03-30 15:13:15 +02:00
proddy
6991677cf9 improve version check, #1497 2025-03-30 14:51:59 +02:00
proddy
83330907cd added full tests for different version upgrades, both backend and webUI 2025-03-30 14:51:13 +02:00
proddy
3571998da3 rename version.h 2025-03-30 14:50:40 +02:00
MichaelDvP
77465ebe81 always show buttons for stable and dev 2025-03-30 14:11:02 +02:00
MichaelDvP
006e5493e2 reactivate wifi all channel scan 2025-03-30 14:09:02 +02:00
proddy
b29136433d 3.7.3 2025-03-30 10:18:45 +02:00
proddy
0347a4b8b0 fix possible out of scope warning 2025-03-30 10:18:38 +02:00
proddy
3330103a8d compile with IDF 5 2025-03-30 10:18:24 +02:00
proddy
0a02252fee move experimental IDF 5 to pio_local.ini 2025-03-30 10:17:44 +02:00
proddy
642f2116d2 testing Arduino Core v3.2.0 / ESP-IDF v5.4.1 2025-03-29 08:08:54 +01:00
proddy
7b8e45c2f7 package update 2025-03-29 08:05:53 +01:00
proddy
0f2244607f fixes #2497 - showFirmwareDialog() was missing argument 2025-03-28 17:23:46 +01:00
proddy
32ab9dda45 replace reset with restart 2025-03-28 17:22:36 +01:00
proddy
b6659b8586 auto-generate 2025-03-28 17:22:20 +01:00
proddy
5eb85066ef package update 2025-03-28 17:22:11 +01:00
proddy
9398fc72a0 update version check tests 2025-03-28 17:20:25 +01:00
MichaelDvP
1bcd453e3f fix version links for dev #2497 2025-03-28 16:46:49 +01:00
MichaelDvP
d405478a13 fix deviceName length (#2482), formatting 2025-03-28 09:39:38 +01:00
Proddy
c927e5f496 Merge pull request #2496 from MichaelDvP/dev
fix secure mqtt and add auxHeaterSource
2025-03-27 18:37:12 +01:00
MichaelDvP
c5dbd7452e add auxHeaterSource #2489 2025-03-27 17:23:42 +01:00
MichaelDvP
3a0b4ea587 fix switch to secure mqtt #2492 2025-03-27 13:57:59 +01:00
MichaelDvP
6f4cdb7122 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-27 07:50:12 +01:00
Proddy
b5d6757660 Merge pull request #2493 from proddy/dev
upgrade mui v7, fix makefile build
2025-03-26 22:09:56 +01:00
proddy
0dcde46296 upgrade mui v7, fix makefile build 2025-03-26 20:24:08 +01:00
Proddy
ac7e91beff Merge pull request #2491 from MichaelDvP/dev
fixes and additions
2025-03-26 18:42:19 +01:00
MichaelDvP
9ea1e2752d update pkg, Grid2->Grid 2025-03-26 17:30:33 +01:00
MichaelDvP
b5471aef94 fix typo in set_wwswitchtime, fixes #2490 2025-03-26 17:03:51 +01:00
MichaelDvP
f31329ceff fix dhw progMode, #2490 2025-03-26 07:16:08 +01:00
MichaelDvP
40d48f4407 add FLAG_HMC310, fix switchtimeWW 2025-03-25 18:13:43 +01:00
MichaelDvP
11b7e1f86e update pkg 2025-03-24 18:44:02 +01:00
MichaelDvP
e364a71eda Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-23 18:35:08 +01:00
Proddy
e006bebb86 Merge pull request #2488 from proddy/dev
rename github actions
2025-03-23 16:56:40 +01:00
proddy
fa3d42a1c7 rename github actions 2025-03-23 16:55:57 +01:00
Proddy
e435fd4391 Merge pull request #2487 from proddy/dev
clean-up
2025-03-23 15:46:17 +01:00
proddy
d42efb32ab clean-up 2025-03-23 15:45:53 +01:00
proddy
ad8f2dc823 add 2025-03-23 15:43:07 +01:00
Proddy
f2ff14f511 Merge pull request #2479 from proddy/dev
fix test data
2025-03-23 14:01:26 +01:00
proddy
e5e9d4c713 fix test data with led_type 2025-03-23 14:00:46 +01:00
proddy
4c5f93000b add led_type to comment 2025-03-23 14:00:35 +01:00
proddy
0c7301a020 TYPE has param 2025-03-23 14:00:20 +01:00
MichaelDvP
74c63bf17e set HMC310 to BC400 compatible 2025-03-23 10:07:22 +01:00
MichaelDvP
4564e0b828 fix printable chars in lastcode 2025-03-23 10:06:49 +01:00
Proddy
2ab9607989 Merge pull request #2478 from misa1515/patch-23
Update index.ts
2025-03-23 07:34:25 +01:00
misa1515
29d198b46d Update index.ts 2025-03-22 22:41:41 +01:00
MichaelDvP
8387ca0c07 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-22 11:59:04 +01:00
MichaelDvP
3796fb8027 add analog sensor NTC and RGB-Led, dev29 2025-03-22 11:41:37 +01:00
MichaelDvP
1da08633ec add scheduler random function (rnd(x) => random 0..x) 2025-03-22 11:41:00 +01:00
MichaelDvP
b097e372e4 update pkg and libs 2025-03-22 11:39:48 +01:00
Proddy
846776929e Merge pull request #2475 from proddy/dev
3.7.3-dev.0
2025-03-22 10:44:09 +01:00
proddy
6e1d56b8ee 3.7.3-dev.0 2025-03-22 10:43:44 +01:00
Proddy
32f7eb7299 Merge pull request #2474 from proddy/dev
update prepare for 3.7.2 stable
2025-03-22 10:09:17 +01:00
proddy
3fc9c3b56c update prepare for 3.7.2 stable 2025-03-22 10:07:58 +01:00
Proddy
e2e46543d2 Merge pull request #2472 from JokerGermany/own1-program-switchtime---german-translation
make switchtime more clear in the german translation
2025-03-22 09:51:15 +01:00
JokerGermany
a2b22198ec make switchtime more clear in the german translation
"Programmschaltzeit 1" don't make clear that "Eigen 1" is meant.
2025-03-21 10:20:57 +01:00
Proddy
642b59f729 Merge pull request #2471 from MichaelDvP/dev
add suprapur-o, fixes #2470
2025-03-20 16:46:48 +01:00
MichaelDvP
9e81de2164 add Suprapur-o, dev28 2025-03-20 11:45:04 +01:00
MichaelDvP
d44797db1d update libs 2025-03-20 11:44:37 +01:00
MichaelDvP
673ee3f79b update pkg 2025-03-20 11:44:23 +01:00
Proddy
38a8179544 Merge pull request #2469 from proddy/dev
update test
2025-03-15 13:49:19 +01:00
proddy
cfb59ac6a0 update test 2025-03-15 13:48:56 +01:00
Proddy
80c26e1adb Merge pull request #2468 from MichaelDvP/dev
shuntingYard support empty strings
2025-03-15 13:47:19 +01:00
MichaelDvP
d0de6e8d0f Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-15 13:38:13 +01:00
Proddy
68be7d00ff Merge pull request #2466 from proddy/dev
added new return code when processing commands
2025-03-15 13:02:38 +01:00
proddy
d3e6043911 replace with LOG_DEBUG 2025-03-15 13:01:42 +01:00
proddy
373895b36a test for NO_VALUE in prep for Michael's change 2025-03-15 13:01:29 +01:00
proddy
594e10dbe1 formatting 2025-03-15 13:01:14 +01:00
proddy
e3c5b462da formatting 2025-03-15 13:01:05 +01:00
proddy
8a1376b169 add test for NO_VALUE 2025-03-15 13:00:47 +01:00
proddy
900e26cf9f package update 2025-03-15 13:00:31 +01:00
MichaelDvP
071e81f29b shuntingYard work with empty strings 2025-03-15 12:03:42 +01:00
proddy
d1bd861ff0 default return code is OK 2025-03-13 22:46:25 +01:00
proddy
f5925dbb3b formatting 2025-03-13 22:46:15 +01:00
proddy
b1eedcb1d8 add new return code NO_VALUE 2025-03-13 22:46:04 +01:00
proddy
ed7a9f43de update tests 2025-03-13 22:45:26 +01:00
proddy
67885950ef package update 2025-03-13 22:44:45 +01:00
Proddy
74ddb771e9 Merge pull request #2464 from MichaelDvP/dev
bitmask for bool custom entities as hex value
2025-03-13 08:40:33 +01:00
MichaelDvP
584d0e0b48 shuntingYard string addition, add tohex() function 2025-03-13 07:45:37 +01:00
MichaelDvP
8d9ca33ea3 bitmask for bool custom entities as hex value 2025-03-12 09:23:00 +01:00
Proddy
f0eea1a6a3 Merge pull request #2461 from MichaelDvP/dev 2025-03-11 10:53:35 +01:00
MichaelDvP
79cc0377c0 fix sonar fail for special characters in strings (ascii>127) 2025-03-11 10:00:10 +01:00
Proddy
115cec08fa Merge pull request #2460 from MichaelDvP/dev 2025-03-11 09:23:38 +01:00
MichaelDvP
6df592c2b8 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-11 07:33:30 +01:00
MichaelDvP
f2b81489ba mixed case strings in scheduler, #2457 2025-03-11 07:33:23 +01:00
Proddy
0d8760219a Merge pull request #2459 from proddy/dev
package updates, fix auto-gen of csv files
2025-03-10 21:58:23 +01:00
proddy
e8e8d9c130 3.7.2-dev.27 2025-03-10 21:57:18 +01:00
proddy
8f712412f5 package update 2025-03-10 21:47:16 +01:00
proddy
f8ece46163 changed comment 2025-03-10 21:47:07 +01:00
proddy
cd8b1add54 formatting 2025-03-10 21:46:55 +01:00
proddy
1c415a9715 re-generated 2025-03-10 21:46:36 +01:00
proddy
e1e3601640 add newline to fix csv gen 2025-03-10 21:46:20 +01:00
MichaelDvP
c2f718b49a shuntingYard mixed case, only compare and commands converted to lower case 2025-03-10 19:42:16 +01:00
Proddy
cee1874689 Merge pull request #2458 from MichaelDvP/dev
fixes #2456, #2457, shuntingYard tests from #2452
2025-03-10 18:38:38 +01:00
MichaelDvP
57d172aac2 Merge branch 'support_nested_conditionals' of https://github.com/philwingfield/EMS-ESP32 into dev 2025-03-10 11:59:09 +01:00
wingphil
bb26900213 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into support_nested_conditionals 2025-03-10 10:11:21 +00:00
wingphil
9d1ee27533 Add test for nested conditionals without brackets 2025-03-10 10:09:44 +00:00
MichaelDvP
7fd735f667 rename remoteseltemp to cooltemp, fix #2456 2025-03-10 11:02:03 +01:00
MichaelDvP
2e79c3a5c6 enlarge tx queue (overflow in #2455) 2025-03-10 10:56:31 +01:00
MichaelDvP
d769999f10 shuntingYard get api-data lowerCase, fix #2457 2025-03-10 10:55:15 +01:00
MichaelDvP
bd93d26361 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-09 17:35:50 +01:00
MichaelDvP
72feefe709 allow brackets in conditions (idea from philwingfield) 2025-03-08 16:50:12 +01:00
Proddy
1d6c2c9664 Merge pull request #2453 from MichaelDvP/dev
fix lastcode #2438, heating/tapwater for heatpumps from activity #2450
2025-03-07 20:51:41 +01:00
MichaelDvP
85c78bc8e9 update pkg 2025-03-07 18:23:40 +01:00
MichaelDvP
18bdcfe050 fix lastcode #2438, heating/tapwater for heatpumps from activity #2450 2025-03-07 18:12:36 +01:00
wingphil
a6f77250b5 Format with clang 2025-03-07 17:08:05 +00:00
wingphil
9874ecde82 feat: Support nested conditionals in shuntingYard 2025-03-07 16:53:41 +00:00
MichaelDvP
584b8788be Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-07 16:42:56 +01:00
Proddy
7eb15652c7 Merge pull request #2449 from MichaelDvP/dev
fix #2446, pc0Flow for all boilers, fix #2411
2025-03-07 13:00:48 +01:00
MichaelDvP
2c28a607ba Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-06 16:44:45 +01:00
wingphil
45eca462e7 test: Move shuntingYard tests to new file 2025-03-06 14:07:51 +00:00
wingphil
4474868afc Add tests for inline conditionals, try to capture current behaviour 2025-03-06 13:59:20 +00:00
wingphil
6c6b5b060d test: Copy shuntingYard tests so that we can assert the output 2025-03-06 13:27:12 +00:00
Proddy
c03eb290d1 Merge pull request #2447 from philwingfield/fix_unit_tests
Fix console unit tests due to changed shell output
2025-03-05 19:38:41 +01:00
wingphil
de9bd44071 Merge branch 'fix_unit_tests' of https://github.com/philwingfield/EMS-ESP32 into fix_unit_tests 2025-03-05 16:16:13 +00:00
wingphil
b7458b0686 test: fix console unit tests due to changed shell output 2025-03-05 16:14:45 +00:00
wingphil
a660ec1afa test: fix console unit tests due to changed shell output 2025-03-05 16:13:20 +00:00
MichaelDvP
c4f6f01f7e fix #2446, pc0Flow for all boilers, fix #2411 2025-03-05 14:20:40 +01:00
Proddy
9f60560f2b Merge pull request #2445 from proddy/dev
upload translation - thanks mattreim
2025-03-04 22:11:34 +01:00
proddy
7b50f80cb8 upload translation - thanks mattreim 2025-03-04 22:09:42 +01:00
Proddy
656d275c56 Merge pull request #2444 from proddy/dev
move Version back to Status page
2025-03-04 20:58:06 +01:00
proddy
eca17f2b2c move Version back to Status page 2025-03-04 20:57:24 +01:00
Proddy
7f60279aa3 Merge pull request #2443 from proddy/dev
fix autofresh in web
2025-03-04 20:26:15 +01:00
proddy
5227fafa1b fix auto refresh (disable cache) 2025-03-04 20:24:55 +01:00
proddy
4991e2b7cd add upload to Version page 2025-03-04 20:24:27 +01:00
Proddy
34c514709a Merge pull request #2442 from MichaelDvP/dev 2025-03-04 07:55:22 +01:00
MichaelDvP
7dfedfeb10 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-03-04 07:36:53 +01:00
MichaelDvP
c8bf4cae17 typo 2025-03-04 07:36:31 +01:00
Proddy
2818e268b6 Merge pull request #2441 from proddy/dev
standalone console working
2025-03-03 21:01:25 +01:00
proddy
7a95c11f62 package update 2025-03-03 20:55:23 +01:00
proddy
d712b1cce9 command NOT_FOUND when not found 2025-03-03 15:13:04 +01:00
proddy
03fa92352b 3.7.2-dev.24 2025-03-03 15:12:42 +01:00
proddy
e121fdb47f fix shell standalone 2025-03-03 15:12:28 +01:00
proddy
c05793f64f package update 2025-03-03 15:12:19 +01:00
proddy
3836610d81 typo 2025-03-03 15:12:07 +01:00
MichaelDvP
c3f87cd321 fix CR10 #2437 2025-03-03 10:11:18 +01:00
Proddy
4d5a27f45e Merge pull request #2439 from proddy/dev
ESPAsyncWebServer @ 3.7.2
2025-03-02 21:39:54 +01:00
proddy
c37c1aaad5 size of log level box 2025-03-02 21:38:24 +01:00
proddy
110c0df6fb change test log message 2025-03-02 21:38:12 +01:00
proddy
04ac3be242 adjust cache 2025-03-02 17:44:53 +01:00
proddy
44c4ee8bc0 show device id in hex 2025-03-02 17:33:31 +01:00
proddy
57c4d550a3 ESPAsyncWebServer @ 3.7.2 2025-03-02 17:33:16 +01:00
Proddy
4bcb95eece Merge pull request #2436 from proddy/dev
show localized elapsed time in version
2025-03-02 15:21:47 +01:00
proddy
0a92d455c8 show localized elapsed time 2025-03-02 15:13:56 +01:00
proddy
edb30931ae remove days_Ago 2025-03-02 15:13:16 +01:00
proddy
d03ab7a16f formatting 2025-03-02 15:13:06 +01:00
proddy
ea9b6b3e00 removed unused file 2025-03-02 13:27:14 +01:00
proddy
bae6b600bd formatting 2025-03-02 13:27:04 +01:00
proddy
7eac920985 move build python script to scripts folder 2025-03-02 13:26:55 +01:00
Proddy
00c2b5992c Merge pull request #2435 from proddy/dev
minor changes
2025-03-02 09:46:55 +01:00
proddy
43d2fa1f00 remove duplicate log message 2025-03-02 09:23:37 +01:00
proddy
92d40d9287 reset search when closing pane 2025-03-02 09:23:15 +01:00
proddy
7a47a2090f fix message in testing devices 2025-03-02 09:22:59 +01:00
proddy
0d98491a97 suppress debug comment 2025-03-02 09:22:33 +01:00
Proddy
16cf16616e Merge pull request #2434 from proddy/dev
update libs
2025-03-01 22:37:42 +01:00
proddy
d9f56ef3ae ESP32Async/AsyncTCP @ 3.3.6 2025-03-01 22:35:14 +01:00
proddy
c8934af9bb update example 2025-03-01 22:17:18 +01:00
Proddy
cbacaa98d9 Merge pull request #2432 from proddy/dev
EMS-ESP-Modules.git @ 1.0.5
2025-03-01 10:54:30 +01:00
proddy
f1b6a0baf3 EMS-ESP-Modules.git @ 1.0.5 2025-03-01 10:54:05 +01:00
Proddy
4d15f48e2b Merge pull request #2431 from proddy/dev
prep for 3.7.2 stable
2025-03-01 10:45:28 +01:00
proddy
2ffd00e28a update dhw.mode with own_prog 2025-03-01 10:44:51 +01:00
proddy
8ef5be9a7f ArduinoJson @ 7.3.1 2025-03-01 10:44:13 +01:00
proddy
8769faeb83 package update 2025-03-01 10:44:03 +01:00
Proddy
cefbf2d4d6 Merge pull request #2430 from proddy/dev
#2427 links open in new window
2025-02-26 21:00:39 +01:00
proddy
bfd5082054 #2427 2025-02-26 20:58:21 +01:00
proddy
3d3a634d94 package update 2025-02-26 20:58:14 +01:00
Proddy
1cb078cd3c Merge pull request #2429 from misa1515/patch-22
Update locale_translations.h
2025-02-26 18:48:38 +01:00
Proddy
22683f5d12 Merge pull request #2428 from misa1515/patch-21
Update index.ts
2025-02-26 18:48:22 +01:00
misa1515
57b42aa7c2 Update locale_translations.h 2025-02-26 17:51:47 +01:00
misa1515
4a59743024 Update index.ts 2025-02-26 17:47:02 +01:00
Proddy
66cec18dee Merge pull request #2426 from proddy/dev
3.7.2-dev.23
2025-02-25 20:50:06 +01:00
proddy
ad71938fde Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2025-02-25 20:49:39 +01:00
proddy
d4155d6e9e 3.7.2-dev.23 2025-02-25 20:49:38 +01:00
Proddy
af6be4c6b1 Merge pull request #2425 from proddy/dev
new command 'set admin password'
2025-02-25 20:47:32 +01:00
proddy
cfbd0168c3 new command 'set admin password' 2025-02-25 20:46:43 +01:00
proddy
61b9bd7581 fix standalone board profile 2025-02-25 20:46:29 +01:00
proddy
4c7ad7124e package update 2025-02-25 20:46:18 +01:00
Proddy
0413314cfb Merge pull request #2424 from proddy/dev
fix weird bug where the total # entities would be incorrect
2025-02-24 22:19:46 +01:00
proddy
ab7cbe8ead show all entities, even if they are marked hidden 2025-02-24 22:18:41 +01:00
proddy
d1264828eb add comment 2025-02-24 22:18:24 +01:00
Proddy
76a317b5c0 Merge pull request #2423 from proddy/dev
add search to Devices webpage
2025-02-24 21:42:14 +01:00
proddy
ec11ae2ef7 add search 2025-02-24 21:38:14 +01:00
proddy
b857c6eb44 change color or num entities so its consistent 2025-02-24 21:37:56 +01:00
proddy
3f8add73ac adjust toast messages 2025-02-24 21:37:29 +01:00
proddy
08b0ddbb7f update packages 2025-02-24 21:37:13 +01:00
proddy
c44cb7e7fd add comments 2025-02-24 21:37:02 +01:00
Proddy
77ff61046e Merge pull request #2422 from MichaelDvP/dev
second fix #2410
2025-02-24 09:51:12 +01:00
MichaelDvP
a8eb06bef2 second fix #2410 2025-02-23 08:33:53 +01:00
Proddy
566b5c8ea5 Merge pull request #2420 from proddy/dev
collection of minor fixes
2025-02-22 13:40:40 +01:00
proddy
eeccd076a0 airbypass 2025-02-22 13:38:04 +01:00
proddy
f45ac9d0ef 3.7.2-dev.22 2025-02-22 13:37:55 +01:00
proddy
cdd9acddfa remove obsolete return_not_found() 2025-02-22 13:37:37 +01:00
proddy
e484f11d12 add test data and comments 2025-02-22 13:37:12 +01:00
proddy
19572f313a don't build web in standalone native 2025-02-22 13:36:45 +01:00
proddy
af9ad5d624 add test data for writing to analog sensor 2025-02-22 13:36:28 +01:00
proddy
8adca69140 update unit tests, add analogsensors 2025-02-22 13:36:12 +01:00
proddy
01710316ed add test for analogsensors 2025-02-22 13:36:00 +01:00
proddy
ab80c82a22 package update 2025-02-22 13:35:37 +01:00
proddy
dceafe65a7 formatting 2025-02-22 13:35:18 +01:00
proddy
4734a81fdb add airbypass 2025-02-22 13:35:08 +01:00
Proddy
a2c099e615 Merge pull request #2419 from MichaelDvP/dev
fix naming of bypass #2417
2025-02-22 11:26:16 +01:00
MichaelDvP
f9b88a1b6b fix naming of bypass #2417 2025-02-22 11:16:54 +01:00
Proddy
7f2b8cc971 Merge pull request #2416 from vmonkey/patch-5
Update CZ
2025-02-22 08:20:58 +01:00
Marek Tyburec
582fb3d72f Update CZ 2025-02-22 08:19:16 +01:00
Marek Tyburec
bf4fa74742 Update CZ 2025-02-22 08:17:07 +01:00
Proddy
c62b3b9864 Merge pull request #2415 from MichaelDvP/dev
fix dhw mode #2410
2025-02-21 21:50:16 +01:00
MichaelDvP
0ae9795d6b fix dhw mode #2410 2025-02-21 12:01:36 +01:00
Proddy
7488c31cd3 Merge pull request #2414 from proddy/dev
minor updates
2025-02-20 22:48:01 +01:00
proddy
dc0e634004 3.7.2-dev.21 2025-02-20 22:47:07 +01:00
proddy
57e7c0ae4f package update 2025-02-20 22:46:55 +01:00
proddy
7214acfa20 update ESPAsyncWebServer to 3.7.1 2025-02-20 22:46:48 +01:00
proddy
ff6d47bb9c spelling 2025-02-20 22:46:21 +01:00
proddy
81971ba53f fixes #2412 2025-02-20 22:46:10 +01:00
Proddy
a58f37e3eb Merge pull request #2407 from proddy/dev
fix showing version in dialog
2025-02-16 11:32:22 +01:00
proddy
09a746cf8e fix showing version in dialog 2025-02-16 11:31:49 +01:00
proddy
ea70119138 US spelling for favorite 2025-02-16 11:28:51 +01:00
Proddy
5a9c5b5e2d Merge pull request #2406 from MichaelDvP/dev
fix verify telegram-type
2025-02-16 11:24:09 +01:00
MichaelDvP
7fb09c5045 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-02-16 11:05:21 +01:00
MichaelDvP
705171f305 fix verify telegram-type 2025-02-16 11:04:19 +01:00
Proddy
400d1a5f1a Merge pull request #2405 from proddy/dev
re-generated files for 3.7.2-dev.20
2025-02-16 11:03:48 +01:00
proddy
c4855cc5f2 re-generated files for 3.7.2-dev.20 2025-02-16 11:02:41 +01:00
Proddy
1e4b487299 Merge pull request #2404 from MichaelDvP/dev
add vacation mode CR50 #2403
2025-02-16 10:48:13 +01:00
MichaelDvP
cbd883103e add vacation mode CR50 #2403 2025-02-16 09:05:44 +01:00
MichaelDvP
2ce12943cd update pkg 2025-02-16 08:42:23 +01:00
Proddy
4151a82b3b Merge pull request #2399 from proddy/dev
improvements to version checking
2025-02-09 20:18:00 +00:00
proddy
b871081ef1 show upgrades for both stable and dev releases 2025-02-09 20:13:52 +00:00
proddy
da51d1d7d9 comments on version tests 2025-02-09 20:13:10 +00:00
proddy
82dae30224 3.7.2-dev.19 2025-02-09 20:12:50 +00:00
proddy
1fdac2fdab package update 2025-02-09 20:12:36 +00:00
proddy
56b23e27d7 formating 2025-02-09 20:12:19 +00:00
Proddy
ba29aa62d3 Merge pull request #2398 from proddy/dev
updates
2025-02-08 22:34:35 +00:00
proddy
be2342285f update AsyncWS libs 2025-02-08 22:33:45 +00:00
proddy
5595c01221 update 2025-02-08 22:33:27 +00:00
proddy
133cddef5b exclude IDF 2025-02-08 22:33:20 +00:00
proddy
0fdba1f84d fix for OSX 2025-02-08 22:33:08 +00:00
proddy
e10ec26e79 update 2025-02-08 22:32:56 +00:00
proddy
ffbb397dba update version 2025-02-08 22:32:48 +00:00
Proddy
799076d0c4 Merge pull request #2396 from misa1515/patch-20
Update index.ts
2025-02-07 21:00:29 +01:00
misa1515
1fbd10df27 Update index.ts 2025-02-06 23:06:10 +01:00
Proddy
4a2f82f1e8 Merge pull request #2393 from mattreim/dev
Update German translation
2025-02-03 22:29:47 +01:00
mattreim
d913e4d90b Update German translation 2025-02-03 21:46:53 +01:00
Proddy
0958c29c9e Merge pull request #2392 from proddy/dev
translations in version webUI page
2025-02-03 20:47:21 +01:00
proddy
36e1c9f79d updates 2025-02-03 20:37:53 +01:00
proddy
8fedac53dd more translations 2025-02-03 20:35:17 +01:00
proddy
a1c6159fc5 package update 2025-02-03 20:35:09 +01:00
proddy
5b33acba5e auto-formatting 2025-02-03 20:34:56 +01:00
Proddy
4abaef2943 Merge pull request #2391 from MichaelDvP/dev
disable old led port when changing port, #2389
2025-02-03 12:20:04 +01:00
MichaelDvP
ad71773293 disable old led port when changing port, #2389 2025-02-03 09:18:41 +01:00
Proddy
5b07309939 Merge pull request #2390 from proddy/dev
fix system command read from crashing
2025-02-02 17:17:40 +01:00
proddy
7a044a1dcd don't use flag tautological-constant-out-of-range-compare 2025-02-02 17:17:03 +01:00
proddy
6507764157 use default icondegrees in HA 2025-02-02 17:16:47 +01:00
proddy
7dfa8fc883 command read with no args crashed EMS-ESP 2025-02-02 17:16:32 +01:00
proddy
6df7965bb2 bump version dev-18 2025-02-02 17:16:11 +01:00
Proddy
02a3dee764 Merge pull request #2388 from proddy/dev
minor changes
2025-02-02 13:34:25 +01:00
proddy
d5895f1710 add example lib_deps 2025-02-02 13:33:28 +01:00
proddy
2b90ad3f6d add example for allvalues 2025-02-02 13:29:35 +01:00
proddy
0bb61b4296 show error when action command fails 2025-02-02 13:29:18 +01:00
proddy
2378fb547c default values 2025-02-02 13:29:02 +01:00
proddy
a79ff3f417 stop flash when ems bus not yet connected 2025-02-02 13:28:55 +01:00
proddy
4bc93615c5 add space when showing error 2025-02-02 13:28:37 +01:00
proddy
685f0d93e5 add allvalues 2025-02-02 13:28:23 +01:00
proddy
1d7b6674bb remove allvalues 2025-02-02 13:28:15 +01:00
proddy
014405e451 package update 2025-02-02 13:28:02 +01:00
Proddy
aff3ca3ad3 Merge pull request #2382 from proddy/dev
remove flash from web dashboard, add tooltip component
2025-01-29 21:09:39 +01:00
Proddy
b723d09952 Merge branch 'emsesp:dev' into dev 2025-01-29 21:07:31 +01:00
Proddy
bfff842c82 Merge pull request #2381 from MichaelDvP/dev
ignore src==0 (#2378) and fix typo
2025-01-29 21:07:01 +01:00
proddy
ad7d21764d remove flash from dashboard 2025-01-29 21:04:01 +01:00
MichaelDvP
f2ae84b004 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-01-29 08:37:04 +01:00
MichaelDvP
a81956654e ignore src==0, fixes #2378 2025-01-29 08:36:03 +01:00
MichaelDvP
3cb662799f fix typo 2025-01-29 08:35:19 +01:00
Proddy
9188d03d61 Merge pull request #2380 from proddy/dev
tidy up dashboard text and alerts
2025-01-28 22:35:21 +01:00
proddy
3df2d36453 https://github.com/emsesp/EMS-ESP32/discussions/2377 2025-01-28 22:33:23 +01:00
Proddy
0ab7eb42e4 Merge pull request #2373 from proddy/dev
support entities api endpoint for multiple devices of same type
2025-01-26 14:56:31 +01:00
proddy
84d4fb37fa update 2025-01-26 14:54:38 +01:00
proddy
aa9b38da03 make makefile work for all platforms 2025-01-26 14:48:49 +01:00
proddy
8342867807 3.7.2-dev.16 2025-01-26 14:48:32 +01:00
proddy
d8cff865da tidy up flags 2025-01-26 14:45:40 +01:00
proddy
096f7e1c88 fix lint warnings 2025-01-26 14:45:33 +01:00
proddy
0608d847f5 update generated docs 2025-01-26 14:01:41 +01:00
proddy
b20360c2a5 update lock 2025-01-26 13:59:37 +01:00
proddy
59b5086cab no need for virtual functions 2025-01-26 13:57:06 +01:00
proddy
2e3024ab61 move all statics up 2025-01-26 13:56:50 +01:00
proddy
b5299719da replace emsesp_stub.h 2025-01-26 13:56:31 +01:00
proddy
2620f56e0d lint warnings 2025-01-26 13:30:53 +01:00
proddy
20b978c46c add lto flag 2025-01-26 13:30:29 +01:00
proddy
5c8a18df68 arduino 6.10.0 and lto flag 2025-01-26 13:30:20 +01:00
proddy
3464d6c324 add test for /api/thermostat/entities 2025-01-26 13:12:26 +01:00
proddy
eac0cc0521 prevent possible out of scope 2025-01-26 13:12:11 +01:00
proddy
0953d37303 support multi devices of same type 2025-01-25 13:31:05 +01:00
proddy
1d3fec2a95 changed text 2025-01-25 13:30:41 +01:00
proddy
61b374b7c0 changed comment 2025-01-25 13:30:30 +01:00
proddy
c47cc0d5f1 test multiple thermostats hc1 hc2 2025-01-25 13:30:14 +01:00
proddy
939882efbf auto-formatting 2025-01-25 13:30:03 +01:00
Proddy
f42cbf548e Merge pull request #2371 from proddy/dev
some minor changes
2025-01-25 08:43:28 +01:00
proddy
91075ace37 comment 2025-01-25 08:40:47 +01:00
proddy
de6405f8d1 neopixel to standalone to not break build 2025-01-25 08:35:35 +01:00
proddy
2ffcaf4a9e move async* libs 2025-01-25 08:35:17 +01:00
proddy
1bda62309b auto-formatting 2025-01-25 08:35:05 +01:00
proddy
83659e5da8 remove loading messages 2025-01-25 08:15:10 +01:00
proddy
a6e136561e show boot partitions 2025-01-25 08:15:02 +01:00
proddy
a75d7487fc Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2025-01-25 08:14:25 +01:00
proddy
31b0dd8d58 update packages 2025-01-25 08:12:55 +01:00
Proddy
696bd1f455 Merge branch 'emsesp:dev' into dev 2025-01-25 07:31:09 +01:00
Proddy
18355efde2 Merge pull request #2367 from misa1515/patch-18
Update locale_translations.h
2025-01-25 07:30:49 +01:00
Proddy
d5100134e4 Merge pull request #2368 from misa1515/patch-19
Update index.ts
2025-01-25 07:30:39 +01:00
Proddy
b932242e04 Merge pull request #2370 from MichaelDvP/dev
add RGB Led to board profile
2025-01-25 07:30:11 +01:00
MichaelDvP
73ccff3412 add RGB Led to board profile 2025-01-24 19:23:19 +01:00
MichaelDvP
e5f852a7ed fix C3 board settings 2025-01-24 19:22:49 +01:00
MichaelDvP
581f19462d don't show double log entries after startup 2025-01-24 19:22:20 +01:00
misa1515
eb59b37251 Update index.ts 2025-01-22 23:36:48 +01:00
misa1515
f3696f60cd Update locale_translations.h 2025-01-22 23:32:31 +01:00
proddy
6b4e21f5db remove duplicate wwCurFlow_ in HIU and HEATPUMP 2025-01-22 23:15:58 +01:00
proddy
3d4d5b7bbc show restarting before it actually restarts 2025-01-22 22:31:36 +01:00
proddy
e6f15681c0 use same ha_uom function to add uom, state and device class 2025-01-22 22:31:21 +01:00
proddy
5f52a646ff 3.7.2-dev.15 2025-01-22 22:30:38 +01:00
proddy
be4f9296a5 add board_build.app_partition_name = app0 2025-01-22 22:30:15 +01:00
proddy
c3181f589c minor change 2025-01-22 22:29:58 +01:00
proddy
872cd40f56 remove Loading... message 2025-01-22 22:29:40 +01:00
proddy
30b9de49bf revert back to default test 2025-01-22 22:29:27 +01:00
Proddy
8a91c6eb2f Merge pull request #2366 from proddy/dev
show progress bar when automatically installing firmware, fix modbus headers
2025-01-21 22:07:00 +01:00
proddy
243471e21d show progress bar when automatically installing firmware 2025-01-21 22:06:01 +01:00
proddy
b8f97ec94d 3.7.2-dev.14 2025-01-21 22:05:26 +01:00
proddy
8576a6f253 added for testing 2025-01-21 22:05:10 +01:00
proddy
b33e6ceca9 package update 2025-01-21 20:28:51 +01:00
proddy
8eaf7f32cd fix csv file generation for non modbus 2025-01-21 20:28:47 +01:00
Proddy
becdc8cef5 Merge pull request #2363 from proddy/dev
fix memory type for S3 so PSRAM is used, fix WebUI upload restarting
2025-01-20 21:05:14 +01:00
proddy
651688219c fix logic for uploading so it restarts 2025-01-20 21:03:52 +01:00
proddy
b9a4bb3511 3.7.2-dev.13 2025-01-20 21:03:29 +01:00
proddy
b318274129 fix memory type for S3 so PSRAM is used 2025-01-20 21:03:20 +01:00
Proddy
8b0e5ba8e7 Merge pull request #2362 from proddy/dev
introduce system status in WebUI for easier monitoring of tasks
2025-01-20 17:42:07 +01:00
proddy
4a9b74b311 include tag in entity_dump unless we're generating it for modbus 2025-01-20 12:57:00 +01:00
proddy
371b198eb6 update generated files 2025-01-20 12:56:23 +01:00
proddy
a6dfdb2c4c package update 2025-01-20 12:56:15 +01:00
proddy
3122c2b2a9 print tag in dump_entities.csv 2025-01-20 12:14:46 +01:00
proddy
9ac8d149fb use system status with standalone 2025-01-20 12:14:30 +01:00
proddy
91e1b0b3b8 added comment 2025-01-20 12:14:12 +01:00
proddy
01636ced88 update dictionary 2025-01-20 12:14:01 +01:00
proddy
53e587537f remove unused system status's 2025-01-20 12:13:51 +01:00
proddy
77eeacf121 remove duplicate 157 thermostat in standalone 2025-01-20 12:13:34 +01:00
proddy
a89c42d659 package update 2025-01-20 12:13:10 +01:00
proddy
ba4bc423f4 rename Restart Monitor 2025-01-20 12:13:00 +01:00
proddy
8cd341576d use await 2025-01-20 12:12:47 +01:00
proddy
006eae5862 introduce system status in WebUI for easier monitoring of tasks 2025-01-19 18:18:04 +01:00
Proddy
6e29de4463 Merge pull request #2361 from proddy/dev
include CPU temp in heartbeat MWTT topic for ESP32
2025-01-19 10:02:38 +01:00
proddy
92d816b990 include CPU temp in heartbeat MWTT topic for ESP32 2025-01-19 10:00:03 +01:00
proddy
37ad1968b5 formating 2025-01-19 09:59:39 +01:00
Proddy
01793dd4f6 Merge pull request #2360 from proddy/dev
implement CPU temp for ESP32
2025-01-18 16:13:29 +01:00
proddy
9a7f7fa1d5 updated 2025-01-18 16:12:59 +01:00
proddy
648675d002 auto-formatting 2025-01-18 16:10:44 +01:00
proddy
462d865fc9 implement CPU temp for ESP32 2025-01-18 16:08:26 +01:00
proddy
9f24851948 add comments 2025-01-18 16:08:04 +01:00
proddy
a5e5ec5098 transformNumFloat with default values 2025-01-18 16:07:57 +01:00
proddy
db90546bc3 transformNumFloat with default values 2025-01-18 16:07:41 +01:00
proddy
2d9ea3ee8d show CPU temp in C or F 2025-01-18 16:07:18 +01:00
proddy
4d3cafcf29 fix DASHBOARD_1 in DE 2025-01-18 16:07:05 +01:00
proddy
8685ffb1bf update Tasmota platform (for testing 3.x) 2025-01-18 16:06:54 +01:00
proddy
86408b3452 package update 2025-01-18 16:06:31 +01:00
Proddy
eab94f3b84 Merge pull request #2352 from proddy/dev
small collection of changes
2025-01-16 22:29:53 +01:00
proddy
9123dbcc9e 3.7.2-dev.11 2025-01-16 21:58:13 +01:00
proddy
ec6f426b06 remove comments 2025-01-16 21:57:53 +01:00
proddy
5482937332 detect browser language if non set 2025-01-16 21:55:51 +01:00
proddy
0b667703c2 update 2025-01-16 21:55:36 +01:00
proddy
c732c96fc2 re-gen files 2025-01-16 21:55:19 +01:00
proddy
e3d260429c formatting 2025-01-16 21:54:54 +01:00
proddy
77eb2c747b tidy up lang header 2025-01-16 21:54:38 +01:00
proddy
6853cd738f package update 2025-01-16 21:54:17 +01:00
proddy
d58776beab fix DASHBOARD_1 2025-01-16 21:53:57 +01:00
Proddy
94a7b1e438 Merge branch 'emsesp:dev' into dev 2025-01-16 16:32:09 +01:00
Proddy
c3f7540f74 Merge pull request #2356 from MichaelDvP/dev
prepare for modbus support AM200, #2354
2025-01-16 16:30:35 +01:00
MichaelDvP
4642a50f69 prepare for modbus support AM200 2025-01-16 09:48:11 +01:00
proddy
b23bcf3f0b message optional in MessageBox 2025-01-14 22:09:23 +01:00
proddy
570678e3d3 show message in Dashboard if no fav entities set 2025-01-14 21:44:56 +01:00
proddy
64a2f5eb11 gracefully close mqtt on restart 2025-01-14 19:03:30 +01:00
proddy
24fba8b382 add test for #2351 2025-01-14 19:03:12 +01:00
proddy
9339ef481a package update 2025-01-14 19:01:11 +01:00
proddy
075789b902 fix showing Active in NTP 2025-01-12 15:19:12 +01:00
Proddy
1dd1b47faf Merge pull request #2343 from proddy/dev
minor updates
2025-01-12 14:16:46 +01:00
proddy
525a164c69 include temp as HA sensor - #2346 2025-01-12 12:09:36 +01:00
proddy
b60f333edb use translation for is_required 2025-01-12 11:58:03 +01:00
proddy
2323fdfe56 update packages 2025-01-12 11:57:53 +01:00
proddy
9b7fed4d1f tidy up imports 2025-01-12 11:50:05 +01:00
proddy
67c59c9b4b modify settings based on board type 2025-01-12 11:49:52 +01:00
proddy
b5fea921e6 grey out modbus with explanation if no psram 2025-01-12 11:49:27 +01:00
proddy
eeb071afc6 3.7.2-dev.10 2025-01-12 08:57:53 +01:00
proddy
5669873101 don't echo wifi password after setting it 2025-01-11 21:11:03 +01:00
proddy
d371c9bc82 auto-formatting 2025-01-11 21:06:47 +01:00
proddy
153dd19fc6 don't auto-install if on Tasmota 2025-01-11 19:02:15 +01:00
proddy
ae258a75d9 simulate ESP32 and ESP32-S3 2025-01-11 19:01:53 +01:00
proddy
37c4be321f output also the flash size 2025-01-11 19:01:03 +01:00
proddy
c810d58064 changed comments, make sure S32 V2 is compiled with Tasmota 2025-01-11 19:00:47 +01:00
proddy
5a27817d11 updated example 2025-01-11 19:00:14 +01:00
proddy
4be2f9283d updated dictionary 2025-01-11 19:00:05 +01:00
proddy
a65162fbbc updated generated file 2025-01-11 18:59:49 +01:00
proddy
494cf3b6a8 package update 2025-01-11 18:59:39 +01:00
proddy
b900194402 package update 2025-01-11 18:59:30 +01:00
proddy
d6e72e72d7 auto-formatting 2025-01-11 18:59:10 +01:00
proddy
960baadeca changed text 2025-01-11 18:58:59 +01:00
proddy
ed92b37869 updated 2025-01-11 18:58:51 +01:00
proddy
1598809815 package update 2025-01-11 12:55:23 +01:00
Proddy
3131969fc1 Merge branch 'emsesp:dev' into dev 2025-01-10 18:11:40 +01:00
Proddy
fb44bc33b9 Merge pull request #2341 from MichaelDvP/dev
fix mqtt commands with base path #2339
2025-01-10 17:10:57 +01:00
MichaelDvP
59a806ac8c fix mqtt commands with base path #2339 2025-01-10 15:14:48 +01:00
proddy
6a2a27e47e mathieucarbou/ESPAsyncWebServer @ 3.6.0 2025-01-09 16:33:07 +01:00
Proddy
251d0af028 Merge branch 'emsesp:dev' into dev 2025-01-09 14:21:45 +01:00
Proddy
8fa800e2f7 Merge pull request #2338 from MichaelDvP/dev
small fixes and additions
2025-01-09 14:21:24 +01:00
MichaelDvP
df9d20ad88 disable WS queue, web log messages are already queued 2025-01-09 12:39:29 +01:00
MichaelDvP
c07754047d add solar influence #2212 2025-01-09 09:18:50 +01:00
MichaelDvP
9c00af317e Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2025-01-09 08:55:12 +01:00
MichaelDvP
d3d132ec45 unused id 2025-01-09 08:55:01 +01:00
MichaelDvP
7adba972e7 Don't show uom for empty string 2025-01-09 08:54:36 +01:00
proddy
d83399bd1f fix Make for OSX 2025-01-08 21:46:05 +01:00
proddy
4471da4aa9 update packages 2025-01-08 21:45:59 +01:00
Proddy
b3be1d9351 Merge pull request #2337 from proddy/dev
replace arduino platform 3.1.0 with previous 2.0.18
2025-01-08 20:20:01 +01:00
proddy
c6b8c2a630 3.7.2-dev.9 2025-01-08 20:17:28 +01:00
proddy
3f51c21dc7 tests for 4MB firmware upload 2025-01-08 20:17:20 +01:00
proddy
a8cdbc4fd6 tidy up directory listing 2025-01-08 20:16:59 +01:00
proddy
95e5babb13 package update 2025-01-08 20:16:48 +01:00
proddy
74cb23a8bb replace arduino platform 3.1.0 with previous 2.0.18 to see if it fixed #2333 2025-01-08 20:16:40 +01:00
Proddy
6be304f295 Merge pull request #2332 from proddy/dev
formatting upgrade button
2025-01-05 22:46:19 +01:00
proddy
e702b0b733 formatting upgrade button 2025-01-05 22:45:48 +01:00
Proddy
bfbd263c74 Merge pull request #2331 from proddy/dev
web UI small changes
2025-01-05 18:28:39 +01:00
proddy
472f922369 tidy up formatting, add a re-install option 2025-01-05 18:26:18 +01:00
proddy
b13c608ff3 formatting imports 2025-01-05 13:34:02 +01:00
proddy
5464909121 change icon size and use customizations icon 2025-01-05 13:32:54 +01:00
Proddy
d874b3f808 Merge pull request #2328 from proddy/dev
core update #2108
2025-01-04 15:07:01 +01:00
proddy
92108bc743 update comments 2025-01-04 14:59:41 +01:00
proddy
66ca1e52bb add local yarn files 2025-01-04 14:59:37 +01:00
proddy
3589094d06 update lock file 2025-01-04 14:59:13 +01:00
proddy
801ed6ef79 update dictionary 2025-01-04 14:59:03 +01:00
proddy
2547ae45a8 comment 2025-01-04 14:50:29 +01:00
proddy
93e4abe72d update packages 2025-01-04 14:13:51 +01:00
proddy
eb87651c47 merge #2108 2025-01-04 13:41:39 +01:00
Proddy
4138598db2 Merge pull request #2320 from misa1515/patch-16
Update locale_translations.h
2025-01-04 13:30:40 +01:00
Proddy
913bbd6e3b Merge pull request #2322 from misa1515/patch-17
Update index.ts
2025-01-01 21:46:39 +01:00
misa1515
d35881b05b Update index.ts 2025-01-01 21:35:02 +01:00
misa1515
33b54ccf12 Update locale_translations.h 2025-01-01 17:47:43 +01:00
Proddy
a8775b2200 Merge pull request #2317 from proddy/dev
cleanup yarn
2024-12-31 13:07:07 +01:00
proddy
6d3746222d updated 2024-12-31 13:06:16 +01:00
proddy
fe169ac80f formatting 2024-12-31 13:06:11 +01:00
proddy
83724e3d44 formatting 2024-12-31 13:05:59 +01:00
proddy
a4db3ef5c4 regenerate files 2024-12-31 13:05:49 +01:00
proddy
f8adad7865 cleanup yarn 2024-12-31 13:05:33 +01:00
proddy
12c094228e add comment 2024-12-31 13:05:07 +01:00
Proddy
902ea80807 Merge pull request #2311 from Sbried/dev
Updated unknown compressor stati "enum_hpactivity"
2024-12-31 12:44:57 +01:00
Proddy
73831d9ac6 Merge pull request #2316 from proddy/dev
fix underlines in Tab headers (webUI) and NL translations
2024-12-31 12:44:31 +01:00
proddy
6bfda79441 NL translations 2024-12-31 12:28:06 +01:00
proddy
112de78fc5 update packages 2024-12-31 12:16:27 +01:00
proddy
adbd2381e1 ignore dependencies 2024-12-31 12:16:16 +01:00
proddy
397f3f546e fix webUI tabs (underline) 2024-12-31 12:15:59 +01:00
Proddy
43d3c28e16 Merge pull request #2307 from ovenystas/fix-sv-translation-bug
fix: Sv translation bugs
2024-12-30 21:28:23 +01:00
Proddy
747a64b869 Merge pull request #2315 from MichaelDvP/dev
fix thermostat clock year, #2313
2024-12-30 21:27:04 +01:00
MichaelDvP
7c2e5560bd fix thermostat clock year, #2313 2024-12-30 19:28:46 +01:00
Sbried
9194db9f70 Updated unknown compressor stati "enum_hpactivity" 0, 5 and added status 7.
No idea what is the difference bewteen 4 (pool) and 5 (pool_heating).
2024-12-29 12:57:26 +01:00
Ove Nystås
fece00c0c6 fix: Sv translation bugs 2024-12-26 19:50:16 +01:00
Proddy
ba3ae5ea56 Merge pull request #2305 from MichaelDvP/dev
fixes #2288, #2299, #2295 (new  FLAG)
2024-12-23 15:29:04 +01:00
MichaelDvP
4c69c9e445 fix show ntp_time (as local time) 2024-12-23 13:03:59 +01:00
MichaelDvP
97925c47fd remove broken ntp_time 2024-12-23 12:12:25 +01:00
MichaelDvP
ad89fe15b1 fix seltep command for CR11 #2295 2024-12-23 09:09:36 +01:00
MichaelDvP
29035cabfe Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-12-22 15:59:18 +01:00
MichaelDvP
9b3d43d27f add min/max for #2288, own flag for CR11 #2295 2024-12-22 15:58:46 +01:00
Proddy
0b4f17473a Merge pull request #2303 from proddy/dev
show ntp time in status, use useInterval everywhere instead of alova'…
2024-12-21 16:31:23 +01:00
proddy
b0c29b57c7 show ntp time in status, use useInterval everywhere instead of alova's AutoRequest 2024-12-21 16:30:05 +01:00
Proddy
6d22f6aebf Merge pull request #2302 from proddy/dev
minor refresh
2024-12-20 17:49:39 +01:00
proddy
3e3e10e6a0 formatting 2024-12-20 17:48:14 +01:00
proddy
b854c777c8 update dictionary 2024-12-20 17:48:04 +01:00
proddy
b71fdd77e8 modbus update with c11 2024-12-20 17:47:56 +01:00
proddy
0f6f7cea19 vite update 2024-12-20 17:47:41 +01:00
Proddy
58beb092c2 Merge pull request #2301 from oliof/patch-1
Update CHANGELOG_LATEST.md
2024-12-20 12:15:41 +01:00
Harald Wagener
c3f200f73b Update CHANGELOG_LATEST.md
fix link to issue #2182
2024-12-20 10:41:37 +01:00
Proddy
98640c11b1 Merge pull request #2298 from MichaelDvP/dev
update for #2294 and #2295
2024-12-19 20:29:49 +01:00
MichaelDvP
d7904bdcaf set mode to manual for CR11, dont show remotetemp for non-master thermostats 2024-12-19 16:52:57 +01:00
MichaelDvP
ce05a94d58 update changelog, dev.6 2024-12-19 12:42:09 +01:00
MichaelDvP
c0ed62dc7a modbus: don't show not found errors in first minute 2024-12-19 12:24:46 +01:00
MichaelDvP
1557fa98b1 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-12-19 09:39:46 +01:00
MichaelDvP
81a530f153 add CR11 thermostat, #2295 2024-12-19 09:38:18 +01:00
Proddy
a4733c3e6a Merge pull request #2296 from proddy/dev
added EMS Device Ventilation module as test data
2024-12-18 21:29:29 +01:00
proddy
7851b8e94c type check 2024-12-18 21:25:22 +01:00
proddy
36838f7690 add example Ventilator to demo 2024-12-18 21:10:35 +01:00
proddy
fdd87d0757 update toastify 2024-12-18 21:10:19 +01:00
MichaelDvP
c8822aff64 fix modbus write for signed values 2024-12-18 13:44:24 +01:00
MichaelDvP
4b3205fc9c modbus publish emsesp-INT8 as modbus-int16, fix #2294 2024-12-18 12:55:53 +01:00
MichaelDvP
afc05ae9e8 update pkg, change for toastify 11 2024-12-18 12:53:55 +01:00
proddy
9c3044efa0 re-generated files 2024-12-16 21:49:37 +01:00
proddy
8caeb129c1 update 2024-12-16 21:49:28 +01:00
proddy
0427504f0e typo 2024-12-16 21:44:34 +01:00
proddy
4f11a7caa1 update dictionary 2024-12-16 21:44:27 +01:00
proddy
150695c185 formatting 2024-12-16 21:44:14 +01:00
proddy
3558591480 remove unused function 2024-12-16 21:43:56 +01:00
proddy
f7a24052c2 make makefile work for OSX 2024-12-16 21:38:06 +01:00
proddy
75c452486c update packages, add workaround for itty-router bug 2024-12-16 21:37:58 +01:00
Proddy
40cab6775c Merge pull request #2292 from ovenystas/add-sv-translations
Add, update and fix misspellings in Swedish translation
2024-12-15 11:20:02 +01:00
Ove Nystås
392829c7db Add, update and fix misspellings in Swedish translation 2024-12-15 00:41:36 +01:00
Proddy
4621c9d616 Merge pull request #2291 from MichaelDvP/dev
thermostat settings for #2290, #2288,#1957 (#2287)
2024-12-13 22:50:46 +01:00
MichaelDvP
006d664ec9 CW100 settings telegram 0x241, #2290 2024-12-13 15:58:06 +01:00
MichaelDvP
0cc9ac4dd8 add reduce threshold #2288, absent mode #1957 (#2287) 2024-12-13 10:14:44 +01:00
MichaelDvP
502096dc22 update pkg 2024-12-13 10:08:42 +01:00
Proddy
8c424c7a64 Merge pull request #2283 from misa1515/patch-15
Update locale_translations.h
2024-12-12 22:35:27 +01:00
misa1515
d7c118b88a Update locale_translations.h 2024-12-09 18:57:16 +01:00
misa1515
1fdb0b7516 Update locale_translations.h 2024-12-07 16:51:42 +01:00
Proddy
c2fc771756 Merge pull request #2280 from MichaelDvP/dev
small fixes and changes
2024-12-06 08:37:49 +01:00
MichaelDvP
6f759c5bc4 update changelog 2024-12-06 08:37:12 +01:00
MichaelDvP
facbbf1353 fix info command #2274, fix standanlone 2024-12-06 08:33:02 +01:00
MichaelDvP
a218c7a781 Add "duplicate" option to Custom Entities #2266 2024-12-05 19:27:04 +01:00
MichaelDvP
5f42709eab update asyncTCP to threadsafe 3.2.14, ems-esp v3.7.2-dev.4 2024-12-05 12:57:19 +01:00
MichaelDvP
5ec0f657a0 newer CT200 temperatures, #2277 2024-12-05 10:09:26 +01:00
MichaelDvP
812911ffbb version 2.7.2-dev.3 2024-12-04 18:28:40 +01:00
MichaelDvP
55235687ba change modbus timeout to seconds and default 300 sec, #2254 2024-12-04 18:28:13 +01:00
MichaelDvP
a970009d20 update eModbus to 1.7.2, #2254 2024-12-04 18:26:45 +01:00
MichaelDvP
4afc16e2cb modbus command path to api #2276 2024-12-04 18:25:31 +01:00
MichaelDvP
3772d72b43 pkg update 2024-12-03 18:17:42 +01:00
MichaelDvP
607f949638 fix render long numbers, #2267 2024-12-03 12:39:30 +01:00
Proddy
473cf7c8af Merge pull request #2275 from proddy/dev
minor updates
2024-12-02 22:12:29 +01:00
Proddy
e0909df06c Merge branch 'emsesp:dev' into dev 2024-12-02 22:11:40 +01:00
proddy
5fc606ef6d remove duplicate code segment, remove weblog # 2024-12-02 22:10:28 +01:00
proddy
a3032f4da7 update packages 2024-12-02 22:10:11 +01:00
proddy
7fdd65e8ca update dictionary 2024-12-02 22:10:05 +01:00
Proddy
dc6bf883f1 Merge pull request #2270 from mkurek/patch-1
Fix typo in polish ventilation translation
2024-12-02 21:45:16 +01:00
Proddy
ce5edd93b4 Merge pull request #2272 from MichaelDvP/dev
heatingtypes #2268, pretty telegram, service commands #2182
2024-12-02 21:44:23 +01:00
Mateusz Kurek
e36e6bec9c Fix typo in polish ventilation translation
prędjkość -> prędkość
2024-12-01 23:41:41 +01:00
MichaelDvP
c8fd08b6d2 changelog v3.7.2-dev.2 2024-12-01 18:06:35 +01:00
MichaelDvP
c0d693c1c8 add RC35 heatingtypes for remote room control, #2268 2024-12-01 18:06:09 +01:00
MichaelDvP
5d2a6e2898 pretty telegram with operation between src and dst 2024-12-01 17:56:23 +01:00
MichaelDvP
4547a5ceb0 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-12-01 17:11:47 +01:00
Proddy
76151c4395 Merge pull request #2265 from proddy/dev
fixes #2264 - tab links broken
2024-11-30 21:29:03 +01:00
proddy
481089b1b4 3.7.2-dev.1 2024-11-30 21:27:59 +01:00
proddy
463787b7f4 fixes #2264 2024-11-30 21:27:34 +01:00
proddy
e2258a1c43 package update 2024-11-30 21:27:22 +01:00
MichaelDvP
5528f29b6a Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-11-29 11:00:24 +01:00
MichaelDvP
e3861d54c9 remove command txMode, fix writeable camelCase names 2024-11-29 11:00:04 +01:00
Proddy
3368f2803c Merge pull request #2260 from proddy/dev
3.7.2-dev
2024-11-29 10:33:36 +01:00
proddy
6ca1d68d23 3.7.2-dev 2024-11-29 10:33:12 +01:00
MichaelDvP
cf93081252 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-11-28 15:44:39 +01:00
MichaelDvP
30fca2a190 system commands withing command (api/mqtt/console), alternative to #2182 2024-11-28 15:40:42 +01:00
228 changed files with 24696 additions and 30729 deletions

View File

@@ -1,53 +1,60 @@
name: 'pre-release' name: 'Build dev release'
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
paths:
- 'src/emsesp_version.h'
branches: branches:
- 'dev' - 'dev'
permissions:
contents: write
jobs: jobs:
pre-release: pre-release:
name: 'Automatic pre-release build' name: 'Build Dev Release'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Enable Corepack
run: corepack enable
- name: Install python 3.11 - name: Install python 3.13
uses: actions/setup-python@v5 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.13'
- name: Install Node.js 20 - name: Install Node.js 22
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.x' node-version: 22
- name: Get EMS-ESP version - name: Checkout repository
uses: actions/checkout@v4
- name: Enable Corepack
run: corepack enable pnpm
- name: Get the EMS-ESP version
id: build_info id: build_info
run: | run: |
version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'` version=`grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}'`
echo "VERSION=$version" >> $GITHUB_OUTPUT echo "VERSION=$version" >> $GITHUB_OUTPUT
- name: Install PlatformIO - name: Install PlatformIO
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install -U platformio pip install -U platformio
python -m pip install intelhex
- name: Build WebUI - name: Build the WebUI
run: | run: |
cd interface cd interface
yarn install pnpm install
yarn typesafe-i18n --no-watch pnpm typesafe-i18n --no-watch
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
yarn build pnpm build
yarn webUI pnpm webUI
- name: Build all PIO target environments from default_envs - name: Build all PIO target environments
run: | run: |
platformio run platformio run
env: env:

View File

@@ -1,7 +1,6 @@
name: 'github-releases-to-discord' name: 'Publish releases to discord'
on: on:
workflow_dispatch:
release: release:
types: [published] types: [published]

View File

@@ -1,4 +1,4 @@
name: 'pr_check' name: 'Pre-check on PR'
on: on:
workflow_dispatch: workflow_dispatch:

View File

@@ -20,15 +20,12 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Install Build Wrapper
- name: Install sonar-scanner and build-wrapper uses: SonarSource/sonarqube-scan-action/install-build-wrapper@master
uses: SonarSource/sonarcloud-github-c-cpp@v2 - name: Run Build Wrapper
run: build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make all
- name: Run build-wrapper - name: SonarQube Scan
run: build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make all uses: SonarSource/sonarqube-scan-action@master
- name: Run sonar-scanner
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: sonar-scanner --define sonar.cfamily.compile-commands="${{ env.BUILD_WRAPPER_OUT_DIR }}/compile_commands.json"

View File

@@ -1,4 +1,7 @@
name: 'tagged-release' name: 'Build stable release'
permissions:
contents: write
on: on:
workflow_dispatch: workflow_dispatch:
@@ -8,40 +11,42 @@ on:
jobs: jobs:
tagged-release: tagged-release:
name: 'Tagged Release' name: 'Build Stable Release'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Enable Corepack - name: Install python 3.13
run: corepack enable
- name: Install python 3.11
uses: actions/setup-python@v5 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.13'
- name: Install Node.js 20 - name: Install Node.js 22
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.x' node-version: 22
- name: Checkout repository
uses: actions/checkout@v4
- name: Enable Corepack
run: corepack enable pnpm
- name: Install PlatformIO - name: Install PlatformIO
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install -U platformio pip install -U platformio
python -m pip install intelhex
- name: Build WebUI - name: Build the WebUI
run: | run: |
cd interface cd interface
yarn install pnpm install
yarn typesafe-i18n --no-watch pnpm typesafe-i18n --no-watch
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
yarn build pnpm build
yarn webUI pnpm webUI
- name: Build all PIO target environments from default_envs - name: Build all PIO target environments
run: | run: |
platformio run platformio run
env: env:

23
.github/workflows/stale_issues.yml vendored Normal file
View File

@@ -0,0 +1,23 @@
name: "Mark or close stale issues and PRs"
on:
schedule:
- cron: "30 1 * * *"
jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 30
days-before-close: 5
stale-issue-message: "This issue is stale because it has been open 30 days with no activity. Remove stale label or comment otherwise this will be closed in 5 days."
stale-pr-message: "This PR has been automatically marked as stale because there has been no activity in last 30 days. It will be closed if no further activity occurs. Thank you for your contributions."
close-issue-message: "This issue was closed because it has been stalled for 5 days with no activity."
close-pr-message: "This PR was automatically closed because of being stale."
stale-pr-label: "stale"
stale-issue-label: "stale"
exempt-issue-labels: "bug,enhancement,pinned,security"
exempt-pr-labels: "bug,enhancement,pinned,security"

View File

@@ -1,4 +1,4 @@
name: 'test-release' name: 'Build test release'
on: on:
workflow_dispatch: workflow_dispatch:
@@ -6,46 +6,55 @@ on:
branches: branches:
- 'dev2' - 'dev2'
permissions:
contents: read
jobs: jobs:
pre-release: pre-release:
name: 'Automatic test-release build' name: 'Build Test Release'
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
contents: write
steps: steps:
- uses: actions/checkout@v4
- name: Enable Corepack - name: Install python 3.13
run: corepack enable uses: actions/setup-python@v5
- uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.13'
- name: Use Node.js 20.x - name: Install Node.js 22
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: '20.x' node-version: 22
- name: Get EMS-ESP source code and version - name: Checkout repository
uses: actions/checkout@v4
- name: Enable Corepack
run: corepack enable pnpm
- name: Get the EMS-ESP version
id: build_info id: build_info
run: | run: |
version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'` version=`grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}'`
echo "VERSION=$version" >> $GITHUB_OUTPUT echo "VERSION=$version" >> $GITHUB_OUTPUT
- name: Install PlatformIO - name: Install PlatformIO
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install -U platformio pip install -U platformio
python -m pip install intelhex
- name: Build WebUI - name: Build the WebUI
run: | run: |
cd interface cd interface
yarn install pnpm install
yarn typesafe-i18n --no-watch pnpm typesafe-i18n --no-watch
sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts
yarn build pnpm build
yarn webUI pnpm webUI
- name: Build all target environments from default_envs - name: Build all target environments
run: | run: |
platformio run platformio run
env: env:

4
.gitignore vendored
View File

@@ -28,14 +28,10 @@ stats.html
*.sln *.sln
*.sw? *.sw?
.pnp.* .pnp.*
*/.yarn/cache/*
*/.yarn/install-state.gz
analyse.html analyse.html
interface/vite.config.ts.timestamp* interface/vite.config.ts.timestamp*
*.local *.local
src/ESP32React/WWWData.h src/ESP32React/WWWData.h
.yarn/*
.yarnrc.yml
# i18n generated files # i18n generated files
interface/src/i18n/i18n-react.tsx interface/src/i18n/i18n-react.tsx

View File

@@ -217,7 +217,7 @@ For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
## **IMPORTANT! BREAKING CHANGES** ## **IMPORTANT! BREAKING CHANGES**
Writeable Text entities have moved from type `sensor` to `text` in Home Assistant to make them also editable within an HA dashboard. Examples are `datetime`, `holidays`, `switchtime`, `vacations`, `maintenancedate`. You will need to manually remove any old discovery topics from your MQTT broker using an application like MQTT Explorer. Writeable Text entities have moved from type `sensor` to `text` in Home Assistant to make them also editable within an HA dashboard. Examples are `datetime`, `holidays`, `switchtime`, `vacations`, `maintenancedate`... You will need to manually remove any old discovery topics from your MQTT broker using an application like MQTT Explorer.
## Added ## Added

View File

@@ -1 +1,56 @@
# Changelog # Changelog
For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
## [3.7.3]
## Added
- analogsensor types: NTC and RGB-Led
- Flag for HMC310 [#2465](https://github.com/emsesp/EMS-ESP32/issues/2465)
- boiler auxheatersource [#2489](https://github.com/emsesp/EMS-ESP32/discussions/2489)
- thermostat last error for RC100/300 [#2501](https://github.com/emsesp/EMS-ESP32/issues/2501)
- boiler 0xC6 telegram [#1963](https://github.com/emsesp/EMS-ESP32/issues/1963)
- CS6800i changes [#2448](https://github.com/emsesp/EMS-ESP32/issues/2448), [#2449](https://github.com/emsesp/EMS-ESP32/issues/2449)
- charging pump [#2544](https://github.com/emsesp/EMS-ESP32/issues/2544)
- hybrid CSH5800iG [#2569](https://github.com/emsesp/EMS-ESP32/issues/2569)
- add EMS Device details to Home Assistant MQTT Discovery
- disinfection command [#2601](https://github.com/emsesp/EMS-ESP32/issues/2601)
- added new board profile for upcoming BBQKees E32V2.2
- set differential pressure entity in Mixer device
- set set climate action cooling/heating in HA [#2583](https://github.com/emsesp/EMS-ESP32/issues/2583)
- Internal sensors of E32V2_2
- FW200 display options [#2610](https://github.com/emsesp/EMS-ESP32/discussions/2610)
- CR11 mode settings OFF/MANUAL depends on selTemp [#2437](https://github.com/emsesp/EMS-ESP32/issues/2437)
- Fuse settings for BBQKees boards
- Analogsensors for pulse output [#2624](https://github.com/emsesp/EMS-ESP32/discussions/2624)
- Analogsensors frequency input [#2631](https://github.com/emsesp/EMS-ESP32/discussions/2631)
- SRC plus thermostats [#2636](https://github.com/emsesp/EMS-ESP32/issues/2636)
- Greenstar 2000 [#2645](https://github.com/emsesp/EMS-ESP32/issues/2645)
- RC3xx `dhw modetype` [#2659](https://github.com/emsesp/EMS-ESP32/discussions/2659)
## Fixed
- dhw/switchtime [#2490](https://github.com/emsesp/EMS-ESP32/issues/2490)
- switch to secure mqtt [#2492](https://github.com/emsesp/EMS-ESP32/issues/2492)
- update link buttons [#2497](https://github.com/emsesp/EMS-ESP32/issues/2497)
- refresh scheduler states [#2502](https://github.com/emsesp/EMS-ESP32/discussions/2502)
- also rebuild HA config on mqtt connect for scheduler, custom and shower
- FB100 controls the hc, not the master [#2510](https://github.com/emsesp/EMS-ESP32/issues/2510)
- IPM DHW module, [#2524](https://github.com/emsesp/EMS-ESP32/issues/2524)
- charge optimization [#2543](https://github.com/emsesp/EMS-ESP32/issues/2543)
- shower active state retained, shows correctly in HA
- MQTT Command Topic with slashes [#2571](https://github.com/emsesp/EMS-ESP32/issues/2571)
- Add pulsed water meter input to V1.3 gateway with Lilygo S3 [#2550](https://github.com/emsesp/EMS-ESP32/issues/2550)
- fix missing long 10-second press of Button to perform a factory reset
- fix wwMaxPower on Junkers ZBS14 [#2609](https://github.com/emsesp/EMS-ESP32/issues/2609)
- ventilation bypass state from telegram 0x55C [#1197](https://github.com/emsesp/EMS-ESP32/issues/1197)
- set selflowtemp for ems+ boilers [#2641](https://github.com/emsesp/EMS-ESP32/discussions/2641)
## Changed
- show console log with ISO date/time [#2533](https://github.com/emsesp/EMS-ESP32/discussions/2533)
- remove ESP32 CPU temperature
- updated core libraries like AsyncTCP, AsyncWebServer and Modbus
- remove command `scan deep`
- ignore repeated `forceheatingoff` commands [#2641](https://github.com/emsesp/EMS-ESP32/discussions/2641)

View File

@@ -69,7 +69,7 @@ Format: `<type>(<scope>): <subject>`
## Example ## Example
``` ```text
feat: add hat wobble feat: add hat wobble
^--^ ^------------^ ^--^ ^------------^
| | | |
@@ -96,7 +96,7 @@ References:
## Contributor License Agreement (CLA) ## Contributor License Agreement (CLA)
``` ```text
By making a contribution to this project, I certify that: By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I (a) The contribution was created in whole or in part by me and I

View File

@@ -98,13 +98,10 @@ CXX := /usr/bin/g++
# LDFLAGS Linker Flags # LDFLAGS Linker Flags
#---------------------------------------------------------------------- #----------------------------------------------------------------------
CPPFLAGS += $(DEFINES) $(DEFAULTS) $(INCLUDE) CPPFLAGS += $(DEFINES) $(DEFAULTS) $(INCLUDE)
CPPFLAGS += -ggdb -g3 -O3 CPPFLAGS += -ggdb -g3 -MMD
CPPFLAGS += -MMD
CPPFLAGS += -flto=auto -fno-lto CPPFLAGS += -flto=auto -fno-lto
CPPFLAGS += -Wall -Wextra -Werror CPPFLAGS += -Wall -Wextra -Werror -Wswitch-enum
CPPFLAGS += -Wswitch-enum CPPFLAGS += -Wno-unused-parameter -Wno-missing-braces -Wno-vla-cxx-extension
CPPFLAGS += -Wno-unused-parameter
CPPFLAGS += -Wno-missing-braces
CPPFLAGS += $(EXTRA_CPPFLAGS) CPPFLAGS += $(EXTRA_CPPFLAGS)

View File

@@ -35,7 +35,7 @@
[![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/3J3GgnzpyT) [![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/3J3GgnzpyT)
[![GitHub stars](https://img.shields.io/github/stars/emsesp/EMS-ESP32.svg?style=social&label=Star)](https://github.com/emsesp/EMS-ESP32/stargazers) [![GitHub stars](https://img.shields.io/github/stars/emsesp/EMS-ESP32.svg?style=social&label=Star)](https://github.com/emsesp/EMS-ESP32/stargazers)
[![GitHub forks](https://img.shields.io/github/forks/emsesp/EMS-ESP32.svg?style=social&label=Fork)](https://github.com/emsesp/EMS-ES32P/network) [![GitHub forks](https://img.shields.io/github/forks/emsesp/EMS-ESP32.svg?style=social&label=Fork)](https://github.com/emsesp/EMS-ESP32/network)
[![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.com/paypalme/prderbyshire/2) [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.com/paypalme/prderbyshire/2)
**EMS-ESP** is an open-source firmware for the Espressif ESP32 microcontroller to communicate with **EMS** (Energy Management System) compatible equipment from manufacturers such as Bosch, Buderus, Nefit, Junkers, Worcester, Sieger, elm.leblanc and iVT. **EMS-ESP** is an open-source firmware for the Espressif ESP32 microcontroller to communicate with **EMS** (Energy Management System) compatible equipment from manufacturers such as Bosch, Buderus, Nefit, Junkers, Worcester, Sieger, elm.leblanc and iVT.
@@ -60,7 +60,7 @@ It requires a small circuit to interface with the EMS bus which can be purchased
## 🚀&nbsp; **Installing** ## 🚀&nbsp; **Installing**
Head over to [download.emsesp.org](https://download.emsesp.org) for instructions on how to install EMS-ESP. There is also further details on which boards are supported in [this section](https://docs.emsesp.org/Getting-Started/#first-time-install) of the documentation. Head over to [download.emsesp.org](https://download.emsesp.org) for instructions on how to install EMS-ESP. There is also further details on which boards are supported in [this section](https://docs.emsesp.org/Installing/) of the documentation.
## 📋&nbsp; **Documentation** ## 📋&nbsp; **Documentation**
@@ -88,7 +88,7 @@ If you like **EMS-ESP**, please give it a ✨ on GitHub, or even better fork it
- [uuid-\*](https://github.com/nomis/mcu-uuid-console) from @nomis. The console, syslog, telnet and logging are based off these awesome open source libraries - [uuid-\*](https://github.com/nomis/mcu-uuid-console) from @nomis. The console, syslog, telnet and logging are based off these awesome open source libraries
- [ArduinoJson](https://github.com/bblanchon/ArduinoJson) for all the JSON processing - [ArduinoJson](https://github.com/bblanchon/ArduinoJson) for all the JSON processing
- [espMqttClient](https://github.com/bertmelis/espMqttClient) for the MQTT client - [espMqttClient](https://github.com/bertmelis/espMqttClient) for the MQTT client
- ESPAsyncWebServer and AsyncTCP for the Web server and TCP backends, with custom modifications for performance - [ESPAsyncWebServer](https://github.com/ESP32Async/ESPAsyncWebServer) and [AsyncTCP](https://github.com/ESP32Async/AsyncTCP) for the Web server and TCP backends
## 📜&nbsp; **License** ## 📜&nbsp; **License**

View File

@@ -0,0 +1,48 @@
{
"build": {
"core": "esp32",
"extra_flags": [
"-DARDUINO_XIAO_ESP32C6",
"-DARDUINO_USB_MODE=1",
"-DARDUINO_USB_CDC_ON_BOOT=1"
],
"f_cpu": "160000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"hwids": [
[
"0x2886",
"0x0046"
],
[
"0x303a",
"0x1001"
]
],
"mcu": "esp32c6",
"variant": "XIAO_ESP32C6"
},
"connectivity": [
"wifi",
"bluetooth",
"zigbee",
"thread"
],
"debug": {
"openocd_target": "esp32c6.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "Seeed Studio XIAO ESP32C6",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194304,
"require_upload_port": true,
"speed": 460800
},
"url": "https://wiki.seeedstudio.com/XIAO_ESP32C6_Getting_Started/",
"vendor": "Seeed Studio"
}

View File

@@ -32,6 +32,8 @@
"**/*.json", "**/*.json",
"src/core/modbus_entity_parameters.hpp", "src/core/modbus_entity_parameters.hpp",
"sdkconfig.*", "sdkconfig.*",
"managed_components/**" "managed_components/**",
"pnpm-*.yaml",
"vite.config.ts"
] ]
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,227 +0,0 @@
telegram_type_id,name,is_fetched
0x04,UBAFactory,fetched
0x06,RCTime,
0x0A,EasyMonitor,fetched
0x10,UBAErrorMessage1,
0x11,UBAErrorMessage2,
0x12,RCErrorMessage,
0x13,RCErrorMessage2,
0x14,UBATotalUptime,fetched
0x15,UBAMaintenanceData,
0x16,UBAParameters,fetched
0x18,UBAMonitorFast,
0x19,UBAMonitorSlow,
0x1A,UBASetPoints,
0x1C,UBAMaintenanceStatus,
0x1E,WM10TempMessage,
0x23,JunkersSetMixer,fetched
0x26,UBASettingsWW,fetched
0x28,WeatherComp,fetched
0x2A,MC110Status,
0x2E,Meters,
0x33,UBAParameterWW,fetched
0x34,UBAMonitorWW,
0x35,UBAFlags,
0x37,WWSettings,fetched
0x38,WWTimer,fetched
0x39,WWCircTimer,fetched
0x3A,RC30WWSettings,fetched
0x3B,Energy,
0x3D,RC35Set,
0x3E,RC35Monitor,
0x3F,RC35Timer,
0x40,RC30Temp,
0x41,RC30Monitor,
0x42,RC35Timer2,
0x47,RC35Set,
0x48,RC35Monitor,
0x49,RC35Timer,
0x4C,RC35Timer2,
0x51,RC35Set,
0x52,RC35Monitor,
0x53,RC35Timer,
0x56,RC35Timer2,
0x5B,RC35Set,
0x5C,RC35Monitor,
0x5D,RC35Timer,
0x60,RC35Timer2,
0x96,SM10Config,fetched
0x97,SM10Monitor,
0x9C,WM10MonitorMessage,
0x9D,WM10SetMessage,
0xA2,RCError,
0xA3,RCOutdoorTemp,
0xA5,IBASettings,fetched
0xA7,RC30Set,
0xA9,RC30Vacation,fetched
0xAA,MMConfigMessage,fetched
0xAB,MMStatusMessage,
0xAC,MMSetMessage,
0xAF,RC20Remote,
0xB0,RC10Set,
0xB1,RC10Monitor,
0xBB,HybridSettings,fetched
0xBF,ErrorMessage,
0xC2,UBAErrorMessage3,
0xD1,UBAOutdoorTemp,
0xE3,UBAMonitorSlowPlus2,
0xE4,UBAMonitorFastPlus,
0xE5,UBAMonitorSlowPlus,
0xE6,UBAParametersPlus,fetched
0xE9,UBAMonitorWWPlus,
0xEA,UBAParameterWWPlus,fetched
0x0101,ISM1Set,fetched
0x0103,ISM1StatusMessage,fetched
0x0104,ISM2StatusMessage,
0x010C,IPMStatusMessage,
0x011E,IPMTempMessage,
0x012E,HPEnergy1,
0x013B,HPEnergy2,
0x0165,JunkersSet,
0x0166,JunkersSet,
0x0167,JunkersSet,
0x0168,JunkersSet,
0x016E,Absent,fetched
0x016F,JunkersMonitor,
0x0170,JunkersMonitor,
0x0171,JunkersMonitor,
0x0172,JunkersMonitor,
0x0179,JunkersSet,
0x017A,JunkersSet,
0x017B,JunkersSet,
0x017C,JunkersSet,
0x01D3,JunkersDhw,fetched
0x023A,RC300OutdoorTemp,fetched
0x023E,PVSettings,fetched
0x0240,RC300Settings,fetched
0x0241,RC300Settings,fetched
0x0267,RC300Floordry,
0x0269,RC300Holiday,fetched
0x0291,HPMode,fetched
0x0292,HPMode,fetched
0x0293,HPMode,fetched
0x0294,HPMode,fetched
0x029B,RC300Curves,
0x029C,RC300Curves,
0x029D,RC300Curves,
0x029E,RC300Curves,
0x029F,RC300Curves,
0x02A0,RC300Curves,
0x02A1,RC300Curves,
0x02A2,RC300Curves,
0x02A5,RC300Monitor,fetched
0x02A6,RC300Monitor,
0x02A7,CRFMonitor,
0x02A8,RC300Monitor,
0x02A9,RC300Monitor,
0x02AA,RC300Monitor,
0x02AB,RC300Monitor,
0x02AC,RC300Monitor,
0x02AF,RC300Summer,
0x02B0,RC300Summer,
0x02B1,RC300Summer,
0x02B2,RC300Summer,
0x02B3,RC300Summer,
0x02B4,RC300Summer,
0x02B5,RC300Summer,
0x02B6,RC300Summer,
0x02B9,RC300Set,
0x02BA,RC300Set,
0x02BB,RC300Set,
0x02BC,RC300Set,
0x02BD,RC300Set,
0x02BE,RC300Set,
0x02BF,RC300Set,
0x02C0,RC300Set,
0x02CC,HPPressure,fetched
0x02CD,MMPLUSConfigMessage,fetched
0x02CE,RC300Set2,
0x02D0,RC300Set2,
0x02D2,RC300Set2,
0x02D6,HPPump2,fetched
0x02D7,MMPLUSStatusMessage,
0x02F5,RC300WWmode,fetched
0x02F6,RC300WW2mode,fetched
0x0313,MMPLUSConfigMessage_WWC,fetched
0x031B,RC300WWtemp,fetched
0x031D,RC300WWmode2,
0x031E,RC300WWmode2,
0x0331,MMPLUSStatusMessage_WWC,
0x0358,SM100SystemConfig,fetched
0x035A,SM100CircuitConfig,fetched
0x035C,SM100HeatAssist,fetched
0x035D,SM100Circuit2Config,fetched
0x035F,SM100Config1,fetched
0x0361,SM100Differential,fetched
0x0362,SM100Monitor,
0x0363,SM100Monitor2,
0x0364,SM100Status,
0x0366,SM100Config,
0x036A,SM100Status2,
0x0380,SM100CollectorConfig,fetched
0x038E,SM100Energy,fetched
0x0391,SM100Time,fetched
0x043F,CRHolidays,fetched
0x0467,HPSet,
0x0468,HPSet,
0x0469,HPSet,
0x046A,HPSet,
0x0471,RC300Summer2,
0x0472,RC300Summer2,
0x0473,RC300Summer2,
0x0474,RC300Summer2,
0x0475,RC300Summer2,
0x0476,RC300Summer2,
0x0477,RC300Summer2,
0x0478,RC300Summer2,
0x047B,HP2,
0x0484,HPSilentMode,fetched
0x0485,HpCooling,fetched
0x0486,HpInConfig,fetched
0x0488,HPValve,fetched
0x048A,HpPool,fetched
0x048B,HPPumps,fetched
0x048D,HpPower,fetched
0x048F,HpTemperatures,
0x0491,HPAdditionalHeater,fetched
0x0492,HpHeaterConfig,fetched
0x0494,UBAEnergySupplied,
0x0495,UBAInformation,
0x0499,HPDhwSettings,fetched
0x049C,HPSettings2,fetched
0x049D,HPSettings3,fetched
0x04A2,HpInput,fetched
0x04A5,HPFan,fetched
0x04A7,HPPowerLimit,fetched
0x04AA,HPPower2,fetched
0x04AE,HPEnergy,fetched
0x04AF,HPMeters,fetched
0x056B,VentilationMode,fetched
0x0583,VentilationMonitor,
0x0585,Blowerspeed,
0x0587,Bypass,
0x05BA,HpPoolStatus,fetched
0x05D9,Airquality,
0x0772,HIUSettings,
0x0779,HIUMonitor,
0x07A5,SM100wwCirc,fetched
0x07A6,SM100wwParam,fetched
0x07AA,SM100wwStatus,
0x07AB,SM100wwCommand,
0x07AC,SM100wwParam1,
0x07AD,SM100ValveStatus,
0x07AE,SM100wwKeepWarm,fetched
0x07D6,SM100wwTemperature,
0x07E0,SM100wwStatus2,fetched
0x0935,EM100SetMessage,fetched
0x0936,EM100OutMessage,
0x0937,EM100TempMessage,
0x0938,EM100InputMessage,
0x0939,EM100MonitorMessage,
0x093A,EM100ConfigMessage,
0x0998,HPSettings,fetched
0x0999,HPFunctionTest,fetched
0x099A,HPStarts,
0x099B,HPFlowTemp,
0x099C,HPComp,
0x09A0,HPTemperature,
1 telegram_type_id name is_fetched
telegram_type_id name is_fetched
0x04 UBAFactory fetched
0x06 RCTime
0x0A EasyMonitor fetched
0x10 UBAErrorMessage1
0x11 UBAErrorMessage2
0x12 RCErrorMessage
0x13 RCErrorMessage2
0x14 UBATotalUptime fetched
0x15 UBAMaintenanceData
0x16 UBAParameters fetched
0x18 UBAMonitorFast
0x19 UBAMonitorSlow
0x1A UBASetPoints
0x1C UBAMaintenanceStatus
0x1E WM10TempMessage
0x23 JunkersSetMixer fetched
0x26 UBASettingsWW fetched
0x28 WeatherComp fetched
0x2A MC110Status
0x2E Meters
0x33 UBAParameterWW fetched
0x34 UBAMonitorWW
0x35 UBAFlags
0x37 WWSettings fetched
0x38 WWTimer fetched
0x39 WWCircTimer fetched
0x3A RC30WWSettings fetched
0x3B Energy
0x3D RC35Set
0x3E RC35Monitor
0x3F RC35Timer
0x40 RC30Temp
0x41 RC30Monitor
0x42 RC35Timer2
0x47 RC35Set
0x48 RC35Monitor
0x49 RC35Timer
0x4C RC35Timer2
0x51 RC35Set
0x52 RC35Monitor
0x53 RC35Timer
0x56 RC35Timer2
0x5B RC35Set
0x5C RC35Monitor
0x5D RC35Timer
0x60 RC35Timer2
0x96 SM10Config fetched
0x97 SM10Monitor
0x9C WM10MonitorMessage
0x9D WM10SetMessage
0xA2 RCError
0xA3 RCOutdoorTemp
0xA5 IBASettings fetched
0xA7 RC30Set
0xA9 RC30Vacation fetched
0xAA MMConfigMessage fetched
0xAB MMStatusMessage
0xAC MMSetMessage
0xAF RC20Remote
0xB0 RC10Set
0xB1 RC10Monitor
0xBB HybridSettings fetched
0xBF ErrorMessage
0xC2 UBAErrorMessage3
0xD1 UBAOutdoorTemp
0xE3 UBAMonitorSlowPlus2
0xE4 UBAMonitorFastPlus
0xE5 UBAMonitorSlowPlus
0xE6 UBAParametersPlus fetched
0xE9 UBAMonitorWWPlus
0xEA UBAParameterWWPlus fetched
0x0101 ISM1Set fetched
0x0103 ISM1StatusMessage fetched
0x0104 ISM2StatusMessage
0x010C IPMStatusMessage
0x011E IPMTempMessage
0x012E HPEnergy1
0x013B HPEnergy2
0x0165 JunkersSet
0x0166 JunkersSet
0x0167 JunkersSet
0x0168 JunkersSet
0x016E Absent fetched
0x016F JunkersMonitor
0x0170 JunkersMonitor
0x0171 JunkersMonitor
0x0172 JunkersMonitor
0x0179 JunkersSet
0x017A JunkersSet
0x017B JunkersSet
0x017C JunkersSet
0x01D3 JunkersDhw fetched
0x023A RC300OutdoorTemp fetched
0x023E PVSettings fetched
0x0240 RC300Settings fetched
0x0241 RC300Settings fetched
0x0267 RC300Floordry
0x0269 RC300Holiday fetched
0x0291 HPMode fetched
0x0292 HPMode fetched
0x0293 HPMode fetched
0x0294 HPMode fetched
0x029B RC300Curves
0x029C RC300Curves
0x029D RC300Curves
0x029E RC300Curves
0x029F RC300Curves
0x02A0 RC300Curves
0x02A1 RC300Curves
0x02A2 RC300Curves
0x02A5 RC300Monitor fetched
0x02A6 RC300Monitor
0x02A7 CRFMonitor
0x02A8 RC300Monitor
0x02A9 RC300Monitor
0x02AA RC300Monitor
0x02AB RC300Monitor
0x02AC RC300Monitor
0x02AF RC300Summer
0x02B0 RC300Summer
0x02B1 RC300Summer
0x02B2 RC300Summer
0x02B3 RC300Summer
0x02B4 RC300Summer
0x02B5 RC300Summer
0x02B6 RC300Summer
0x02B9 RC300Set
0x02BA RC300Set
0x02BB RC300Set
0x02BC RC300Set
0x02BD RC300Set
0x02BE RC300Set
0x02BF RC300Set
0x02C0 RC300Set
0x02CC HPPressure fetched
0x02CD MMPLUSConfigMessage fetched
0x02CE RC300Set2
0x02D0 RC300Set2
0x02D2 RC300Set2
0x02D6 HPPump2 fetched
0x02D7 MMPLUSStatusMessage
0x02F5 RC300WWmode fetched
0x02F6 RC300WW2mode fetched
0x0313 MMPLUSConfigMessage_WWC fetched
0x031B RC300WWtemp fetched
0x031D RC300WWmode2
0x031E RC300WWmode2
0x0331 MMPLUSStatusMessage_WWC
0x0358 SM100SystemConfig fetched
0x035A SM100CircuitConfig fetched
0x035C SM100HeatAssist fetched
0x035D SM100Circuit2Config fetched
0x035F SM100Config1 fetched
0x0361 SM100Differential fetched
0x0362 SM100Monitor
0x0363 SM100Monitor2
0x0364 SM100Status
0x0366 SM100Config
0x036A SM100Status2
0x0380 SM100CollectorConfig fetched
0x038E SM100Energy fetched
0x0391 SM100Time fetched
0x043F CRHolidays fetched
0x0467 HPSet
0x0468 HPSet
0x0469 HPSet
0x046A HPSet
0x0471 RC300Summer2
0x0472 RC300Summer2
0x0473 RC300Summer2
0x0474 RC300Summer2
0x0475 RC300Summer2
0x0476 RC300Summer2
0x0477 RC300Summer2
0x0478 RC300Summer2
0x047B HP2
0x0484 HPSilentMode fetched
0x0485 HpCooling fetched
0x0486 HpInConfig fetched
0x0488 HPValve fetched
0x048A HpPool fetched
0x048B HPPumps fetched
0x048D HpPower fetched
0x048F HpTemperatures
0x0491 HPAdditionalHeater fetched
0x0492 HpHeaterConfig fetched
0x0494 UBAEnergySupplied
0x0495 UBAInformation
0x0499 HPDhwSettings fetched
0x049C HPSettings2 fetched
0x049D HPSettings3 fetched
0x04A2 HpInput fetched
0x04A5 HPFan fetched
0x04A7 HPPowerLimit fetched
0x04AA HPPower2 fetched
0x04AE HPEnergy fetched
0x04AF HPMeters fetched
0x056B VentilationMode fetched
0x0583 VentilationMonitor
0x0585 Blowerspeed
0x0587 Bypass
0x05BA HpPoolStatus fetched
0x05D9 Airquality
0x0772 HIUSettings
0x0779 HIUMonitor
0x07A5 SM100wwCirc fetched
0x07A6 SM100wwParam fetched
0x07AA SM100wwStatus
0x07AB SM100wwCommand
0x07AC SM100wwParam1
0x07AD SM100ValveStatus
0x07AE SM100wwKeepWarm fetched
0x07D6 SM100wwTemperature
0x07E0 SM100wwStatus2 fetched
0x0935 EM100SetMessage fetched
0x0936 EM100OutMessage
0x0937 EM100TempMessage
0x0938 EM100InputMessage
0x0939 EM100MonitorMessage
0x093A EM100ConfigMessage
0x0998 HPSettings fetched
0x0999 HPFunctionTest fetched
0x099A HPStarts
0x099B HPFlowTemp
0x099C HPComp
0x09A0 HPTemperature

View File

@@ -1,4 +0,0 @@
/.yarn/** linguist-vendored
/.yarn/releases/* binary
/.yarn/plugins/**/* binary
/.pnp.* binary linguist-generated

View File

@@ -4,5 +4,4 @@ dist/
src/i18n/* src/i18n/*
.prettierrc .prettierrc
.yarn/ .typesafe-i18n.json
.typesafe-i18n.json

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +0,0 @@
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.7.0.cjs

View File

@@ -10,8 +10,7 @@ export default tseslint.config(
{ {
languageOptions: { languageOptions: {
parserOptions: { parserOptions: {
project: true, project: true
tsconfigRootDir: import.meta.dirname
} }
} }
}, },

View File

@@ -1,6 +1,6 @@
{ {
"name": "EMS-ESP", "name": "EMS-ESP",
"version": "3.7.2", "version": "3.7.3",
"description": "EMS-ESP WebUI", "description": "EMS-ESP WebUI",
"homepage": "https://emsesp.org", "homepage": "https://emsesp.org",
"author": "proddy, emsesp.org", "author": "proddy, emsesp.org",
@@ -8,59 +8,60 @@
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"preinstall": "npx only-allow pnpm",
"dev": "vite dev", "dev": "vite dev",
"build": "vite build", "build": "vite build",
"preview": "vite preview", "preview": "vite preview",
"build-hosted": "typesafe-i18n --no-watch && vite build --mode hosted", "build-hosted": "typesafe-i18n && vite build --mode hosted",
"preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"yarn:mock-rest\" \"vite preview\"", "preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"pnpm:mock-rest\" \"vite preview\"",
"mock-rest": "bun --watch ../mock-api/rest_server.ts", "mock-rest": "bun --watch ../mock-api/restServer.ts",
"standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"yarn:mock-rest\" \"vite\"", "standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite\"",
"typesafe-i18n": "typesafe-i18n --no-watch", "typesafe-i18n": "typesafe-i18n --no-watch",
"webUI": "node progmem-generator.js", "webUI": "node progmem-generator.js",
"format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'", "format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'",
"lint": "eslint . --fix" "lint": "eslint . --fix"
}, },
"dependencies": { "dependencies": {
"@alova/adapter-xhr": "2.1.1", "@alova/adapter-xhr": "2.2.1",
"@emotion/react": "^11.14.0", "@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0", "@emotion/styled": "^11.14.1",
"@mui/icons-material": "^6.4.8", "@mui/icons-material": "^7.3.4",
"@mui/material": "^6.4.8", "@mui/material": "^7.3.4",
"@table-library/react-table-library": "4.1.12", "@table-library/react-table-library": "4.1.15",
"alova": "3.2.10", "alova": "3.3.4",
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
"formidable": "^3.5.4",
"jwt-decode": "^4.0.0", "jwt-decode": "^4.0.0",
"mime-types": "^2.1.35", "magic-string": "^0.30.19",
"preact": "^10.26.4", "mime-types": "^3.0.1",
"react": "^19.0.0", "preact": "^10.27.2",
"react-dom": "^19.0.0", "react": "^19.2.0",
"react-dom": "^19.2.0",
"react-icons": "^5.5.0", "react-icons": "^5.5.0",
"react-router": "^7.4.0", "react-router": "^7.9.4",
"react-toastify": "^11.0.5", "react-toastify": "^11.0.5",
"typesafe-i18n": "^5.26.2", "typesafe-i18n": "^5.26.2",
"typescript": "^5.8.2" "typescript": "^5.9.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.26.10", "@babel/core": "^7.28.4",
"@eslint/js": "^9.23.0", "@eslint/js": "^9.38.0",
"@preact/compat": "^18.3.1", "@preact/compat": "^18.3.1",
"@preact/preset-vite": "^2.10.1", "@preact/preset-vite": "^2.10.2",
"@trivago/prettier-plugin-sort-imports": "^5.2.2", "@trivago/prettier-plugin-sort-imports": "^5.2.2",
"@types/formidable": "^3", "@types/node": "^24.9.1",
"@types/node": "^22.13.11", "@types/react": "^19.2.2",
"@types/react": "^19.0.12", "@types/react-dom": "^19.2.2",
"@types/react-dom": "^19.0.4", "concurrently": "^9.2.1",
"concurrently": "^9.1.2", "eslint": "^9.38.0",
"eslint": "^9.23.0", "eslint-config-prettier": "^10.1.8",
"eslint-config-prettier": "^10.1.1", "prettier": "^3.6.2",
"formidable": "^3.5.2", "rollup-plugin-visualizer": "^6.0.5",
"prettier": "^3.5.3", "terser": "^5.44.0",
"rollup-plugin-visualizer": "^5.14.0", "typescript-eslint": "^8.46.2",
"terser": "^5.39.0", "vite": "^7.1.11",
"typescript-eslint": "8.27.0",
"vite": "^6.2.2",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^5.1.4" "vite-tsconfig-paths": "^5.1.4"
}, },
"packageManager": "yarn@4.7.0" "packageManager": "pnpm@10.19.0+sha512.c9fc7236e92adf5c8af42fd5bf1612df99c2ceb62f27047032f4720b33f8eacdde311865e91c411f2774f618d82f320808ecb51718bfa82c060c4ba7c76a32b8"
} }

6056
interface/pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,8 @@
onlyBuiltDependencies:
- cwebp-bin
- esbuild
- gifsicle
- jpegtran-bin
- mozjpeg
- optipng-bin
- pngquant-bin

View File

@@ -4,6 +4,7 @@ import {
existsSync, existsSync,
readFileSync, readFileSync,
readdirSync, readdirSync,
statSync,
unlinkSync unlinkSync
} from 'fs'; } from 'fs';
import mime from 'mime-types'; import mime from 'mime-types';
@@ -15,67 +16,79 @@ const INDENT = ' ';
const outputPath = '../src/ESP32React/WWWData.h'; const outputPath = '../src/ESP32React/WWWData.h';
const sourcePath = './dist'; const sourcePath = './dist';
const bytesPerLine = 20; const bytesPerLine = 20;
var totalSize = 0; let totalSize = 0;
let bundleStats = {
js: { count: 0, uncompressed: 0, compressed: 0 },
css: { count: 0, uncompressed: 0, compressed: 0 },
html: { count: 0, uncompressed: 0, compressed: 0 },
svg: { count: 0, uncompressed: 0, compressed: 0 },
other: { count: 0, uncompressed: 0, compressed: 0 }
};
const generateWWWClass = () => const generateWWWClass =
`typedef std::function<void(const char * uri, const String & contentType, const uint8_t * content, size_t len, const String & hash)> RouteRegistrationHandler; () => `typedef std::function<void(const char * uri, const String & contentType, const uint8_t * content, size_t len, const String & hash)> RouteRegistrationHandler;
// Total size is ${totalSize} bytes // Bundle Statistics:
// - Total compressed size: ${(totalSize / 1000).toFixed(1)} KB
// - Total uncompressed size: ${(Object.values(bundleStats).reduce((sum, stat) => sum + stat.uncompressed, 0) / 1000).toFixed(1)} KB
// - Compression ratio: ${(((Object.values(bundleStats).reduce((sum, stat) => sum + stat.uncompressed, 0) - totalSize) / Object.values(bundleStats).reduce((sum, stat) => sum + stat.uncompressed, 0)) * 100).toFixed(1)}%
// - Generated on: ${new Date().toISOString()}
class WWWData { class WWWData {
${indent}public: ${INDENT}public:
${indent.repeat(2)}static void registerRoutes(RouteRegistrationHandler handler) { ${INDENT.repeat(2)}static void registerRoutes(RouteRegistrationHandler handler) {
${fileInfo.map((file) => `${indent.repeat(3)}handler("${file.uri}", "${file.mimeType}", ${file.variable}, ${file.size}, "${file.hash}");`).join('\n')} ${fileInfo.map((f) => `${INDENT.repeat(3)}handler("${f.uri}", "${f.mimeType}", ${f.variable}, ${f.size}, "${f.hash}");`).join('\n')}
${indent.repeat(2)}} ${INDENT.repeat(2)}}
}; };
`; `;
function getFilesSync(dir, files = []) { const getFilesSync = (dir, files = []) => {
readdirSync(dir, { withFileTypes: true }).forEach((entry) => { readdirSync(dir, { withFileTypes: true }).forEach((entry) => {
const entryPath = resolve(dir, entry.name); const entryPath = resolve(dir, entry.name);
if (entry.isDirectory()) { entry.isDirectory() ? getFilesSync(entryPath, files) : files.push(entryPath);
getFilesSync(entryPath, files);
} else {
files.push(entryPath);
}
}); });
return files; return files;
} };
function cleanAndOpen(path) { const cleanAndOpen = (path) => {
if (existsSync(path)) { existsSync(path) && unlinkSync(path);
unlinkSync(path);
}
return createWriteStream(path, { flags: 'w+' }); return createWriteStream(path, { flags: 'w+' });
} };
const getFileType = (filePath) => {
const ext = filePath.split('.').pop().toLowerCase();
if (ext === 'js') return 'js';
if (ext === 'css') return 'css';
if (ext === 'html') return 'html';
if (ext === 'svg') return 'svg';
return 'other';
};
const writeFile = (relativeFilePath, buffer) => { const writeFile = (relativeFilePath, buffer) => {
const variable = 'ESP_REACT_DATA_' + fileInfo.length; const variable = `ESP_REACT_DATA_${fileInfo.length}`;
const mimeType = mime.lookup(relativeFilePath); const mimeType = mime.lookup(relativeFilePath);
var size = 0; const fileType = getFileType(relativeFilePath);
writeStream.write('const uint8_t ' + variable + '[] = {'); let size = 0;
// const zipBuffer = zlib.brotliCompressSync(buffer, { quality: 1 }); writeStream.write(`const uint8_t ${variable}[] = {`);
const zipBuffer = zlib.gzipSync(buffer, { level: 9 });
// create sha const zipBuffer = zlib.gzipSync(buffer, { level: 9 });
const hashSum = crypto.createHash('sha256'); const hash = crypto.createHash('sha256').update(zipBuffer).digest('hex');
hashSum.update(zipBuffer);
const hash = hashSum.digest('hex');
zipBuffer.forEach((b) => { zipBuffer.forEach((b) => {
if (!(size % bytesPerLine)) { if (!(size % bytesPerLine)) {
writeStream.write('\n'); writeStream.write('\n' + INDENT);
writeStream.write(indent);
} }
writeStream.write('0x' + ('00' + b.toString(16).toUpperCase()).slice(-2) + ','); writeStream.write('0x' + b.toString(16).toUpperCase().padStart(2, '0') + ',');
size++; size++;
}); });
if (size % bytesPerLine) { size % bytesPerLine && writeStream.write('\n');
writeStream.write('\n');
}
writeStream.write('};\n\n'); writeStream.write('};\n\n');
// Update bundle statistics
bundleStats[fileType].count++;
bundleStats[fileType].uncompressed += buffer.length;
bundleStats[fileType].compressed += zipBuffer.length;
fileInfo.push({ fileInfo.push({
uri: '/' + relativeFilePath.replace(sep, '/'), uri: '/' + relativeFilePath.replace(sep, '/'),
mimeType, mimeType,
@@ -84,32 +97,52 @@ const writeFile = (relativeFilePath, buffer) => {
hash hash
}); });
// console.log(relativeFilePath + ' (size ' + size + ' bytes)');
totalSize += size; totalSize += size;
}; };
// start console.log(`Generating ${outputPath} from ${sourcePath}`);
console.log('Generating ' + outputPath + ' from ' + sourcePath);
const includes = ARDUINO_INCLUDES;
const indent = INDENT;
const fileInfo = []; const fileInfo = [];
const writeStream = cleanAndOpen(resolve(outputPath)); const writeStream = cleanAndOpen(resolve(outputPath));
// includes writeStream.write(ARDUINO_INCLUDES);
writeStream.write(includes);
// process static files
const buildPath = resolve(sourcePath); const buildPath = resolve(sourcePath);
for (const filePath of getFilesSync(buildPath)) { for (const filePath of getFilesSync(buildPath)) {
const readStream = readFileSync(filePath); writeFile(relative(buildPath, filePath), readFileSync(filePath));
const relativeFilePath = relative(buildPath, filePath);
writeFile(relativeFilePath, readStream);
} }
// add class
writeStream.write(generateWWWClass()); writeStream.write(generateWWWClass());
// end
writeStream.end(); writeStream.end();
console.log('Total size: ' + totalSize / 1000 + ' KB'); // Calculate and display bundle statistics
const totalUncompressed = Object.values(bundleStats).reduce(
(sum, stat) => sum + stat.uncompressed,
0
);
const totalCompressed = Object.values(bundleStats).reduce(
(sum, stat) => sum + stat.compressed,
0
);
const compressionRatio = (
((totalUncompressed - totalCompressed) / totalUncompressed) *
100
).toFixed(1);
console.log('\n📊 Bundle Size Analysis:');
console.log('='.repeat(50));
console.log(`Total compressed size: ${(totalSize / 1000).toFixed(1)} KB`);
console.log(`Total uncompressed size: ${(totalUncompressed / 1000).toFixed(1)} KB`);
console.log(`Compression ratio: ${compressionRatio}%`);
console.log('\n📁 File Type Breakdown:');
Object.entries(bundleStats).forEach(([type, stats]) => {
if (stats.count > 0) {
const ratio = (
((stats.uncompressed - stats.compressed) / stats.uncompressed) *
100
).toFixed(1);
console.log(
`${type.toUpperCase().padEnd(4)}: ${stats.count} files, ${(stats.uncompressed / 1000).toFixed(1)} KB → ${(stats.compressed / 1000).toFixed(1)} KB (${ratio}% compression)`
);
}
});
console.log('='.repeat(50));

View File

@@ -37,10 +37,9 @@ const AuthenticatedRouting = () => {
<Route path="/dashboard/*" element={<Dashboard />} /> <Route path="/dashboard/*" element={<Dashboard />} />
<Route path="/devices/*" element={<Devices />} /> <Route path="/devices/*" element={<Devices />} />
<Route path="/sensors/*" element={<Sensors />} /> <Route path="/sensors/*" element={<Sensors />} />
<Route path="/status/*" element={<Status />} />
<Route path="/help/*" element={<Help />} /> <Route path="/help/*" element={<Help />} />
<Route path="/*" element={<Navigate to="/" />} />
<Route path="/status/*" element={<Status />} />
<Route path="/status/hardwarestatus/*" element={<HardwareStatus />} /> <Route path="/status/hardwarestatus/*" element={<HardwareStatus />} />
<Route path="/status/activity" element={<Activity />} /> <Route path="/status/activity" element={<Activity />} />
<Route path="/status/log" element={<SystemLog />} /> <Route path="/status/log" element={<SystemLog />} />
@@ -68,6 +67,8 @@ const AuthenticatedRouting = () => {
<Route path="/customentities" element={<CustomEntities />} /> <Route path="/customentities" element={<CustomEntities />} />
</> </>
)} )}
<Route path="/*" element={<Navigate to="/" />} />
</Routes> </Routes>
</Layout> </Layout>
); );

View File

@@ -98,7 +98,7 @@ const SignIn = () => {
<Box display="flex" flexDirection="column" alignItems="center"> <Box display="flex" flexDirection="column" alignItems="center">
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
disabled={processing} disabled={processing}
sx={{ sx={{
width: 240 width: 240
@@ -117,7 +117,7 @@ const SignIn = () => {
}} }}
/> />
<ValidatedPasswordField <ValidatedPasswordField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
disabled={processing} disabled={processing}
sx={{ sx={{
width: 240 width: 240

View File

@@ -70,6 +70,7 @@ export const readDeviceEntities = (id: number) =>
alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities`, { alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities`, {
params: { id }, params: { id },
responseType: 'arraybuffer', responseType: 'arraybuffer',
// @ts-expect-error - exactOptionalPropertyTypes compatibility issue
transform(data) { transform(data) {
return (data as DeviceEntity[]).map((de: DeviceEntity) => ({ return (data as DeviceEntity[]).map((de: DeviceEntity) => ({
...de, ...de,
@@ -92,6 +93,7 @@ export const writeDeviceName = (data: { id: number; name: string }) =>
// SettingsScheduler // SettingsScheduler
export const readSchedule = () => export const readSchedule = () =>
alovaInstance.Get<ScheduleItem[]>('/rest/schedule', { alovaInstance.Get<ScheduleItem[]>('/rest/schedule', {
// @ts-expect-error - exactOptionalPropertyTypes compatibility issue
transform(data) { transform(data) {
return (data as Schedule).schedule.map((si: ScheduleItem) => ({ return (data as Schedule).schedule.map((si: ScheduleItem) => ({
...si, ...si,
@@ -129,6 +131,7 @@ export const writeModules = (data: {
// CustomEntities // CustomEntities
export const readCustomEntities = () => export const readCustomEntities = () =>
alovaInstance.Get<EntityItem[]>('/rest/customEntities', { alovaInstance.Get<EntityItem[]>('/rest/customEntities', {
// @ts-expect-error - exactOptionalPropertyTypes compatibility issue
transform(data) { transform(data) {
return (data as Entities).entities.map((ei: EntityItem) => ({ return (data as Entities).entities.map((ei: EntityItem) => ({
...ei, ...ei,
@@ -143,7 +146,8 @@ export const readCustomEntities = () =>
o_name: ei.name, o_name: ei.name,
o_writeable: ei.writeable, o_writeable: ei.writeable,
o_value: ei.value, o_value: ei.value,
o_deleted: ei.deleted o_deleted: ei.deleted,
o_hide: ei.hide
})); }));
} }
}); });

View File

@@ -30,7 +30,7 @@ export const getDevVersion = () =>
cacheFor: 60 * 10 * 1000, cacheFor: 60 * 10 * 1000,
transform(response: { data: { name: string; published_at: string } }) { transform(response: { data: { name: string; published_at: string } }) {
return { return {
name: response.data.name.split(/\s+/).splice(-1)[0].substring(1), name: response.data.name.split(/\s+/).splice(-1)[0]?.substring(1) || '',
published_at: response.data.published_at published_at: response.data.published_at
}; };
} }

View File

@@ -1,40 +1,37 @@
let decoder; // @ts-nocheck - Optimized MessagePack unpacking library for EMS-ESP32
let decoder,
src,
srcEnd,
position = 0,
strings = [],
stringPosition = 0,
currentUnpackr = {},
currentStructures,
srcString,
srcStringStart = 0,
srcStringEnd = 0,
bundledStrings,
referenceMap,
dataView;
const EMPTY_ARRAY = [],
currentExtensions = [];
const defaultOptions = { useRecords: false, mapsAsObjects: true };
try { try {
decoder = new TextDecoder(); decoder = new TextDecoder();
} catch (error) {} } catch (error) {}
let src; class C1Type {}
let srcEnd; const C1 = new C1Type();
let position = 0;
const EMPTY_ARRAY = [];
let strings = EMPTY_ARRAY;
let stringPosition = 0;
let currentUnpackr = {};
let currentStructures;
let srcString;
let srcStringStart = 0;
let srcStringEnd = 0;
let bundledStrings;
let referenceMap;
const currentExtensions = [];
let dataView;
const defaultOptions = {
useRecords: false,
mapsAsObjects: true
};
export class C1Type {}
export const C1 = new C1Type();
C1.name = 'MessagePack 0xC1'; C1.name = 'MessagePack 0xC1';
let sequentialMode = false; let sequentialMode = false,
let inlineObjectReadThreshold = 2; inlineObjectReadThreshold = 2,
let readStruct, onLoadedStructures, onSaveState; readStruct,
// no-eval build onLoadedStructures,
onSaveState;
try { try {
new Function(''); new Function('');
} catch (error) { } catch (error) {
// if eval variants are not supported, do not create inline object readers ever
inlineObjectReadThreshold = Infinity; inlineObjectReadThreshold = Infinity;
} }
export class Unpackr { export class Unpackr {
constructor(options) { constructor(options) {
if (options) { if (options) {
@@ -50,19 +47,15 @@ export class Unpackr {
if (options.structures) if (options.structures)
options.structures.sharedLength = options.structures.length; options.structures.sharedLength = options.structures.length;
else if (options.getStructures) { else if (options.getStructures) {
(options.structures = []).uninitialized = true; // this is what we use to denote an uninitialized structures (options.structures = []).uninitialized = true;
options.structures.sharedLength = 0; options.structures.sharedLength = 0;
} }
if (options.int64AsNumber) { if (options.int64AsNumber) options.int64AsType = 'number';
options.int64AsType = 'number';
}
} }
Object.assign(this, options); Object.assign(this, options);
} }
unpack(source, options?: any) { unpack(source, options?: any) {
if (src) { if (src) {
// re-entrant execution, save the state and restore it after we do this unpack
return saveState(() => { return saveState(() => {
clearSource(); clearSource();
return this return this
@@ -86,9 +79,6 @@ export class Unpackr {
strings = EMPTY_ARRAY; strings = EMPTY_ARRAY;
bundledStrings = null; bundledStrings = null;
src = source; src = source;
// this provides cached access to the data view for a buffer if it is getting reused, which is a recommend
// technique for getting data from a database where it can be copied into an existing buffer instead of creating
// new ones
try { try {
dataView = dataView =
source.dataView || source.dataView ||
@@ -191,10 +181,10 @@ export class Unpackr {
return this.unpack(source, end); return this.unpack(source, end);
} }
} }
export function getPosition() { function getPosition() {
return position; return position;
} }
export function checkedRead(options: any) { function checkedRead(options: any) {
try { try {
if (!currentUnpackr.trusted && !sequentialMode) { if (!currentUnpackr.trusted && !sequentialMode) {
const sharedLength = currentStructures.sharedLength || 0; const sharedLength = currentStructures.sharedLength || 0;
@@ -264,7 +254,7 @@ function restoreStructures() {
currentStructures.restoreStructures = null; currentStructures.restoreStructures = null;
} }
export function read() { function read() {
let token = src[position++]; let token = src[position++];
if (token < 0xa0) { if (token < 0xa0) {
if (token < 0x80) { if (token < 0x80) {
@@ -589,7 +579,7 @@ const createSecondByteReader = (firstId, read0) =>
return structure.read(); return structure.read();
}; };
export function loadStructures() { function loadStructures() {
const loadedStructures = saveState(() => { const loadedStructures = saveState(() => {
// save the state in case getStructures modifies our buffer // save the state in case getStructures modifies our buffer
src = null; src = null;
@@ -605,9 +595,8 @@ var readFixedString = readStringJS;
var readString8 = readStringJS; var readString8 = readStringJS;
var readString16 = readStringJS; var readString16 = readStringJS;
var readString32 = readStringJS; var readString32 = readStringJS;
export let isNativeAccelerationEnabled = false; let isNativeAccelerationEnabled = false;
function setExtractor(extractStrings) {
export function setExtractor(extractStrings) {
isNativeAccelerationEnabled = true; isNativeAccelerationEnabled = true;
readFixedString = readString(1); readFixedString = readString(1);
readString8 = readString(2); readString8 = readString(2);
@@ -701,7 +690,7 @@ function readStringJS(length) {
return result; return result;
} }
export function readString(source, start, length) { function readString(source, start, length) {
const existingSrc = src; const existingSrc = src;
src = source; src = source;
position = start; position = start;
@@ -1065,7 +1054,7 @@ currentExtensions[0x70] = (data) => {
currentExtensions[0x73] = () => new Set(read()); currentExtensions[0x73] = () => new Set(read());
export const typedArrays = [ const typedArrays = [
'Int8', 'Int8',
'Uint8', 'Uint8',
'Uint8Clamped', 'Uint8Clamped',
@@ -1177,44 +1166,20 @@ function saveState(callback) {
dataView = new DataView(src.buffer, src.byteOffset, src.byteLength); dataView = new DataView(src.buffer, src.byteOffset, src.byteLength);
return value; return value;
} }
export function clearSource() { function clearSource() {
src = null; src = null;
referenceMap = null; referenceMap = null;
currentStructures = null; currentStructures = null;
} }
export function addExtension(extension) { function addExtension(extension) {
if (extension.unpack) currentExtensions[extension.type] = extension.unpack; if (extension.unpack) currentExtensions[extension.type] = extension.unpack;
else currentExtensions[extension.type] = extension; else currentExtensions[extension.type] = extension;
} }
export const mult10 = new Array(147); // this is a table matching binary exponents to the multiplier to determine significant digit rounding const mult10 = new Array(147);
for (let i = 0; i < 256; i++) { for (let i = 0; i < 256; i++) {
mult10[i] = +('1e' + Math.floor(45.15 - i * 0.30103)); mult10[i] = +('1e' + Math.floor(45.15 - i * 0.30103));
} }
export const Decoder = Unpackr; const defaultUnpackr = new Unpackr({ useRecords: false });
var defaultUnpackr = new Unpackr({ useRecords: false });
export const unpack = defaultUnpackr.unpack; export const unpack = defaultUnpackr.unpack;
export const unpackMultiple = defaultUnpackr.unpackMultiple;
export const decode = defaultUnpackr.unpack;
export const FLOAT32_OPTIONS = {
NEVER: 0,
ALWAYS: 1,
DECIMAL_ROUND: 3,
DECIMAL_FIT: 4
};
const f32Array = new Float32Array(1);
const u8Array = new Uint8Array(f32Array.buffer, 0, 4);
export function roundFloat32(float32Number) {
f32Array[0] = float32Number;
const multiplier = mult10[((u8Array[3] & 0x7f) << 1) | (u8Array[2] >> 7)];
return (
((multiplier * float32Number + (float32Number > 0 ? 0.5 : -0.5)) >> 0) /
multiplier
);
}
export function setReadStruct(updatedReadStruct, loadedStructs, saveState) {
readStruct = updatedReadStruct;
onLoadedStructures = loadedStructs;
onSaveState = saveState;
}

View File

@@ -76,6 +76,7 @@ const CustomEntities = () => {
ei.factor !== ei.o_factor || ei.factor !== ei.o_factor ||
ei.value_type !== ei.o_value_type || ei.value_type !== ei.o_value_type ||
ei.writeable !== ei.o_writeable || ei.writeable !== ei.o_writeable ||
ei.hide !== ei.o_hide ||
ei.deleted !== ei.o_deleted || ei.deleted !== ei.o_deleted ||
(ei.value || '') !== (ei.o_value || '') (ei.value || '') !== (ei.o_value || '')
); );
@@ -136,8 +137,8 @@ const CustomEntities = () => {
const saveEntities = async () => { const saveEntities = async () => {
await writeEntities({ await writeEntities({
entities: entities entities: entities
.filter((ei) => !ei.deleted) .filter((ei: EntityItem) => !ei.deleted)
.map((condensed_ei) => ({ .map((condensed_ei: EntityItem) => ({
id: condensed_ei.id, id: condensed_ei.id,
ram: condensed_ei.ram, ram: condensed_ei.ram,
name: condensed_ei.name, name: condensed_ei.name,
@@ -147,6 +148,7 @@ const CustomEntities = () => {
factor: condensed_ei.factor, factor: condensed_ei.factor,
uom: condensed_ei.uom, uom: condensed_ei.uom,
writeable: condensed_ei.writeable, writeable: condensed_ei.writeable,
hide: condensed_ei.hide,
value_type: condensed_ei.value_type, value_type: condensed_ei.value_type,
value: condensed_ei.value value: condensed_ei.value
})) }))
@@ -209,6 +211,7 @@ const CustomEntities = () => {
value_type: item.value_type, value_type: item.value_type,
writeable: item.writeable, writeable: item.writeable,
deleted: false, deleted: false,
hide: item.hide,
value: item.value value: item.value
}); });
setDialogOpen(true); setDialogOpen(true);
@@ -228,6 +231,7 @@ const CustomEntities = () => {
value_type: 0, value_type: 0,
writeable: false, writeable: false,
deleted: false, deleted: false,
hide: false,
value: '' value: ''
}); });
setDialogOpen(true); setDialogOpen(true);
@@ -248,15 +252,17 @@ const CustomEntities = () => {
const renderEntity = () => { const renderEntity = () => {
if (!entities) { if (!entities) {
return <FormLoader onRetry={fetchEntities} errorMessage={error?.message} />; return (
<FormLoader onRetry={fetchEntities} errorMessage={error?.message || ''} />
);
} }
return ( return (
<Table <Table
data={{ data={{
nodes: entities nodes: entities
.filter((ei) => !ei.deleted) .filter((ei: EntityItem) => !ei.deleted)
.sort((a, b) => a.name.localeCompare(b.name)) .sort((a: EntityItem, b: EntityItem) => a.name.localeCompare(b.name))
}} }}
theme={entity_theme} theme={entity_theme}
layout={{ custom: true }} layout={{ custom: true }}

View File

@@ -2,7 +2,11 @@ import { useEffect, useState } from 'react';
import AddIcon from '@mui/icons-material/Add'; import AddIcon from '@mui/icons-material/Add';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
import DoneIcon from '@mui/icons-material/Done'; import DoneIcon from '@mui/icons-material/Done';
import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
import InsertCommentOutlinedIcon from '@mui/icons-material/InsertCommentOutlined';
import RemoveIcon from '@mui/icons-material/RemoveCircleOutline'; import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
import { import {
Box, Box,
@@ -12,7 +16,7 @@ import {
DialogActions, DialogActions,
DialogContent, DialogContent,
DialogTitle, DialogTitle,
Grid2 as Grid, Grid,
InputAdornment, InputAdornment,
MenuItem, MenuItem,
TextField TextField
@@ -70,7 +74,10 @@ const CustomEntitiesDialog = ({
} }
}, [open, selectedItem]); }, [open, selectedItem]);
const handleClose = (_event, reason: 'backdropClick' | 'escapeKeyDown') => { const handleClose = (
_event: React.SyntheticEvent,
reason: 'backdropClick' | 'escapeKeyDown'
) => {
if (reason !== 'backdropClick') { if (reason !== 'backdropClick') {
onClose(); onClose();
} }
@@ -119,7 +126,7 @@ const CustomEntitiesDialog = ({
<Grid container spacing={2} rowSpacing={0}> <Grid container spacing={2} rowSpacing={0}>
<Grid size={12}> <Grid size={12}>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="name" name="name"
label={LL.NAME(0)} label={LL.NAME(0)}
value={editItem.name} value={editItem.name}
@@ -128,6 +135,20 @@ const CustomEntitiesDialog = ({
onChange={updateFormValue} onChange={updateFormValue}
/> />
</Grid> </Grid>
<Grid mt={3}>
<BlockFormControlLabel
control={
<Checkbox
icon={<InsertCommentOutlinedIcon htmlColor="white" />}
checkedIcon={<CommentsDisabledOutlinedIcon color="primary" />}
checked={editItem.hide}
onChange={updateFormValue}
name="hide"
/>
}
label="API/MQTT"
/>
</Grid>
<Grid> <Grid>
<TextField <TextField
name="ram" name="ram"
@@ -177,10 +198,12 @@ const CustomEntitiesDialog = ({
)} )}
{editItem.ram === 0 && ( {editItem.ram === 0 && (
<> <>
<Grid mt={3} size={9}> <Grid mt={3}>
<BlockFormControlLabel <BlockFormControlLabel
control={ control={
<Checkbox <Checkbox
icon={<EditOffOutlinedIcon color="primary" />}
checkedIcon={<EditOutlinedIcon htmlColor="white" />}
checked={editItem.writeable} checked={editItem.writeable}
onChange={updateFormValue} onChange={updateFormValue}
name="writeable" name="writeable"
@@ -191,7 +214,7 @@ const CustomEntitiesDialog = ({
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="device_id" name="device_id"
label={LL.ID_OF(LL.DEVICE())} label={LL.ID_OF(LL.DEVICE())}
margin="normal" margin="normal"
@@ -211,7 +234,7 @@ const CustomEntitiesDialog = ({
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="type_id" name="type_id"
label={LL.ID_OF(LL.TYPE(1))} label={LL.ID_OF(LL.TYPE(1))}
margin="normal" margin="normal"
@@ -231,7 +254,7 @@ const CustomEntitiesDialog = ({
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="offset" name="offset"
label={LL.OFFSET()} label={LL.OFFSET()}
margin="normal" margin="normal"
@@ -323,7 +346,7 @@ const CustomEntitiesDialog = ({
editItem.device_id !== '0' && ( editItem.device_id !== '0' && (
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="factor" name="factor"
label={LL.BYTES()} label={LL.BYTES()}
value={numberValue(editItem.factor as number)} value={numberValue(editItem.factor as number)}
@@ -341,7 +364,7 @@ const CustomEntitiesDialog = ({
{editItem.value_type === DeviceValueType.BOOL && ( {editItem.value_type === DeviceValueType.BOOL && (
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="factor" name="factor"
label={LL.BITMASK()} label={LL.BITMASK()}
value={editItem.factor as string} value={editItem.factor as string}

View File

@@ -16,7 +16,7 @@ import {
DialogActions, DialogActions,
DialogContent, DialogContent,
DialogTitle, DialogTitle,
Grid2 as Grid, Grid,
InputAdornment, InputAdornment,
Link, Link,
MenuItem, MenuItem,
@@ -125,13 +125,22 @@ const Customizations = () => {
const setOriginalSettings = (data: DeviceEntity[]) => { const setOriginalSettings = (data: DeviceEntity[]) => {
setDeviceEntities( setDeviceEntities(
data.map((de) => ({ data.map((de) => {
...de, const result: DeviceEntity = {
o_m: de.m, ...de,
o_cn: de.cn, o_m: de.m
o_mi: de.mi, };
o_ma: de.ma if (de.cn !== undefined) {
})) result.o_cn = de.cn;
}
if (de.mi !== undefined) {
result.o_mi = de.mi;
}
if (de.ma !== undefined) {
result.o_ma = de.ma;
}
return result;
})
); );
}; };
@@ -244,8 +253,11 @@ const Customizations = () => {
setSelectedDevice(-1); setSelectedDevice(-1);
setSelectedDeviceTypeNameURL(''); setSelectedDeviceTypeNameURL('');
} else { } else {
setSelectedDeviceTypeNameURL(devices.devices[index].url || ''); const device = devices.devices[index];
setSelectedDeviceName(devices.devices[index].n); if (device) {
setSelectedDeviceTypeNameURL(device.url || '');
setSelectedDeviceName(device.n);
}
setNumChanges(0); setNumChanges(0);
setRestartNeeded(false); setRestartNeeded(false);
} }
@@ -306,7 +318,7 @@ const Customizations = () => {
const filter_entity = (de: DeviceEntity) => const filter_entity = (de: DeviceEntity) =>
(de.m & selectedFilters || !selectedFilters) && (de.m & selectedFilters || !selectedFilters) &&
formatName(de, true).includes(search); formatName(de, true).toLowerCase().includes(search.toLowerCase());
const maskDisabled = (set: boolean) => { const maskDisabled = (set: boolean) => {
setDeviceEntities( setDeviceEntities(
@@ -396,14 +408,20 @@ const Customizations = () => {
await sendCustomizationEntities({ await sendCustomizationEntities({
id: selectedDevice, id: selectedDevice,
entity_ids: masked_entities entity_ids: masked_entities
}).catch((error: Error) => { })
if (error.message === 'Reboot required') { .then(() => {
setRestartNeeded(true); toast.success(LL.CUSTOMIZATIONS_SAVED());
} else { })
toast.error(error.message); .catch((error: Error) => {
} if (error.message === 'Reboot required') {
}); setRestartNeeded(true);
setOriginalSettings(deviceEntities); } else {
toast.error(error.message);
}
})
.finally(() => {
setOriginalSettings(deviceEntities);
});
} }
}; };
@@ -545,7 +563,7 @@ const Customizations = () => {
size="small" size="small"
color="secondary" color="secondary"
value={getMaskString(selectedFilters)} value={getMaskString(selectedFilters)}
onChange={(event, mask: string[]) => { onChange={(_, mask: string[]) => {
setSelectedFilters(getMaskNumber(mask)); setSelectedFilters(getMaskNumber(mask));
}} }}
> >

View File

@@ -10,7 +10,7 @@ import {
DialogActions, DialogActions,
DialogContent, DialogContent,
DialogTitle, DialogTitle,
Grid2 as Grid, Grid,
TextField, TextField,
Typography Typography
} from '@mui/material'; } from '@mui/material';
@@ -54,7 +54,10 @@ const CustomizationsDialog = ({
} }
}, [open, selectedItem]); }, [open, selectedItem]);
const handleClose = (_event, reason: 'backdropClick' | 'escapeKeyDown') => { const handleClose = (
_event: React.SyntheticEvent,
reason: 'backdropClick' | 'escapeKeyDown'
) => {
if (reason !== 'backdropClick') { if (reason !== 'backdropClick') {
onClose(); onClose();
} }

View File

@@ -1,4 +1,4 @@
import { useContext, useEffect, useState } from 'react'; import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
import { IconContext } from 'react-icons/lib'; import { IconContext } from 'react-icons/lib';
import { Link } from 'react-router'; import { Link } from 'react-router';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
@@ -76,35 +76,40 @@ const Dashboard = () => {
} }
); );
const deviceValueDialogSave = async (devicevalue: DeviceValue) => { const deviceValueDialogSave = useCallback(
if (!selectedDashboardItem) { async (devicevalue: DeviceValue) => {
return; if (!selectedDashboardItem) {
} return;
const id = selectedDashboardItem.parentNode.id; // this is the parent ID }
await sendDeviceValue({ id, c: devicevalue.c ?? '', v: devicevalue.v }) const id = selectedDashboardItem.id; // this is the parent ID
.then(() => { await sendDeviceValue({ id, c: devicevalue.c ?? '', v: devicevalue.v })
toast.success(LL.WRITE_CMD_SENT()); .then(() => {
}) toast.success(LL.WRITE_CMD_SENT());
.catch((error: Error) => { })
toast.error(error.message); .catch((error: Error) => {
}) toast.error(error.message);
.finally(() => { })
setDeviceValueDialogOpen(false); .finally(() => {
setSelectedDashboardItem(undefined); setDeviceValueDialogOpen(false);
}); setSelectedDashboardItem(undefined);
}; });
},
[selectedDashboardItem, sendDeviceValue, LL]
);
const dashboard_theme = useTheme({ const dashboard_theme = useMemo(
Table: ` () =>
useTheme({
Table: `
--data-table-library_grid-template-columns: minmax(80px, auto) 120px 32px; --data-table-library_grid-template-columns: minmax(80px, auto) 120px 32px;
`, `,
BaseRow: ` BaseRow: `
font-size: 14px; font-size: 14px;
.td { .td {
height: 28px; height: 28px;
} }
`, `,
Row: ` Row: `
cursor: pointer; cursor: pointer;
background-color: #1e1e1e; background-color: #1e1e1e;
&:nth-of-type(odd) .td { &:nth-of-type(odd) .td {
@@ -114,7 +119,7 @@ const Dashboard = () => {
background-color: #177ac9; background-color: #177ac9;
}, },
`, `,
BaseCell: ` BaseCell: `
&:nth-of-type(2) { &:nth-of-type(2) {
text-align: right; text-align: right;
} }
@@ -122,12 +127,14 @@ const Dashboard = () => {
text-align: right; text-align: right;
} }
` `
}); }),
[]
);
const tree = useTree( const tree = useTree(
{ nodes: data.nodes }, { nodes: data.nodes },
{ {
onChange: undefined // not used but needed onChange: () => {} // not used but needed
}, },
{ {
treeIcon: { treeIcon: {
@@ -162,28 +169,31 @@ const Dashboard = () => {
: tree.fns.onRemoveAll(); // collapse tree : tree.fns.onRemoveAll(); // collapse tree
}, [parentNodes]); }, [parentNodes]);
const showType = (n?: string, t?: number) => { const showType = useCallback(
// if we have a name show it (n?: string, t?: number) => {
if (n) { // if we have a name show it
return n; if (n) {
} return n;
if (t) {
// otherwise pick translation based on type
switch (t) {
case DeviceType.CUSTOM:
return LL.CUSTOM_ENTITIES(0);
case DeviceType.ANALOGSENSOR:
return LL.ANALOG_SENSORS();
case DeviceType.TEMPERATURESENSOR:
return LL.TEMP_SENSORS();
case DeviceType.SCHEDULER:
return LL.SCHEDULER();
default:
break;
} }
} if (t) {
return ''; // otherwise pick translation based on type
}; switch (t) {
case DeviceType.CUSTOM:
return LL.CUSTOM_ENTITIES(0);
case DeviceType.ANALOGSENSOR:
return LL.ANALOG_SENSORS();
case DeviceType.TEMPERATURESENSOR:
return LL.TEMP_SENSORS();
case DeviceType.SCHEDULER:
return LL.SCHEDULER();
default:
break;
}
}
return '';
},
[LL]
);
const showName = (di: DashboardItem) => { const showName = (di: DashboardItem) => {
if (di.id < 100) { if (di.id < 100) {
@@ -201,20 +211,24 @@ const Dashboard = () => {
if (di.dv) { if (di.dv) {
return <span>{di.dv.id.slice(2)}</span>; return <span>{di.dv.id.slice(2)}</span>;
} }
return null;
}; };
const hasMask = (id: string, mask: number) => const hasMask = (id: string, mask: number) =>
(parseInt(id.slice(0, 2), 16) & mask) === mask; (parseInt(id.slice(0, 2), 16) & mask) === mask;
const editDashboardValue = (di: DashboardItem) => { const editDashboardValue = useCallback(
if (me.admin && di.dv?.c) { (di: DashboardItem) => {
setSelectedDashboardItem(di); if (me.admin && di.dv?.c) {
setDeviceValueDialogOpen(true); setSelectedDashboardItem(di);
} setDeviceValueDialogOpen(true);
}; }
},
[me.admin]
);
const handleShowAll = ( const handleShowAll = (
event: React.MouseEvent<HTMLElement>, _event: React.MouseEvent<HTMLElement>,
toggle: boolean | null toggle: boolean | null
) => { ) => {
if (toggle !== null) { if (toggle !== null) {
@@ -225,7 +239,9 @@ const Dashboard = () => {
const renderContent = () => { const renderContent = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={fetchDashboard} errorMessage={error?.message} />; return (
<FormLoader onRetry={fetchDashboard} errorMessage={error?.message || ''} />
);
} }
const hasFavEntities = data.nodes.filter( const hasFavEntities = data.nodes.filter(

View File

@@ -31,7 +31,7 @@ import {
DialogActions, DialogActions,
DialogContent, DialogContent,
DialogTitle, DialogTitle,
Grid2 as Grid, Grid,
IconButton, IconButton,
InputAdornment, InputAdornment,
List, List,
@@ -329,13 +329,16 @@ const Devices = () => {
const handleDownloadCsv = () => { const handleDownloadCsv = () => {
const deviceIndex = coreData.devices.findIndex( const deviceIndex = coreData.devices.findIndex(
(d) => d.id === device_select.state.id (d: Device) => d.id === device_select.state.id
); );
if (deviceIndex === -1) { if (deviceIndex === -1) {
return; return;
} }
const filename = const selectedDevice = coreData.devices[deviceIndex];
coreData.devices[deviceIndex].tn + '_' + coreData.devices[deviceIndex].n; if (!selectedDevice) {
return;
}
const filename = selectedDevice.tn + '_' + selectedDevice.n;
const columns = [ const columns = [
{ {
@@ -350,7 +353,7 @@ const Devices = () => {
{ {
accessor: (dv: DeviceValue) => accessor: (dv: DeviceValue) =>
dv.u !== undefined && DeviceValueUOM_s[dv.u] dv.u !== undefined && DeviceValueUOM_s[dv.u]
? DeviceValueUOM_s[dv.u].replace(/[^a-zA-Z0-9]/g, '') ? DeviceValueUOM_s[dv.u]?.replace(/[^a-zA-Z0-9]/g, '')
: '', : '',
name: 'UoM' name: 'UoM'
}, },
@@ -373,7 +376,9 @@ const Devices = () => {
]; ];
const data = onlyFav const data = onlyFav
? deviceData.nodes.filter((dv) => hasMask(dv.id, DeviceEntityMask.DV_FAVORITE)) ? deviceData.nodes.filter((dv: DeviceValue) =>
hasMask(dv.id, DeviceEntityMask.DV_FAVORITE)
)
: deviceData.nodes; : deviceData.nodes;
const csvData = data.reduce( const csvData = data.reduce(
@@ -433,10 +438,14 @@ const Devices = () => {
const renderDeviceDetails = () => { const renderDeviceDetails = () => {
if (showDeviceInfo) { if (showDeviceInfo) {
const deviceIndex = coreData.devices.findIndex( const deviceIndex = coreData.devices.findIndex(
(d) => d.id === device_select.state.id (d: Device) => d.id === device_select.state.id
); );
if (deviceIndex === -1) { if (deviceIndex === -1) {
return; return null;
}
const deviceDetails = coreData.devices[deviceIndex];
if (!deviceDetails) {
return null;
} }
return ( return (
@@ -449,47 +458,35 @@ const Devices = () => {
<DialogContent dividers> <DialogContent dividers>
<List dense={true}> <List dense={true}>
<ListItem> <ListItem>
<ListItemText <ListItemText primary={LL.TYPE(0)} secondary={deviceDetails.tn} />
primary={LL.TYPE(0)}
secondary={coreData.devices[deviceIndex].tn}
/>
</ListItem> </ListItem>
<ListItem> <ListItem>
<ListItemText <ListItemText primary={LL.NAME(0)} secondary={deviceDetails.n} />
primary={LL.NAME(0)}
secondary={coreData.devices[deviceIndex].n}
/>
</ListItem> </ListItem>
{coreData.devices[deviceIndex].t !== DeviceType.CUSTOM && ( {deviceDetails.t !== DeviceType.CUSTOM && (
<> <>
<ListItem> <ListItem>
<ListItemText <ListItemText primary={LL.BRAND()} secondary={deviceDetails.b} />
primary={LL.BRAND()}
secondary={coreData.devices[deviceIndex].b}
/>
</ListItem> </ListItem>
<ListItem> <ListItem>
<ListItemText <ListItemText
primary={LL.ID_OF(LL.DEVICE())} primary={LL.ID_OF(LL.DEVICE())}
secondary={ secondary={
'0x' + '0x' +
( ('00' + deviceDetails.d.toString(16).toUpperCase()).slice(-2)
'00' +
coreData.devices[deviceIndex].d.toString(16).toUpperCase()
).slice(-2)
} }
/> />
</ListItem> </ListItem>
<ListItem> <ListItem>
<ListItemText <ListItemText
primary={LL.ID_OF(LL.PRODUCT())} primary={LL.ID_OF(LL.PRODUCT())}
secondary={coreData.devices[deviceIndex].p} secondary={deviceDetails.p}
/> />
</ListItem> </ListItem>
<ListItem> <ListItem>
<ListItemText <ListItemText
primary={LL.VERSION()} primary={LL.VERSION()}
secondary={coreData.devices[deviceIndex].v} secondary={deviceDetails.v}
/> />
</ListItem> </ListItem>
</> </>
@@ -508,6 +505,7 @@ const Devices = () => {
</Dialog> </Dialog>
); );
} }
return null;
}; };
const renderCoreData = () => ( const renderCoreData = () => (
@@ -598,19 +596,26 @@ const Devices = () => {
const shown_data = onlyFav const shown_data = onlyFav
? deviceData.nodes.filter( ? deviceData.nodes.filter(
(dv) => (dv: DeviceValue) =>
hasMask(dv.id, DeviceEntityMask.DV_FAVORITE) && hasMask(dv.id, DeviceEntityMask.DV_FAVORITE) &&
dv.id.slice(2).includes(search) dv.id.slice(2).toLowerCase().includes(search.toLowerCase())
) )
: deviceData.nodes.filter((dv) => dv.id.slice(2).includes(search)); : deviceData.nodes.filter((dv: DeviceValue) =>
dv.id.slice(2).toLowerCase().includes(search.toLowerCase())
);
const deviceIndex = coreData.devices.findIndex( const deviceIndex = coreData.devices.findIndex(
(d) => d.id === device_select.state.id (d: Device) => d.id === device_select.state.id
); );
if (deviceIndex === -1) { if (deviceIndex === -1) {
return; return;
} }
const deviceInfo = coreData.devices[deviceIndex];
if (!deviceInfo) {
return;
}
const [, height] = size;
return ( return (
<Box <Box
sx={{ sx={{
@@ -621,15 +626,15 @@ const Devices = () => {
bottom: 0, bottom: 0,
top: 64, top: 64,
zIndex: 'modal', zIndex: 'modal',
maxHeight: () => size[1] - 126, maxHeight: () => (height || 0) - 126,
border: '1px solid #177ac9' border: '1px solid #177ac9'
}} }}
> >
<Box sx={{ p: 1 }}> <Box sx={{ p: 1 }}>
<Grid container justifyContent="space-between"> <Grid container justifyContent="space-between">
<Typography noWrap variant="subtitle1" color="warning.main"> <Typography noWrap variant="subtitle1" color="warning.main">
{coreData.devices[deviceIndex].n}&nbsp;( {deviceInfo.n}&nbsp;(
{coreData.devices[deviceIndex].tn}) {deviceInfo.tn})
</Typography> </Typography>
<Grid justifyContent="flex-end"> <Grid justifyContent="flex-end">
<ButtonTooltip title={LL.CLOSE()}> <ButtonTooltip title={LL.CLOSE()}>
@@ -699,7 +704,7 @@ const Devices = () => {
' ' + ' ' +
shown_data.length + shown_data.length +
'/' + '/' +
coreData.devices[deviceIndex].e + deviceInfo.e +
' ' + ' ' +
LL.ENTITIES(shown_data.length)} LL.ENTITIES(shown_data.length)}
</span> </span>

View File

@@ -11,7 +11,7 @@ import {
DialogContent, DialogContent,
DialogTitle, DialogTitle,
FormHelperText, FormHelperText,
Grid2 as Grid, Grid,
InputAdornment, InputAdornment,
MenuItem, MenuItem,
TextField, TextField,
@@ -120,7 +120,7 @@ const DevicesDialog = ({
{editItem.l ? ( {editItem.l ? (
<TextField <TextField
name="v" name="v"
label={LL.VALUE(0)} // label={LL.VALUE(0)}
value={editItem.v} value={editItem.v}
disabled={!writeable} disabled={!writeable}
sx={{ width: '30ch' }} sx={{ width: '30ch' }}
@@ -135,7 +135,7 @@ const DevicesDialog = ({
</TextField> </TextField>
) : editItem.s || editItem.u !== DeviceValueUOM.NONE ? ( ) : editItem.s || editItem.u !== DeviceValueUOM.NONE ? (
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="v" name="v"
label={LL.VALUE(0)} label={LL.VALUE(0)}
value={numberValue(Math.round((editItem.v as number) * 10) / 10)} value={numberValue(Math.round((editItem.v as number) * 10) / 10)}
@@ -159,7 +159,7 @@ const DevicesDialog = ({
/> />
) : ( ) : (
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="v" name="v"
label={LL.VALUE(0)} label={LL.VALUE(0)}
value={editItem.v} value={editItem.v}

View File

@@ -43,7 +43,7 @@ const EntityMaskToggle = ({ onUpdate, de }: EntityMaskToggleProps) => {
size="small" size="small"
color="secondary" color="secondary"
value={getMaskString(de.m)} value={getMaskString(de.m)}
onChange={(event, mask: string[]) => { onChange={(_event, mask: string[]) => {
de.m = getMaskNumber(mask); de.m = getMaskNumber(mask);
if (de.n === '' && de.m & DeviceEntityMask.DV_READONLY) { if (de.n === '' && de.m & DeviceEntityMask.DV_READONLY) {
de.m = de.m | DeviceEntityMask.DV_WEB_EXCLUDE; de.m = de.m | DeviceEntityMask.DV_WEB_EXCLUDE;

View File

@@ -41,7 +41,8 @@ const Help = () => {
useRequest(() => callAction({ action: 'getCustomSupport' })).onSuccess((event) => { useRequest(() => callAction({ action: 'getCustomSupport' })).onSuccess((event) => {
if (event && event.data && Object.keys(event.data).length !== 0) { if (event && event.data && Object.keys(event.data).length !== 0) {
const data = event.data.Support; const data = (event.data as { Support: { img_url?: string; html?: string[] } })
.Support;
if (data.img_url) { if (data.img_url) {
setCustomSupportIMG(data.img_url); setCustomSupportIMG(data.img_url);
} }
@@ -59,7 +60,7 @@ const Help = () => {
toast.info(LL.DOWNLOAD_SUCCESSFUL()); toast.info(LL.DOWNLOAD_SUCCESSFUL());
}) })
.onError((error) => { .onError((error) => {
toast.error(error.message); toast.error(String(error.error?.message || 'An error occurred'));
}); });
return ( return (

View File

@@ -133,13 +133,15 @@ const Modules = () => {
}; };
const saveModules = async () => { const saveModules = async () => {
await updateModules({ await Promise.all(
modules: modules.map((condensed_mi) => ({ modules.map((condensed_mi: ModuleItem) =>
key: condensed_mi.key, updateModules({
enabled: condensed_mi.enabled, key: condensed_mi.key,
license: condensed_mi.license enabled: condensed_mi.enabled,
})) license: condensed_mi.license
}) })
)
)
.then(() => { .then(() => {
toast.success(LL.MODULES_UPDATED()); toast.success(LL.MODULES_UPDATED());
}) })
@@ -154,7 +156,9 @@ const Modules = () => {
const renderContent = () => { const renderContent = () => {
if (!modules) { if (!modules) {
return <FormLoader onRetry={fetchModules} errorMessage={error?.message} />; return (
<FormLoader onRetry={fetchModules} errorMessage={error?.message || ''} />
);
} }
if (modules.length === 0) { if (modules.length === 0) {

View File

@@ -10,7 +10,7 @@ import {
DialogActions, DialogActions,
DialogContent, DialogContent,
DialogTitle, DialogTitle,
Grid2 as Grid, Grid,
TextField TextField
} from '@mui/material'; } from '@mui/material';

View File

@@ -27,6 +27,7 @@ import {
useLayoutTitle useLayoutTitle
} from 'components'; } from 'components';
import { useI18nContext } from 'i18n/i18n-react'; import { useI18nContext } from 'i18n/i18n-react';
import { useInterval } from 'utils';
import { readSchedule, writeSchedule } from '../../api/app'; import { readSchedule, writeSchedule } from '../../api/app';
import SettingsSchedulerDialog from './SchedulerDialog'; import SettingsSchedulerDialog from './SchedulerDialog';
@@ -73,6 +74,12 @@ const Scheduler = () => {
); );
} }
useInterval(() => {
if (numChanges === 0) {
void fetchSchedule();
}
});
useEffect(() => { useEffect(() => {
const formatter = new Intl.DateTimeFormat(locale, { const formatter = new Intl.DateTimeFormat(locale, {
weekday: 'short', weekday: 'short',
@@ -128,8 +135,8 @@ const Scheduler = () => {
const saveSchedule = async () => { const saveSchedule = async () => {
await updateSchedule({ await updateSchedule({
schedule: schedule schedule: schedule
.filter((si) => !si.deleted) .filter((si: ScheduleItem) => !si.deleted)
.map((condensed_si) => ({ .map((condensed_si: ScheduleItem) => ({
id: condensed_si.id, id: condensed_si.id,
active: condensed_si.active, active: condensed_si.active,
flags: condensed_si.flags, flags: condensed_si.flags,
@@ -205,7 +212,9 @@ const Scheduler = () => {
const renderSchedule = () => { const renderSchedule = () => {
if (!schedule) { if (!schedule) {
return <FormLoader onRetry={fetchSchedule} errorMessage={error?.message} />; return (
<FormLoader onRetry={fetchSchedule} errorMessage={error?.message || ''} />
);
} }
const dayBox = (si: ScheduleItem, flag: number) => ( const dayBox = (si: ScheduleItem, flag: number) => (
@@ -244,8 +253,8 @@ const Scheduler = () => {
<Table <Table
data={{ data={{
nodes: schedule nodes: schedule
.filter((si) => !si.deleted) .filter((si: ScheduleItem) => !si.deleted)
.sort((a, b) => a.flags - b.flags) .sort((a: ScheduleItem, b: ScheduleItem) => a.flags - b.flags)
}} }}
theme={schedule_theme} theme={schedule_theme}
layout={{ custom: true }} layout={{ custom: true }}

View File

@@ -13,7 +13,7 @@ import {
DialogActions, DialogActions,
DialogContent, DialogContent,
DialogTitle, DialogTitle,
Grid2 as Grid, Grid,
TextField, TextField,
ToggleButton, ToggleButton,
ToggleButtonGroup, ToggleButtonGroup,
@@ -144,7 +144,10 @@ const SchedulerDialog = ({
</Typography> </Typography>
); );
const handleClose = (_event, reason: 'backdropClick' | 'escapeKeyDown') => { const handleClose = (
_event: React.SyntheticEvent,
reason: 'backdropClick' | 'escapeKeyDown'
) => {
if (reason !== 'backdropClick') { if (reason !== 'backdropClick') {
onClose(); onClose();
} }
@@ -325,7 +328,7 @@ const SchedulerDialog = ({
</> </>
)} )}
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="cmd" name="cmd"
label={LL.COMMAND(0)} label={LL.COMMAND(0)}
multiline multiline
@@ -344,7 +347,7 @@ const SchedulerDialog = ({
onChange={updateFormValue} onChange={updateFormValue}
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="name" name="name"
label={LL.NAME(0) + ' (' + LL.OPTIONAL() + ')'} label={LL.NAME(0) + ' (' + LL.OPTIONAL() + ')'}
value={editItem.name} value={editItem.name}

View File

@@ -439,7 +439,8 @@ const Sensors = () => {
<Cell>{a.n}</Cell> <Cell>{a.n}</Cell>
<Cell stiff>{AnalogTypeNames[a.t]} </Cell> <Cell stiff>{AnalogTypeNames[a.t]} </Cell>
{(a.t === AnalogType.DIGITAL_OUT && a.g !== 25 && a.g !== 26) || {(a.t === AnalogType.DIGITAL_OUT && a.g !== 25 && a.g !== 26) ||
a.t === AnalogType.DIGITAL_IN ? ( a.t === AnalogType.DIGITAL_IN ||
a.t === AnalogType.PULSE ? (
<Cell stiff>{a.v ? LL.ON() : LL.OFF()}</Cell> <Cell stiff>{a.v ? LL.ON() : LL.OFF()}</Cell>
) : ( ) : (
<Cell stiff>{a.t ? formatValue(a.v, a.u) : ''}</Cell> <Cell stiff>{a.t ? formatValue(a.v, a.u) : ''}</Cell>

View File

@@ -10,7 +10,7 @@ import {
DialogActions, DialogActions,
DialogContent, DialogContent,
DialogTitle, DialogTitle,
Grid2 as Grid, Grid,
InputAdornment, InputAdornment,
MenuItem, MenuItem,
TextField, TextField,
@@ -57,7 +57,10 @@ const SensorsAnalogDialog = ({
} }
}, [open, selectedItem]); }, [open, selectedItem]);
const handleClose = (_event, reason: 'backdropClick' | 'escapeKeyDown') => { const handleClose = (
_event: React.SyntheticEvent,
reason: 'backdropClick' | 'escapeKeyDown'
) => {
if (reason !== 'backdropClick') { if (reason !== 'backdropClick') {
onClose(); onClose();
} }
@@ -88,7 +91,7 @@ const SensorsAnalogDialog = ({
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="g" name="g"
label="GPIO" label="GPIO"
sx={{ width: '11ch' }} sx={{ width: '11ch' }}
@@ -107,7 +110,7 @@ const SensorsAnalogDialog = ({
)} )}
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="n" name="n"
label={LL.NAME(0)} label={LL.NAME(0)}
value={editItem.n} value={editItem.n}
@@ -132,7 +135,9 @@ const SensorsAnalogDialog = ({
))} ))}
</TextField> </TextField>
</Grid> </Grid>
{editItem.t >= AnalogType.COUNTER && editItem.t <= AnalogType.RATE && ( {((editItem.t >= AnalogType.COUNTER && editItem.t <= AnalogType.RATE) ||
(editItem.t >= AnalogType.FREQ_0 &&
editItem.t <= AnalogType.FREQ_2)) && (
<Grid> <Grid>
<TextField <TextField
name="u" name="u"
@@ -171,6 +176,27 @@ const SensorsAnalogDialog = ({
/> />
</Grid> </Grid>
)} )}
{editItem.t === AnalogType.NTC && (
<Grid>
<TextField
name="o"
label={LL.OFFSET()}
value={numberValue(editItem.o)}
sx={{ width: '11ch' }}
type="number"
variant="outlined"
onChange={updateFormValue}
slotProps={{
input: {
startAdornment: (
<InputAdornment position="start">°C</InputAdornment>
)
},
htmlInput: { min: '-20', max: '20', step: '0.1' }
}}
/>
</Grid>
)}
{editItem.t === AnalogType.COUNTER && ( {editItem.t === AnalogType.COUNTER && (
<Grid> <Grid>
<TextField <TextField
@@ -187,6 +213,19 @@ const SensorsAnalogDialog = ({
/> />
</Grid> </Grid>
)} )}
{editItem.t === AnalogType.RGB && (
<Grid>
<TextField
name="o"
label={'RGB ' + LL.VALUE(0)}
value={numberValue(editItem.o)}
type="number"
sx={{ width: '11ch' }}
variant="outlined"
onChange={updateFormValue}
/>
</Grid>
)}
{editItem.t >= AnalogType.COUNTER && editItem.t <= AnalogType.RATE && ( {editItem.t >= AnalogType.COUNTER && editItem.t <= AnalogType.RATE && (
<Grid> <Grid>
<TextField <TextField
@@ -314,6 +353,42 @@ const SensorsAnalogDialog = ({
</Grid> </Grid>
</> </>
)} )}
{editItem.t === AnalogType.PULSE && (
<>
<Grid>
<TextField
name="o"
label={LL.POLARITY()}
value={editItem.o}
sx={{ width: '11ch' }}
select
onChange={updateFormValue}
>
<MenuItem value={0}>{LL.ACTIVEHIGH()}</MenuItem>
<MenuItem value={1}>{LL.ACTIVELOW()}</MenuItem>
</TextField>
</Grid>
<Grid>
<TextField
name="f"
label="Pulse"
value={numberValue(editItem.f)}
type="number"
sx={{ width: '15ch' }}
variant="outlined"
onChange={updateFormValue}
slotProps={{
input: {
startAdornment: (
<InputAdornment position="start">s</InputAdornment>
)
},
htmlInput: { min: '0', max: '10000', step: '0.1' }
}}
/>
</Grid>
</>
)}
</Grid> </Grid>
</DialogContent> </DialogContent>
<DialogActions> <DialogActions>

View File

@@ -9,7 +9,7 @@ import {
DialogActions, DialogActions,
DialogContent, DialogContent,
DialogTitle, DialogTitle,
Grid2 as Grid, Grid,
InputAdornment, InputAdornment,
TextField, TextField,
Typography Typography
@@ -52,7 +52,10 @@ const SensorsTemperatureDialog = ({
} }
}, [open, selectedItem]); }, [open, selectedItem]);
const handleClose = (_event, reason: 'backdropClick' | 'escapeKeyDown') => { const handleClose = (
_event: React.SyntheticEvent,
reason: 'backdropClick' | 'escapeKeyDown'
) => {
if (reason !== 'backdropClick') { if (reason !== 'backdropClick') {
onClose(); onClose();
} }
@@ -82,7 +85,7 @@ const SensorsTemperatureDialog = ({
<Grid container spacing={2}> <Grid container spacing={2}>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="n" name="n"
label={LL.NAME(0)} label={LL.NAME(0)}
value={editItem.n} value={editItem.n}

View File

@@ -188,7 +188,8 @@ export enum DeviceValueUOM {
VOLTS, VOLTS,
MBAR, MBAR,
LH, LH,
CTKWH CTKWH,
HZ
} }
export const DeviceValueUOM_s = [ export const DeviceValueUOM_s = [
@@ -218,7 +219,8 @@ export const DeviceValueUOM_s = [
'V', 'V',
'mbar', 'mbar',
'l/h', 'l/h',
'ct/kWh' 'ct/kWh',
'Hz'
]; ];
export enum AnalogType { export enum AnalogType {
@@ -232,20 +234,32 @@ export enum AnalogType {
DIGITAL_OUT = 6, DIGITAL_OUT = 6,
PWM_0 = 7, PWM_0 = 7,
PWM_1 = 8, PWM_1 = 8,
PWM_2 = 9 PWM_2 = 9,
NTC = 10,
RGB = 11,
PULSE = 12,
FREQ_0 = 13,
FREQ_1 = 14,
FREQ_2 = 15
} }
export const AnalogTypeNames = [ export const AnalogTypeNames = [
'(disabled)', '(disabled)',
'Digital In', 'Digital In',
'Counter', 'Counter',
'ADC', 'ADC In',
'Timer', 'Timer',
'Rate', 'Rate',
'Digital Out', 'Digital Out',
'PWM 0', 'PWM 0',
'PWM 1', 'PWM 1',
'PWM 2' 'PWM 2',
'NTC Temp.',
'RGB Led',
'Pulse',
'Freq 0',
'Freq 1',
'Freq 2'
]; ];
type BoardProfiles = Record<string, string>; type BoardProfiles = Record<string, string>;
@@ -255,6 +269,7 @@ export const BOARD_PROFILES: BoardProfiles = {
S32S3: 'BBQKees Gateway S3', S32S3: 'BBQKees Gateway S3',
E32: 'BBQKees Gateway E32', E32: 'BBQKees Gateway E32',
E32V2: 'BBQKees Gateway E32 V2', E32V2: 'BBQKees Gateway E32 V2',
E32V2_2: 'BBQKees Gateway E32 V2.2',
NODEMCU: 'NodeMCU 32S', NODEMCU: 'NodeMCU 32S',
'MH-ET': 'MH-ET Live D1 Mini', 'MH-ET': 'MH-ET Live D1 Mini',
LOLIN: 'Lolin D32', LOLIN: 'Lolin D32',
@@ -380,6 +395,7 @@ export interface EntityItem {
value_type: number; value_type: number;
value?: unknown; value?: unknown;
writeable: boolean; writeable: boolean;
hide: boolean;
deleted?: boolean; deleted?: boolean;
o_id?: number; o_id?: number;
o_ram?: number; o_ram?: number;
@@ -393,6 +409,7 @@ export interface EntityItem {
o_deleted?: boolean; o_deleted?: boolean;
o_writeable?: boolean; o_writeable?: boolean;
o_value?: unknown; o_value?: unknown;
o_hide?: boolean;
} }
export interface Entities { export interface Entities {

View File

@@ -13,7 +13,7 @@ import type {
export const GPIO_VALIDATOR = { export const GPIO_VALIDATOR = {
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
value: number, value: number,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -36,7 +36,7 @@ export const GPIO_VALIDATOR = {
export const GPIO_VALIDATORR = { export const GPIO_VALIDATORR = {
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
value: number, value: number,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -60,7 +60,7 @@ export const GPIO_VALIDATORR = {
export const GPIO_VALIDATORC3 = { export const GPIO_VALIDATORC3 = {
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
value: number, value: number,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -74,7 +74,7 @@ export const GPIO_VALIDATORC3 = {
export const GPIO_VALIDATORS2 = { export const GPIO_VALIDATORS2 = {
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
value: number, value: number,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -94,7 +94,7 @@ export const GPIO_VALIDATORS2 = {
export const GPIO_VALIDATORS3 = { export const GPIO_VALIDATORS3 = {
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
value: number, value: number,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -279,7 +279,7 @@ export const createSettingsValidator = (settings: Settings) =>
export const uniqueNameValidator = (schedule: ScheduleItem[], o_name?: string) => ({ export const uniqueNameValidator = (schedule: ScheduleItem[], o_name?: string) => ({
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
name: string, name: string,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -324,7 +324,7 @@ export const uniqueCustomNameValidator = (
o_name?: string o_name?: string
) => ({ ) => ({
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
name: string, name: string,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -353,7 +353,7 @@ export const entityItemValidation = (entity: EntityItem[], entityItem: EntityIte
device_id: [ device_id: [
{ {
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
value: string, value: string,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -367,7 +367,7 @@ export const entityItemValidation = (entity: EntityItem[], entityItem: EntityIte
type_id: [ type_id: [
{ {
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
value: string, value: string,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -389,7 +389,7 @@ export const uniqueTemperatureNameValidator = (
sensors: TemperatureSensor[], sensors: TemperatureSensor[],
o_name?: string o_name?: string
) => ({ ) => ({
validator(rule: InternalRuleItem, n: string, callback: (error?: string) => void) { validator(_rule: InternalRuleItem, n: string, callback: (error?: string) => void) {
if ( if (
(o_name === undefined || o_name.toLowerCase() !== n.toLowerCase()) && (o_name === undefined || o_name.toLowerCase() !== n.toLowerCase()) &&
n !== '' && n !== '' &&
@@ -419,7 +419,7 @@ export const temperatureSensorItemValidation = (
export const isGPIOUniqueValidator = (sensors: AnalogSensor[]) => ({ export const isGPIOUniqueValidator = (sensors: AnalogSensor[]) => ({
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
gpio: number, gpio: number,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {
@@ -435,7 +435,7 @@ export const uniqueAnalogNameValidator = (
sensors: AnalogSensor[], sensors: AnalogSensor[],
o_name?: string o_name?: string
) => ({ ) => ({
validator(rule: InternalRuleItem, n: string, callback: (error?: string) => void) { validator(_rule: InternalRuleItem, n: string, callback: (error?: string) => void) {
if ( if (
(o_name === undefined || o_name.toLowerCase() !== n.toLowerCase()) && (o_name === undefined || o_name.toLowerCase() !== n.toLowerCase()) &&
n !== '' && n !== '' &&
@@ -482,7 +482,7 @@ export const deviceValueItemValidation = (dv: DeviceValue) =>
{ required: true, message: 'Value is required' }, { required: true, message: 'Value is required' },
{ {
validator( validator(
rule: InternalRuleItem, _rule: InternalRuleItem,
value: unknown, value: unknown,
callback: (error?: string) => void callback: (error?: string) => void
) { ) {

View File

@@ -54,12 +54,12 @@ const APSettings = () => {
origData, origData,
dirtyFlags, dirtyFlags,
setDirtyFlags, setDirtyFlags,
updateDataValue updateDataValue as (value: unknown) => void
); );
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={errorMessage} />; return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
} }
const validateAndSubmit = async () => { const validateAndSubmit = async () => {
@@ -80,7 +80,7 @@ const APSettings = () => {
return ( return (
<> <>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="provision_mode" name="provision_mode"
label={LL.AP_PROVIDE() + '...'} label={LL.AP_PROVIDE() + '...'}
value={data.provision_mode} value={data.provision_mode}
@@ -103,7 +103,7 @@ const APSettings = () => {
{isAPEnabled(data) && ( {isAPEnabled(data) && (
<> <>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="ssid" name="ssid"
label={LL.ACCESS_POINT(2) + ' SSID'} label={LL.ACCESS_POINT(2) + ' SSID'}
fullWidth fullWidth
@@ -113,7 +113,7 @@ const APSettings = () => {
margin="normal" margin="normal"
/> />
<ValidatedPasswordField <ValidatedPasswordField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="password" name="password"
label={LL.ACCESS_POINT(2) + ' ' + LL.PASSWORD()} label={LL.ACCESS_POINT(2) + ' ' + LL.PASSWORD()}
fullWidth fullWidth
@@ -123,7 +123,7 @@ const APSettings = () => {
margin="normal" margin="normal"
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="channel" name="channel"
label={LL.AP_PREFERRED_CHANNEL()} label={LL.AP_PREFERRED_CHANNEL()}
value={numberValue(data.channel)} value={numberValue(data.channel)}
@@ -151,7 +151,7 @@ const APSettings = () => {
label={LL.AP_HIDE_SSID()} label={LL.AP_HIDE_SSID()}
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="max_clients" name="max_clients"
label={LL.AP_MAX_CLIENTS()} label={LL.AP_MAX_CLIENTS()}
value={numberValue(data.max_clients)} value={numberValue(data.max_clients)}
@@ -169,7 +169,7 @@ const APSettings = () => {
))} ))}
</ValidatedTextField> </ValidatedTextField>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="local_ip" name="local_ip"
label={LL.AP_LOCAL_IP()} label={LL.AP_LOCAL_IP()}
fullWidth fullWidth
@@ -179,7 +179,7 @@ const APSettings = () => {
margin="normal" margin="normal"
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="gateway_ip" name="gateway_ip"
label={LL.NETWORK_GATEWAY()} label={LL.NETWORK_GATEWAY()}
fullWidth fullWidth
@@ -189,7 +189,7 @@ const APSettings = () => {
margin="normal" margin="normal"
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="subnet_mask" name="subnet_mask"
label={LL.NETWORK_SUBNET()} label={LL.NETWORK_SUBNET()}
fullWidth fullWidth

View File

@@ -9,7 +9,7 @@ import {
Button, Button,
Checkbox, Checkbox,
Divider, Divider,
Grid2 as Grid, Grid,
InputAdornment, InputAdornment,
MenuItem, MenuItem,
TextField, TextField,
@@ -75,7 +75,7 @@ const ApplicationSettings = () => {
origData, origData,
dirtyFlags, dirtyFlags,
setDirtyFlags, setDirtyFlags,
updateDataValue updateDataValue as (value: unknown) => void
); );
const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>(); const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
@@ -135,7 +135,7 @@ const ApplicationSettings = () => {
const content = () => { const content = () => {
if (!data || !hardwareData) { if (!data || !hardwareData) {
return <FormLoader onRetry={loadData} errorMessage={errorMessage} />; return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
} }
const validateAndSubmit = async () => { const validateAndSubmit = async () => {
@@ -219,7 +219,7 @@ const ApplicationSettings = () => {
<Grid container spacing={2} rowSpacing={0}> <Grid container spacing={2} rowSpacing={0}>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="modbus_max_clients" name="modbus_max_clients"
label={LL.AP_MAX_CLIENTS()} label={LL.AP_MAX_CLIENTS()}
variant="outlined" variant="outlined"
@@ -231,7 +231,7 @@ const ApplicationSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="modbus_port" name="modbus_port"
label="Port" label="Port"
variant="outlined" variant="outlined"
@@ -243,7 +243,7 @@ const ApplicationSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="modbus_timeout" name="modbus_timeout"
label="Timeout" label="Timeout"
slotProps={{ slotProps={{
@@ -273,7 +273,7 @@ const ApplicationSettings = () => {
<Grid container spacing={2} rowSpacing={0}> <Grid container spacing={2} rowSpacing={0}>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="syslog_host" name="syslog_host"
label="Host" label="Host"
variant="outlined" variant="outlined"
@@ -284,7 +284,7 @@ const ApplicationSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="syslog_port" name="syslog_port"
label="Port" label="Port"
variant="outlined" variant="outlined"
@@ -315,7 +315,7 @@ const ApplicationSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="syslog_mark_interval" name="syslog_mark_interval"
label={LL.MARK_INTERVAL()} label={LL.MARK_INTERVAL()}
slotProps={{ slotProps={{
@@ -485,7 +485,7 @@ const ApplicationSettings = () => {
<Grid container spacing={2} rowSpacing={0}> <Grid container spacing={2} rowSpacing={0}>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="rx_gpio" name="rx_gpio"
label={LL.GPIO_OF('Rx')} label={LL.GPIO_OF('Rx')}
fullWidth fullWidth
@@ -498,7 +498,7 @@ const ApplicationSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="tx_gpio" name="tx_gpio"
label={LL.GPIO_OF('Tx')} label={LL.GPIO_OF('Tx')}
fullWidth fullWidth
@@ -511,7 +511,7 @@ const ApplicationSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="pbutton_gpio" name="pbutton_gpio"
label={LL.GPIO_OF(LL.BUTTON())} label={LL.GPIO_OF(LL.BUTTON())}
fullWidth fullWidth
@@ -524,7 +524,7 @@ const ApplicationSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="dallas_gpio" name="dallas_gpio"
label={ label={
LL.GPIO_OF(LL.TEMPERATURE()) + ' (0=' + LL.DISABLED(1) + ')' LL.GPIO_OF(LL.TEMPERATURE()) + ' (0=' + LL.DISABLED(1) + ')'
@@ -539,7 +539,7 @@ const ApplicationSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="led_gpio" name="led_gpio"
label={LL.GPIO_OF('LED') + ' (0=' + LL.DISABLED(1) + ')'} label={LL.GPIO_OF('LED') + ' (0=' + LL.DISABLED(1) + ')'}
fullWidth fullWidth
@@ -554,7 +554,7 @@ const ApplicationSettings = () => {
<Grid> <Grid>
<TextField <TextField
name="led_type" name="led_type"
label={'LED ' + LL.TYPE()} label={'LED ' + LL.TYPE(0)}
value={data.led_type} value={data.led_type}
fullWidth fullWidth
variant="outlined" variant="outlined"
@@ -743,7 +743,7 @@ const ApplicationSettings = () => {
{data.remote_timeout_en && ( {data.remote_timeout_en && (
<Box mt={2}> <Box mt={2}>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="remote_timeout" name="remote_timeout"
label={LL.REMOTE_TIMEOUT()} label={LL.REMOTE_TIMEOUT()}
slotProps={{ slotProps={{
@@ -783,7 +783,7 @@ const ApplicationSettings = () => {
{data.shower_timer && ( {data.shower_timer && (
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="shower_min_duration" name="shower_min_duration"
label={LL.MIN_DURATION()} label={LL.MIN_DURATION()}
slotProps={{ slotProps={{
@@ -801,7 +801,7 @@ const ApplicationSettings = () => {
<> <>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="shower_alert_trigger" name="shower_alert_trigger"
label={LL.TRIGGER_TIME()} label={LL.TRIGGER_TIME()}
slotProps={{ slotProps={{
@@ -817,7 +817,7 @@ const ApplicationSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="shower_alert_coldshot" name="shower_alert_coldshot"
label={LL.COLD_SHOT_DURATION()} label={LL.COLD_SHOT_DURATION()}
slotProps={{ slotProps={{

View File

@@ -2,7 +2,7 @@ import { useState } from 'react';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
import DownloadIcon from '@mui/icons-material/GetApp'; import DownloadIcon from '@mui/icons-material/GetApp';
import { Box, Button, Grid2 as Grid, Typography } from '@mui/material'; import { Box, Button, Grid, Typography } from '@mui/material';
import * as SystemApi from 'api/system'; import * as SystemApi from 'api/system';
import { API, callAction } from 'api/app'; import { API, callAction } from 'api/app';
@@ -35,7 +35,7 @@ const DownloadUpload = () => {
toast.info(LL.DOWNLOAD_SUCCESSFUL()); toast.info(LL.DOWNLOAD_SUCCESSFUL());
}) })
.onError((error) => { .onError((error) => {
toast.error(error.message); toast.error(String(error.error?.message || 'An error occurred'));
}); });
const { send: sendAPI } = useRequest((data: APIcall) => API(data), { const { send: sendAPI } = useRequest((data: APIcall) => API(data), {
@@ -57,7 +57,7 @@ const DownloadUpload = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={error?.message} />; return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
} }
return ( return (

View File

@@ -5,7 +5,7 @@ import WarningIcon from '@mui/icons-material/Warning';
import { import {
Button, Button,
Checkbox, Checkbox,
Grid2 as Grid, Grid,
InputAdornment, InputAdornment,
MenuItem, MenuItem,
TextField, TextField,
@@ -56,7 +56,7 @@ const MqttSettings = () => {
origData, origData,
dirtyFlags, dirtyFlags,
setDirtyFlags, setDirtyFlags,
updateDataValue updateDataValue as (value: unknown) => void
); );
const SecondsInputProps = { const SecondsInputProps = {
@@ -65,7 +65,7 @@ const MqttSettings = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={errorMessage} />; return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
} }
const validateAndSubmit = async () => { const validateAndSubmit = async () => {
@@ -93,7 +93,7 @@ const MqttSettings = () => {
<Grid container spacing={2} rowSpacing={0}> <Grid container spacing={2} rowSpacing={0}>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="host" name="host"
label={LL.ADDRESS_OF(LL.BROKER())} label={LL.ADDRESS_OF(LL.BROKER())}
multiline multiline
@@ -105,7 +105,7 @@ const MqttSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="port" name="port"
label="Port" label="Port"
variant="outlined" variant="outlined"
@@ -117,7 +117,7 @@ const MqttSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="base" name="base"
label={LL.BASE_TOPIC()} label={LL.BASE_TOPIC()}
variant="outlined" variant="outlined"
@@ -158,7 +158,7 @@ const MqttSettings = () => {
</Grid> </Grid>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="keep_alive" name="keep_alive"
label="Keep Alive" label="Keep Alive"
slotProps={{ slotProps={{
@@ -254,109 +254,107 @@ const MqttSettings = () => {
} }
label={LL.MQTT_RESPONSE()} label={LL.MQTT_RESPONSE()}
/> />
{!data.ha_enabled && ( <Grid container spacing={2} rowSpacing={0}>
<Grid container spacing={2} rowSpacing={0}> <Grid>
<BlockFormControlLabel
control={
<Checkbox
name="publish_single"
checked={data.publish_single}
onChange={updateFormValue}
disabled={data.ha_enabled}
/>
}
label={LL.MQTT_PUBLISH_TEXT_1()}
/>
</Grid>
{data.publish_single && (
<Grid> <Grid>
<BlockFormControlLabel <BlockFormControlLabel
control={ control={
<Checkbox <Checkbox
name="publish_single" name="publish_single2cmd"
checked={data.publish_single} checked={data.publish_single2cmd}
onChange={updateFormValue} onChange={updateFormValue}
/> />
} }
label={LL.MQTT_PUBLISH_TEXT_1()} label={LL.MQTT_PUBLISH_TEXT_2()}
/> />
</Grid> </Grid>
{data.publish_single && ( )}
</Grid>
<Grid container spacing={2} rowSpacing={0}>
<Grid>
<BlockFormControlLabel
control={
<Checkbox
name="ha_enabled"
checked={data.ha_enabled}
onChange={updateFormValue}
disabled={data.publish_single}
/>
}
label={LL.MQTT_PUBLISH_TEXT_3()}
/>
</Grid>
{data.ha_enabled && (
<Grid container spacing={2} rowSpacing={0}>
<Grid> <Grid>
<BlockFormControlLabel <TextField
control={ name="discovery_type"
<Checkbox label={LL.MQTT_PUBLISH_TEXT_5()}
name="publish_single2cmd" value={data.discovery_type}
checked={data.publish_single2cmd} variant="outlined"
onChange={updateFormValue} onChange={updateFormValue}
/> margin="normal"
} select
label={LL.MQTT_PUBLISH_TEXT_2()} >
<MenuItem value={0}>Home Assistant</MenuItem>
<MenuItem value={1}>Domoticz</MenuItem>
<MenuItem value={2}>Domoticz (latest)</MenuItem>
</TextField>
</Grid>
<Grid>
<TextField
name="discovery_prefix"
label={LL.MQTT_PUBLISH_TEXT_4()}
variant="outlined"
value={data.discovery_prefix}
onChange={updateFormValue}
margin="normal"
/> />
</Grid> </Grid>
)} <Grid>
</Grid> <TextField
)} name="entity_format"
{!data.publish_single && ( label={LL.MQTT_ENTITY_FORMAT()}
<Grid container spacing={2} rowSpacing={0}> value={data.entity_format}
<Grid> variant="outlined"
<BlockFormControlLabel onChange={updateFormValue}
control={ margin="normal"
<Checkbox select
name="ha_enabled" >
checked={data.ha_enabled} <MenuItem value={0}>{LL.MQTT_ENTITY_FORMAT_0()}</MenuItem>
onChange={updateFormValue} <MenuItem value={3}>
/> {LL.MQTT_ENTITY_FORMAT_1()}&nbsp;(v3.6)
} </MenuItem>
label={LL.MQTT_PUBLISH_TEXT_3()} <MenuItem value={4}>
/> {LL.MQTT_ENTITY_FORMAT_2()}&nbsp;(v3.6)
</Grid> </MenuItem>
{data.ha_enabled && ( <MenuItem value={1}>{LL.MQTT_ENTITY_FORMAT_1()}</MenuItem>
<Grid container spacing={2} rowSpacing={0}> <MenuItem value={2}>{LL.MQTT_ENTITY_FORMAT_2()}</MenuItem>
<Grid> </TextField>
<TextField
name="discovery_type"
label={LL.MQTT_PUBLISH_TEXT_5()}
value={data.discovery_type}
variant="outlined"
onChange={updateFormValue}
margin="normal"
select
>
<MenuItem value={0}>Home Assistant</MenuItem>
<MenuItem value={1}>Domoticz</MenuItem>
<MenuItem value={2}>Domoticz (latest)</MenuItem>
</TextField>
</Grid>
<Grid>
<TextField
name="discovery_prefix"
label={LL.MQTT_PUBLISH_TEXT_4()}
variant="outlined"
value={data.discovery_prefix}
onChange={updateFormValue}
margin="normal"
/>
</Grid>
<Grid>
<TextField
name="entity_format"
label={LL.MQTT_ENTITY_FORMAT()}
value={data.entity_format}
variant="outlined"
onChange={updateFormValue}
margin="normal"
select
>
<MenuItem value={0}>{LL.MQTT_ENTITY_FORMAT_0()}</MenuItem>
<MenuItem value={3}>
{LL.MQTT_ENTITY_FORMAT_1()}&nbsp;(v3.6)
</MenuItem>
<MenuItem value={4}>
{LL.MQTT_ENTITY_FORMAT_2()}&nbsp;(v3.6)
</MenuItem>
<MenuItem value={1}>{LL.MQTT_ENTITY_FORMAT_1()}</MenuItem>
<MenuItem value={2}>{LL.MQTT_ENTITY_FORMAT_2()}</MenuItem>
</TextField>
</Grid>
</Grid> </Grid>
)} </Grid>
</Grid> )}
)} </Grid>
<Typography sx={{ pt: 2 }} variant="h6" color="primary"> <Typography sx={{ pt: 2 }} variant="h6" color="primary">
{LL.MQTT_PUBLISH_INTERVALS()}&nbsp;(0=auto) {LL.MQTT_PUBLISH_INTERVALS()}&nbsp;(0=auto)
</Typography> </Typography>
<Grid container spacing={2} rowSpacing={0}> <Grid container spacing={2} rowSpacing={0}>
<Grid> <Grid>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="publish_time_heartbeat" name="publish_time_heartbeat"
label="Heartbeat" label="Heartbeat"
slotProps={{ slotProps={{
@@ -442,7 +440,7 @@ const MqttSettings = () => {
<Grid> <Grid>
<TextField <TextField
name="publish_time_sensor" name="publish_time_sensor"
label={LL.TEMP_SENSORS()} label={LL.SENSORS()}
variant="outlined" variant="outlined"
value={numberValue(data.publish_time_sensor)} value={numberValue(data.publish_time_sensor)}
type="number" type="number"

View File

@@ -1,12 +1,27 @@
import { useState } from 'react'; import { useState } from 'react';
import { toast } from 'react-toastify';
import AccessTimeIcon from '@mui/icons-material/AccessTime';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import WarningIcon from '@mui/icons-material/Warning'; import WarningIcon from '@mui/icons-material/Warning';
import { Button, Checkbox, MenuItem } from '@mui/material'; import {
Box,
Button,
Checkbox,
Dialog,
DialogActions,
DialogContent,
DialogTitle,
MenuItem,
TextField,
Typography
} from '@mui/material';
import * as NTPApi from 'api/ntp'; import * as NTPApi from 'api/ntp';
import { readNTPSettings } from 'api/ntp'; import { readNTPSettings } from 'api/ntp';
import { dialogStyle } from 'CustomTheme';
import { useRequest } from 'alova/client';
import { updateState } from 'alova/client'; import { updateState } from 'alova/client';
import type { ValidateFieldsError } from 'async-validator'; import type { ValidateFieldsError } from 'async-validator';
import { import {
@@ -19,8 +34,8 @@ import {
useLayoutTitle useLayoutTitle
} from 'components'; } from 'components';
import { useI18nContext } from 'i18n/i18n-react'; import { useI18nContext } from 'i18n/i18n-react';
import type { NTPSettingsType } from 'types'; import type { NTPSettingsType, Time } from 'types';
import { updateValueDirty, useRest } from 'utils'; import { formatLocalDateTime, updateValueDirty, useRest } from 'utils';
import { validate } from 'validators'; import { validate } from 'validators';
import { NTP_SETTINGS_VALIDATOR } from 'validators/ntp'; import { NTP_SETTINGS_VALIDATOR } from 'validators/ntp';
@@ -46,18 +61,101 @@ const NTPSettings = () => {
const { LL } = useI18nContext(); const { LL } = useI18nContext();
useLayoutTitle('NTP'); useLayoutTitle('NTP');
const [localTime, setLocalTime] = useState<string>('');
const [settingTime, setSettingTime] = useState<boolean>(false);
const [processing, setProcessing] = useState<boolean>(false);
const { send: updateTime } = useRequest(
(local_time: Time) => NTPApi.updateTime(local_time),
{
immediate: false
}
);
const updateFormValue = updateValueDirty( const updateFormValue = updateValueDirty(
origData, origData,
dirtyFlags, dirtyFlags,
setDirtyFlags, setDirtyFlags,
updateDataValue updateDataValue as (value: unknown) => void
); );
const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>(); const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
const updateLocalTime = (event: React.ChangeEvent<HTMLInputElement>) =>
setLocalTime(event.target.value);
const openSetTime = () => {
setLocalTime(formatLocalDateTime(new Date()));
setSettingTime(true);
};
const configureTime = async () => {
setProcessing(true);
await updateTime({ local_time: formatLocalDateTime(new Date(localTime)) })
.then(async () => {
toast.success(LL.TIME_SET());
setSettingTime(false);
await loadData();
})
.catch(() => {
toast.error(LL.PROBLEM_UPDATING());
})
.finally(() => {
setProcessing(false);
});
};
const renderSetTimeDialog = () => (
<Dialog
sx={dialogStyle}
open={settingTime}
onClose={() => setSettingTime(false)}
>
<DialogTitle>{LL.SET_TIME(1)}</DialogTitle>
<DialogContent dividers>
<Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
<Typography variant="body2">{LL.SET_TIME_TEXT()}</Typography>
</Box>
<TextField
label={LL.LOCAL_TIME(0)}
type="datetime-local"
value={localTime}
onChange={updateLocalTime}
disabled={processing}
fullWidth
slotProps={{
inputLabel: {
shrink: true
}
}}
/>
</DialogContent>
<DialogActions>
<Button
startIcon={<CancelIcon />}
variant="outlined"
onClick={() => setSettingTime(false)}
color="secondary"
>
{LL.CANCEL()}
</Button>
<Button
startIcon={<AccessTimeIcon />}
variant="outlined"
onClick={configureTime}
disabled={processing}
color="primary"
>
{LL.UPDATE()}
</Button>
</DialogActions>
</Dialog>
);
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={errorMessage} />; return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
} }
const validateAndSubmit = async () => { const validateAndSubmit = async () => {
@@ -92,7 +190,7 @@ const NTPSettings = () => {
label={LL.ENABLE_NTP()} label={LL.ENABLE_NTP()}
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="server" name="server"
label={LL.NTP_SERVER()} label={LL.NTP_SERVER()}
fullWidth fullWidth
@@ -102,7 +200,7 @@ const NTPSettings = () => {
margin="normal" margin="normal"
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="tz_label" name="tz_label"
label={LL.TIME_ZONE()} label={LL.TIME_ZONE()}
fullWidth fullWidth
@@ -115,6 +213,25 @@ const NTPSettings = () => {
<MenuItem disabled>{LL.TIME_ZONE()}...</MenuItem> <MenuItem disabled>{LL.TIME_ZONE()}...</MenuItem>
{timeZoneSelectItems()} {timeZoneSelectItems()}
</ValidatedTextField> </ValidatedTextField>
<Box display="flex" flexWrap="wrap">
{!data.enabled && !dirtyFlags.length && (
<Box flexWrap="nowrap" whiteSpace="nowrap">
<ButtonRow>
<Button
onClick={openSetTime}
variant="outlined"
color="primary"
startIcon={<AccessTimeIcon />}
>
{LL.SET_TIME(0)}
</Button>
</ButtonRow>
</Box>
)}
</Box>
{renderSetTimeDialog()}
{dirtyFlags && dirtyFlags.length !== 0 && ( {dirtyFlags && dirtyFlags.length !== 0 && (
<ButtonRow> <ButtonRow>
<Button <Button

View File

@@ -35,7 +35,7 @@ const Network = () => {
], ],
useLocation() useLocation()
); );
const routerTab = matchedRoutes?.[0].route.path || false; const routerTab = matchedRoutes?.[0]?.route.path || false;
const navigate = useNavigate(); const navigate = useNavigate();
@@ -56,7 +56,7 @@ const Network = () => {
return ( return (
<WiFiConnectionContext.Provider <WiFiConnectionContext.Provider
value={{ value={{
selectedNetwork, ...(selectedNetwork && { selectedNetwork }),
selectNetwork, selectNetwork,
deselectNetwork deselectNetwork
}} }}

View File

@@ -104,7 +104,7 @@ const NetworkSettings = () => {
origData, origData,
dirtyFlags, dirtyFlags,
setDirtyFlags, setDirtyFlags,
updateDataValue updateDataValue as (value: unknown) => void
); );
const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>(); const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
@@ -113,7 +113,7 @@ const NetworkSettings = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={errorMessage} />; return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
} }
const validateAndSubmit = async () => { const validateAndSubmit = async () => {
@@ -172,7 +172,7 @@ const NetworkSettings = () => {
</List> </List>
) : ( ) : (
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="ssid" name="ssid"
label={'SSID (' + LL.NETWORK_BLANK_SSID() + ')'} label={'SSID (' + LL.NETWORK_BLANK_SSID() + ')'}
fullWidth fullWidth
@@ -183,7 +183,7 @@ const NetworkSettings = () => {
/> />
)} )}
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="bssid" name="bssid"
label={'BSSID (' + LL.NETWORK_BLANK_BSSID() + ')'} label={'BSSID (' + LL.NETWORK_BLANK_BSSID() + ')'}
fullWidth fullWidth
@@ -194,7 +194,7 @@ const NetworkSettings = () => {
/> />
{(!selectedNetwork || !isNetworkOpen(selectedNetwork)) && ( {(!selectedNetwork || !isNetworkOpen(selectedNetwork)) && (
<ValidatedPasswordField <ValidatedPasswordField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="password" name="password"
label={LL.PASSWORD()} label={LL.PASSWORD()}
fullWidth fullWidth
@@ -251,7 +251,7 @@ const NetworkSettings = () => {
{LL.GENERAL_OPTIONS()} {LL.GENERAL_OPTIONS()}
</Typography> </Typography>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="hostname" name="hostname"
label={LL.HOSTNAME()} label={LL.HOSTNAME()}
fullWidth fullWidth
@@ -304,7 +304,7 @@ const NetworkSettings = () => {
{data.static_ip_config && ( {data.static_ip_config && (
<> <>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="local_ip" name="local_ip"
label={LL.AP_LOCAL_IP()} label={LL.AP_LOCAL_IP()}
fullWidth fullWidth
@@ -314,7 +314,7 @@ const NetworkSettings = () => {
margin="normal" margin="normal"
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="gateway_ip" name="gateway_ip"
label={LL.NETWORK_GATEWAY()} label={LL.NETWORK_GATEWAY()}
fullWidth fullWidth
@@ -324,7 +324,7 @@ const NetworkSettings = () => {
margin="normal" margin="normal"
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="subnet_mask" name="subnet_mask"
label={LL.NETWORK_SUBNET()} label={LL.NETWORK_SUBNET()}
fullWidth fullWidth
@@ -334,7 +334,7 @@ const NetworkSettings = () => {
margin="normal" margin="normal"
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="dns_ip_1" name="dns_ip_1"
label="DNS #1" label="DNS #1"
fullWidth fullWidth
@@ -344,7 +344,7 @@ const NetworkSettings = () => {
margin="normal" margin="normal"
/> />
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="dns_ip_2" name="dns_ip_2"
label="DNS #2" label="DNS #2"
fullWidth fullWidth

View File

@@ -50,9 +50,7 @@ const WiFiNetworkScanner = () => {
const renderNetworkScanner = () => { const renderNetworkScanner = () => {
if (!networkList) { if (!networkList) {
return ( return <FormLoader errorMessage={errorMessage || ''} />;
<FormLoader message={LL.SCANNING() + '...'} errorMessage={errorMessage} />
);
} }
return <WiFiNetworkSelector networkList={networkList} />; return <WiFiNetworkSelector networkList={networkList} />;
}; };

View File

@@ -97,7 +97,7 @@ const ManageUsers = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={errorMessage} />; return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
} }
const noAdminConfigured = () => !data.users.find((u) => u.admin); const noAdminConfigured = () => !data.users.find((u) => u.admin);
@@ -260,15 +260,20 @@ const ManageUsers = () => {
</Box> </Box>
</Box> </Box>
<GenerateToken username={generatingToken} onClose={closeGenerateToken} /> <GenerateToken
<User username={generatingToken || ''}
user={user} onClose={closeGenerateToken}
setUser={setUser}
creating={creating}
onDoneEditing={doneEditingUser}
onCancelEditing={cancelEditingUser}
validator={createUserValidator(data.users, creating)}
/> />
{user && (
<User
user={user}
setUser={setUser}
creating={creating}
onDoneEditing={doneEditingUser}
onCancelEditing={cancelEditingUser}
validator={createUserValidator(data.users, creating)}
/>
)}
</> </>
); );
}; };

View File

@@ -19,7 +19,7 @@ const Security = () => {
], ],
useLocation() useLocation()
); );
const routerTab = matchedRoutes?.[0].route.path || false; const routerTab = matchedRoutes?.[0]?.route.path || false;
return ( return (
<> <>

View File

@@ -47,12 +47,12 @@ const SecuritySettings = () => {
origData, origData,
dirtyFlags, dirtyFlags,
setDirtyFlags, setDirtyFlags,
updateDataValue updateDataValue as (value: unknown) => void
); );
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={errorMessage} />; return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
} }
const validateAndSubmit = async () => { const validateAndSubmit = async () => {
@@ -69,7 +69,7 @@ const SecuritySettings = () => {
return ( return (
<> <>
<ValidatedPasswordField <ValidatedPasswordField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="jwt_secret" name="jwt_secret"
label={LL.SU_PASSWORD()} label={LL.SU_PASSWORD()}
fullWidth fullWidth

View File

@@ -82,7 +82,7 @@ const User: FC<UserFormProps> = ({
</DialogTitle> </DialogTitle>
<DialogContent dividers> <DialogContent dividers>
<ValidatedTextField <ValidatedTextField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="username" name="username"
label={LL.USERNAME(1)} label={LL.USERNAME(1)}
fullWidth fullWidth
@@ -93,7 +93,7 @@ const User: FC<UserFormProps> = ({
margin="normal" margin="normal"
/> />
<ValidatedPasswordField <ValidatedPasswordField
fieldErrors={fieldErrors} fieldErrors={fieldErrors || {}}
name="password" name="password"
label={LL.PASSWORD()} label={LL.PASSWORD()}
fullWidth fullWidth

View File

@@ -61,7 +61,7 @@ const APStatus = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={error?.message} />; return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
} }
return ( return (

View File

@@ -67,7 +67,8 @@ const SystemActivity = () => {
}); });
const showName = (id: number) => { const showName = (id: number) => {
const name: keyof Translation['STATUS_NAMES'] = id; const name: keyof Translation['STATUS_NAMES'] =
id.toString() as keyof Translation['STATUS_NAMES'];
return LL.STATUS_NAMES[name](); return LL.STATUS_NAMES[name]();
}; };
@@ -87,7 +88,7 @@ const SystemActivity = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={error?.message} />; return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
} }
return ( return (

View File

@@ -41,7 +41,7 @@ const HardwareStatus = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={error?.message} />; return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
} }
return ( return (

View File

@@ -99,7 +99,7 @@ const MqttStatus = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={error?.message} />; return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
} }
const renderConnectionStatus = () => ( const renderConnectionStatus = () => (

View File

@@ -1,40 +1,27 @@
import { useState } from 'react';
import { toast } from 'react-toastify';
import AccessTimeIcon from '@mui/icons-material/AccessTime'; import AccessTimeIcon from '@mui/icons-material/AccessTime';
import CancelIcon from '@mui/icons-material/Cancel';
import DnsIcon from '@mui/icons-material/Dns'; import DnsIcon from '@mui/icons-material/Dns';
import SwapVerticalCircleIcon from '@mui/icons-material/SwapVerticalCircle'; import SwapVerticalCircleIcon from '@mui/icons-material/SwapVerticalCircle';
import UpdateIcon from '@mui/icons-material/Update'; import UpdateIcon from '@mui/icons-material/Update';
import { import {
Avatar, Avatar,
Box,
Button,
Dialog,
DialogActions,
DialogContent,
DialogTitle,
Divider, Divider,
List, List,
ListItem, ListItem,
ListItemAvatar, ListItemAvatar,
ListItemText, ListItemText,
TextField,
Typography,
useTheme useTheme
} from '@mui/material'; } from '@mui/material';
import type { Theme } from '@mui/material'; import type { Theme } from '@mui/material';
import * as NTPApi from 'api/ntp'; import * as NTPApi from 'api/ntp';
import { dialogStyle } from 'CustomTheme';
import { useRequest } from 'alova/client'; import { useRequest } from 'alova/client';
import { ButtonRow, FormLoader, SectionContent, useLayoutTitle } from 'components'; import { FormLoader, SectionContent, useLayoutTitle } from 'components';
import { useI18nContext } from 'i18n/i18n-react'; import { useI18nContext } from 'i18n/i18n-react';
import type { NTPStatusType, Time } from 'types'; import type { NTPStatusType } from 'types';
import { NTPSyncStatus } from 'types'; import { NTPSyncStatus } from 'types';
import { useInterval } from 'utils'; import { useInterval } from 'utils';
import { formatDateTime, formatLocalDateTime } from 'utils'; import { formatDateTime } from 'utils';
const NTPStatus = () => { const NTPStatus = () => {
const { data, send: loadData, error } = useRequest(NTPApi.readNTPStatus); const { data, send: loadData, error } = useRequest(NTPApi.readNTPStatus);
@@ -43,24 +30,11 @@ const NTPStatus = () => {
void loadData(); void loadData();
}); });
const [localTime, setLocalTime] = useState<string>('');
const [settingTime, setSettingTime] = useState<boolean>(false);
const [processing, setProcessing] = useState<boolean>(false);
const { LL } = useI18nContext(); const { LL } = useI18nContext();
useLayoutTitle('NTP'); useLayoutTitle('NTP');
const { send: updateTime } = useRequest(
(local_time: Time) => NTPApi.updateTime(local_time),
{
immediate: false
}
);
NTPApi.updateTime; NTPApi.updateTime;
const isNtpActive = ({ status }: NTPStatusType) =>
status === NTPSyncStatus.NTP_ACTIVE;
const isNtpEnabled = ({ status }: NTPStatusType) => const isNtpEnabled = ({ status }: NTPStatusType) =>
status !== NTPSyncStatus.NTP_DISABLED; status !== NTPSyncStatus.NTP_DISABLED;
@@ -77,14 +51,6 @@ const NTPStatus = () => {
} }
}; };
const updateLocalTime = (event: React.ChangeEvent<HTMLInputElement>) =>
setLocalTime(event.target.value);
const openSetTime = () => {
setLocalTime(formatLocalDateTime(new Date()));
setSettingTime(true);
};
const theme = useTheme(); const theme = useTheme();
const ntpStatus = ({ status }: NTPStatusType) => { const ntpStatus = ({ status }: NTPStatusType) => {
@@ -100,73 +66,9 @@ const NTPStatus = () => {
} }
}; };
const configureTime = async () => {
setProcessing(true);
await updateTime({ local_time: formatLocalDateTime(new Date(localTime)) })
.then(async () => {
toast.success(LL.TIME_SET());
setSettingTime(false);
await loadData();
})
.catch(() => {
toast.error(LL.PROBLEM_UPDATING());
})
.finally(() => {
setProcessing(false);
});
};
const renderSetTimeDialog = () => (
<Dialog
sx={dialogStyle}
open={settingTime}
onClose={() => setSettingTime(false)}
>
<DialogTitle>{LL.SET_TIME(1)}</DialogTitle>
<DialogContent dividers>
<Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
<Typography variant="body2">{LL.SET_TIME_TEXT()}</Typography>
</Box>
<TextField
label={LL.LOCAL_TIME(0)}
type="datetime-local"
value={localTime}
onChange={updateLocalTime}
disabled={processing}
fullWidth
slotProps={{
inputLabel: {
shrink: true
}
}}
/>
</DialogContent>
<DialogActions>
<Button
startIcon={<CancelIcon />}
variant="outlined"
onClick={() => setSettingTime(false)}
color="secondary"
>
{LL.CANCEL()}
</Button>
<Button
startIcon={<AccessTimeIcon />}
variant="outlined"
onClick={configureTime}
disabled={processing}
color="primary"
>
{LL.UPDATE()}
</Button>
</DialogActions>
</Dialog>
);
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={error?.message} />; return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
} }
return ( return (
@@ -219,23 +121,6 @@ const NTPStatus = () => {
</ListItem> </ListItem>
<Divider variant="inset" component="li" /> <Divider variant="inset" component="li" />
</List> </List>
<Box display="flex" flexWrap="wrap">
{data && !isNtpActive(data) && (
<Box flexWrap="nowrap" whiteSpace="nowrap">
<ButtonRow>
<Button
onClick={openSetTime}
variant="outlined"
color="primary"
startIcon={<AccessTimeIcon />}
>
{LL.SET_TIME(0)}
</Button>
</ButtonRow>
</Box>
)}
</Box>
{renderSetTimeDialog()}
</> </>
); );
}; };

View File

@@ -120,7 +120,7 @@ const NetworkStatus = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={error?.message} />; return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
} }
return ( return (

View File

@@ -248,7 +248,7 @@ const SystemStatus = () => {
const content = () => { const content = () => {
if (!data || !LL) { if (!data || !LL) {
return <FormLoader onRetry={loadData} errorMessage={error?.message} />; return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
} }
return ( return (

View File

@@ -8,7 +8,7 @@ import {
Box, Box,
Button, Button,
Checkbox, Checkbox,
Grid2 as Grid, Grid,
IconButton, IconButton,
MenuItem, MenuItem,
TextField, TextField,
@@ -31,13 +31,14 @@ import type { LogEntry, LogSettings } from 'types';
import { LogLevel } from 'types'; import { LogLevel } from 'types';
import { updateValueDirty, useRest } from 'utils'; import { updateValueDirty, useRest } from 'utils';
const TextColors = { const TextColors: Record<LogLevel, string> = {
[LogLevel.ERROR]: '#ff0000', // red [LogLevel.ERROR]: '#ff0000', // red
[LogLevel.WARNING]: '#ff0000', // red [LogLevel.WARNING]: '#ff0000', // red
[LogLevel.NOTICE]: '#ffffff', // white [LogLevel.NOTICE]: '#ffffff', // white
[LogLevel.INFO]: '#ffcc00', // yellow [LogLevel.INFO]: '#ffcc00', // yellow
[LogLevel.DEBUG]: '#00ffff', // cyan [LogLevel.DEBUG]: '#00ffff', // cyan
[LogLevel.TRACE]: '#00ffff' // cyan [LogLevel.TRACE]: '#00ffff', // cyan
[LogLevel.ALL]: '#ffffff' // white
}; };
const LogEntryLine = styled('span')( const LogEntryLine = styled('span')(
@@ -109,7 +110,7 @@ const SystemLog = () => {
origData, origData,
dirtyFlags, dirtyFlags,
setDirtyFlags, setDirtyFlags,
updateDataValue updateDataValue as (value: unknown) => void
); );
useSSE(fetchLogES, { useSSE(fetchLogES, {
@@ -190,7 +191,7 @@ const SystemLog = () => {
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={errorMessage} />; return <FormLoader onRetry={loadData} errorMessage={errorMessage || ''} />;
} }
return ( return (

View File

@@ -51,7 +51,7 @@ const SystemMonitor = () => {
} }
}) })
.onError((error) => { .onError((error) => {
setErrorMessage(error.message); setErrorMessage(String(error.error?.message || 'An error occurred'));
}); });
useInterval(() => { useInterval(() => {
@@ -97,7 +97,7 @@ const SystemMonitor = () => {
color="error" color="error"
onClick={onCancel} onClick={onCancel}
> >
{LL.RESET(0)} {LL.RESTART()}
</Button> </Button>
</MessageBox> </MessageBox>
) : ( ) : (

View File

@@ -2,9 +2,9 @@ import { useContext, useEffect, useState } from 'react';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import CloseIcon from '@mui/icons-material/Close';
import CheckIcon from '@mui/icons-material/Done'; import CheckIcon from '@mui/icons-material/Done';
import DownloadIcon from '@mui/icons-material/GetApp'; import DownloadIcon from '@mui/icons-material/GetApp';
import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
import WarningIcon from '@mui/icons-material/Warning'; import WarningIcon from '@mui/icons-material/Warning';
import { import {
Box, Box,
@@ -15,7 +15,7 @@ import {
DialogContent, DialogContent,
DialogTitle, DialogTitle,
FormControlLabel, FormControlLabel,
Grid2 as Grid, Grid,
Link, Link,
Typography Typography
} from '@mui/material'; } from '@mui/material';
@@ -44,7 +44,10 @@ const Version = () => {
const [restarting, setRestarting] = useState<boolean>(false); const [restarting, setRestarting] = useState<boolean>(false);
const [openInstallDialog, setOpenInstallDialog] = useState<boolean>(false); const [openInstallDialog, setOpenInstallDialog] = useState<boolean>(false);
const [usingDevVersion, setUsingDevVersion] = useState<boolean>(false); const [usingDevVersion, setUsingDevVersion] = useState<boolean>(false);
const [upgradeAvailable, setUpgradeAvailable] = useState<boolean>(false); const [fetchDevVersion, setFetchDevVersion] = useState<boolean>(false);
const [devUpgradeAvailable, setDevUpgradeAvailable] = useState<boolean>(false);
const [stableUpgradeAvailable, setStableUpgradeAvailable] =
useState<boolean>(false);
const [internetLive, setInternetLive] = useState<boolean>(false); const [internetLive, setInternetLive] = useState<boolean>(false);
const [downloadOnly, setDownloadOnly] = useState<boolean>(false); const [downloadOnly, setDownloadOnly] = useState<boolean>(false);
@@ -62,8 +65,13 @@ const Version = () => {
immediate: false immediate: false
} }
).onSuccess((event) => { ).onSuccess((event) => {
const data = event.data as { emsesp_version: string; upgradeable: boolean }; const data = event.data as {
setUpgradeAvailable(data.upgradeable); emsesp_version: string;
dev_upgradeable: boolean;
stable_upgradeable: boolean;
};
setDevUpgradeAvailable(data.dev_upgradeable);
setStableUpgradeAvailable(data.stable_upgradeable);
}); });
const { const {
@@ -71,7 +79,7 @@ const Version = () => {
send: loadData, send: loadData,
error error
} = useRequest(SystemApi.readSystemStatus).onSuccess((event) => { } = useRequest(SystemApi.readSystemStatus).onSuccess((event) => {
// older version of EMS-ESP on 4MB boards, can't use OTA because of SSL support in HttpClient // older version of EMS-ESP using ESP32 (not S3) and no PSRAM, can't use OTA because of SSL support in HttpClient
if (event.data.arduino_version.startsWith('Tasmota')) { if (event.data.arduino_version.startsWith('Tasmota')) {
setDownloadOnly(true); setDownloadOnly(true);
} }
@@ -102,7 +110,7 @@ const Version = () => {
}, [latestVersion, latestDevVersion]); }, [latestVersion, latestDevVersion]);
const rtf = new Intl.RelativeTimeFormat(locale, { numeric: 'auto' }); const rtf = new Intl.RelativeTimeFormat(locale, { numeric: 'auto' });
const DIVISIONS = [ const DIVISIONS: Array<{ amount: number; name: string }> = [
{ amount: 60, name: 'seconds' }, { amount: 60, name: 'seconds' },
{ amount: 60, name: 'minutes' }, { amount: 60, name: 'minutes' },
{ amount: 24, name: 'hours' }, { amount: 24, name: 'hours' },
@@ -111,18 +119,21 @@ const Version = () => {
{ amount: 12, name: 'months' }, { amount: 12, name: 'months' },
{ amount: Number.POSITIVE_INFINITY, name: 'years' } { amount: Number.POSITIVE_INFINITY, name: 'years' }
]; ];
function formatTimeAgo(date) { function formatTimeAgo(date: Date) {
let duration = (date.getTime() - new Date().getTime()) / 1000; let duration = (date.getTime() - new Date().getTime()) / 1000;
for (let i = 0; i < DIVISIONS.length; i++) { for (let i = 0; i < DIVISIONS.length; i++) {
const division = DIVISIONS[i]; const division = DIVISIONS[i];
if (Math.abs(duration) < division.amount) { if (division && Math.abs(duration) < division.amount) {
return rtf.format( return rtf.format(
Math.round(duration), Math.round(duration),
division.name as Intl.RelativeTimeFormatUnit division.name as Intl.RelativeTimeFormatUnit
); );
} }
duration /= division.amount; if (division) {
duration /= division.amount;
}
} }
return rtf.format(0, 'seconds');
} }
const { send: sendAPI } = useRequest((data: APIcall) => API(data), { const { send: sendAPI } = useRequest((data: APIcall) => API(data), {
@@ -138,20 +149,21 @@ const Version = () => {
); );
}; };
const getBinURL = () => { const getBinURL = (showingDev: boolean) => {
if (!internetLive) { if (!internetLive) {
return ''; return '';
} }
const filename = const filename =
'EMS-ESP-' + 'EMS-ESP-' +
(usingDevVersion ? latestDevVersion.name : latestVersion.name).replaceAll( (showingDev ? latestDevVersion.name : latestVersion.name).replaceAll(
'.', '.',
'_' '_'
) + ) +
'-' + '-' +
getPlatform() + getPlatform() +
'.bin'; '.bin';
return usingDevVersion return showingDev
? DEV_URL + filename ? DEV_URL + filename
: STABLE_URL + 'v' + latestVersion.name + '/' + filename; : STABLE_URL + 'v' + latestVersion.name + '/' + filename;
}; };
@@ -172,107 +184,127 @@ const Version = () => {
useLayoutTitle('EMS-ESP Firmware'); useLayoutTitle('EMS-ESP Firmware');
const renderInstallDialog = () => ( const renderInstallDialog = () => {
<Dialog const binURL = getBinURL(fetchDevVersion);
sx={dialogStyle}
open={openInstallDialog}
onClose={() => closeInstallDialog()}
>
<DialogTitle>
{LL.INSTALL() +
' ' +
(usingDevVersion ? LL.DEVELOPMENT() : LL.STABLE()) +
' Firmware'}
</DialogTitle>
<DialogContent dividers>
<Typography mb={2}>
{LL.INSTALL_VERSION(
usingDevVersion ? latestDevVersion?.name : latestVersion?.name
)}
</Typography>
</DialogContent>
<DialogActions>
<Button
startIcon={<CancelIcon />}
variant="outlined"
onClick={() => closeInstallDialog()}
color="secondary"
>
{LL.CANCEL()}
</Button>
<Button
startIcon={<DownloadIcon />}
variant="outlined"
onClick={() => closeInstallDialog()}
color="primary"
>
<Link underline="none" target="_blank" href={getBinURL()} color="primary">
{LL.DOWNLOAD(1)}
</Link>
</Button>
<Button
startIcon={<WarningIcon color="warning" />}
variant="outlined"
onClick={() => installFirmwareURL(getBinURL())}
color="primary"
>
{LL.INSTALL()}
</Button>
</DialogActions>
</Dialog>
);
const showFirmwareDialog = (useDevVersion?: boolean) => { return (
setUsingDevVersion(useDevVersion || usingDevVersion); <Dialog
sx={dialogStyle}
open={openInstallDialog}
onClose={() => closeInstallDialog()}
>
<DialogTitle>
{LL.UPDATE() +
' ' +
(fetchDevVersion ? LL.DEVELOPMENT() : LL.STABLE()) +
' Firmware'}
</DialogTitle>
<DialogContent dividers>
<Typography mb={2}>
{LL.INSTALL_VERSION(
downloadOnly ? LL.DOWNLOAD(1) : LL.INSTALL(),
fetchDevVersion ? latestDevVersion?.name : latestVersion?.name
)}
</Typography>
</DialogContent>
<DialogActions>
<Button
startIcon={<CancelIcon />}
variant="outlined"
onClick={() => closeInstallDialog()}
color="secondary"
>
{LL.CANCEL()}
</Button>
<Button
startIcon={<DownloadIcon />}
variant="outlined"
onClick={() => closeInstallDialog()}
color="primary"
>
<Link underline="none" target="_blank" href={binURL} color="primary">
{LL.DOWNLOAD(0)}
</Link>
</Button>
{!downloadOnly && (
<Button
startIcon={<WarningIcon color="warning" />}
variant="outlined"
onClick={() => installFirmwareURL(binURL)}
color="primary"
>
{LL.INSTALL()}
</Button>
)}
</DialogActions>
</Dialog>
);
};
const showFirmwareDialog = (useDevVersion: boolean) => {
setFetchDevVersion(useDevVersion);
setOpenInstallDialog(true); setOpenInstallDialog(true);
}; };
const closeInstallDialog = () => { const closeInstallDialog = () => {
setOpenInstallDialog(false); setOpenInstallDialog(false);
setUsingDevVersion(data.emsesp_version.includes('dev'));
}; };
const showButtons = (showDev?: boolean) => { const showButtons = (showingDev: boolean) => {
if (!me.admin) { const choice = showingDev
return; ? !usingDevVersion
? LL.SWITCH_RELEASE_TYPE(LL.DEVELOPMENT())
: devUpgradeAvailable
? LL.UPDATE_AVAILABLE()
: undefined
: usingDevVersion
? LL.SWITCH_RELEASE_TYPE(LL.STABLE())
: stableUpgradeAvailable
? LL.UPDATE_AVAILABLE()
: undefined;
if (!choice) {
return (
<>
<CheckIcon
color="success"
sx={{ verticalAlign: 'middle', ml: 0.5, mr: 0.5 }}
/>
<span style={{ color: '#66bb6a', fontSize: '0.8em' }}>
{LL.LATEST_VERSION(usingDevVersion ? LL.DEVELOPMENT() : LL.STABLE())}
</span>
<Button
sx={{ ml: 2 }}
variant="outlined"
size="small"
onClick={() => showFirmwareDialog(showingDev)}
>
{LL.REINSTALL()}
</Button>
</>
);
} }
if (downloadOnly) { if (!me.admin) {
return ( return;
<Button
sx={{ ml: 2 }}
startIcon={<DownloadIcon />}
variant="outlined"
onClick={() => setOpenInstallDialog(false)}
color="warning"
size="small"
>
<Link underline="none" target="_blank" href={getBinURL()} color="warning">
{LL.DOWNLOAD(1)}
</Link>
</Button>
);
} }
return ( return (
<Button <Button
sx={{ ml: 2 }} sx={{ ml: 2 }}
variant="outlined" variant="outlined"
color="warning" color={choice === LL.UPDATE_AVAILABLE() ? 'success' : 'warning'}
size="small" size="small"
onClick={() => showFirmwareDialog()} onClick={() => showFirmwareDialog(showingDev)}
> >
{upgradeAvailable || (!usingDevVersion && showDev) {choice}
? LL.UPGRADE()
: LL.REINSTALL()}
&hellip;
</Button> </Button>
); );
}; };
const content = () => { const content = () => {
if (!data) { if (!data) {
return <FormLoader onRetry={loadData} errorMessage={error?.message} />; return <FormLoader onRetry={loadData} errorMessage={error?.message || ''} />;
} }
const isDev = data.emsesp_version.includes('dev'); const isDev = data.emsesp_version.includes('dev');
@@ -314,7 +346,25 @@ const Version = () => {
<Typography> <Typography>
{getPlatform()} {getPlatform()}
<Typography variant="caption"> <Typography variant="caption">
&nbsp; &#40;{data.psram ? '+PSRAM' : '-PSRAM'}&#41; &nbsp; &#40;
{data.psram ? (
<CheckIcon
color="success"
sx={{
fontSize: '1.5em',
verticalAlign: 'middle'
}}
/>
) : (
<CloseIcon
color="error"
sx={{
fontSize: '1.5em',
verticalAlign: 'middle'
}}
/>
)}
PSRAM&#41;
</Typography> </Typography>
</Typography> </Typography>
</Grid> </Grid>
@@ -395,7 +445,7 @@ const Version = () => {
{formatTimeAgo(new Date(latestVersion.published_at))}) {formatTimeAgo(new Date(latestVersion.published_at))})
</Typography> </Typography>
)} )}
{!usingDevVersion && showButtons(false)} {showButtons(false)}
</Typography> </Typography>
</Grid> </Grid>
@@ -417,24 +467,6 @@ const Version = () => {
</Typography> </Typography>
</Grid> </Grid>
</Grid> </Grid>
{upgradeAvailable ? (
<Typography mt={2} color="warning">
<InfoOutlinedIcon
color="warning"
sx={{ verticalAlign: 'middle', mr: 2 }}
/>
{LL.UPGRADE_AVAILABLE()}
</Typography>
) : (
<Typography mt={2} color="success">
<CheckIcon
color="success"
sx={{ verticalAlign: 'middle', mr: 2 }}
/>
{LL.LATEST_VERSION()}
</Typography>
)}
</> </>
) : ( ) : (
<Typography mt={2} color="warning"> <Typography mt={2} color="warning">

View File

@@ -1,26 +1,24 @@
import type { FC } from 'react'; import { memo } from 'react';
import { Box } from '@mui/material'; import { Box } from '@mui/material';
import type { BoxProps } from '@mui/material'; import type { BoxProps } from '@mui/material';
const ButtonRow: FC<BoxProps> = ({ children, ...rest }) => ( const ButtonRow = memo<BoxProps>(({ children, ...rest }) => (
<Box <Box
sx={{ sx={{
'& button, & a, & .MuiCard-root': { '& button, & a, & .MuiCard-root': {
mt: 2, mt: 2,
mx: 0.6, mx: 0.6,
'&:last-child': { '&:last-child': { mr: 0 },
mr: 0 '&:first-of-type': { ml: 0 }
},
'&:first-of-type': {
ml: 0
}
} }
}} }}
{...rest} {...rest}
> >
{children} {children}
</Box> </Box>
); ));
ButtonRow.displayName = 'ButtonRow';
export default ButtonRow; export default ButtonRow;

View File

@@ -1,7 +1,12 @@
import { Tooltip, type TooltipProps, styled, tooltipClasses } from '@mui/material'; import { Tooltip, type TooltipProps, styled, tooltipClasses } from '@mui/material';
export const ButtonTooltip = styled(({ className, ...props }: TooltipProps) => ( export const ButtonTooltip = styled(({ className, ...props }: TooltipProps) => (
<Tooltip {...props} placement="top" arrow classes={{ popper: className }} /> <Tooltip
{...props}
placement="top"
arrow
classes={{ ...(className && { popper: className }) }}
/>
))(({ theme }) => ({ ))(({ theme }) => ({
[`& .${tooltipClasses.arrow}`]: { [`& .${tooltipClasses.arrow}`]: {
color: theme.palette.success.main color: theme.palette.success.main

View File

@@ -1,10 +1,15 @@
// Optimized exports - use direct exports to reduce bundle size
export { default as SectionContent } from './SectionContent';
export { default as ButtonRow } from './ButtonRow';
export { default as MessageBox } from './MessageBox';
export { default as ButtonTooltip } from './ButtonTooltip';
// Re-export sub-modules
export * from './inputs'; export * from './inputs';
export * from './layout'; export * from './layout';
export * from './loading'; export * from './loading';
export * from './routing'; export * from './routing';
export * from './upload'; export * from './upload';
export { default as SectionContent } from './SectionContent';
export { default as ButtonRow } from './ButtonRow'; // Specific routing exports
export { default as MessageBox } from './MessageBox';
export { default as BlockNavigation } from './routing/BlockNavigation'; export { default as BlockNavigation } from './routing/BlockNavigation';
export { default as ButtonTooltip } from './ButtonTooltip';

View File

@@ -16,14 +16,14 @@ const ValidatedTextField: FC<ValidatedTextFieldProps> = ({
fieldErrors, fieldErrors,
...rest ...rest
}) => { }) => {
const errors = fieldErrors && fieldErrors[rest.name]; const errors = fieldErrors?.[rest.name];
const renderErrors = () =>
errors &&
errors.map((e) => <FormHelperText key={e.message}>{e.message}</FormHelperText>);
return ( return (
<> <>
<TextField error={!!errors} {...rest} /> <TextField error={!!errors} {...rest} />
{renderErrors()} {errors?.map((e) => (
<FormHelperText key={e.message}>{e.message}</FormHelperText>
))}
</> </>
); );
}; };

View File

@@ -23,7 +23,12 @@ const LayoutMenuItem = ({
const selected = routeMatches(to, pathname); const selected = routeMatches(to, pathname);
return ( return (
<ListItemButton component={Link} to={to} disabled={disabled} selected={selected}> <ListItemButton
component={Link}
to={to}
disabled={disabled || false}
selected={selected}
>
<ListItemIcon sx={{ color: selected ? '#90caf9' : '#9e9e9e' }}> <ListItemIcon sx={{ color: selected ? '#90caf9' : '#9e9e9e' }}>
<Icon /> <Icon />
</ListItemIcon> </ListItemIcon>

View File

@@ -58,12 +58,22 @@ const LayoutMenuItem = ({
} }
> >
<ListItemButton component={Link} to={to}> <ListItemButton component={Link} to={to}>
<RenderIcon icon={icon} bgcolor={bgcolor} label={label} text={text} /> <RenderIcon
icon={icon}
{...(bgcolor && { bgcolor })}
label={label}
text={text}
/>
</ListItemButton> </ListItemButton>
</ListItem> </ListItem>
) : ( ) : (
<ListItem> <ListItem>
<RenderIcon icon={icon} bgcolor={bgcolor} label={label} text={text} /> <RenderIcon
icon={icon}
{...(bgcolor && { bgcolor })}
label={label}
text={text}
/>
</ListItem> </ListItem>
)} )}
</> </>

View File

@@ -0,0 +1,20 @@
import { Box, CircularProgress } from '@mui/material';
const LazyLoader = () => (
<Box
display="flex"
justifyContent="center"
alignItems="center"
minHeight="200px"
sx={{
backgroundColor: 'background.default',
borderRadius: 1,
border: '1px solid',
borderColor: 'divider'
}}
>
<CircularProgress size={40} />
</Box>
);
export default LazyLoader;

View File

@@ -1,2 +1,3 @@
export { default as LoadingSpinner } from './LoadingSpinner'; export { default as LoadingSpinner } from './LoadingSpinner';
export { default as FormLoader } from './FormLoader'; export { default as FormLoader } from './FormLoader';
export { default as LazyLoader } from './LazyLoader';

View File

@@ -1,6 +1,5 @@
import type { Path } from 'react-router'; import type { Path } from 'react-router';
import type * as H from 'history';
import { jwtDecode } from 'jwt-decode'; import { jwtDecode } from 'jwt-decode';
import type { Me, SignInRequest, SignInResponse } from 'types'; import type { Me, SignInRequest, SignInResponse } from 'types';
@@ -18,7 +17,7 @@ export function getStorage() {
return localStorage || sessionStorage; return localStorage || sessionStorage;
} }
export function storeLoginRedirect(location?: H.Location) { export function storeLoginRedirect(location?: { pathname: string; search: string }) {
if (location) { if (location) {
getStorage().setItem(SIGN_IN_PATHNAME, location.pathname); getStorage().setItem(SIGN_IN_PATHNAME, location.pathname);
getStorage().setItem(SIGN_IN_SEARCH, location.search); getStorage().setItem(SIGN_IN_SEARCH, location.search);
@@ -36,7 +35,7 @@ export function fetchLoginRedirect(): Partial<Path> {
clearLoginRedirect(); clearLoginRedirect();
return { return {
pathname: signInPathname || `/dashboard`, pathname: signInPathname || `/dashboard`,
search: (signInPathname && signInSearch) || undefined ...(signInPathname && signInSearch && { search: signInSearch })
}; };
} }

View File

@@ -1,16 +1,59 @@
// Code inspired by Prince Azubuike from https://medium.com/@dprincecoder/creating-a-drag-and-drop-file-upload-component-in-react-a-step-by-step-guide-4d93b6cc21e0 // Code inspired by Prince Azubuike from https://medium.com/@dprincecoder/creating-a-drag-and-drop-file-upload-component-in-react-a-step-by-step-guide-4d93b6cc21e0
import { type ChangeEvent, useRef, useState } from 'react'; import {
type ChangeEvent,
type DragEvent,
type MouseEvent,
useRef,
useState
} from 'react';
import CancelIcon from '@mui/icons-material/Cancel'; import CancelIcon from '@mui/icons-material/Cancel';
import CloudUploadIcon from '@mui/icons-material/CloudUpload'; import CloudUploadIcon from '@mui/icons-material/CloudUpload';
import UploadIcon from '@mui/icons-material/Upload'; import UploadIcon from '@mui/icons-material/Upload';
import { Box, Button } from '@mui/material'; import { Box, Button, Typography, styled } from '@mui/material';
import { useI18nContext } from 'i18n/i18n-react'; import { useI18nContext } from 'i18n/i18n-react';
import './dragNdrop.css'; const DocumentUploader = styled(Box)<{ active?: boolean }>(({ theme, active }) => ({
border: `2px dashed ${active ? '#6dc24b' : '#4282fe'}`,
backgroundColor: '#2e3339',
padding: theme.spacing(1.25),
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
position: 'relative',
borderRadius: theme.spacing(1),
cursor: 'pointer',
minHeight: '120px',
transition: 'border-color 0.2s ease-in-out'
}));
const DragNdrop = ({ text, onFileSelected }) => { const UploadInfo = styled(Box)({
display: 'flex',
alignItems: 'center'
});
const FileInfo = styled(Box)({
display: 'flex',
flexDirection: 'column',
width: '100%',
justifyContent: 'space-between',
alignItems: 'center'
});
const FileName = styled(Typography)(({ theme }) => ({
fontSize: '14px',
color: '#6dc24b',
margin: theme.spacing(1, 0)
}));
interface DragNdropProps {
text: string;
onFileSelected: (file: File) => void;
}
const DragNdrop = ({ text, onFileSelected }: DragNdropProps) => {
const [file, setFile] = useState<File>(); const [file, setFile] = useState<File>();
const [dragged, setDragged] = useState(false); const [dragged, setDragged] = useState(false);
const inputRef = useRef<HTMLInputElement | null>(null); const inputRef = useRef<HTMLInputElement | null>(null);
@@ -28,14 +71,17 @@ const DragNdrop = ({ text, onFileSelected }) => {
}; };
const handleFileChange = (e: ChangeEvent<HTMLInputElement>) => { const handleFileChange = (e: ChangeEvent<HTMLInputElement>) => {
if (!e.target.files) { if (!e.target.files || e.target.files.length === 0) {
return; return;
} }
checkFileExtension(e.target.files[0]); const selectedFile = e.target.files[0];
if (selectedFile) {
checkFileExtension(selectedFile);
}
e.target.value = ''; // this is to allow the same file to be selected again e.target.value = ''; // this is to allow the same file to be selected again
}; };
const handleDrop = (event) => { const handleDrop = (event: DragEvent<HTMLDivElement>) => {
event.preventDefault(); event.preventDefault();
const droppedFiles = event.dataTransfer.files; const droppedFiles = event.dataTransfer.files;
if (droppedFiles.length > 0) { if (droppedFiles.length > 0) {
@@ -43,38 +89,40 @@ const DragNdrop = ({ text, onFileSelected }) => {
} }
}; };
const handleRemoveFile = (event) => { const handleRemoveFile = (event: MouseEvent<HTMLButtonElement>) => {
event.stopPropagation(); event.stopPropagation();
setFile(undefined); setFile(undefined);
setDragged(false); setDragged(false);
}; };
const handleUploadClick = (event) => { const handleUploadClick = (event: MouseEvent<HTMLButtonElement>) => {
event.stopPropagation(); event.stopPropagation();
onFileSelected(file); if (file) {
onFileSelected(file);
}
}; };
const handleBrowseClick = () => { const handleBrowseClick = () => {
inputRef.current?.click(); inputRef.current?.click();
}; };
const handleDragOver = (event) => { const handleDragOver = (event: DragEvent<HTMLDivElement>) => {
event.preventDefault(); // prevent file from being opened event.preventDefault(); // prevent file from being opened
setDragged(true); setDragged(true);
}; };
return ( return (
<div <DocumentUploader
className={`document-uploader ${file || dragged ? 'active' : ''}`} active={!!(file || dragged)}
onDrop={handleDrop} onDrop={handleDrop}
onDragOver={handleDragOver} onDragOver={handleDragOver}
onDragLeave={() => setDragged(false)} onDragLeave={() => setDragged(false)}
onClick={handleBrowseClick} onClick={handleBrowseClick}
> >
<div className="upload-info"> <UploadInfo>
<CloudUploadIcon sx={{ marginRight: 4 }} color="primary" fontSize="large" /> <CloudUploadIcon sx={{ marginRight: 4 }} color="primary" fontSize="large" />
<p>{text}</p> <Typography>{text}</Typography>
</div> </UploadInfo>
<input <input
type="file" type="file"
@@ -88,9 +136,9 @@ const DragNdrop = ({ text, onFileSelected }) => {
{file && ( {file && (
<> <>
<div className="file-info"> <FileInfo>
<p>{file.name}</p> <FileName>{file.name}</FileName>
</div> </FileInfo>
<Box> <Box>
<Button <Button
startIcon={<CancelIcon />} startIcon={<CancelIcon />}
@@ -112,7 +160,7 @@ const DragNdrop = ({ text, onFileSelected }) => {
</Box> </Box>
</> </>
)} )}
</div> </DocumentUploader>
); );
}; };

View File

@@ -12,7 +12,12 @@ import { useI18nContext } from 'i18n/i18n-react';
import DragNdrop from './DragNdrop'; import DragNdrop from './DragNdrop';
import { LinearProgressWithLabel } from './LinearProgressWithLabel'; import { LinearProgressWithLabel } from './LinearProgressWithLabel';
const SingleUpload = ({ text, doRestart }) => { interface SingleUploadProps {
text: string;
doRestart: () => void;
}
const SingleUpload = ({ text, doRestart }: SingleUploadProps) => {
const [md5, setMd5] = useState<string>(); const [md5, setMd5] = useState<string>();
const [file, setFile] = useState<File>(); const [file, setFile] = useState<File>();
const { LL } = useI18nContext(); const { LL } = useI18nContext();
@@ -25,8 +30,8 @@ const SingleUpload = ({ text, doRestart }) => {
} = useRequest(SystemApi.uploadFile, { } = useRequest(SystemApi.uploadFile, {
immediate: false immediate: false
}).onSuccess(({ data }) => { }).onSuccess(({ data }) => {
if (data) { if (data && typeof data === 'object' && 'md5' in data) {
setMd5(data.md5 as string); setMd5((data as { md5: string }).md5);
toast.success(LL.UPLOAD() + ' MD5 ' + LL.SUCCESSFUL()); toast.success(LL.UPLOAD() + ' MD5 ' + LL.SUCCESSFUL());
setFile(undefined); setFile(undefined);
} else { } else {
@@ -34,16 +39,19 @@ const SingleUpload = ({ text, doRestart }) => {
} }
}); });
useEffect(async () => { useEffect(() => {
if (file) { const uploadFile = async () => {
await sendUpload(file).catch((error: Error) => { if (file) {
if (error.message === 'The user aborted a request') { await sendUpload(file).catch((error: Error) => {
toast.warning(LL.UPLOAD() + ' ' + LL.ABORTED()); if (error.message.includes('The user aborted a request')) {
} else { toast.warning(LL.UPLOAD() + ' ' + LL.ABORTED());
toast.warning('Invalid file extension or incompatible bin file'); } else {
} toast.warning('Invalid file extension or incompatible bin file');
}); }
} });
}
};
void uploadFile();
}, [file]); }, [file]);
return ( return (

View File

@@ -1,33 +0,0 @@
.document-uploader {
border: 2px dashed #4282fe;
background-color: #2e3339;
padding: 10px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
position: relative;
border-radius: 8px;
cursor: pointer;
&.active {
border-color: #6dc24b;
}
.upload-info {
display: flex;
align-items: center;
}
.file-info {
display: flex;
flex-direction: column;
width: 100%;
justify-content: space-between;
align-items: center;
p {
font-size: 14px;
color: #6dc24b;
}
}
}

View File

@@ -69,7 +69,12 @@ const Authentication: FC<RequiredChildrenProps> = ({ children }) => {
// cache object to prevent re-renders // cache object to prevent re-renders
const obj = useMemo( const obj = useMemo(
() => ({ signIn, signOut, me, refresh }), () => ({
signIn,
signOut,
refresh,
...(me && { me })
}),
[signIn, signOut, me, refresh] [signIn, signOut, me, refresh]
); );

View File

@@ -162,6 +162,7 @@ const cz: Translation = {
UPLOAD: 'Nahrát', UPLOAD: 'Nahrát',
DOWNLOAD: '{{S|s|s}}táhnout', DOWNLOAD: '{{S|s|s}}táhnout',
INSTALL: 'Instalovat', INSTALL: 'Instalovat',
REINSTALL: 'Znovu instalovat',
ABORTED: 'přerušeno', ABORTED: 'přerušeno',
FAILED: 'neúspěšné', FAILED: 'neúspěšné',
SUCCESSFUL: 'úspěšné', SUCCESSFUL: 'úspěšné',
@@ -187,7 +188,7 @@ const cz: Translation = {
COMPACT: 'Kompaktní', COMPACT: 'Kompaktní',
DOWNLOAD_SETTINGS_TEXT: 'Vytvořte zálohu svého nastavení a konfigurace', DOWNLOAD_SETTINGS_TEXT: 'Vytvořte zálohu svého nastavení a konfigurace',
UPLOAD_TEXT: 'Nahrajte nový soubor firmwaru (.bin) nebo záložní soubor (.json)', UPLOAD_TEXT: 'Nahrajte nový soubor firmwaru (.bin) nebo záložní soubor (.json)',
UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate UPLOAD_DROP_TEXT: 'Přetáhněte soubor sem nebo klikněte pro výběr',
ERROR: 'Neočekávaná chyba, zkuste to prosím znovu', ERROR: 'Neočekávaná chyba, zkuste to prosím znovu',
TIME_SET: 'Čas nastaven', TIME_SET: 'Čas nastaven',
MANAGE_USERS: 'Spravovat uživatele', MANAGE_USERS: 'Spravovat uživatele',
@@ -331,28 +332,27 @@ const cz: Translation = {
ALLVALUES: 'Všechny hodnoty', ALLVALUES: 'Všechny hodnoty',
SPECIAL_FUNCTIONS: 'Speciální funkce', SPECIAL_FUNCTIONS: 'Speciální funkce',
WAIT_FIRMWARE: 'Firmware se nahrává a instaluje', WAIT_FIRMWARE: 'Firmware se nahrává a instaluje',
INSTALL_VERSION: 'Tímto se instalovat verze {0}. Jste si jistí?', INSTALL_VERSION: 'Tímto se {0} verze {1}. Jste si jistí?',
UPGRADE_AVAILABLE: 'Je k dispozici aktualizace firmwaru!', UPDATE_AVAILABLE: 'aktualizace dostupná',
LATEST_VERSION: 'Používáte nejnovější verzi firmwaru', LATEST_VERSION: 'Používáte nejnovější verzi {0}firmwaru',
PLEASE_WAIT: 'Prosím čekejte', PLEASE_WAIT: 'Prosím čekejte',
RESTARTING_PRE: 'Inicializace', RESTARTING_PRE: 'Inicializace',
RESTARTING_POST: 'Příprava', RESTARTING_POST: 'Příprava',
AUTO_SCROLL: 'Automatické rolování', AUTO_SCROLL: 'Automatické rolování',
DASHBOARD: 'Dashboard', DASHBOARD: 'Dashboard',
DEVELOPER_MODE: 'Režim vývojáře', DEVELOPER_MODE: 'Režim vývojáře',
BYTES: 'Bytes', // TODO translate BYTES: 'Bajty',
BITMASK: 'Bit Mask',// TODO translate BITMASK: 'Bit Mask',
DUPLICATE: 'Duplikát', DUPLICATE: 'Duplikát',
UPGRADE: 'Upgrade',
DASHBOARD_1: 'Všechny aktivní entity EMS jsou označené jako oblíbené. Všechny vlastní entity, harmonogramy a externí sensory jsou zobrazeny níže.', DASHBOARD_1: 'Všechny aktivní entity EMS jsou označené jako oblíbené. Všechny vlastní entity, harmonogramy a externí sensory jsou zobrazeny níže.',
NO_DATA_1: 'Nebyly nalezeny žádné oblíbené entity. Použijte', NO_DATA_1: 'Nebyly nalezeny žádné oblíbené entity. Použijte modul',
NO_DATA_2: 'modul sloužící k jejich výběru.', NO_DATA_2: 'pro jejich výběr.',
NO_DATA_3: 'Pro zobrazení všech dostupných entit navštivte', NO_DATA_3: 'Pro zobrazení všech dostupných entit navštivte stránku',
THIS_VERSION: 'Tato verze', THIS_VERSION: 'Tato verze',
PLATFORM: 'Platforma', PLATFORM: 'Platforma',
RELEASE_TYPE: 'Typ sestavení', RELEASE_TYPE: 'Typ sestavení',
REINSTALL: 'Přeinstalovat',
INTERNET_CONNECTION_REQUIRED: 'Pro automatickou kontrolu a instalaci aktualizací je třeba internetové připojení', INTERNET_CONNECTION_REQUIRED: 'Pro automatickou kontrolu a instalaci aktualizací je třeba internetové připojení',
SWITCH_RELEASE_TYPE: 'Přepnout na {0} verzi'
}; };
export default cz; export default cz;

View File

@@ -42,7 +42,7 @@ const de: Translation = {
CANCEL: 'Abbrechen', CANCEL: 'Abbrechen',
RESET: 'Zurücksetzen', RESET: 'Zurücksetzen',
APPLY_CHANGES: 'Änderungen anwenden ({0})', APPLY_CHANGES: 'Änderungen anwenden ({0})',
UPDATE: 'Update', UPDATE: 'Aktualisieren',
EXECUTE: 'Ausführen', EXECUTE: 'Ausführen',
REMOVE: 'Entfernen', REMOVE: 'Entfernen',
PROBLEM_UPDATING: 'Problem beim Aktualisieren', PROBLEM_UPDATING: 'Problem beim Aktualisieren',
@@ -160,8 +160,9 @@ const de: Translation = {
HELP_INFORMATION_3: 'Um neue Funktionen anzufragen oder Fehler zu melden, eröffnen Sie ein Issue auf GitHub', HELP_INFORMATION_3: 'Um neue Funktionen anzufragen oder Fehler zu melden, eröffnen Sie ein Issue auf GitHub',
HELP_INFORMATION_4: 'Bitte laden Sie die Systemdetails und hängen Sie sie an das Support-Issue an', HELP_INFORMATION_4: 'Bitte laden Sie die Systemdetails und hängen Sie sie an das Support-Issue an',
UPLOAD: 'Hochladen', UPLOAD: 'Hochladen',
DOWNLOAD: '{{H|h|h}}erunterladen', DOWNLOAD: '{{Herunterladen|heruntergeladen|}}',
INSTALL: 'Installieren', INSTALL: 'Installieren',
REINSTALL: 'Neu installieren',
ABORTED: 'abgebrochen', ABORTED: 'abgebrochen',
FAILED: 'gescheitert', FAILED: 'gescheitert',
SUCCESSFUL: 'erfolgreich', SUCCESSFUL: 'erfolgreich',
@@ -331,9 +332,9 @@ const de: Translation = {
ALLVALUES: 'Alle Werte', ALLVALUES: 'Alle Werte',
SPECIAL_FUNCTIONS: 'Sonderfunktionen', SPECIAL_FUNCTIONS: 'Sonderfunktionen',
WAIT_FIRMWARE: 'Die Firmware wird hochgeladen und installiert.', WAIT_FIRMWARE: 'Die Firmware wird hochgeladen und installiert.',
INSTALL_VERSION: 'Dadurch wird die Version {0} heruntergeladen. Sind Sie sicher?', INSTALL_VERSION: 'Dadurch wird die Version {1} {0}. Sind Sie sicher?',
UPGRADE_AVAILABLE: 'Es ist ein Firmware-Upgrade verfügbar.', UPDATE_AVAILABLE: 'Firmware-Update verfügbar',
LATEST_VERSION: 'Sie verwenden die neueste Firmware-Version', LATEST_VERSION: 'Sie verwenden die neueste {0} Firmware-Version',
PLEASE_WAIT: 'Bitte warten', PLEASE_WAIT: 'Bitte warten',
RESTARTING_PRE: 'Initialisierung', RESTARTING_PRE: 'Initialisierung',
RESTARTING_POST: 'Vorbereitung', RESTARTING_POST: 'Vorbereitung',
@@ -343,7 +344,6 @@ const de: Translation = {
BYTES: 'Bytes', BYTES: 'Bytes',
BITMASK: 'Bit Maske', BITMASK: 'Bit Maske',
DUPLICATE: 'Kopieren', DUPLICATE: 'Kopieren',
UPGRADE: 'Aktualisieren',
DASHBOARD_1: 'Alle EMS-Entitäten, die aktiv und als Favorit markiert sind, sowie alle benutzerdefinierten Entitäten, Zeitpläne und externen Sensordaten werden unten angezeigt.', DASHBOARD_1: 'Alle EMS-Entitäten, die aktiv und als Favorit markiert sind, sowie alle benutzerdefinierten Entitäten, Zeitpläne und externen Sensordaten werden unten angezeigt.',
NO_DATA_1: 'Keine favorisierten EMS-Entitäten gefunden! Verwenden Sie das Modul', NO_DATA_1: 'Keine favorisierten EMS-Entitäten gefunden! Verwenden Sie das Modul',
NO_DATA_2: ', um sie zu markieren.', NO_DATA_2: ', um sie zu markieren.',
@@ -351,8 +351,8 @@ const de: Translation = {
THIS_VERSION: 'Diese Version', THIS_VERSION: 'Diese Version',
PLATFORM: 'Plattform', PLATFORM: 'Plattform',
RELEASE_TYPE: 'Release Typ', RELEASE_TYPE: 'Release Typ',
REINSTALL: 'Neu installieren', INTERNET_CONNECTION_REQUIRED: 'Für die automatische Versionsprüfung und Aktualisierung ist eine Internetverbindung erforderlich',
INTERNET_CONNECTION_REQUIRED: 'Internetverbindung erforderlich für automatische Version-Überprüfung und -Aktualisierung', SWITCH_RELEASE_TYPE: 'Zum {0}-Release wechseln'
}; };
export default de; export default de;

View File

@@ -162,6 +162,7 @@ const en: Translation = {
UPLOAD: 'Upload', UPLOAD: 'Upload',
DOWNLOAD: '{{D|d|d}}ownload', DOWNLOAD: '{{D|d|d}}ownload',
INSTALL: 'Install', INSTALL: 'Install',
REINSTALL: 'Reinstall',
ABORTED: 'aborted', ABORTED: 'aborted',
FAILED: 'failed', FAILED: 'failed',
SUCCESSFUL: 'successful', SUCCESSFUL: 'successful',
@@ -331,9 +332,9 @@ const en: Translation = {
ALLVALUES: 'All Values', ALLVALUES: 'All Values',
SPECIAL_FUNCTIONS: 'Special Functions', SPECIAL_FUNCTIONS: 'Special Functions',
WAIT_FIRMWARE: 'Firmware is uploading and installing', WAIT_FIRMWARE: 'Firmware is uploading and installing',
INSTALL_VERSION: 'This will install version {0}. Are you sure?', INSTALL_VERSION: 'This will {0} version {1}. Are you sure?',
UPGRADE_AVAILABLE: 'There is a firmware upgrade available!', UPDATE_AVAILABLE: 'update available',
LATEST_VERSION: 'You are using the latest firmware version', LATEST_VERSION: 'You are using the latest {0} firmware version',
PLEASE_WAIT: 'Please wait', PLEASE_WAIT: 'Please wait',
RESTARTING_PRE: 'Initializing', RESTARTING_PRE: 'Initializing',
RESTARTING_POST: 'Preparing', RESTARTING_POST: 'Preparing',
@@ -344,15 +345,14 @@ const en: Translation = {
BYTES: 'Bytes', BYTES: 'Bytes',
BITMASK: 'Bit Mask', BITMASK: 'Bit Mask',
DUPLICATE: 'Duplicate', DUPLICATE: 'Duplicate',
UPGRADE: 'Upgrade',
NO_DATA_1: 'No favorite EMS entities found yet. Use the', NO_DATA_1: 'No favorite EMS entities found yet. Use the',
NO_DATA_2: 'module to mark them.', NO_DATA_2: 'module to mark them.',
NO_DATA_3: 'To see all available entities go to', NO_DATA_3: 'To see all available entities go to',
THIS_VERSION: 'This Version', THIS_VERSION: 'This Version',
PLATFORM: 'Platform', PLATFORM: 'Platform',
RELEASE_TYPE: 'Release Type', RELEASE_TYPE: 'Release Type',
REINSTALL: 'Re-install',
INTERNET_CONNECTION_REQUIRED: 'Internet connection required for automatic version checking and upgrading', INTERNET_CONNECTION_REQUIRED: 'Internet connection required for automatic version checking and upgrading',
SWITCH_RELEASE_TYPE: 'Switch to {0} release'
}; };
export default en; export default en;

View File

@@ -41,9 +41,9 @@ const fr: Translation = {
CHANGE_VALUE: 'Changer la valeur', CHANGE_VALUE: 'Changer la valeur',
CANCEL: 'Annuler', CANCEL: 'Annuler',
RESET: 'Réinitialiser', RESET: 'Réinitialiser',
APPLY_CHANGES: 'Apply Changes ({0})', // TODO translate APPLY_CHANGES: 'Appliquer les changements ({0})',
UPDATE: 'Update', // TODO translate UPDATE: 'Update',
EXECUTE: 'Execute', // TODO translate EXECUTE: 'Execute',
REMOVE: 'Enlever', REMOVE: 'Enlever',
PROBLEM_UPDATING: 'Problème lors de la mise à jour', PROBLEM_UPDATING: 'Problème lors de la mise à jour',
PROBLEM_LOADING: 'Problème lors du chargement', PROBLEM_LOADING: 'Problème lors du chargement',
@@ -66,13 +66,13 @@ const fr: Translation = {
TEMP_SENSOR: 'Capteur de température', TEMP_SENSOR: 'Capteur de température',
TEMP_SENSORS: 'Capteurs de température', TEMP_SENSORS: 'Capteurs de température',
WRITE_CMD_SENT: 'Envoyer la commande sent', WRITE_CMD_SENT: 'Envoyer la commande sent',
EMS_BUS_WARNING: 'Bus EMS déconnecté. Si ce message persiste après quelques secondes, vérifiez les paramètres et la configuration de la carte.', EMS_BUS_WARNING: 'Bus EMS déconnecté. Si ce message persiste après quelques secondes, vérifiez les paramètres et la configuration de la carte.',
EMS_BUS_SCANNING: 'Scan des appareils EMS...', EMS_BUS_SCANNING: 'Scan des appareils EMS...',
CONNECTED: 'Connecté', CONNECTED: 'Connecté',
TX_ISSUES: 'Problèmes de transmission (Tx) - Essayez un autre mode Tx', TX_ISSUES: 'Problèmes de transmission (Tx) - Essayez un autre mode Tx',
DISCONNECTED: 'Déconnecté', DISCONNECTED: 'Déconnecté',
EMS_SCAN: 'Etes-vous sûr de vouloir lancer un scan complet du bus EMS ?', EMS_SCAN: 'Etes-vous sûr de vouloir lancer un scan complet du bus EMS ?',
DATA_TRAFFIC: 'Data Traffic', // TODO translate DATA_TRAFFIC: 'Traffic des données',
EMS_DEVICE: 'Appareils EMS', EMS_DEVICE: 'Appareils EMS',
SUCCESS: 'SUCCÈS', SUCCESS: 'SUCCÈS',
FAIL: 'ÉCHEC', FAIL: 'ÉCHEC',
@@ -114,9 +114,9 @@ const fr: Translation = {
BYPASS_TOKEN: "Contourner l'autorisation du jeton d'accès sur les appels API", BYPASS_TOKEN: "Contourner l'autorisation du jeton d'accès sur les appels API",
READONLY: 'Activer le mode lecture uniquement (bloque toutes les commandes EMS sortantes en écriture Tx)', READONLY: 'Activer le mode lecture uniquement (bloque toutes les commandes EMS sortantes en écriture Tx)',
UNDERCLOCK_CPU: 'Underclock du CPU', UNDERCLOCK_CPU: 'Underclock du CPU',
HEATINGOFF: 'Start boiler with forced heating off', // TODO translate HEATINGOFF: 'Démarrer le chauffage avec le chauffage forcé éteint',
REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT: 'Remote timeout',
REMOTE_TIMEOUT_EN: 'Disable remote on missing room temperature', // TODO translate REMOTE_TIMEOUT_EN: 'Disable remote on missing room temperature',
MIN_DURATION: 'Wait time', MIN_DURATION: 'Wait time',
ENABLE_SHOWER_TIMER: 'Activer la minuterie de la douche', ENABLE_SHOWER_TIMER: 'Activer la minuterie de la douche',
ENABLE_SHOWER_ALERT: 'Activer les alertes de durée de douche', ENABLE_SHOWER_ALERT: 'Activer les alertes de durée de douche',
@@ -148,7 +148,7 @@ const fr: Translation = {
CUSTOMIZATIONS_HELP_3: "désactiver l'action d'écriture", CUSTOMIZATIONS_HELP_3: "désactiver l'action d'écriture",
CUSTOMIZATIONS_HELP_4: "exclure de MQTT et de l'API", CUSTOMIZATIONS_HELP_4: "exclure de MQTT et de l'API",
CUSTOMIZATIONS_HELP_5: 'cacher des appareils', CUSTOMIZATIONS_HELP_5: 'cacher des appareils',
CUSTOMIZATIONS_HELP_6: 'remove from memory', // TODO translate CUSTOMIZATIONS_HELP_6: 'supprimer de la mémoire',
SELECT_DEVICE: 'Sélectionnez un appareil', SELECT_DEVICE: 'Sélectionnez un appareil',
SET_ALL: 'tout régler', SET_ALL: 'tout régler',
OPTIONS: 'Options', OPTIONS: 'Options',
@@ -162,20 +162,21 @@ const fr: Translation = {
UPLOAD: 'Upload', UPLOAD: 'Upload',
DOWNLOAD: '{{D|d|d}}ownload', DOWNLOAD: '{{D|d|d}}ownload',
INSTALL: 'Installer', INSTALL: 'Installer',
REINSTALL: 'Réinstaller',
ABORTED: 'annulé', ABORTED: 'annulé',
FAILED: 'échoué', FAILED: 'échoué',
SUCCESSFUL: 'réussi', SUCCESSFUL: 'réussi',
SYSTEM: 'Système', SYSTEM: 'Système',
LOG_OF: '{0} Log', LOG_OF: '{0} Log',
STATUS_OF: 'Statut {0}', STATUS_OF: 'Statut {0}',
DOWNLOAD_UPLOAD: 'Download/Upload', // TODO translate DOWNLOAD_UPLOAD: 'Télécharger/Mettre à jour',
CLOSE: 'Fermer', CLOSE: 'Fermer',
USE: 'Utiliser', USE: 'Utiliser',
FACTORY_RESET: 'Réinitialisation', FACTORY_RESET: 'Réinitialisation',
SYSTEM_FACTORY_TEXT: "L'appareil a été réinitialisé et va maintenant redémarrer", SYSTEM_FACTORY_TEXT: "L'appareil a été réinitialisé et va maintenant redémarrer",
SYSTEM_FACTORY_TEXT_DIALOG: "Êtes-vous sûr de vouloir réinitialiser l'appareil à ses paramètres d'usine ?", SYSTEM_FACTORY_TEXT_DIALOG: "Êtes-vous sûr de vouloir réinitialiser l'appareil à ses paramètres d'usine ?",
AVAILABLE_VERSION: 'Latest Available Versions', // TODO translate AVAILABLE_VERSION: 'Versions disponibles',
STABLE: 'Stable', // TODO translate STABLE: 'Stable',
DEVELOPMENT: 'Développement', DEVELOPMENT: 'Développement',
UPTIME: 'Durée de fonctionnement du système', UPTIME: 'Durée de fonctionnement du système',
FREE_MEMORY: 'Libre Memory', FREE_MEMORY: 'Libre Memory',
@@ -185,9 +186,9 @@ const fr: Translation = {
FILESYSTEM: 'File System (Utilisée / Libre)', FILESYSTEM: 'File System (Utilisée / Libre)',
BUFFER_SIZE: 'Max taille du buffer', BUFFER_SIZE: 'Max taille du buffer',
COMPACT: 'Compact', COMPACT: 'Compact',
DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings', // TODO translate DOWNLOAD_SETTINGS_TEXT: 'Créer une sauvegarde de vos paramètres et configurations',
UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)', // TODO translate UPLOAD_TEXT: 'Télécharger un nouveau fichier firmware (.bin) ou une sauvegarde (.json)',
UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here',
ERROR: 'Erreur inattendue, veuillez réessayer', ERROR: 'Erreur inattendue, veuillez réessayer',
TIME_SET: 'Time set', TIME_SET: 'Time set',
MANAGE_USERS: 'Gérer les utilisateurs', MANAGE_USERS: 'Gérer les utilisateurs',
@@ -217,7 +218,7 @@ const fr: Translation = {
MQTT_PUBLISH_TEXT_2: 'Publier vers des topics de commande (ioBroker)', MQTT_PUBLISH_TEXT_2: 'Publier vers des topics de commande (ioBroker)',
MQTT_PUBLISH_TEXT_3: 'Activer la découverte MQTT', MQTT_PUBLISH_TEXT_3: 'Activer la découverte MQTT',
MQTT_PUBLISH_TEXT_4: 'Préfixe pour les topics découverte', MQTT_PUBLISH_TEXT_4: 'Préfixe pour les topics découverte',
MQTT_PUBLISH_TEXT_5: 'Discovery type', // TODO translate MQTT_PUBLISH_TEXT_5: 'Type de découverte',
MQTT_PUBLISH_INTERVALS: 'Intervalles de publication', MQTT_PUBLISH_INTERVALS: 'Intervalles de publication',
MQTT_INT_BOILER: 'Chaudières et pompes à chaleur', MQTT_INT_BOILER: 'Chaudières et pompes à chaleur',
MQTT_INT_THERMOSTATS: 'Thermostats', MQTT_INT_THERMOSTATS: 'Thermostats',
@@ -226,10 +227,10 @@ const fr: Translation = {
MQTT_INT_WATER: 'Modules eau', MQTT_INT_WATER: 'Modules eau',
MQTT_QUEUE: 'Queue MQTT', MQTT_QUEUE: 'Queue MQTT',
DEFAULT: 'Défaut', DEFAULT: 'Défaut',
MQTT_ENTITY_FORMAT: 'Entity ID format', // TODO translate MQTT_ENTITY_FORMAT: 'Format de l\'ID de l\'entité',
MQTT_ENTITY_FORMAT_0: 'Single instance, long name (v3.4)', // TODO translate MQTT_ENTITY_FORMAT_0: 'Instance unique, nom long (v3.4)',
MQTT_ENTITY_FORMAT_1: 'Single instance, short name', // TODO translate MQTT_ENTITY_FORMAT_1: 'Instance unique, nom court',
MQTT_ENTITY_FORMAT_2: 'Multiple instances, short name', // TODO translate MQTT_ENTITY_FORMAT_2: 'Instances multiples, nom court',
MQTT_CLEAN_SESSION: 'Flag Clean Session', MQTT_CLEAN_SESSION: 'Flag Clean Session',
MQTT_RETAIN_FLAG: 'Toujours activer le Retain Flag', MQTT_RETAIN_FLAG: 'Toujours activer le Retain Flag',
INACTIVE: 'Inactif', INACTIVE: 'Inactif',
@@ -260,7 +261,7 @@ const fr: Translation = {
NETWORK_SCANNER: 'Scan réseau', NETWORK_SCANNER: 'Scan réseau',
NETWORK_NO_WIFI: 'Pas de réseau WiFi trouvé', NETWORK_NO_WIFI: 'Pas de réseau WiFi trouvé',
NETWORK_BLANK_SSID: 'laisser vide pour désactiver le WiFi', NETWORK_BLANK_SSID: 'laisser vide pour désactiver le WiFi',
NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate NETWORK_BLANK_BSSID: 'laisser vide pour utiliser uniquement le SSID',
TX_POWER: 'Puissance Tx', TX_POWER: 'Puissance Tx',
HOSTNAME: "Nom d'hôte", HOSTNAME: "Nom d'hôte",
NETWORK_DISABLE_SLEEP: 'Désactiver le mode veille du WiFi', NETWORK_DISABLE_SLEEP: 'Désactiver le mode veille du WiFi',
@@ -280,79 +281,78 @@ const fr: Translation = {
ENTITY: 'entité', ENTITY: 'entité',
MIN: 'min', MIN: 'min',
MAX: 'max', MAX: 'max',
BLOCK_NAVIGATE_1: 'You have unsaved changes', // TODO translate BLOCK_NAVIGATE_1: 'Vous avez des modifications non enregistrées',
BLOCK_NAVIGATE_2: 'If you navigate to a different page, your unsaved changes will be lost. Are you sure you want to leave this page?', // TODO translate BLOCK_NAVIGATE_2: 'Si vous naviguez vers une autre page, vos modifications non enregistrées seront perdues. Êtes-vous sûr de vouloir quitter cette page ?',
STAY: 'Stay', // TODO translate STAY: 'Rester',
LEAVE: 'Leave', // TODO translate LEAVE: 'Quitter',
SCHEDULER: 'Scheduler', // TODO translate SCHEDULER: 'Scheduler',
SCHEDULER_HELP_1: 'Automate commands by adding scheduled events below. Set a unique Name to enable/disable activation via API/MQTT', // TODO translate SCHEDULER_HELP_1: 'Automatiser les commandes en ajoutant des événements programmés ci-dessous. Définissez un nom unique pour activer/désactiver l\'activation via API/MQTT',
SCHEDULER_HELP_2: 'Use 00:00 to trigger once on start-up', // TODO translate SCHEDULER_HELP_2: 'Utiliser 00:00 pour déclencher une fois au démarrage',
SCHEDULE: 'Schedule', // TODO translate SCHEDULE: 'Programme',
TIME: 'Time', // TODO translate TIME: 'Temps',
TIMER: 'Timer', // TODO translate TIMER: 'Minuteur',
ONCHANGE: 'Sur le changement', // TODO translate ONCHANGE: 'Sur le changement',
CONDITION: 'Condition', // TODO translate CONDITION: 'Condition',
IMMEDIATE: 'Immédiate', // TODO translate IMMEDIATE: 'Immédiat',
SCHEDULE_UPDATED: 'Schedule updated', // TODO translate SCHEDULE_UPDATED: 'Programme mis à jour',
SCHEDULE_TIMER_1: 'on startup', // TODO translate SCHEDULE_TIMER_1: 'au démarrage',
SCHEDULE_TIMER_2: 'every minute', // TODO translate SCHEDULE_TIMER_2: 'toutes les minutes',
SCHEDULE_TIMER_3: 'every hour', // TODO translate SCHEDULE_TIMER_3: 'toutes les heures',
CUSTOM_ENTITIES: 'Custom Entities', // TODO translate CUSTOM_ENTITIES: 'Entités personnalisées',
ENTITIES_HELP_1: 'Fetch custom entities from the EMS bus', // TODO translate ENTITIES_HELP_1: 'Récupérer les entités personnalisées du bus EMS',
ENTITIES_UPDATED: 'Entities Updated', // TODO translate ENTITIES_UPDATED: 'Entités mises à jour',
WRITEABLE: 'Writeable', // TODO translate WRITEABLE: 'Écriture',
SHOWING: 'Showing', // TODO translate SHOWING: 'Affichage',
SEARCH: 'Search', // TODO translate SEARCH: 'Rechercher',
CERT: 'TLS root certificate (leave blank for insecure)', // TODO translate CERT: 'Certificat racine TLS (laisser vide pour l\'insecurité)',
ENABLE_TLS: 'Activer TLS', ENABLE_TLS: 'Activer TLS',
ON: 'On', // TODO translate ON: 'On',
OFF: 'Off', // TODO translate OFF: 'Off',
POLARITY: 'Polarity', // TODO translate POLARITY: 'Polarity',
ACTIVEHIGH: 'Active High', // TODO translate ACTIVEHIGH: 'Actif haut',
ACTIVELOW: 'Active Low', // TODO translate ACTIVELOW: 'Actif bas',
UNCHANGED: 'Unchanged', // TODO translate UNCHANGED: 'Inchangé',
ALWAYS: 'Always', // TODO translate ALWAYS: 'Toujours',
ACTIVITY: 'Activity', // TODO translate ACTIVITY: 'Activité',
CONFIGURE: 'Configure {0}', // TODO translate CONFIGURE: 'Configurer {0}',
SYSTEM_MEMORY: 'System Memory', // TODO translate SYSTEM_MEMORY: 'Mémoire système',
APPLICATION_SETTINGS_1: 'Modify EMS-ESP Application Settings', // TODO translate APPLICATION_SETTINGS_1: 'Modifier les paramètres de l\'application EMS-ESP',
SECURITY_1: 'Add or remove users', // TODO translate SECURITY_1: 'Ajouter ou supprimer des utilisateurs',
DOWNLOAD_UPLOAD_1: 'Download and Upload Settings and Firmware', // TODO translate DOWNLOAD_UPLOAD_1: 'Télécharger et mettre à jour les paramètres et le firmware',
MODULES: 'Module', // TODO translate MODULES: 'Module',
MODULES_1: 'Activer ou désactiver les modules externes', MODULES_1: 'Activer ou désactiver les modules externes',
MODULES_UPDATED: 'Modules updated', // TODO translate MODULES_UPDATED: 'Modules mis à jour',
MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate MODULES_DESCRIPTION: 'Cliquer sur le module pour activer ou désactiver les modules EMS-ESP',
MODULES_NONE: 'No external modules detected', // TODO translate MODULES_NONE: 'Aucun module externe détecté',
RENAME: 'Rename', // TODO translate RENAME: 'Renommer',
ENABLE_MODBUS: 'Activer Modbus', ENABLE_MODBUS: 'Activer Modbus',
VIEW_LOG: 'View log to diagnose issues', // TODO translate VIEW_LOG: 'Voir le journal pour diagnostiquer les problèmes',
UPLOAD_DRAG: 'drag and drop a file here or click to select one', // TODO translate UPLOAD_DRAG: 'glisser-déposer un fichier ici ou cliquer pour en sélectionner un',
SERVICES: 'Services', // TODO translate SERVICES: 'Services',
ALLVALUES: 'All Values', // TODO translate ALLVALUES: 'Toutes les valeurs',
SPECIAL_FUNCTIONS: 'Special Functions', SPECIAL_FUNCTIONS: 'Fonctions spéciales',
WAIT_FIRMWARE: 'Firmware is uploading and installing', // TODO translate WAIT_FIRMWARE: 'Firmware en cours de téléchargement et d\'installation',
INSTALL_VERSION: 'This will install version {0}. Are you sure?', // TODO translate INSTALL_VERSION: 'Cela va {0} la version {1}. Êtes-vous sûr ?',
UPGRADE_AVAILABLE: 'There is a firmware upgrade available!', // TODO translate UPDATE_AVAILABLE: 'mise à jour disponible',
LATEST_VERSION: 'You are using the latest firmware version', // TODO translate LATEST_VERSION: 'Vous utilisez la dernière version {0} du firmware',
PLEASE_WAIT: 'Please wait', // TODO translate PLEASE_WAIT: 'Veuillez patienter',
RESTARTING_PRE: 'Initializing', // TODO translate RESTARTING_PRE: 'Initialisation',
RESTARTING_POST: 'Preparing', // TODO translate RESTARTING_POST: 'Préparation',
AUTO_SCROLL: 'Auto Scroll', // TODO translate AUTO_SCROLL: 'Défilement automatique',
DASHBOARD: 'Dashboard', // TODO translate DASHBOARD: 'Tableau de bord',
DEVELOPER_MODE: 'Developer Mode', // TODO translate DEVELOPER_MODE: 'Mode développeur',
BYTES: 'Bytes', // TODO translate BYTES: 'Octets',
BITMASK: 'Bit Mask',// TODO translate BITMASK: 'Masque de bits',
DUPLICATE: 'Duplicate', // TODO translate DUPLICATE: 'Dupliquer',
UPGRADE: 'Upgrade', // TODO translate DASHBOARD_1: 'Toutes les entités EMS actives et marquées comme favoris, plus toutes les entités personnalisées, les programmes et les données des capteurs externes sont affichées ci-dessous.',
DASHBOARD_1: 'All EMS entities that are active and marked as Favorite, plus all Custom Entities, Schedules and external Sensors data are displayed below.', // TODO translate NO_DATA_1: 'Aucune entité EMS favorite trouvée. Utilisez le',
NO_DATA_1: 'No favorite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'module pour les marquer.',
NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'Pour voir toutes les entités disponibles, aller à',
NO_DATA_3: 'To see all available entities go to', // TODO translate THIS_VERSION: 'Cette version',
THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Plateforme',
PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Type de version',
RELEASE_TYPE: 'Release Type', // TODO translate INTERNET_CONNECTION_REQUIRED: 'Connexion Internet requise pour la vérification automatique des versions et la mise à niveau',
REINSTALL: 'Re-install', // TODO translate SWITCH_RELEASE_TYPE: 'Passer à la version {0}'
INTERNET_CONNECTION_REQUIRED: 'Internet connection required for automatic version checking and upgrading',
}; };
export default fr; export default fr;

View File

@@ -72,7 +72,7 @@ const it: Translation = {
TX_ISSUES: 'Problema di Tx - prova una modalità differente', TX_ISSUES: 'Problema di Tx - prova una modalità differente',
DISCONNECTED: 'Disconnesso', DISCONNECTED: 'Disconnesso',
EMS_SCAN: 'Sei sicuro di voler iniziare una scansione completa del bus EMS ?', EMS_SCAN: 'Sei sicuro di voler iniziare una scansione completa del bus EMS ?',
DATA_TRAFFIC: 'Data Traffic', // TODO translate DATA_TRAFFIC: 'Traffico dati',
EMS_DEVICE: 'Dispositivo EMS ', EMS_DEVICE: 'Dispositivo EMS ',
SUCCESS: 'SUCCESSO', SUCCESS: 'SUCCESSO',
FAIL: 'FALLITO', FAIL: 'FALLITO',
@@ -115,7 +115,7 @@ const it: Translation = {
READONLY: 'Abilita modalità sola-lettura (blocca tutti i comandi di scrittura EMS Tx in uscita)', READONLY: 'Abilita modalità sola-lettura (blocca tutti i comandi di scrittura EMS Tx in uscita)',
UNDERCLOCK_CPU: 'Abbassa velocità della CPU', UNDERCLOCK_CPU: 'Abbassa velocità della CPU',
REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT: 'Remote timeout',
REMOTE_TIMEOUT_EN: 'Disable remote on missing room temperature', // TODO translate REMOTE_TIMEOUT_EN: 'Disabilitare il telecomando in caso di temperatura ambiente mancante',
HEATINGOFF: 'Avviamento caldaia con riscaldamento forzato spento', HEATINGOFF: 'Avviamento caldaia con riscaldamento forzato spento',
MIN_DURATION: 'Wait time', MIN_DURATION: 'Wait time',
ENABLE_SHOWER_TIMER: 'Abilita timer doccia', ENABLE_SHOWER_TIMER: 'Abilita timer doccia',
@@ -162,6 +162,7 @@ const it: Translation = {
UPLOAD: 'Carica', UPLOAD: 'Carica',
DOWNLOAD: 'Scarica', DOWNLOAD: 'Scarica',
INSTALL: 'Installare {0}', INSTALL: 'Installare {0}',
REINSTALL: 'Riavviare',
ABORTED: 'Annullato', ABORTED: 'Annullato',
FAILED: 'Fallito', FAILED: 'Fallito',
SUCCESSFUL: 'Riuscito', SUCCESSFUL: 'Riuscito',
@@ -174,8 +175,8 @@ const it: Translation = {
FACTORY_RESET: 'Impostazioni di fabbrica', FACTORY_RESET: 'Impostazioni di fabbrica',
SYSTEM_FACTORY_TEXT: 'Il dispositivo è stato ripristinato alle impostazioni di fabbrica e ora verrà riavviato', SYSTEM_FACTORY_TEXT: 'Il dispositivo è stato ripristinato alle impostazioni di fabbrica e ora verrà riavviato',
SYSTEM_FACTORY_TEXT_DIALOG: 'Sei sicuro di voler ripristinare il dispositivo alle impostazioni di fabbrica??', SYSTEM_FACTORY_TEXT_DIALOG: 'Sei sicuro di voler ripristinare il dispositivo alle impostazioni di fabbrica??',
AVAILABLE_VERSION: 'Latest Available Versions', // TODO translate AVAILABLE_VERSION: 'Versioni disponibili',
STABLE: 'Stable', // TODO translate STABLE: 'Stabile',
DEVELOPMENT: 'Sviluppo', DEVELOPMENT: 'Sviluppo',
UPTIME: 'Tempo di attività del sistema', UPTIME: 'Tempo di attività del sistema',
FREE_MEMORY: 'Free Memory', FREE_MEMORY: 'Free Memory',
@@ -184,10 +185,10 @@ const it: Translation = {
APPSIZE: 'Applicazione (Partizione: Usata / Libera)', APPSIZE: 'Applicazione (Partizione: Usata / Libera)',
FILESYSTEM: 'Memoria Sistema (Usata / Libera)', FILESYSTEM: 'Memoria Sistema (Usata / Libera)',
BUFFER_SIZE: 'Max Buffer Size', BUFFER_SIZE: 'Max Buffer Size',
COMPACT: 'Compact', COMPACT: 'Compatto',
DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings', // TODO translate DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings',
UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)', // TODO translate UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)',
UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here',
ERROR: 'Errore Inaspettato, prego tenta ancora', ERROR: 'Errore Inaspettato, prego tenta ancora',
TIME_SET: 'Imposta Ora', TIME_SET: 'Imposta Ora',
MANAGE_USERS: 'Gestione Utenti', MANAGE_USERS: 'Gestione Utenti',
@@ -260,7 +261,7 @@ const it: Translation = {
NETWORK_SCANNER: 'Scansione Rete', NETWORK_SCANNER: 'Scansione Rete',
NETWORK_NO_WIFI: 'Nessuana rete WiFi trovata', NETWORK_NO_WIFI: 'Nessuana rete WiFi trovata',
NETWORK_BLANK_SSID: 'lasciare vuoto per disattivare WiFi', NETWORK_BLANK_SSID: 'lasciare vuoto per disattivare WiFi',
NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate NETWORK_BLANK_BSSID: 'lasciare vuoto per usare solo SSID',
TX_POWER: 'Potenza Tx', TX_POWER: 'Potenza Tx',
HOSTNAME: 'Nome ospite', HOSTNAME: 'Nome ospite',
NETWORK_DISABLE_SLEEP: 'Disabilita la modalità sospensione Wi-Fi', NETWORK_DISABLE_SLEEP: 'Disabilita la modalità sospensione Wi-Fi',
@@ -303,56 +304,55 @@ const it: Translation = {
WRITEABLE: 'Scrivibile', WRITEABLE: 'Scrivibile',
SHOWING: 'Visualizza', SHOWING: 'Visualizza',
SEARCH: 'Ricerca', SEARCH: 'Ricerca',
CERT: 'TLS root certificate (leave blank for insecure)', // TODO translate CERT: 'Certificato radice TLS (lasciare vuoto per l\'insecure)',
ENABLE_TLS: 'Abilita TLS', ENABLE_TLS: 'Abilita TLS',
ON: 'On', // TODO translate ON: 'On',
OFF: 'Off', // TODO translate OFF: 'Off',
POLARITY: 'Polarity', // TODO translate POLARITY: 'Polarity',
ACTIVEHIGH: 'Active High', // TODO translate ACTIVEHIGH: 'Active High',
ACTIVELOW: 'Active Low', // TODO translate ACTIVELOW: 'Active Low',
UNCHANGED: 'Unchanged', // TODO translate UNCHANGED: 'Unchanged',
ALWAYS: 'Always', // TODO translate ALWAYS: 'Always',
ACTIVITY: 'Activity', // TODO translate ACTIVITY: 'Activity',
CONFIGURE: 'Configure {0}', // TODO translate CONFIGURE: 'Configure {0}',
SYSTEM_MEMORY: 'System Memory', // TODO translate SYSTEM_MEMORY: 'System Memory',
APPLICATION_SETTINGS_1: 'Modify EMS-ESP Application Settings', // TODO translate APPLICATION_SETTINGS_1: 'Modify EMS-ESP Application Settings',
SECURITY_1: 'Add or remove users', // TODO translate SECURITY_1: 'Add or remove users',
DOWNLOAD_UPLOAD_1: 'Download and Upload Settings and Firmware', // TODO translate DOWNLOAD_UPLOAD_1: 'Download and Upload Settings and Firmware',
MODULES: 'Module', // TODO translate MODULES: 'Module',
MODULES_1: 'Attiva o disattiva i moduli esterni', // TODO translate MODULES_1: 'Attiva o disattiva i moduli esterni',
MODULES_UPDATED: 'Modules updated', // TODO translate MODULES_UPDATED: 'Modules updated',
MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules',
MODULES_NONE: 'No external modules detected', // TODO translate MODULES_NONE: 'No external modules detected',
RENAME: 'Rename', // TODO translate RENAME: 'Rename',
ENABLE_MODBUS: 'Abilita Modbus', ENABLE_MODBUS: 'Abilita Modbus',
VIEW_LOG: 'View log to diagnose issues', // TODO translate VIEW_LOG: 'Visualizza log per diagnosticare problemi',
UPLOAD_DRAG: 'drag and drop a file here or click to select one', // TODO translate UPLOAD_DRAG: 'trascina e rilascia un file qui o clicca per selezionare uno',
SERVICES: 'Services', // TODO translate SERVICES: 'Servizi',
ALLVALUES: 'All Values', // TODO translate ALLVALUES: 'Tutti i valori',
SPECIAL_FUNCTIONS: 'Special Functions', // TODO translate SPECIAL_FUNCTIONS: 'Funzioni speciali',
WAIT_FIRMWARE: 'Firmware is uploading and installing', // TODO translate WAIT_FIRMWARE: 'Firmware è in upload e installazione',
INSTALL_VERSION: 'This will install version {0}. Are you sure?', // TODO translate INSTALL_VERSION: 'Questo installerà la versione {1} {0}. Sei sicuro?',
UPGRADE_AVAILABLE: 'There is a firmware upgrade available!', // TODO translate UPDATE_AVAILABLE: 'aggiornamento disponibile',
LATEST_VERSION: 'You are using the latest firmware version', // TODO translate LATEST_VERSION: 'Stai usando la versione più recente del firmware {0}',
PLEASE_WAIT: 'Please wait', // TODO translate PLEASE_WAIT: 'Attendere',
RESTARTING_PRE: 'Initializing', // TODO translate RESTARTING_PRE: 'Inizializzazione',
RESTARTING_POST: 'Preparing', // TODO translate RESTARTING_POST: 'Preparazione',
AUTO_SCROLL: 'Auto Scroll', // TODO translate AUTO_SCROLL: 'Scorrimento automatico',
DASHBOARD: 'Dashboard', // TODO translate DASHBOARD: 'Pannello di controllo',
DEVELOPER_MODE: 'Developer Mode', // TODO translate DEVELOPER_MODE: 'Modalità sviluppatore',
BYTES: 'Bytes', // TODO translate BYTES: 'Byte',
BITMASK: 'Bit Mask',// TODO translate BITMASK: 'Bitmask',
DUPLICATE: 'Duplicate', // TODO translate DUPLICATE: 'Duplicato',
UPGRADE: 'Upgrade', // TODO translate DASHBOARD_1: 'Tutte le entità EMS che sono attive e marcate come preferite, più tutte le entità personalizzate, piani di programmazione e dati dei sensori esterni sono visualizzati di seguito.',
DASHBOARD_1: 'All EMS entities that are active and marked as Favorite, plus all Custom Entities, Schedules and external Sensors data are displayed below.', // TODO translate NO_DATA_1: 'Nessuna entità EMS preferita trovata. Usa il',
NO_DATA_1: 'No favorite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'modulo per marcarle.',
NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'Per vedere tutte le entità disponibili vai a',
NO_DATA_3: 'To see all available entities go to', // TODO translate THIS_VERSION: 'Questa versione',
THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Piattaforma',
PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Tipo di rilascio',
RELEASE_TYPE: 'Release Type', // TODO translate INTERNET_CONNECTION_REQUIRED: 'Connessione internet richiesta per il controllo automatico delle versioni e l\'aggiornamento',
REINSTALL: 'Re-install', // TODO translate SWITCH_RELEASE_TYPE: 'Cambia in {0} rilascio'
INTERNET_CONNECTION_REQUIRED: 'Internet connection required for automatic version checking and upgrading',
}; };
export default it; export default it;

View File

@@ -162,6 +162,7 @@ const nl: Translation = {
UPLOAD: 'Upload', UPLOAD: 'Upload',
DOWNLOAD: '{{D|d|d}}ownload', DOWNLOAD: '{{D|d|d}}ownload',
INSTALL: 'Installeren', INSTALL: 'Installeren',
REINSTALL: 'Opnieuw installeren',
ABORTED: 'afgebroken', ABORTED: 'afgebroken',
FAILED: 'mislukt', FAILED: 'mislukt',
SUCCESSFUL: 'successvol', SUCCESSFUL: 'successvol',
@@ -252,13 +253,13 @@ const nl: Translation = {
AP_CLIENTS: 'AP Clients', AP_CLIENTS: 'AP Clients',
AP_MAX_CLIENTS: 'Max Clients', AP_MAX_CLIENTS: 'Max Clients',
AP_LOCAL_IP: 'Local IP', AP_LOCAL_IP: 'Local IP',
NETWORK_SCAN: 'Scan WiFi Networken', NETWORK_SCAN: 'Scan WiFi Netwerken',
IDLE: 'Idle', IDLE: 'Idle',
LOST: 'Verloren', LOST: 'Verloren',
SCANNING: 'Scannen', SCANNING: 'Scannen',
SCAN_AGAIN: 'Opnieuw scannen', SCAN_AGAIN: 'Opnieuw scannen',
NETWORK_SCANNER: 'Netwerk Scanner', NETWORK_SCANNER: 'Netwerk Scanner',
NETWORK_NO_WIFI: 'Geen WiFi networken gevonden', NETWORK_NO_WIFI: 'Geen WiFi netwerken gevonden',
NETWORK_BLANK_SSID: 'laat leeg om WiFi uit te schakelen', NETWORK_BLANK_SSID: 'laat leeg om WiFi uit te schakelen',
NETWORK_BLANK_BSSID: 'laat leeg om alleen SSID te bebruiken', NETWORK_BLANK_BSSID: 'laat leeg om alleen SSID te bebruiken',
TX_POWER: 'Tx Vermogen', TX_POWER: 'Tx Vermogen',
@@ -273,7 +274,7 @@ const nl: Translation = {
NETWORK_SUBNET: 'Subnetmasker', NETWORK_SUBNET: 'Subnetmasker',
NETWORK_DNS: 'DNS Servers', NETWORK_DNS: 'DNS Servers',
ADDRESS_OF: '{0} Address', ADDRESS_OF: '{0} Address',
ADMINISTRATOR: 'Administrator', ADMINISTRATOR: 'Administrator',
GUEST: 'Gast', GUEST: 'Gast',
NEW: 'Nieuwe', NEW: 'Nieuwe',
NEW_NAME_OF: 'Hernoem {0}', NEW_NAME_OF: 'Hernoem {0}',
@@ -320,7 +321,7 @@ const nl: Translation = {
DOWNLOAD_UPLOAD_1: 'Download en upload instellingen en firmware', DOWNLOAD_UPLOAD_1: 'Download en upload instellingen en firmware',
MODULES: 'Module', MODULES: 'Module',
MODULES_1: 'Externe modules activeren of deactiveren', MODULES_1: 'Externe modules activeren of deactiveren',
MODULES_UPDATED: 'Modules geüpdatet', MODULES_UPDATED: 'Modules geüpdatet',
MODULES_DESCRIPTION: 'Klik op de module om EMS-ESP library modules te activeren of te deactiveren', MODULES_DESCRIPTION: 'Klik op de module om EMS-ESP library modules te activeren of te deactiveren',
MODULES_NONE: 'Geen externe modules gedetecteerd', MODULES_NONE: 'Geen externe modules gedetecteerd',
RENAME: 'Hernoemen', RENAME: 'Hernoemen',
@@ -331,19 +332,18 @@ const nl: Translation = {
ALLVALUES: 'All waarden', ALLVALUES: 'All waarden',
SPECIAL_FUNCTIONS: 'Speciale functies', SPECIAL_FUNCTIONS: 'Speciale functies',
WAIT_FIRMWARE: 'Firmware wordt geüpload en geïnstalleerd', WAIT_FIRMWARE: 'Firmware wordt geüpload en geïnstalleerd',
INSTALL_VERSION: 'Hiermee wordt versie {0} geïnstalleerd. Weet je het zeker?', INSTALL_VERSION: 'Hiermee wordt versie {1} {0}. Weet je het zeker?',
UPGRADE_AVAILABLE: 'Er is een firmware-upgrade beschikbaar!', UPDATE_AVAILABLE: 'update beschikbaar',
LATEST_VERSION: 'U gebruikt de nieuwste firmwareversie', LATEST_VERSION: 'U gebruikt de nieuwste {0} firmwareversie',
PLEASE_WAIT: 'Een ogenblik geduld', PLEASE_WAIT: 'Een ogenblik geduld',
RESTARTING_PRE: 'Initialiseren', RESTARTING_PRE: 'Initialiseren',
RESTARTING_POST: 'Voorbereiding', RESTARTING_POST: 'Voorbereiding',
AUTO_SCROLL: 'Automatisch Scrollen', AUTO_SCROLL: 'Automatisch Scrollen',
DASHBOARD: 'Dashboard', DASHBOARD: 'Dashboard',
DEVELOPER_MODE: 'Ontwikkelaarsmodus', DEVELOPER_MODE: 'Ontwikkelaarsmodus',
BYTES: 'Bytes', // TODO translate BYTES: 'Bytes',
BITMASK: 'Bit Mask',// TODO translate BITMASK: 'Bit Mask',
DUPLICATE: 'Duplicaat', DUPLICATE: 'Duplicaat',
UPGRADE: 'Upgraden',
DASHBOARD_1: 'Alle EMS-entiteiten die actief zijn en als favoriet zijn gemarkeerd, plus alle aangepaste entiteiten en externe sensorgegevens worden hieronder weergegeven.', DASHBOARD_1: 'Alle EMS-entiteiten die actief zijn en als favoriet zijn gemarkeerd, plus alle aangepaste entiteiten en externe sensorgegevens worden hieronder weergegeven.',
NO_DATA_1: 'Er zijn nog geen favoriete EMS-entiteiten gevonden. Gebruik de', NO_DATA_1: 'Er zijn nog geen favoriete EMS-entiteiten gevonden. Gebruik de',
NO_DATA_2: 'module om ze te markeren.', NO_DATA_2: 'module om ze te markeren.',
@@ -351,8 +351,8 @@ const nl: Translation = {
THIS_VERSION: 'Deze Versie', THIS_VERSION: 'Deze Versie',
PLATFORM: 'Platform', PLATFORM: 'Platform',
RELEASE_TYPE: 'Release Typ', RELEASE_TYPE: 'Release Typ',
REINSTALL: 'Opnieuw Installeren',
INTERNET_CONNECTION_REQUIRED: 'Internetverbinding vereist voor automatische versiecontrole en -upgrade', INTERNET_CONNECTION_REQUIRED: 'Internetverbinding vereist voor automatische versiecontrole en -upgrade',
SWITCH_RELEASE_TYPE: 'Switch naar {0} release'
}; };
export default nl; export default nl;

View File

@@ -43,7 +43,7 @@ const no: Translation = {
RESET: 'Nullstill', RESET: 'Nullstill',
APPLY_CHANGES: 'Utfør endringer({0})', APPLY_CHANGES: 'Utfør endringer({0})',
UPDATE: 'Oppdater', UPDATE: 'Oppdater',
EXECUTE: 'Execute', // TODO translate EXECUTE: 'Utfør',
REMOVE: 'Fjern', REMOVE: 'Fjern',
PROBLEM_UPDATING: 'Problem med oppdatering', PROBLEM_UPDATING: 'Problem med oppdatering',
PROBLEM_LOADING: 'Problem med opplasting', PROBLEM_LOADING: 'Problem med opplasting',
@@ -72,7 +72,7 @@ const no: Translation = {
TX_ISSUES: 'Tx problemer - prøv en annen Tx Modus', TX_ISSUES: 'Tx problemer - prøv en annen Tx Modus',
DISCONNECTED: 'Frakoblet', DISCONNECTED: 'Frakoblet',
EMS_SCAN: 'Er du sikker på du vil starte full søking av EMS bussen?', EMS_SCAN: 'Er du sikker på du vil starte full søking av EMS bussen?',
DATA_TRAFFIC: 'Data Traffic', // TODO translate DATA_TRAFFIC: 'Data trafikk',
EMS_DEVICE: 'EMS Enhet', EMS_DEVICE: 'EMS Enhet',
SUCCESS: 'VELLYKKET', SUCCESS: 'VELLYKKET',
FAIL: 'MISLYKKET', FAIL: 'MISLYKKET',
@@ -115,9 +115,9 @@ const no: Translation = {
READONLY: 'Aktiver read-only modus (blokker all EMS Tx Skriving)', READONLY: 'Aktiver read-only modus (blokker all EMS Tx Skriving)',
UNDERCLOCK_CPU: 'Underklokking av prosessorhastighet', UNDERCLOCK_CPU: 'Underklokking av prosessorhastighet',
REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT: 'Remote timeout',
REMOTE_TIMEOUT_EN: 'Disable remote control on missing room temperature', // TODO translate REMOTE_TIMEOUT_EN: 'Deaktiver fjernstyring på manglende romtemperatur',
HEATINGOFF: 'Start boiler with forced heating off', // TODO translate HEATINGOFF: 'Start kjele med tvingt oppvarming av',
MIN_DURATION: 'Wait time', MIN_DURATION: 'Ventetid',
ENABLE_SHOWER_TIMER: 'Aktiver Dusjtimer', ENABLE_SHOWER_TIMER: 'Aktiver Dusjtimer',
ENABLE_SHOWER_ALERT: 'Aktiver Dusj-varsling', ENABLE_SHOWER_ALERT: 'Aktiver Dusj-varsling',
TRIGGER_TIME: 'Aktiveringstid', TRIGGER_TIME: 'Aktiveringstid',
@@ -162,6 +162,7 @@ const no: Translation = {
UPLOAD: 'Opplasning', UPLOAD: 'Opplasning',
DOWNLOAD: '{{N|n|n}}edlasting', DOWNLOAD: '{{N|n|n}}edlasting',
INSTALL: 'Installer', INSTALL: 'Installer',
REINSTALL: 'Ominstaller',
ABORTED: 'avbrutt', ABORTED: 'avbrutt',
FAILED: 'feilet', FAILED: 'feilet',
SUCCESSFUL: 'vellykket', SUCCESSFUL: 'vellykket',
@@ -174,9 +175,9 @@ const no: Translation = {
FACTORY_RESET: 'Sett tilbake til fabrikkinstilling', FACTORY_RESET: 'Sett tilbake til fabrikkinstilling',
SYSTEM_FACTORY_TEXT: 'Enhet har blitt satt tilbake til fabrikkinstilling og vil restarte', SYSTEM_FACTORY_TEXT: 'Enhet har blitt satt tilbake til fabrikkinstilling og vil restarte',
SYSTEM_FACTORY_TEXT_DIALOG: 'Er du sikker på at du vil resette enheten til fabrikkinstillinger?', SYSTEM_FACTORY_TEXT_DIALOG: 'Er du sikker på at du vil resette enheten til fabrikkinstillinger?',
AVAILABLE_VERSION: 'Latest Available Versions', // TODO translate AVAILABLE_VERSION: 'Tilgjengelige versjoner',
STABLE: 'Stable', // TODO translate STABLE: 'Stabil',
DEVELOPMENT: 'Development', DEVELOPMENT: 'Utvikling',
UPTIME: 'System Oppetid', UPTIME: 'System Oppetid',
FREE_MEMORY: 'Ledig Memory', FREE_MEMORY: 'Ledig Memory',
PSRAM: 'PSRAM (Størrelse / Ledig)', PSRAM: 'PSRAM (Størrelse / Ledig)',
@@ -185,9 +186,9 @@ const no: Translation = {
FILESYSTEM: 'File System (Brukt / Ledig)', FILESYSTEM: 'File System (Brukt / Ledig)',
BUFFER_SIZE: 'Max Buffer Størrelse', BUFFER_SIZE: 'Max Buffer Størrelse',
COMPACT: 'Komprimere', COMPACT: 'Komprimere',
DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings', // TODO translate DOWNLOAD_SETTINGS_TEXT: 'Lag en sikkerhetskopi av dine konfigurasjon og innstillinger',
UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)', // TODO translate UPLOAD_TEXT: 'Last opp en ny firmware fil (.bin) eller en sikkerhetskopi fil (.json)',
UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate UPLOAD_DROP_TEXT: 'Dropp en firmware fil (.bin) eller klikk her',
ERROR: 'Ukjent feil, prøv igjen', ERROR: 'Ukjent feil, prøv igjen',
TIME_SET: 'Still in tid', TIME_SET: 'Still in tid',
MANAGE_USERS: 'Administrer Brukere', MANAGE_USERS: 'Administrer Brukere',
@@ -223,7 +224,7 @@ const no: Translation = {
MQTT_INT_THERMOSTATS: 'Termostat', MQTT_INT_THERMOSTATS: 'Termostat',
MQTT_INT_SOLAR: 'Solpaneler', MQTT_INT_SOLAR: 'Solpaneler',
MQTT_INT_MIXER: 'Blandeventil', MQTT_INT_MIXER: 'Blandeventil',
MQTT_INT_WATER: 'Water Modules', // TODO translate MQTT_INT_WATER: 'Vannmoduler',
MQTT_QUEUE: 'MQTT Queue', MQTT_QUEUE: 'MQTT Queue',
DEFAULT: 'Standard', DEFAULT: 'Standard',
MQTT_ENTITY_FORMAT: 'Enhets ID format', MQTT_ENTITY_FORMAT: 'Enhets ID format',
@@ -260,7 +261,7 @@ const no: Translation = {
NETWORK_SCANNER: 'Nettverk Scanner', NETWORK_SCANNER: 'Nettverk Scanner',
NETWORK_NO_WIFI: 'Ingen trådløse nett funnet', NETWORK_NO_WIFI: 'Ingen trådløse nett funnet',
NETWORK_BLANK_SSID: 'la feltet være blankt for å deaktivisere trådløst nettverk', NETWORK_BLANK_SSID: 'la feltet være blankt for å deaktivisere trådløst nettverk',
NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate NETWORK_BLANK_BSSID: 'la feltet være blankt for å bruke kun SSID',
TX_POWER: 'Tx Effekt', TX_POWER: 'Tx Effekt',
HOSTNAME: 'Hostname', HOSTNAME: 'Hostname',
NETWORK_DISABLE_SLEEP: 'Hindre at trådløst nettverk går i Sleep Mode', NETWORK_DISABLE_SLEEP: 'Hindre at trådløst nettverk går i Sleep Mode',
@@ -297,62 +298,61 @@ const no: Translation = {
SCHEDULE_TIMER_1: 'ved oppstart', SCHEDULE_TIMER_1: 'ved oppstart',
SCHEDULE_TIMER_2: 'hvert minutt', SCHEDULE_TIMER_2: 'hvert minutt',
SCHEDULE_TIMER_3: 'hver time', SCHEDULE_TIMER_3: 'hver time',
CUSTOM_ENTITIES: 'Custom Entities', // TODO translate CUSTOM_ENTITIES: 'Personlige entiteter',
ENTITIES_HELP_1: 'Fetch custom entities from the EMS bus', // TODO translate ENTITIES_HELP_1: 'Hent personlige entiteter fra EMS bussen',
ENTITIES_UPDATED: 'Entities Updated', // TODO translate ENTITIES_UPDATED: 'Entiteter oppdatert',
WRITEABLE: 'Writeable', // TODO translate WRITEABLE: 'Skrivbar',
SHOWING: 'Showing', // TODO translate SHOWING: 'Viser',
SEARCH: 'Search', // TODO translate SEARCH: 'Søk',
CERT: 'TLS root certificate (leave blank for insecure)', // TODO translate CERT: 'TLS rot sertifikat (la feltet stå blankt for usikkert)',
ENABLE_TLS: 'Aktiviser TLS', ENABLE_TLS: 'Aktiviser TLS',
ON: 'On', // TODO translate ON: '',
OFF: 'Off', // TODO translate OFF: 'Av',
POLARITY: 'Polarity', // TODO translate POLARITY: 'Polarity',
ACTIVEHIGH: 'Active High', // TODO translate ACTIVEHIGH: 'Active High',
ACTIVELOW: 'Active Low', // TODO translate ACTIVELOW: 'Active Low',
UNCHANGED: 'Unchanged', // TODO translate UNCHANGED: 'Unchanged',
ALWAYS: 'Always', // TODO translate ALWAYS: 'Always',
ACTIVITY: 'Activity', // TODO translate ACTIVITY: 'Aktivitet',
CONFIGURE: 'Configure {0}', // TODO translate CONFIGURE: 'Konfigurer {0}',
SYSTEM_MEMORY: 'System Memory', // TODO translate SYSTEM_MEMORY: 'System Memory',
APPLICATION_SETTINGS_1: 'Modify EMS-ESP Application Settings', // TODO translate APPLICATION_SETTINGS_1: 'Modify EMS-ESP Application Settings',
SECURITY_1: 'Add or remove users', // TODO translate SECURITY_1: 'Add or remove users',
DOWNLOAD_UPLOAD_1: 'Download and Upload Settings and Firmware', // TODO translate DOWNLOAD_UPLOAD_1: 'Download and Upload Settings and Firmware',
MODULES: 'Module', // TODO translate MODULES: 'Modul',
MODULES_1: 'Aktiver eller deaktiver eksterne moduler', MODULES_1: 'Aktiver eller deaktiver eksterne moduler',
MODULES_UPDATED: 'Modules updated', // TODO translate MODULES_UPDATED: 'Moduler oppdatert',
MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate MODULES_DESCRIPTION: 'Klikk på modulen for å aktivere eller deaktivere EMS-ESP biblioteksmoduler',
MODULES_NONE: 'No external modules detected', // TODO translate MODULES_NONE: 'Ingen eksterne moduler funnet',
RENAME: 'Rename', // TODO translate RENAME: 'Gi nytt navn',
ENABLE_MODBUS: 'Aktiver Modbus', ENABLE_MODBUS: 'Aktiver Modbus',
VIEW_LOG: 'View log to diagnose issues', // TODO translate VIEW_LOG: 'Se logg for å diagnostisere problemer',
UPLOAD_DRAG: 'drag and drop a file here or click to select one', // TODO translate UPLOAD_DRAG: 'dra og slippe en fil her eller klikk for å velge en',
SERVICES: 'Services', // TODO translate SERVICES: 'Tjenester',
ALLVALUES: 'All Values', // TODO translate ALLVALUES: 'Alle verdier',
SPECIAL_FUNCTIONS: 'Special Functions', // TODO translate SPECIAL_FUNCTIONS: 'Spesielle funksjoner',
WAIT_FIRMWARE: 'Firmware is uploading and installing', // TODO translate WAIT_FIRMWARE: 'Firmware er i opplasting og installasjon',
INSTALL_VERSION: 'This will install version {0}. Are you sure?', // TODO translate INSTALL_VERSION: 'Dette vil {0} versjon {1}. Er du sikker?',
UPGRADE_AVAILABLE: 'There is a firmware upgrade available!', // TODO translate UPDATE_AVAILABLE: 'oppdatering tilgjengelig',
LATEST_VERSION: 'You are using the latest firmware version', // TODO translate LATEST_VERSION: 'Du bruker den nyeste {0} firmware versjonen',
PLEASE_WAIT: 'Please wait', // TODO translate PLEASE_WAIT: 'Vennligst vent',
RESTARTING_PRE: 'Initializing', // TODO translate RESTARTING_PRE: 'Initialiserer',
RESTARTING_POST: 'Preparing', // TODO translate RESTARTING_POST: 'Forbereder',
AUTO_SCROLL: 'Auto Scroll', // TODO translate AUTO_SCROLL: 'Automatisk rulling',
DASHBOARD: 'Dashboard', // TODO translate DASHBOARD: 'Dashboard',
DEVELOPER_MODE: 'Developer Mode', // TODO translate DEVELOPER_MODE: 'Utvikler modus',
BYTES: 'Bytes', // TODO translate BYTES: 'Bytes',
BITMASK: 'Bit Mask',// TODO translate BITMASK: 'Bitmask',
DUPLICATE: 'Duplicate', // TODO translate DUPLICATE: 'Duplikat',
UPGRADE: 'Upgrade', // TODO translate DASHBOARD_1: 'Alle EMS enheter som er aktive og merket som favoritt, pluss alle personlige enheter, planlegg og eksterne sensor data er vist nedenfor.',
DASHBOARD_1: 'All EMS entities that are active and marked as Favorite, plus all Custom Entities, Schedules and external Sensors data are displayed below.', // TODO translate NO_DATA_1: 'Ingen favoritte EMS enheter funnet enda. Bruk',
NO_DATA_1: 'No favorite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'modul for å markere dem.',
NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'For å se alle tilgjengelige enheter, gå til',
NO_DATA_3: 'To see all available entities go to', // TODO translate THIS_VERSION: 'Denne versjonen',
THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Plattform',
PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Utgivelses type',
RELEASE_TYPE: 'Release Type', // TODO translate INTERNET_CONNECTION_REQUIRED: 'Internettilkobling kreves for automatisk versjonskontroll og oppgradering',
REINSTALL: 'Re-install', // TODO translate SWITCH_RELEASE_TYPE: 'Bytt til {0} utgivelse'
INTERNET_CONNECTION_REQUIRED: 'Internet connection required for automatic version checking and upgrading',
}; };
export default no; export default no;

View File

@@ -72,7 +72,7 @@ const pl: BaseTranslation = {
TX_ISSUES: 'problem z zapisem na magistralę EMS, spróbuj wybrać inny "Tryb transmisji (Tx)"', TX_ISSUES: 'problem z zapisem na magistralę EMS, spróbuj wybrać inny "Tryb transmisji (Tx)"',
DISCONNECTED: 'brak połączenia', DISCONNECTED: 'brak połączenia',
EMS_SCAN: 'Czy na pewno wykonać pełne skanowanie magistrali EMS?', EMS_SCAN: 'Czy na pewno wykonać pełne skanowanie magistrali EMS?',
DATA_TRAFFIC: 'Data Traffic', // TODO translate DATA_TRAFFIC: 'Ruch Danych',
EMS_DEVICE: 'Urządzenie EMS', EMS_DEVICE: 'Urządzenie EMS',
SUCCESS: 'Udane', SUCCESS: 'Udane',
FAIL: 'Nieudane', FAIL: 'Nieudane',
@@ -115,7 +115,7 @@ const pl: BaseTranslation = {
READONLY: 'Tryb pracy "tylko do odczytu" (blokuje wszystkie komendy zapisu na magistralę EMS)', READONLY: 'Tryb pracy "tylko do odczytu" (blokuje wszystkie komendy zapisu na magistralę EMS)',
UNDERCLOCK_CPU: 'Obniż taktowanie CPU', UNDERCLOCK_CPU: 'Obniż taktowanie CPU',
REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT: 'Remote timeout',
REMOTE_TIMEOUT_EN: 'Disable remote control on missing room temperature', // TODO translate REMOTE_TIMEOUT_EN: 'Wyłącz kontrolę zdalną przy braku temperatury pomieszczenia',
HEATINGOFF: 'Uruchom kocioł z wymuszonym wyłączonym grzaniem', HEATINGOFF: 'Uruchom kocioł z wymuszonym wyłączonym grzaniem',
MIN_DURATION: 'Wait time', MIN_DURATION: 'Wait time',
ENABLE_SHOWER_TIMER: 'Aktywuj minutnik prysznica', ENABLE_SHOWER_TIMER: 'Aktywuj minutnik prysznica',
@@ -162,6 +162,7 @@ const pl: BaseTranslation = {
UPLOAD: 'Wysyłanie', UPLOAD: 'Wysyłanie',
DOWNLOAD: '{{P|p||P}}obier{{anie|z||z}}', DOWNLOAD: '{{P|p||P}}obier{{anie|z||z}}',
INSTALL: 'Zainstalować', INSTALL: 'Zainstalować',
REINSTALL: 'Zainstalować ponownie',
ABORTED: 'zostało przerwane!', ABORTED: 'zostało przerwane!',
FAILED: 'nie powiodł{{o|a|}} się!', FAILED: 'nie powiodł{{o|a|}} się!',
SUCCESSFUL: 'powiodło się.', SUCCESSFUL: 'powiodło się.',
@@ -174,9 +175,9 @@ const pl: BaseTranslation = {
FACTORY_RESET: 'Ustawienia fabryczne', FACTORY_RESET: 'Ustawienia fabryczne',
SYSTEM_FACTORY_TEXT: 'Interfejs EMS-ESP został przywrócony do ustawień fabrycznych i zostanie teraz ponownie uruchomiony.', SYSTEM_FACTORY_TEXT: 'Interfejs EMS-ESP został przywrócony do ustawień fabrycznych i zostanie teraz ponownie uruchomiony.',
SYSTEM_FACTORY_TEXT_DIALOG: 'Na pewno chcesz przywrócić ustawienia fabryczne interfejsu EMS-ESP?', SYSTEM_FACTORY_TEXT_DIALOG: 'Na pewno chcesz przywrócić ustawienia fabryczne interfejsu EMS-ESP?',
AVAILABLE_VERSION: 'Latest Available Versions', // TODO translate AVAILABLE_VERSION: 'Najnowsze dostępne wersje',
STABLE: 'Stable', // TODO translate STABLE: 'Stabilna',
DEVELOPMENT: 'Testowe', DEVELOPMENT: 'Testowa',
UPTIME: 'Czas działania systemu', UPTIME: 'Czas działania systemu',
FREE_MEMORY: 'Wolne Memory', FREE_MEMORY: 'Wolne Memory',
PSRAM: 'PSRAM (rozmiar / wolne)', PSRAM: 'PSRAM (rozmiar / wolne)',
@@ -185,9 +186,9 @@ const pl: BaseTranslation = {
FILESYSTEM: 'System plików (wykorzystane / wolne)', FILESYSTEM: 'System plików (wykorzystane / wolne)',
BUFFER_SIZE: 'Maksymalna pojemność bufora (ilość wpisów)', BUFFER_SIZE: 'Maksymalna pojemność bufora (ilość wpisów)',
COMPACT: 'Kompaktowy', COMPACT: 'Kompaktowy',
DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings', // TODO translate DOWNLOAD_SETTINGS_TEXT: 'Utwórz kopię swoich ustawień i konfiguracji',
UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)', // TODO translate UPLOAD_TEXT: 'Wgraj nowy plik firmware (.bin) lub kopię ustawień (.json)',
UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate UPLOAD_DROP_TEXT: 'Upuść plik firmware .bin lub kliknij tutaj',
ERROR: 'Nieoczekiwany błąd, spróbuj ponownie!', ERROR: 'Nieoczekiwany błąd, spróbuj ponownie!',
TIME_SET: 'Zegar został ustawiony.', TIME_SET: 'Zegar został ustawiony.',
MANAGE_USERS: 'Zarządzanie użytkownikami', MANAGE_USERS: 'Zarządzanie użytkownikami',
@@ -318,41 +319,40 @@ const pl: BaseTranslation = {
APPLICATION_SETTINGS_1: 'Modyfikacja ustawień aplikacji EMS-ESP', APPLICATION_SETTINGS_1: 'Modyfikacja ustawień aplikacji EMS-ESP',
SECURITY_1: 'Dodawanie i usuwanie użytkowników', SECURITY_1: 'Dodawanie i usuwanie użytkowników',
DOWNLOAD_UPLOAD_1: 'Pobieranie/wysyłanie ustawień i firmware', DOWNLOAD_UPLOAD_1: 'Pobieranie/wysyłanie ustawień i firmware',
MODULES: 'Module', // TODO translate MODULES: 'Moduł',
MODULES_1: 'Aktywuj lub dezaktywuj moduły zewnętrzne', MODULES_1: 'Aktywuj lub dezaktywuj moduły zewnętrzne',
MODULES_UPDATED: 'Modules updated', // TODO translate MODULES_UPDATED: 'Zaktualizowano moduły',
MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate MODULES_DESCRIPTION: 'Kliknij na moduł aby aktywować lub dezaktywować bibliotekę modułów EMS-ESP',
MODULES_NONE: 'No external modules detected', // TODO translate MODULES_NONE: 'Brak wykrytych modułów zewnętrznych',
RENAME: 'Rename', // TODO translate RENAME: 'Zmień nazwę',
ENABLE_MODBUS: 'Aktywuj Modbus', ENABLE_MODBUS: 'Aktywuj Modbus',
VIEW_LOG: 'View log to diagnose issues', // TODO translate VIEW_LOG: 'Zdiagnozuj problemy',
UPLOAD_DRAG: 'drag and drop a file here or click to select one', // TODO translate UPLOAD_DRAG: 'przeciągnij i upuść plik lub kliknij tutaj',
SERVICES: 'Services', // TODO translate SERVICES: 'Usługi',
ALLVALUES: 'All Values', // TODO translate ALLVALUES: 'Wszystkie wartości',
SPECIAL_FUNCTIONS: 'Special Functions', // TODO translate SPECIAL_FUNCTIONS: 'Specjalne funkcje',
WAIT_FIRMWARE: 'Firmware is uploading and installing', // TODO translate WAIT_FIRMWARE: 'Firma jest wysyłana i instaluje się',
INSTALL_VERSION: 'This will install version {0}. Are you sure?', // TODO translate INSTALL_VERSION: 'To zainstaluje wersję {1} {0}. Jesteś pewny?',
UPGRADE_AVAILABLE: 'There is a firmware upgrade available!', // TODO translate UPDATE_AVAILABLE: 'aktualizacja dostępna',
LATEST_VERSION: 'You are using the latest firmware version', // TODO translate LATEST_VERSION: 'Jesteś używając najnowszej wersji firmware {0}',
PLEASE_WAIT: 'Please wait', // TODO translate PLEASE_WAIT: 'Proszę czekać',
RESTARTING_PRE: 'Initializing', // TODO translate RESTARTING_PRE: 'Inicjalizacja',
RESTARTING_POST: 'Preparing', // TODO translate RESTARTING_POST: 'Przygotowanie',
AUTO_SCROLL: 'Auto Scroll', // TODO translate AUTO_SCROLL: 'Auto Scroll',
DASHBOARD: 'Dashboard', // TODO translate DASHBOARD: 'Pulpit',
DEVELOPER_MODE: 'Developer Mode', // TODO translate DEVELOPER_MODE: 'Tryb programisty',
BYTES: 'Bytes', // TODO translate BYTES: 'Bajty',
BITMASK: 'Bit Mask',// TODO translate BITMASK: 'Bit Mask',
DUPLICATE: 'Duplicate', // TODO translate DUPLICATE: 'Duplicate',
UPGRADE: 'Upgrade', // TODO translate DASHBOARD_1: 'All EMS entities that are active and marked as Favorite, plus all Custom Entities, Schedules and external Sensors data are displayed below.',
DASHBOARD_1: 'All EMS entities that are active and marked as Favorite, plus all Custom Entities, Schedules and external Sensors data are displayed below.', // TODO translate NO_DATA_1: 'Brak ulubionych encji EMS. Użyj',
NO_DATA_1: 'No favorite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'moduł do ich oznaczenia.',
NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'Aby zobaczyć wszystkie dostępne encje przejdź do',
NO_DATA_3: 'To see all available entities go to', // TODO translate THIS_VERSION: 'Ta wersja',
THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platforma',
PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Typ wydania',
RELEASE_TYPE: 'Release Type', // TODO translate INTERNET_CONNECTION_REQUIRED: 'Połączenie internetowe jest wymagane do automatycznej kontroli wersji i aktualizacji',
REINSTALL: 'Re-install', // TODO translate SWITCH_RELEASE_TYPE: 'Zmień na {0} wydanie'
INTERNET_CONNECTION_REQUIRED: 'Internet connection required for automatic version checking and upgrading', // TODO translate
}; };
export default pl; export default pl;

View File

@@ -155,13 +155,14 @@ const sk: Translation = {
NAME: 'Názov', NAME: 'Názov',
CUSTOMIZATIONS_RESET: 'Naozaj chcete odstrániť všetky prispôsobenia vrátane vlastných nastavení snímačov teploty a analógových snímačov?', CUSTOMIZATIONS_RESET: 'Naozaj chcete odstrániť všetky prispôsobenia vrátane vlastných nastavení snímačov teploty a analógových snímačov?',
SUPPORT_INFORMATION: 'Informácie pre podporu', SUPPORT_INFORMATION: 'Informácie pre podporu',
HELP_INFORMATION_1: 'Navštívte online wiki, kde nájdete pokyny na konfiguráciu EMS-ESP', HELP_INFORMATION_1: 'Navštívte online wiki, kde nájdete pokyny na konfiguráciu EMS-ESP',
HELP_INFORMATION_2: 'Pre živý komunitný chat sa pripojte na náš Discord server', HELP_INFORMATION_2: 'Pre živý komunitný chat sa pripojte na náš Discord server',
HELP_INFORMATION_3: 'Ak chcete požiadať o funkciu alebo nahlásiť chybu', HELP_INFORMATION_3: 'Ak chcete požiadať o funkciu alebo nahlásiť chybu',
HELP_INFORMATION_4: 'nezabudnite si stiahnuť a pripojiť informácie o vašom systéme, aby ste mohli rýchlejšie reagovať pri nahlasovaní problému', HELP_INFORMATION_4: 'nezabudnite si stiahnuť a pripojiť informácie o vašom systéme, aby ste mohli rýchlejšie reagovať pri nahlasovaní problému',
UPLOAD: 'Nahrať', UPLOAD: 'Nahrať',
DOWNLOAD: '{{S|s|s}}tiahnuť', DOWNLOAD: '{{S|s|s}}tiahnuť',
INSTALL: 'Inštalovať', INSTALL: 'Inštalovať',
REINSTALL: 'Inštalovať znova',
ABORTED: 'zrušené', ABORTED: 'zrušené',
FAILED: 'chybné', FAILED: 'chybné',
SUCCESSFUL: 'úspešné', SUCCESSFUL: 'úspešné',
@@ -187,7 +188,7 @@ const sk: Translation = {
COMPACT: 'Kompaktné', COMPACT: 'Kompaktné',
DOWNLOAD_SETTINGS_TEXT: 'Vytvorte zálohu svojej konfigurácie a nastavení', DOWNLOAD_SETTINGS_TEXT: 'Vytvorte zálohu svojej konfigurácie a nastavení',
UPLOAD_TEXT: 'Nahrajte nový súbor firmvéru (.bin) alebo súbor zálohy (.json)', UPLOAD_TEXT: 'Nahrajte nový súbor firmvéru (.bin) alebo súbor zálohy (.json)',
UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate UPLOAD_DROP_TEXT: 'Presuňte súbor .bin firmvéru alebo kliknite sem',
ERROR: 'Neočakávaná chyba, prosím skúste to znova', ERROR: 'Neočakávaná chyba, prosím skúste to znova',
TIME_SET: 'Nastavený čas', TIME_SET: 'Nastavený čas',
MANAGE_USERS: 'Správa používateľov', MANAGE_USERS: 'Správa používateľov',
@@ -323,7 +324,7 @@ const sk: Translation = {
MODULES_UPDATED: 'Aktualizované moduly', MODULES_UPDATED: 'Aktualizované moduly',
MODULES_DESCRIPTION: 'Kliknutím na modul aktivujete alebo deaktivujete moduly knižnice EMS-ESP', MODULES_DESCRIPTION: 'Kliknutím na modul aktivujete alebo deaktivujete moduly knižnice EMS-ESP',
MODULES_NONE: 'Neboli zistené žiadne externé moduly', MODULES_NONE: 'Neboli zistené žiadne externé moduly',
RENAME: 'Premenovať', RENAME: 'Premenovať',
ENABLE_MODBUS: 'Povoliť Modbus', ENABLE_MODBUS: 'Povoliť Modbus',
VIEW_LOG: 'Zobrazte log na diagnostiku problémov', VIEW_LOG: 'Zobrazte log na diagnostiku problémov',
UPLOAD_DRAG: 'presuňte sem súbor alebo ho kliknutím vyberte', UPLOAD_DRAG: 'presuňte sem súbor alebo ho kliknutím vyberte',
@@ -331,19 +332,18 @@ const sk: Translation = {
ALLVALUES: 'Všetky hodnoty', ALLVALUES: 'Všetky hodnoty',
SPECIAL_FUNCTIONS: 'Špeciálne funkcie', SPECIAL_FUNCTIONS: 'Špeciálne funkcie',
WAIT_FIRMWARE: 'Firmvér sa nahráva a inštaluje', WAIT_FIRMWARE: 'Firmvér sa nahráva a inštaluje',
INSTALL_VERSION: 'Týmto sa inštalovať verzia {0}. Si si istý?', INSTALL_VERSION: 'Týmto sa {0} verzia {1}. Si si istý?',
UPGRADE_AVAILABLE: 'K dispozícii je aktualizácia firmvéru!', UPDATE_AVAILABLE: 'dostupná aktualizácia',
LATEST_VERSION: 'Používate poslednú verziu firmvéru', LATEST_VERSION: 'Používate poslednú {0} verziu firmvéru',
PLEASE_WAIT: 'Čakajte prosím', PLEASE_WAIT: 'Čakajte prosím',
RESTARTING_PRE: 'Prebieha inicializácia', RESTARTING_PRE: 'Prebieha inicializácia',
RESTARTING_POST: 'Príprava', RESTARTING_POST: 'Príprava',
AUTO_SCROLL: 'Automatické rolovanie', AUTO_SCROLL: 'Automatické rolovanie',
DASHBOARD: 'Panel', DASHBOARD: 'Panel',
DEVELOPER_MODE: 'Režim vývojára', DEVELOPER_MODE: 'Režim vývojára',
BYTES: 'Bytes', // TODO translate BYTES: 'Bytov',
BITMASK: 'Bit Mask',// TODO translate BITMASK: 'Bitová maska',
DUPLICATE: 'Duplicitné', DUPLICATE: 'Duplicitné',
UPGRADE: 'Inovovať',
DASHBOARD_1: 'Všetky entity EMS, ktoré sú aktívne a označené ako obľúbené, plus všetky vlastné entity, plány a údaje externých senzorov sú zobrazené nižšie.', DASHBOARD_1: 'Všetky entity EMS, ktoré sú aktívne a označené ako obľúbené, plus všetky vlastné entity, plány a údaje externých senzorov sú zobrazené nižšie.',
NO_DATA_1: 'Nenašli sa žiadne obľúbené entity EMS. Použite', NO_DATA_1: 'Nenašli sa žiadne obľúbené entity EMS. Použite',
NO_DATA_2: 'modul na ich označenie.', NO_DATA_2: 'modul na ich označenie.',
@@ -351,8 +351,8 @@ const sk: Translation = {
THIS_VERSION: 'Táto verzia', THIS_VERSION: 'Táto verzia',
PLATFORM: 'Platforma', PLATFORM: 'Platforma',
RELEASE_TYPE: 'Typ vydania', RELEASE_TYPE: 'Typ vydania',
REINSTALL: 'Preinštalovať',
INTERNET_CONNECTION_REQUIRED: 'Internetové pripojenie je potrebné pre automatickú kontrolu a aktualizáciu', INTERNET_CONNECTION_REQUIRED: 'Internetové pripojenie je potrebné pre automatickú kontrolu a aktualizáciu',
SWITCH_RELEASE_TYPE: 'Prepnúť na {0} verziu'
}; };
export default sk; export default sk;

View File

@@ -162,6 +162,7 @@ const sv: Translation = {
UPLOAD: 'Uppladdning', UPLOAD: 'Uppladdning',
DOWNLOAD: '{{N|n|n}}edladdning', DOWNLOAD: '{{N|n|n}}edladdning',
INSTALL: 'Installera', INSTALL: 'Installera',
REINSTALL: 'Återinstallera',
ABORTED: 'Avbruten', ABORTED: 'Avbruten',
FAILED: 'Misslyckades', FAILED: 'Misslyckades',
SUCCESSFUL: 'Lyckades', SUCCESSFUL: 'Lyckades',
@@ -187,7 +188,7 @@ const sv: Translation = {
COMPACT: 'Komprimerad', COMPACT: 'Komprimerad',
DOWNLOAD_SETTINGS_TEXT: 'Skapa en säkerhetskopia av din konfiguration och inställningar', DOWNLOAD_SETTINGS_TEXT: 'Skapa en säkerhetskopia av din konfiguration och inställningar',
UPLOAD_TEXT: 'Ladda upp en ny firmwarefil (.bin) eller en säkerhetskopiafil (.json)', UPLOAD_TEXT: 'Ladda upp en ny firmwarefil (.bin) eller en säkerhetskopiafil (.json)',
UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate UPLOAD_DROP_TEXT: 'Droppa en firmware .bin fil eller klicka här',
ERROR: 'Okänt fel, var god försök igen', ERROR: 'Okänt fel, var god försök igen',
TIME_SET: 'Ställ in tid', TIME_SET: 'Ställ in tid',
MANAGE_USERS: 'Användare', MANAGE_USERS: 'Användare',
@@ -331,28 +332,27 @@ const sv: Translation = {
ALLVALUES: 'Alla värden', ALLVALUES: 'Alla värden',
SPECIAL_FUNCTIONS: 'Specialfunktioner', SPECIAL_FUNCTIONS: 'Specialfunktioner',
WAIT_FIRMWARE: 'Firmware laddas upp och installeras', WAIT_FIRMWARE: 'Firmware laddas upp och installeras',
INSTALL_VERSION: 'Det här kommer installera version {0}. Är du säker?', INSTALL_VERSION: 'Det här kommer {0} version {1}. Är du säker?',
UPGRADE_AVAILABLE: 'Det finns en tillgänglig firmwareupgradering!', UPDATE_AVAILABLE: 'uppdatering tillgänglig',
LATEST_VERSION: 'Du använder den senaste firmwareversionen.', LATEST_VERSION: 'Du använder den senaste {0} firmwareversionen.',
PLEASE_WAIT: 'Var god vänta', PLEASE_WAIT: 'Var god vänta',
RESTARTING_PRE: 'Initialiserar', RESTARTING_PRE: 'Initialiserar',
RESTARTING_POST: 'Förbereder', RESTARTING_POST: 'Förbereder',
AUTO_SCROLL: 'Autoskrolla', AUTO_SCROLL: 'Autoskrolla',
DASHBOARD: 'Kontrollpanel', DASHBOARD: 'Kontrollpanel',
DEVELOPER_MODE: 'Utvecklarläge', DEVELOPER_MODE: 'Utvecklarläge',
BYTES: 'Bytes', // TODO translate BYTES: 'Bytes',
BITMASK: 'Bit Mask',// TODO translate BITMASK: 'Bitmask',
DUPLICATE: 'Dublett', DUPLICATE: 'Dublett',
UPGRADE: 'Uppgradera', DASHBOARD_1: 'Alla EMS-enheter som är aktiva och markerade som favorit, plus alla anpassade entiteter, scheman och externa sensor-data visas nedan.',
DASHBOARD_1: 'All EMS entities that are active and marked as Favorite, plus all Custom Entities, Schedules and external Sensors data are displayed below.', // TODO translate NO_DATA_1: 'Inga favorit EMS enheter hittade än. Använd',
NO_DATA_1: 'No favorite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'modul för att markera dem.',
NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'För att se alla tillgängliga enheter, gå till',
NO_DATA_3: 'To see all available entities go to', // TODO translate THIS_VERSION: 'Denna version',
THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Plattform',
PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Utgivelsestyp',
RELEASE_TYPE: 'Release Type', // TODO translate
REINSTALL: 'Re-install', // TODO translate
INTERNET_CONNECTION_REQUIRED: 'Internetanslutning krävs för automatisk version kontroll och uppdatering', INTERNET_CONNECTION_REQUIRED: 'Internetanslutning krävs för automatisk version kontroll och uppdatering',
SWITCH_RELEASE_TYPE: 'Byt till {0} utgåva'
}; };
export default sv; export default sv;

View File

@@ -43,7 +43,7 @@ const tr: Translation = {
RESET: 'Reset', RESET: 'Reset',
APPLY_CHANGES: 'Apply Changes ({0})', APPLY_CHANGES: 'Apply Changes ({0})',
UPDATE: 'Update', UPDATE: 'Update',
EXECUTE: 'Execute', // TODO translate EXECUTE: 'Uygulamak',
REMOVE: 'Kaldır', REMOVE: 'Kaldır',
PROBLEM_UPDATING: 'Güncelleme Sorunu', PROBLEM_UPDATING: 'Güncelleme Sorunu',
PROBLEM_LOADING: 'Yükleme Sorunu', PROBLEM_LOADING: 'Yükleme Sorunu',
@@ -72,7 +72,7 @@ const tr: Translation = {
TX_ISSUES: 'Tx sorunu - başka bir Tx Modu deneyin', TX_ISSUES: 'Tx sorunu - başka bir Tx Modu deneyin',
DISCONNECTED: 'Bağlantı kesildi', DISCONNECTED: 'Bağlantı kesildi',
EMS_SCAN: 'EMS Hattında tam bir cihaz taraması başlatmak istediğinizden emin misiniz?', EMS_SCAN: 'EMS Hattında tam bir cihaz taraması başlatmak istediğinizden emin misiniz?',
DATA_TRAFFIC: 'Data Traffic', // TODO translate DATA_TRAFFIC: 'Veri trafiği',
EMS_DEVICE: 'EMS Cihazı', EMS_DEVICE: 'EMS Cihazı',
SUCCESS: 'BAŞARILI', SUCCESS: 'BAŞARILI',
FAIL: 'HATA', FAIL: 'HATA',
@@ -115,8 +115,8 @@ const tr: Translation = {
READONLY: 'Salt okunur modu devreye al (bütün giden EMS Tx Yazma komutlarını engeller)', READONLY: 'Salt okunur modu devreye al (bütün giden EMS Tx Yazma komutlarını engeller)',
UNDERCLOCK_CPU: 'İşlemci hızını düşür', UNDERCLOCK_CPU: 'İşlemci hızını düşür',
REMOTE_TIMEOUT: 'Remote timeout', REMOTE_TIMEOUT: 'Remote timeout',
REMOTE_TIMEOUT_EN: 'Disable remote on missing room temperature', // TODO translate REMOTE_TIMEOUT_EN: 'Disable remote on missing room temperature',
HEATINGOFF: 'Start boiler with forced heating off', // TODO translate HEATINGOFF: 'Start boiler with forced heating off',
MIN_DURATION: 'Wait time', MIN_DURATION: 'Wait time',
ENABLE_SHOWER_TIMER: 'Duş Sayacını Devreye Al', ENABLE_SHOWER_TIMER: 'Duş Sayacını Devreye Al',
ENABLE_SHOWER_ALERT: 'Duş Alarmını Devreye Al', ENABLE_SHOWER_ALERT: 'Duş Alarmını Devreye Al',
@@ -162,6 +162,7 @@ const tr: Translation = {
UPLOAD: 'Yükleme', UPLOAD: 'Yükleme',
DOWNLOAD: '{{İ|i|i}}İndirme', DOWNLOAD: '{{İ|i|i}}İndirme',
INSTALL: 'Düzenlemek', INSTALL: 'Düzenlemek',
REINSTALL: 'Yeniden düzenlemek',
ABORTED: 'iptal edildi', ABORTED: 'iptal edildi',
FAILED: 'başarısız', FAILED: 'başarısız',
SUCCESSFUL: 'başarılı', SUCCESSFUL: 'başarılı',
@@ -174,8 +175,8 @@ const tr: Translation = {
FACTORY_RESET: 'Fabrika ayarına dönme', FACTORY_RESET: 'Fabrika ayarına dönme',
SYSTEM_FACTORY_TEXT: 'Cihaz fabrika ayarlarına döndü ve şimdi yendiden başlatılacak', SYSTEM_FACTORY_TEXT: 'Cihaz fabrika ayarlarına döndü ve şimdi yendiden başlatılacak',
SYSTEM_FACTORY_TEXT_DIALOG: 'Cihazı fabrika ayarlarına döndürmek istediğinize emin misiniz?', SYSTEM_FACTORY_TEXT_DIALOG: 'Cihazı fabrika ayarlarına döndürmek istediğinize emin misiniz?',
AVAILABLE_VERSION: 'Latest Available Versions', // TODO translate AVAILABLE_VERSION: 'En son kullanılabilir sürümler',
STABLE: 'Stable', // TODO translate STABLE: 'Kararlı',
DEVELOPMENT: 'Geliştirme', DEVELOPMENT: 'Geliştirme',
UPTIME: 'Sistem Çalışma Süresi', UPTIME: 'Sistem Çalışma Süresi',
FREE_MEMORY: 'Yığın Memory', FREE_MEMORY: 'Yığın Memory',
@@ -185,9 +186,9 @@ const tr: Translation = {
FILESYSTEM: 'Dosya Sistemi (Kullanılmış / Boş)', FILESYSTEM: 'Dosya Sistemi (Kullanılmış / Boş)',
BUFFER_SIZE: 'En fazla bellek boyutu', BUFFER_SIZE: 'En fazla bellek boyutu',
COMPACT: 'Sıkışık', COMPACT: 'Sıkışık',
DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings', // TODO translate DOWNLOAD_SETTINGS_TEXT: 'Yapılandırma ve ayarlarınızın yedekleme yapın',
UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)', // TODO translate UPLOAD_TEXT: 'Yeni bir firmware dosyası (.bin) veya yedek dosyası (.json) yükle',
UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate UPLOAD_DROP_TEXT: 'Bir firmware .bin dosyası veya buraya tıklayın',
ERROR: 'Beklenemedik hata, lütfen tekrar deneyin.', ERROR: 'Beklenemedik hata, lütfen tekrar deneyin.',
TIME_SET: 'Zaman ayarı', TIME_SET: 'Zaman ayarı',
MANAGE_USERS: 'Kullanıcıları yönet', MANAGE_USERS: 'Kullanıcıları yönet',
@@ -223,7 +224,7 @@ const tr: Translation = {
MQTT_INT_THERMOSTATS: 'Termostatlar', MQTT_INT_THERMOSTATS: 'Termostatlar',
MQTT_INT_SOLAR: 'Güneş Enerjisi Modülleri', MQTT_INT_SOLAR: 'Güneş Enerjisi Modülleri',
MQTT_INT_MIXER: 'Karışım Modülleri', MQTT_INT_MIXER: 'Karışım Modülleri',
MQTT_INT_WATER: 'Water Modules', // TODO translate MQTT_INT_WATER: 'Su Modülleri',
MQTT_QUEUE: 'MQTT Sırası', MQTT_QUEUE: 'MQTT Sırası',
DEFAULT: 'Varsayılan', DEFAULT: 'Varsayılan',
MQTT_ENTITY_FORMAT: 'Varlık Kimlik biçimi', MQTT_ENTITY_FORMAT: 'Varlık Kimlik biçimi',
@@ -260,7 +261,7 @@ const tr: Translation = {
NETWORK_SCANNER: 'Ağ Tarayıcısı', NETWORK_SCANNER: 'Ağ Tarayıcısı',
NETWORK_NO_WIFI: 'Hiçbir Kablosuz Ağ bulunamadı', NETWORK_NO_WIFI: 'Hiçbir Kablosuz Ağ bulunamadı',
NETWORK_BLANK_SSID: 'Kablosuz ağı devre dışı bırakmak için boş bırakın', NETWORK_BLANK_SSID: 'Kablosuz ağı devre dışı bırakmak için boş bırakın',
NETWORK_BLANK_BSSID: 'leave blank to use only SSID', // TODO translate NETWORK_BLANK_BSSID: 'sadece SSID kullanmak için boş bırakın',
TX_POWER: 'Aktarım gücü', TX_POWER: 'Aktarım gücü',
HOSTNAME: 'Ana Makine Adı', HOSTNAME: 'Ana Makine Adı',
NETWORK_DISABLE_SLEEP: 'Kablosuz uyku modunu devre dışına al', NETWORK_DISABLE_SLEEP: 'Kablosuz uyku modunu devre dışına al',
@@ -280,79 +281,78 @@ const tr: Translation = {
ENTITY: 'varlık', ENTITY: 'varlık',
MIN: 'min', MIN: 'min',
MAX: 'maks', MAX: 'maks',
BLOCK_NAVIGATE_1: 'You have unsaved changes', // TODO translate BLOCK_NAVIGATE_1: 'Değiştirilmişleriniz var',
BLOCK_NAVIGATE_2: 'If you navigate to a different page, your unsaved changes will be lost. Are you sure you want to leave this page?', // TODO translate BLOCK_NAVIGATE_2: 'Farklı bir sayfaya geçerseniz değiştirilmişleriniz kaybolacak. Bu sayfadan çıkmak istediğinize emin misiniz?',
STAY: 'Stay', // TODO translate STAY: 'Kal',
LEAVE: 'Leave', // TODO translate LEAVE: 'Çık',
SCHEDULER: 'Scheduler', // TODO translate SCHEDULER: 'Zamanlayıcı',
SCHEDULER_HELP_1: 'Automate commands by adding scheduled events below. Set a unique Name to enable/disable activation via API/MQTT', // TODO translate SCHEDULER_HELP_1: 'Komutları zamanlayarak otomatikleştirin. Benzersiz bir ad belirtin API/MQTT aracılığıyla etkinleştirmek/devre dışı bırakma',
SCHEDULER_HELP_2: 'Use 00:00 to trigger once on start-up', // TODO translate SCHEDULER_HELP_2: 'Başlangıçta bir kere tetiklemek için 00:00 kullanın',
SCHEDULE: 'Schedule', // TODO translate SCHEDULE: 'Zamanlama',
TIME: 'Time', // TODO translate TIME: 'Zaman',
TIMER: 'Timer', // TODO translate TIMER: 'Zamanlayıcı',
ONCHANGE: 'Değişimde', ONCHANGE: 'Değişimde',
CONDITION: 'Durum', // TODO translate CONDITION: 'Durum',
IMMEDIATE: 'hemen', // TODO translate IMMEDIATE: 'hemen',
SCHEDULE_UPDATED: 'Schedule updated', // TODO translate SCHEDULE_UPDATED: 'Zamanlama güncellendi',
SCHEDULE_TIMER_1: 'on startup', // TODO translate SCHEDULE_TIMER_1: 'Başlangıçta',
SCHEDULE_TIMER_2: 'every minute', // TODO translate SCHEDULE_TIMER_2: 'her dakikada',
SCHEDULE_TIMER_3: 'every hour', // TODO translate SCHEDULE_TIMER_3: 'her saatte',
CUSTOM_ENTITIES: 'Custom Entities', // TODO translate CUSTOM_ENTITIES: 'Özel Varlıklar',
ENTITIES_HELP_1: 'Fetch custom entities from the EMS bus', // TODO translate ENTITIES_HELP_1: 'Özel varlıkları EMS hattından alın',
ENTITIES_UPDATED: 'Entities Updated', // TODO translate ENTITIES_UPDATED: 'Varlıklar güncellendi',
WRITEABLE: 'Writeable', // TODO translate WRITEABLE: 'Yazılabilir',
SHOWING: 'Showing', // TODO translate SHOWING: 'Görüntüleniyor',
SEARCH: 'Search', // TODO translate SEARCH: 'Ara',
CERT: 'TLS root certificate (leave blank for insecure)', CERT: 'TLS kök sertifikası (güvenli olmayan için boş bırakın)',
ENABLE_TLS: 'TLS deveye al', ENABLE_TLS: 'TLS deveye al',
ON: 'On', // TODO translate ON: 'On',
OFF: 'Off', // TODO translate OFF: 'Off',
POLARITY: 'Polarity', // TODO translate POLARITY: 'Polarity',
ACTIVEHIGH: 'Active High', // TODO translate ACTIVEHIGH: 'Aktif Yüksek',
ACTIVELOW: 'Active Low', // TODO translate ACTIVELOW: 'Aktif Düşük',
UNCHANGED: 'Unchanged', // TODO translate UNCHANGED: 'Değiştirilmedi',
ALWAYS: 'Always', // TODO translate ALWAYS: 'Her zaman',
ACTIVITY: 'Activity', // TODO translate ACTIVITY: 'Faaliyet',
CONFIGURE: 'Configure {0}', // TODO translate CONFIGURE: 'Yapılandır {0}',
SYSTEM_MEMORY: 'System Memory', // TODO translate SYSTEM_MEMORY: 'Sistem Belleği',
APPLICATION_SETTINGS_1: 'Modify EMS-ESP Application Settings', // TODO translate APPLICATION_SETTINGS_1: 'EMS-ESP Uygulama Ayarlarını Değiştir',
SECURITY_1: 'Add or remove users', // TODO translate SECURITY_1: 'Kullanıcıları ekle veya kaldır',
DOWNLOAD_UPLOAD_1: 'Download and Upload Settings and Firmware', // TODO translate DOWNLOAD_UPLOAD_1: 'Ayarları ve firmware dosyasını indir ve yükle',
MODULES: 'Module', // TODO translate MODULES: 'Modül',
MODULES_1: 'Harici modülleri etkinleştirin veya devre dışı bırakın', MODULES_1: 'Harici modülleri etkinleştirin veya devre dışı bırakın',
MODULES_UPDATED: 'Modules updated', // TODO translate MODULES_UPDATED: 'Modülleri güncellendi',
MODULES_DESCRIPTION: 'Click on the Module to activate or de-activate EMS-ESP library modules', // TODO translate MODULES_DESCRIPTION: 'Modüle tıklayarak etkinleştirin veya devre dışı bırakın EMS-ESP kütüphane modülleri',
MODULES_NONE: 'No external modules detected', // TODO translate MODULES_NONE: 'Hiçbir harici modül tespit edilmedi',
RENAME: 'Rename', // TODO translate RENAME: 'Yeniden Adlandır',
ENABLE_MODBUS: 'Enable Modbus', // TODO translate ENABLE_MODBUS: 'Modbus\'ı etkinleştir',
VIEW_LOG: 'View log to diagnose issues', // TODO translate VIEW_LOG: 'Sorunu tanımlamak için günlüğü görüntüleyin',
UPLOAD_DRAG: 'drag and drop a file here or click to select one', // TODO translate UPLOAD_DRAG: 'Bir dosya buraya sürükleyip bırakın veya seçmek için tıklayın',
SERVICES: 'Services', // TODO translate SERVICES: 'Hizmetler',
ALLVALUES: 'All Values', // TODO translate ALLVALUES: 'Tüm Değerler',
SPECIAL_FUNCTIONS: 'Special Functions', // TODO translate SPECIAL_FUNCTIONS: 'Özel Fonksiyonlar',
WAIT_FIRMWARE: 'Firmware is uploading and installing', // TODO translate WAIT_FIRMWARE: 'Firmware yükleniyor ve yükleniyor',
INSTALL_VERSION: 'This will install version {0}. Are you sure?', // TODO translate INSTALL_VERSION: 'Bu {0} sürümü {1} yükleyecek. Emin misiniz?',
UPGRADE_AVAILABLE: 'There is a firmware upgrade available!', // TODO translate UPDATE_AVAILABLE: 'güncellendi!',
LATEST_VERSION: 'You are using the latest firmware version.', // TODO translate LATEST_VERSION: 'En son {0} firmware sürümünü kullanıyorsunuz.',
PLEASE_WAIT: 'Please wait', // TODO translate PLEASE_WAIT: 'Lütfen bekleyin',
RESTARTING_PRE: 'Initializing', // TODO translate RESTARTING_PRE: 'Başlatılıyor',
RESTARTING_POST: 'Preparing', // TODO translate RESTARTING_POST: 'Hazırlanıyor',
AUTO_SCROLL: 'Auto Scroll', // TODO translate AUTO_SCROLL: 'Otomatik kaydırma',
DASHBOARD: 'Dashboard', // TODO translate DASHBOARD: 'Kontrol Paneli',
DEVELOPER_MODE: 'Developer Mode', // TODO translate DEVELOPER_MODE: 'Geliştirici Modu',
BYTES: 'Bytes', // TODO translate BYTES: 'Bayt',
BITMASK: 'Bit Mask',// TODO translate BITMASK: 'Bit Maskesi',
DUPLICATE: 'Duplicate', // TODO translate DUPLICATE: 'Çift',
UPGRADE: 'Upgrade', // TODO translate DASHBOARD_1: 'Tüm aktif ve Favori olarak işaretlenmiş EMS varlıkları, artı tüm özel varlıklar, zamanlayıcılar ve harici sensör verileri aşağıda görüntüleniyor.',
DASHBOARD_1: 'All EMS entities that are active and marked as Favorite, plus all Custom Entities, Schedules and external Sensors data are displayed below.', // TODO translate NO_DATA_1: 'Henüz bir favori EMS varlığı bulunamadı. Kullanın',
NO_DATA_1: 'No favorite EMS entities found yet. Use the', // TODO translate NO_DATA_2: 'modülünü kullanın.',
NO_DATA_2: 'module to mark them.', // TODO translate NO_DATA_3: 'Tüm kullanılabilir varlıkları görmek için git',
NO_DATA_3: 'To see all available entities go to', // TODO translate THIS_VERSION: 'Bu Sürüm',
THIS_VERSION: 'This Version', // TODO translate PLATFORM: 'Platforma',
PLATFORM: 'Platform', // TODO translate RELEASE_TYPE: 'Sürüm Tipi',
RELEASE_TYPE: 'Release Type', // TODO translate INTERNET_CONNECTION_REQUIRED: 'Otomatik sürüm kontrolü ve güncelleme için internet bağlantısı gereklidir',
REINSTALL: 'Re-install', // TODO translate SWITCH_RELEASE_TYPE: '{0} sürümüne geç'
INTERNET_CONNECTION_REQUIRED: 'Internet connection required for automatic version checking and upgrading', // TODO translate
}; };
export default tr; export default tr;

View File

@@ -13,7 +13,7 @@ const router = createBrowserRouter(
createRoutesFromElements(<Route path="/*" element={<App />} />) createRoutesFromElements(<Route path="/*" element={<App />} />)
); );
createRoot(document.getElementById('root') as HTMLElement).render( createRoot(document.getElementById('root')!).render(
<StrictMode> <StrictMode>
<RouterProvider router={router} /> <RouterProvider router={router} />
</StrictMode> </StrictMode>

View File

@@ -29,10 +29,10 @@ export const updateValue =
export const updateValueDirty = export const updateValueDirty =
( (
origData, origData: unknown,
dirtyFlags: string[], dirtyFlags: string[],
setDirtyFlags: React.Dispatch<React.SetStateAction<string[]>>, setDirtyFlags: React.Dispatch<React.SetStateAction<string[]>>,
updateDataValue: (unknown) => void updateDataValue: (value: unknown) => void
) => ) =>
(event: React.ChangeEvent<HTMLInputElement>) => { (event: React.ChangeEvent<HTMLInputElement>) => {
const updated_value = extractEventValue(event); const updated_value = extractEventValue(event);

View File

@@ -1,31 +1,108 @@
{ {
"compilerOptions": { "compilerOptions": {
"target": "ESNext", // Target modern browsers for better performance
"target": "ES2022",
"useDefineForClassFields": true, "useDefineForClassFields": true,
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"types": ["node"], // Optimized library selection
"lib": ["ES2022", "DOM", "DOM.Iterable"],
"types": ["node", "vite/client"],
// JavaScript handling
"allowJs": false, "allowJs": false,
"skipLibCheck": true, "checkJs": false,
"esModuleInterop": false,
"allowSyntheticDefaultImports": true, // Module system optimized for Vite
"strict": true,
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"composite": true,
"module": "ESNext", "module": "ESNext",
"moduleResolution": "bundler", "moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
// Emit configuration
"noEmit": true, "noEmit": true,
"useUnknownInCatchVariables": false, "declaration": false,
"declarationMap": false,
"sourceMap": false,
// React/JSX configuration
"jsx": "react-jsx", "jsx": "react-jsx",
"noImplicitAny": false, "jsxImportSource": "react",
"baseUrl": "src",
// Strict type checking for better code quality
"strict": true,
"noImplicitAny": true,
"strictNullChecks": true,
"strictFunctionTypes": true,
"strictBindCallApply": true,
"strictPropertyInitialization": true,
"noImplicitReturns": true,
"noImplicitThis": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"exactOptionalPropertyTypes": true,
// Additional checks
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedIndexedAccess": true,
"useUnknownInCatchVariables": true,
// Performance optimizations
"skipLibCheck": true,
"skipDefaultLibCheck": true,
"incremental": true,
"tsBuildInfoFile": ".tsbuildinfo",
// Path mapping for cleaner imports
"baseUrl": ".",
"paths": { "paths": {
"@": ["src"], "@/*": ["src/*"],
"@/*": ["src/*"] "@/components/*": ["src/components/*"],
"@/utils/*": ["src/utils/*"],
"@/types/*": ["src/types/*"],
"@/hooks/*": ["src/hooks/*"],
"@/services/*": ["src/services/*"],
"@/assets/*": ["src/assets/*"],
// Support for bare imports from src directory
"App": ["src/App"],
"AppRouting": ["src/AppRouting"],
"CustomTheme": ["src/CustomTheme"],
"SignIn": ["src/SignIn"],
"AuthenticatedRouting": ["src/AuthenticatedRouting"],
"env": ["src/env"],
"components": ["src/components"],
"contexts": ["src/contexts"],
"i18n": ["src/i18n"],
"utils": ["src/utils"],
"validators": ["src/validators"],
"types": ["src/types"],
"api": ["src/api"],
"app": ["src/app"],
// Wildcard patterns for subdirectories
"components/*": ["src/components/*"],
"contexts/*": ["src/contexts/*"],
"i18n/*": ["src/i18n/*"],
"utils/*": ["src/utils/*"],
"validators/*": ["src/validators/*"],
"types/*": ["src/types/*"],
"api/*": ["src/api/*"],
"app/*": ["src/app/*"]
} }
}, },
"include": ["src/**/*", "vite.config.ts"], "include": ["src/**/*", "vite.config.ts", "progmem-generator.js"],
"exclude": ["node_modules", "dist"] "exclude": [
"node_modules",
"dist",
"build",
".tsbuildinfo",
"**/*.test.ts",
"**/*.test.tsx",
"**/*.spec.ts",
"**/*.spec.tsx"
],
"ts-node": {
"esm": true
}
} }

View File

@@ -1,131 +1,331 @@
import preact from '@preact/preset-vite'; import preact from '@preact/preset-vite';
import fs from 'fs';
import path from 'path';
import { visualizer } from 'rollup-plugin-visualizer'; import { visualizer } from 'rollup-plugin-visualizer';
import { defineConfig } from 'vite'; import { defineConfig } from 'vite';
import { Plugin } from 'vite';
import viteImagemin from 'vite-plugin-imagemin'; import viteImagemin from 'vite-plugin-imagemin';
import viteTsconfigPaths from 'vite-tsconfig-paths'; import viteTsconfigPaths from 'vite-tsconfig-paths';
import zlib from 'zlib';
// @ts-expect-error - mock server doesn't have type declarations
import mockServer from '../mock-api/mockServer.js'; import mockServer from '../mock-api/mockServer.js';
export default defineConfig(({ command, mode }) => { // Plugin to display bundle size information
if (command === 'serve') { const bundleSizeReporter = (): Plugin => {
console.log('Preparing for standalone build with server, mode=' + mode); return {
return { name: 'bundle-size-reporter',
plugins: [preact(), viteTsconfigPaths(), mockServer()], // eslint-disable-next-line @typescript-eslint/no-explicit-any
server: { writeBundle(options: any, bundle: any) {
open: true, console.log('\n📦 Bundle Size Report:');
port: mode == 'production' ? 4173 : 3000, console.log('='.repeat(50));
proxy: {
'/api': { let totalSize = 0;
target: 'http://localhost:3080', const files: Array<{ name: string; size: number; gzipSize?: number }> = [];
changeOrigin: true,
secure: false for (const [fileName, chunk] of Object.entries(
}, bundle as Record<string, unknown>
'/rest': 'http://localhost:3080', )) {
'/gh': 'http://localhost:3080' // mock for GitHub API // eslint-disable-next-line @typescript-eslint/no-explicit-any
if ((chunk as any).type === 'chunk' || (chunk as any).type === 'asset') {
const filePath = path.join((options.dir as string) || 'dist', fileName);
let size = 0;
let gzipSize = 0;
try {
const stats = fs.statSync(filePath);
size = stats.size;
totalSize += size;
// Calculate gzip size
const fileContent = fs.readFileSync(filePath);
gzipSize = zlib.gzipSync(fileContent).length;
files.push({
name: fileName,
size,
gzipSize
});
} catch (error) {
console.warn(`Could not read file ${fileName}:`, error);
}
} }
} }
};
}
if (mode === 'hosted') { // Sort files by size (largest first)
console.log('Preparing for hosted build'); files.sort((a, b) => b.size - a.size);
return {
plugins: [preact(), viteTsconfigPaths()],
build: {
chunkSizeWarningLimit: 1024
}
};
}
console.log('Preparing for production, optimized build'); // Display individual file sizes
files.forEach((file) => {
const sizeKB = (file.size / 1024).toFixed(2);
const gzipKB = file.gzipSize ? (file.gzipSize / 1024).toFixed(2) : 'N/A';
console.log(
`📄 ${file.name.padEnd(30)} ${sizeKB.padStart(8)} KB (${gzipKB} KB gzipped)`
);
});
return { console.log('='.repeat(50));
plugins: [ console.log(`📊 Total Bundle Size: ${(totalSize / 1024).toFixed(2)} KB`);
preact(),
viteTsconfigPaths(), // Calculate and display gzip total
{ const totalGzipSize = files.reduce(
...viteImagemin({ (sum, file) => sum + (file.gzipSize || 0),
verbose: false, 0
gifsicle: { );
optimizationLevel: 7, console.log(`🗜️ Total Gzipped Size: ${(totalGzipSize / 1024).toFixed(2)} KB`);
interlaced: false
}, // Show compression ratio
optipng: { const compressionRatio = (
optimizationLevel: 7 ((totalSize - totalGzipSize) / totalSize) *
}, 100
mozjpeg: { ).toFixed(1);
quality: 20 console.log(`📈 Compression Ratio: ${compressionRatio}%`);
},
pngquant: { console.log('='.repeat(50));
quality: [0.8, 0.9], }
speed: 4 };
}, };
svgo: {
plugins: [ export default defineConfig(
{ ({ command, mode }: { command: string; mode: string }) => {
name: 'removeViewBox' if (command === 'serve') {
}, console.log('Preparing for standalone build with server, mode=' + mode);
{ return {
name: 'removeEmptyAttrs', plugins: [
active: false preact({
} // Keep dev tools enabled for development
] devToolsEnabled: true,
prefreshEnabled: true
}),
viteTsconfigPaths(),
bundleSizeReporter(), // Add bundle size reporting
mockServer()
],
server: {
open: true,
port: mode == 'production' ? 4173 : 3000,
proxy: {
'/api': {
target: 'http://localhost:3080',
changeOrigin: true,
secure: false
},
'/rest': 'http://localhost:3080',
'/gh': 'http://localhost:3080' // mock for GitHub API
} }
}),
enforce: 'pre'
},
visualizer({
template: 'treemap', // or sunburst
open: false,
gzipSize: true,
brotliSize: true,
filename: '../analyse.html' // will be saved in project's root
})
],
build: {
// target: 'es2022',
chunkSizeWarningLimit: 1024,
minify: 'terser',
terserOptions: {
compress: {
passes: 4,
arrows: true,
drop_console: true,
drop_debugger: true,
sequences: true
}, },
mangle: { // Optimize development builds
// toplevel: true build: {
// module: true target: 'es2020',
// properties: { minify: false, // Disable minification for faster dev builds
// regex: /^_/ sourcemap: true // Enable source maps for debugging
// } }
}, };
ecma: 5, }
enclose: false,
keep_classnames: false,
keep_fnames: false,
ie8: false,
module: false,
nameCache: null,
safari10: false,
toplevel: false
},
rollupOptions: { if (mode === 'hosted') {
output: { console.log('Preparing for hosted build');
manualChunks(id: string) { return {
if (id.includes('node_modules')) { plugins: [
// creating a chunk to react routes deps. Reducing the vendor chunk size preact({
if (id.includes('react-router')) { // Enable Preact optimizations for hosted build
return '@react-router'; devToolsEnabled: false,
prefreshEnabled: false
}),
viteTsconfigPaths(),
bundleSizeReporter() // Add bundle size reporting
],
build: {
target: 'es2020',
chunkSizeWarningLimit: 512,
minify: 'terser',
cssMinify: true,
assetsInlineLimit: 4096,
terserOptions: {
compress: {
passes: 3,
drop_console: true,
drop_debugger: true,
dead_code: true,
unused: true
},
mangle: {
toplevel: true
},
ecma: 2020
},
rollupOptions: {
treeshake: {
moduleSideEffects: false
},
output: {
manualChunks(id: string) {
if (id.includes('node_modules')) {
if (id.includes('preact')) {
return '@preact';
}
return 'vendor';
}
return undefined;
} }
return 'vendor';
} }
} }
} }
} };
} }
};
}); console.log('Preparing for production, optimized build');
return {
plugins: [
preact({
// Enable Preact optimizations
devToolsEnabled: false,
prefreshEnabled: false
}),
viteTsconfigPaths(),
// Enable image optimization for size reduction
{
...viteImagemin({
verbose: false,
gifsicle: {
optimizationLevel: 7,
interlaced: false
},
optipng: {
optimizationLevel: 7
},
mozjpeg: {
quality: 20
},
pngquant: {
quality: [0.8, 0.9],
speed: 4
},
svgo: {
plugins: [
{
name: 'removeViewBox'
},
{
name: 'removeEmptyAttrs',
active: false
}
]
}
}),
enforce: 'pre'
},
visualizer({
template: 'treemap', // or sunburst
open: false,
gzipSize: true,
brotliSize: true,
filename: '../analyse.html' // will be saved in project's root
}),
bundleSizeReporter() // Add bundle size reporting
],
build: {
// Target modern browsers for smaller bundles
target: 'es2020',
chunkSizeWarningLimit: 512,
minify: 'terser',
// Enable CSS minification
cssMinify: true,
// Optimize asset handling
assetsInlineLimit: 4096, // Inline small assets
terserOptions: {
compress: {
passes: 6,
arrows: true,
drop_console: true,
drop_debugger: true,
sequences: true
// Additional aggressive compression options
// dead_code: true,
// hoist_funs: true,
// hoist_vars: true,
// if_return: true,
// join_vars: true,
// loops: true,
// pure_getters: true,
// reduce_vars: true,
// side_effects: false,
// switches: true,
// unsafe: true,
// unsafe_arrows: true,
// unsafe_comps: true,
// unsafe_Function: true,
// unsafe_math: true,
// unsafe_proto: true,
// unsafe_regexp: true,
// unsafe_undefined: true,
// unused: true
},
mangle: {
toplevel: true, // Enable top-level mangling
module: true // Enable module mangling
// properties: {
// regex: /^_/ // Mangle properties starting with _
// }
},
ecma: 2020, // Updated to modern ECMAScript
enclose: false,
keep_classnames: false,
keep_fnames: false,
ie8: false,
module: false,
safari10: false,
toplevel: true // Enable top-level optimization
},
rollupOptions: {
// Enable tree shaking
treeshake: {
moduleSideEffects: false,
propertyReadSideEffects: false,
tryCatchDeoptimization: false
},
output: {
// Optimize chunk naming for better caching
chunkFileNames: 'assets/[name]-[hash].js',
entryFileNames: 'assets/[name]-[hash].js',
assetFileNames: 'assets/[name]-[hash].[ext]',
manualChunks(id: string) {
if (id.includes('node_modules')) {
// More granular chunk splitting for better caching
if (id.includes('react-router')) {
return '@react-router';
}
if (id.includes('preact')) {
return '@preact';
}
if (id.includes('uuid')) {
return '@uuid';
}
if (id.includes('axios') || id.includes('fetch')) {
return '@http';
}
if (id.includes('lodash') || id.includes('ramda')) {
return '@utils';
}
return 'vendor';
}
// Split large application modules
if (id.includes('components/')) {
return 'components';
}
if (id.includes('pages/') || id.includes('routes/')) {
return 'pages';
}
return undefined;
},
// Enable source maps for debugging (optional)
sourcemap: false // Disable for production to save space
}
}
}
};
}
);

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