Commit Graph

4122 Commits

Author SHA1 Message Date
MichaelDvP
1863e57f5b fix #496, RC30 design temp 2022-05-12 18:21:30 +02:00
MichaelDvP
a0454943a7 Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into idf4_no_master 2022-05-10 14:01:31 +02:00
MichaelDvP
a3130d498e Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into idf4 2022-05-10 13:44:22 +02:00
MichaelDvP
3168438d6f LITTLEFS->LittleFS 2022-05-10 13:26:50 +02:00
MichaelDvP
9202d799c6 npm update 2022-05-10 13:26:35 +02:00
MichaelDvP
c9f10fb5cc uart isr to IRAM 2022-05-10 12:42:46 +02:00
MichaelDvP
b3fde5a2da Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into idf4 2022-05-10 12:40:45 +02:00
MichaelDvP
8339fc735c uart in IRAM 2022-05-10 12:36:42 +02:00
MichaelDvP
3e2f7a5976 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4_no_master 2022-05-10 09:59:15 +02:00
MichaelDvP
9c732ae19f uart back 2022-05-10 09:59:04 +02:00
Proddy
7e26c0633a Merge branch 'emsesp:dev' into dev 2022-05-08 20:14:16 +02:00
Proddy
226a557d5c prevent build failing 2022-05-08 20:13:48 +02:00
Proddy
08021138ae Merge branch 'emsesp:dev' into dev 2022-05-08 20:11:32 +02:00
MichaelDvP
b16fa6d5c0 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4_no_master 2022-05-08 18:21:48 +02:00
MichaelDvP
6203eedbe5 uart 2022-05-08 17:27:56 +02:00
Proddy
db8c30ddbb fix for customizations after upload new file 2022-05-08 17:02:38 +02:00
Proddy
0e9202ae4d change to saving customization file after upload 2022-05-08 17:01:38 +02:00
Proddy
85f6628718 Merge pull request #495 from proddy/dev
standalone compiling fix
2022-05-08 15:02:25 +02:00
Proddy
8dab64b9bb Merge branch 'emsesp:dev' into dev 2022-05-08 15:01:44 +02:00
Proddy
8b521aa572 fix standalone compiling 2022-05-08 15:01:04 +02:00
Proddy
663fd22e03 Merge pull request #494 from proddy/dev
Feature: upload customization settings from a file #256
2022-05-08 14:59:16 +02:00
Proddy
1f933fb26a updates for #256 2022-05-08 14:58:41 +02:00
Proddy
0faa56f5ff Merge branch 'emsesp:dev' into dev 2022-05-08 12:57:33 +02:00
Proddy
9c2aac31b6 Merge pull request #493 from MichaelDvP/dev
api entitiy attributes with hcs
2022-05-08 12:57:12 +02:00
MichaelDvP
fdab56936f Merge branch 'dev' into idf4_no_master 2022-05-08 11:35:04 +02:00
MichaelDvP
c0aa263f2b parse_command checks prefix-numbers and prefix id 2022-05-08 11:19:12 +02:00
MichaelDvP
6c151654cc parse_command 2022-05-08 10:33:17 +02:00
Proddy
87c9d4d823 fix duplication 2022-05-07 18:41:42 +02:00
Proddy
fd53999777 Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2022-05-07 18:40:21 +02:00
Proddy
ce60bd10b6 telnet and analog on by default 2022-05-07 17:50:36 +02:00
Proddy
ee0492771d text change 2022-05-07 17:50:22 +02:00
Proddy
964e75e191 minor change 2022-05-07 17:50:10 +02:00
Proddy
cb16be6b1d remove id from User 2022-05-07 17:50:00 +02:00
Proddy
84a2a7340c comments 2022-05-07 17:49:49 +02:00
Proddy
a383925661 fix axios error reporting 2022-05-07 17:49:36 +02:00
Proddy
c49928bf3b remove id in User 2022-05-07 17:49:27 +02:00
Proddy
02fc57961b remove id 2022-05-07 17:49:15 +02:00
Proddy
9923b60d64 Feature: upload customization settings from a file #256 2022-05-07 17:49:02 +02:00
Proddy
f243162724 comments 2022-05-07 17:46:49 +02:00
Proddy
b35ab94509 upload script example 2022-05-07 17:46:31 +02:00
Proddy
4f399b51f5 package updates 2022-05-07 17:46:13 +02:00
MichaelDvP
9e14b34e1f uart, tx-mode 1 check buffersize, change event-task 2022-05-07 15:34:58 +02:00
MichaelDvP
bf54ee2e9d Merge branch 'dev' into idf4 2022-05-07 15:31:54 +02:00
MichaelDvP
9d2ed1cdbd uart, tx-mode 1 check buffersize 2022-05-07 15:29:11 +02:00
MichaelDvP
db9237451f Merge branch 'dev' of https://github.com/MichaelDvP/EMS-ESP32 into idf4_no_master 2022-05-06 17:54:34 +02:00
MichaelDvP
6277fbbea1 api entitiy attributes with hcs 2022-05-06 13:32:18 +02:00
Proddy
1b21e02b7a Merge pull request #492 from MichaelDvP/dev
some small fixes
2022-05-06 12:42:43 +02:00
MichaelDvP
1a5b012545 csv utf-8 with semicolon and Intl.Number format 2022-05-06 12:15:25 +02:00
MichaelDvP
f4aa4ed912 allow id for attribute 2022-05-06 12:02:56 +02:00
MichaelDvP
d075ee3111 Merge branch 'dev_no_master_thermostat' into idf4_no_master 2022-05-06 12:01:38 +02:00