andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 21:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,110 Commits 6 Branches 30 Tags
83e400fbe9cb9960587e6abf6fa0caa8c8a8862b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Proddy 225e482814 Merge pull request #1519 from MichaelDvP/dev_1 
compile with tasmota arduino 2.14 and 3.0
 2023-12-20 22:06:39 +01:00
Proddy 08c5fd8f64 Merge pull request #1514 from MichaelDvP/dev 
ethernet with arduino_3.0, sort translations alphabetical
 2023-12-18 09:45:38 +01:00
Proddy a28cdaa930 Merge pull request #1515 from proddy/dev 
add SK entity translations (from Michael)
 2023-12-18 09:44:25 +01:00
Proddy a01ee4a48d Merge pull request #1513 from proddy/dev 
fix SK
 2023-12-17 09:47:19 +01:00
Proddy abf4eeb39a Merge pull request #1508 from misa1515/patch-8 
Update index.ts
 2023-12-17 09:33:00 +01:00
Proddy 40a85634ef Merge pull request #1509 from misa1515/patch-9 
Update LayoutAuthMenu.tsx
 2023-12-17 09:32:31 +01:00
Proddy a5c41a1cd8 Merge pull request #1510 from misa1515/patch-10 
Update SignIn.tsx
 2023-12-17 09:32:07 +01:00
Proddy c6668e1d6a Merge pull request #1511 from misa1515/patch-11 
Update system.cpp
 2023-12-17 09:31:38 +01:00
Proddy ef2ed0f4d1 Merge pull request #1507 from proddy/dev 
add SK
 2023-12-16 22:40:08 +01:00
Proddy 68cb94547e Merge pull request #1499 from MichaelDvP/dev 
latest entities
 2023-12-13 11:51:58 +01:00
Proddy ac288b794f Merge pull request #1493 from proddy/dev 
update standalone server to bun and itty-router, add back router paths, add support download button
 2023-12-12 22:37:56 +01:00
Proddy c9ca395e6d Merge branch 'emsesp:dev' into dev 2023-12-04 17:39:07 +01:00
Proddy c3ac215493 Merge pull request #1481 from MichaelDvP/dev 
add hpMaxPower #1475
 2023-12-04 17:38:54 +01:00
Proddy 9375fb4d2d Merge branch 'emsesp:dev' into dev 2023-12-03 21:28:42 +01:00
Proddy f9b8ac6f30 Merge pull request #1478 from MichaelDvP/dev 
fixes for #1474 and #1477
 2023-12-03 21:28:23 +01:00
Proddy 7efa8ffbe0 Merge pull request #1473 from proddy/dev 
roll back dom-router changes
 2023-12-02 11:06:46 +01:00
Proddy 85016d6582 Merge branch 'emsesp:dev' into dev 2023-12-02 11:06:06 +01:00
Proddy c1fa5c42c4 Merge pull request #1471 from MichaelDvP/dev 
Some new/fixed entities
 2023-11-29 20:55:14 +01:00
Proddy 306baee94d Merge pull request #1470 from proddy/dev 
HA don't set entity_category to Diagnostic/Configuration for EMS entities
 2023-11-28 20:54:20 +01:00
Proddy ba21293c42 Merge pull request #1465 from proddy/dev 
fix router loops
 2023-11-26 18:44:35 +01:00
Proddy c81f579464 Merge pull request #1464 from MichaelDvP/dev 
revert to react-router-dom 6.18.0 to bring blue tab line back
 2023-11-26 09:58:35 +01:00
Proddy b60127c3ba Merge pull request #1461 from MichaelDvP/dev 
revert to react-router-dom 6.19.0 to fix tab-routing-issue
 2023-11-25 10:08:17 +01:00
Proddy d36246d4d1 Merge pull request #1458 from proddy/dev 
3.6.5-dev.0
 2023-11-24 07:41:46 +01:00
Proddy 24cca67625 Merge pull request #1457 from proddy/dev 
update packages
 2023-11-24 07:28:52 +01:00
Proddy 6e08356ff7 Merge pull request #1455 from MichaelDvP/dev 
fix boiler commands to ems telegrams
 2023-11-23 19:07:13 +01:00
Proddy 01a15a5c85 Merge pull request #1451 from MichaelDvP/dev 
next fix RC300 mode
 2023-11-22 08:24:25 +01:00
Proddy 5ad03facce Merge pull request #1445 from proddy/dev 
patch for 3.6.3 with fixes #1440 #1442
 2023-11-21 10:43:08 +01:00
Proddy ad3bf294d8 Merge branch 'emsesp:dev' into dev 2023-11-21 10:42:39 +01:00
Proddy cff5b8c949 Merge pull request #1444 from MichaelDvP/dev 
set/read thermostat mode for RC100-RC300, fix #1440 and fix #1442
 2023-11-21 10:33:46 +01:00
Proddy 2de855e044 Merge pull request #1439 from proddy/dev 
prepare another 3.6.3 build with board profile fixed
 2023-11-19 21:19:10 +01:00
Proddy 905b52e39d Merge pull request #1438 from MichaelDvP/dev 
fix crash on wrong thermostat mode command (if not using HA)
 2023-11-18 14:05:54 +01:00
Proddy 64d46fe8f7 Merge pull request #1437 from proddy/dev 
update changelog
 2023-11-18 13:43:27 +01:00
Proddy 873b75240c Merge pull request #1436 from proddy/dev 
3.6.4-dev-0
 2023-11-18 13:38:20 +01:00
Proddy e20434da88 Merge pull request #1435 from proddy/dev 
prepare for 3.6.3 release
 2023-11-18 13:19:27 +01:00
Proddy 1c3bc98bbb Merge pull request #1434 from proddy/dev 
fix web building with vite 5
 2023-11-17 12:11:28 +01:00
Proddy 8cfc540670 Merge pull request #1432 from proddy/dev 
fix building on osx, some package updates again
 2023-11-16 22:44:23 +01:00
Proddy e4a899912c Merge pull request #1430 from proddy/dev 
fix for export_values and new command_allvalues()
 2023-11-16 07:41:26 +01:00
Proddy 6b9dadc0d9 Merge pull request #1428 from MichaelDvP/dev2x 
latest changes
 2023-11-15 12:08:18 +01:00
Proddy 7b5a37a85d Merge pull request #1426 from proddy/dev 
fix bug when traversing ems devices when using cmd allvalues
 2023-11-15 09:50:40 +01:00
Proddy c9775c1edd Merge pull request #1425 from proddy/dev 
only send command and value to backend write service
 2023-11-14 21:41:59 +01:00
Proddy a8ea6ef4a8 Merge pull request #1422 from ellepdesk/options-invert-pullup 
Add options to invert RX and TX and to enable pullup on RX
 2023-11-13 17:02:31 +01:00
Proddy 196e98b3bd Merge pull request #1418 from proddy/dev 
show UOM in console when 'show values'. And added a new system command called 'values' which dumps the same to JSON
 2023-11-13 17:00:33 +01:00
Proddy c40a11504c Merge pull request #1417 from MichaelDvP/dev2x 
uptime, inputs, output EA0, HIU entities
 2023-11-12 16:05:52 +01:00
Proddy 8ba40003e4 Merge pull request #1411 from proddy/dev 
fix HA warnings - add a device name - #1393
 2023-11-11 18:02:46 +01:00
Proddy 20f32db8bc Merge pull request #1409 from MichaelDvP/dev2x 
fix `retTemp`, #1334
 2023-11-11 14:43:35 +01:00
Proddy 981d62dc2c Merge pull request #1384 from WiktorBuczko/patch-1 
Update and fix translation
 2023-11-11 10:56:53 +01:00
Proddy ffcf0bf2d7 Merge pull request #1408 from proddy/dev 
update gh actions
 2023-11-11 10:18:18 +01:00
Proddy 7e1f16c865 Merge pull request #1407 from proddy/dev 
remove set command (with no args)
 2023-11-11 09:43:14 +01:00
Proddy 81b654cc41 Merge pull request #1405 from proddy/dev2 
fix standalone compiling
 2023-11-10 11:55:26 +01:00
Proddy 52077cbd07 Merge pull request #1402 from proddy/dev2 
package sync with dev
 2023-11-09 23:47:11 +01:00
Proddy 8c03592157 Merge pull request #1400 from MichaelDvP/dev2x 
Small change from my Dev2
 2023-11-09 23:30:36 +01:00
Proddy e7254bc7f4 Merge pull request #1395 from proddy/dev 
fix MQTT base with paths not working in HA [#1393]
 2023-11-09 23:29:43 +01:00
Proddy 06f5e1226f Merge pull request #1391 from proddy/dev2 
sync with latest dev
 2023-11-05 17:15:20 +01:00
Proddy af57af46b0 Merge pull request #1390 from proddy/dev 
update changelog and bump version
 2023-11-05 17:13:33 +01:00
Proddy 207953e8d1 Merge pull request #1383 from proddy/dev 
no commands for nrgheat & nrgww - #1382
 2023-11-04 14:11:13 +01:00
Proddy 2afe50fc9e Merge pull request #1381 from MichaelDvP/dev2 
Dev2: relais, fix exhausttemp, fix RC20 remote
 2023-11-04 11:53:46 +01:00
Proddy 6f097e4613 Merge pull request #1377 from proddy/dev 
small updates
 2023-10-31 22:09:04 +01:00
Proddy 90af88f36d Merge pull request #1376 from proddy/dev2 
Dev2
 2023-10-31 22:07:48 +01:00
Proddy 6853651c8b Merge pull request #1374 from proddy/dev2 
Dev2
 2023-10-31 18:09:45 +01:00
Proddy 1991ca4128 Merge pull request #1372 from proddy/dev 
shower duration in sec
 2023-10-31 12:34:18 +01:00
Proddy 879df338e3 Merge pull request #1371 from proddy/dev2 
small things
 2023-10-31 12:33:53 +01:00
Proddy af8e77029e Merge pull request #1369 from MichaelDvP/dev2 
Testbuild
 2023-10-30 16:43:33 +01:00
Proddy 94519179df Merge pull request #1368 from proddy/dev 
use DEBUG logging for commands with json output - #1364
 2023-10-30 13:10:58 +01:00
Proddy 6a221e84cc Merge pull request #1365 from proddy/dev 
3.6.3-dev.5
 2023-10-29 13:44:42 +01:00
Proddy 7ea7a4b25a Merge branch 'emsesp:dev' into dev 2023-10-29 13:44:17 +01:00
Proddy 222f853616 Merge pull request #1362 from proddy/dev 
messing with yarn again (bored)
 2023-10-26 12:17:15 -07:00
Proddy 6c7787b2ae Merge pull request #1358 from owenvoke/feature/tls-typo 
chore: fix typos of TLS
 2023-10-25 06:22:16 -07:00
Proddy 8929e15e00 Merge pull request #1356 from proddy/dev 
show options and range in export - #1342
 2023-10-23 07:12:04 -07:00
Proddy 4c789a656b Merge pull request #1355 from proddy/dev 
minor changes
 2023-10-22 07:54:24 -07:00
Proddy be93627ec0 Merge pull request #1353 from proddy/dev 
minor changes plus Michael's updated AsyncTCP library
 2023-10-22 03:43:15 -07:00
Proddy 36ca7e09ca Merge pull request #1352 from proddy/dev 
quick link from device entities to custom entities page (the list icon)
 2023-10-21 07:15:47 -07:00
Proddy 1fded64f2e Merge pull request #1343 from proddy/dev 
show entity count in device list, remove type
 2023-10-20 07:42:02 -07:00
Proddy f9a176e09c Merge pull request #1341 from proddy/dev 
fixes from previous checkin
 2023-10-17 12:21:19 -07:00
Proddy 8584901229 Merge pull request #1340 from proddy/dev 
add missing 'yarn webUI'
 2023-10-17 11:29:14 -07:00
Proddy 9223a00270 Merge pull request #1339 from proddy/dev 
update web building
 2023-10-17 07:19:21 -07:00
Proddy 20e301594c Update github-releases-to-discord.yml 2023-10-16 15:01:30 +02:00
Proddy f90f4279d7 Create github-releases-to-discord.yml 2023-10-16 14:58:08 +02:00
Proddy 9962f16d62 Merge pull request #1336 from proddy/dev 
fixed helper text in entity dialog for numeric values
 2023-10-16 04:16:32 -07:00
Proddy 9641adce1c Merge pull request #1333 from proddy/dev 
added timestamp to shower_data, add HA's ent_cat discovery to all sensors
 2023-10-15 10:33:05 -07:00
Proddy 8395983106 Merge pull request #1319 from MichaelDvP/dev 
add forceheatingoff #1262 and header/heatblock #1317
 2023-10-08 12:19:22 +01:00
Proddy a8c7b2bca4 Merge pull request #1318 from proddy/dev 
fix shower duration
 2023-10-03 22:08:55 +01:00
Proddy f76e6b56b1 Merge pull request #1316 from MichaelDvP/dev 
arduino 2.0.13 and 3.0.0 ready
 2023-10-03 21:35:47 +01:00
Proddy 4b41180785 Merge pull request #1312 from proddy/dev 
preparing for 3.6.3
 2023-10-01 17:50:27 +02:00
Proddy 20d8b6400f Merge pull request #1311 from proddy/dev 
minor changes
 2023-10-01 17:32:50 +02:00
Proddy f9a53cf320 Merge pull request #1309 from MichaelDvP/dev 
Some small corrections
 2023-09-29 11:18:24 +02:00
Proddy 5bc3bd23e2 Merge pull request #1306 from proddy/dev 
small changes
 2023-09-25 09:15:44 +02:00
Proddy 398cbadb64 Merge pull request #1304 from MichaelDvP/dev 
burner settings use min/max from telegram 4, fix max for values < 0
 2023-09-21 20:31:06 +02:00
Proddy 385d2377db Merge pull request #1303 from proddy/dev 
disabled entity values shown in white text in web
 2023-09-20 23:10:41 +02:00
Proddy 96ff5ed123 Merge pull request #1302 from MichaelDvP/dev2 
network connection and powerentities
 2023-09-20 20:08:22 +02:00
Proddy af935d8124 Merge pull request #1298 from proddy/dev 
some refactoring and change #1297
 2023-09-19 16:47:30 +02:00
Proddy 0eb96e764c Merge pull request #1296 from proddy/dev 
3.6.2-dev-0
 2023-09-16 09:27:09 +02:00
Proddy 34f87a0a21 Merge pull request #1292 from proddy/dev 
use espressif core 2.0.12 via Tasmota for 4MB build
 2023-09-10 13:18:46 +02:00
Proddy 4da45a7240 Merge pull request #1291 from proddy/dev 
preparing 3.7.0
 2023-09-09 15:02:12 +02:00
Proddy 677f6c5a6e Merge pull request #1290 from proddy/dev 
#1280 sample value is a string for enums
 2023-09-09 13:43:09 +02:00
Proddy 877d60f46f Merge pull request #1289 from MichaelDvP/dev 
Fixes from testbuild
 2023-09-09 12:32:57 +02:00
Proddy 33ea1c6863 Merge pull request #1288 from proddy/dev 
fix for MQTT enum index option leads to error in HA #1280
 2023-09-09 10:26:25 +02:00
Proddy 83211e0ef8 Merge pull request #1286 from MichaelDvP/dev 
show color wifi-quality in network selector
 2023-09-08 15:26:05 +02:00
Proddy 04fd04b2ab Merge pull request #1285 from proddy/dev 
mqtt fix
 2023-09-08 09:26:50 +02:00
Proddy 27aa72eda1 Merge pull request #1284 from MichaelDvP/dev 
fix for espressif@6.4.0
 2023-09-06 10:59:49 +02:00
Proddy 9ebcfe38bc Merge pull request #1279 from proddy/dev 
add missing translations and show value type in table
 2023-09-02 13:41:58 +02:00