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
3,347 Commits 6 Branches 30 Tags
47fb13aa4ad2f16416e0a4aa2a74e508ea4c88a8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Proddy 915418eca8 Merge pull request #330 from MichaelDvP/dev_ 
fixes #327 #329
 2022-01-26 20:27:02 +01:00
Proddy 8c4e5e5185 Merge pull request #324 from MichaelDvP/dev_ 2022-01-25 13:24:29 +01:00
Proddy 4569ee50a5 Merge pull request #320 from MichaelDvP/dev 
helptext for string commands
 2022-01-24 20:31:13 +01:00
Proddy ab34f7c056 Merge pull request #319 from MichaelDvP/dev 2022-01-24 13:30:09 +01:00
Proddy 02e2b51814 Merge pull request #307 from MichaelDvP/dev 
check received status before toggling fetch on empty telegram
 2022-01-20 10:04:03 +01:00
Proddy 3d8e1b8f86 Merge pull request #245 from proddy:dev 
Add back RC30 - #243
 2021-12-14 20:23:34 +00:00
Proddy 0f41079803 Merge pull request #235 from pswid:dev 
fix overlapping 0xC2 and overflow of offset
 2021-12-14 19:49:37 +00:00
Proddy 90c39d1f85 Merge pull request #234 from pswid/dev 2021-12-03 09:38:40 +01:00
Proddy 84d3d42306 Merge pull request #220 from proddy:dev 
minor updates
 2021-11-25 09:16:03 +01:00
Proddy 5de529cbb2 Merge pull request #218 from pswid:dev 
timestamp in boiler last error code
 2021-11-25 08:49:44 +01:00
Proddy 6532abd870 Merge pull request #217 from proddy:dev 
text changes, renamed status to bus_status in heartbeat, improved WebUI table layout, added Ethernet phy to custom profile board
 2021-11-22 09:11:41 +01:00
Proddy 5a9122f8be Merge pull request #215 from proddy/dev 2021-11-20 21:25:02 +01:00
Proddy 30b111b986 Merge pull request #208 from proddy:dev 
fixes #207
 2021-11-19 13:00:58 +01:00
Proddy 96180c837d Merge pull request #203 from proddy:dev 
Add Network to MQTT topic info and system/info command
 2021-11-18 12:11:40 +01:00
Proddy 74287ebb99 Merge pull request #201 from proddy:dev 
fixes #199 - change value validation fails
 2021-11-17 19:03:27 +01:00
Proddy 5f6033cac1 Merge pull request #197 from proddy/dev 
fixes #196 (HA missing entities), add row click to devices, change max limit on integer types to avoid NaN, refactored generation of device value JSON objects
 2021-11-15 17:45:52 +01:00
Proddy 7c16870294 Merge pull request #194 from kpschaper/bugfix_settemp 
bugfix revert auto mode -> the mode is hardcoded for the thermostat_ha_cmd #183
 2021-11-14 18:17:18 +01:00
Proddy e368f422f4 Merge pull request #195 from proddy/dev 
Fix console UOM, set temperature to show 1 decimal place in web
 2021-11-14 18:04:39 +01:00
Proddy 5893487d4a Merge pull request #189 from proddy:dev 
fix MQTT non-JSON payloads
 2021-11-14 12:56:20 +01:00
Proddy 3c8e20d4e4 Merge pull request #193 from kpschaper/fix_rc10_mode 
Mode update for #183
 2021-11-14 12:55:37 +01:00
Proddy 409d382ff9 Merge pull request #188 from MichaelDvP:dev 
Mode update for #183
 2021-11-11 20:04:25 +01:00
Proddy 72a59917fb Merge pull request #185 from kpschaper/fix_shower_alert 
Fix shower timer; doing_cold_shot is never being reset
 2021-11-07 17:42:49 +01:00
Proddy 91b7fd59d1 Merge pull request #181 from kpschaper/moduline200 
Show mode (off / heat) in Home Assistant for Moduline 200
 2021-11-06 20:56:57 +01:00
Proddy 67cb778039 Merge pull request #135 from Sunbuzz/ft_add_connect 
Added CONNECT device 0x236 "Wireless sensor base"
 2021-09-29 12:11:25 +02:00
Proddy 42d89d1d10 Merge pull request #134 from proddy/dev 
Dev
 2021-09-28 16:18:30 +02:00
Proddy 9e856b28a9 Merge pull request #130 from MichaelDvP/dev 
use TAG_DEVICE_DATA_WW
 2021-09-25 18:13:37 +02:00
Proddy 442202d978 Merge pull request #109 from MichaelDvP/dev 
add RC300 second summermode telegram
 2021-09-15 17:53:04 +02:00
Proddy d7678b340f Merge pull request #104 from Sunbuzz/pool 
Pool
 2021-09-08 12:18:21 +02:00
Proddy edef2f1bf6 Merge pull request #102 from Sunbuzz/pool 
Added pool data to telegrams 0x494 & 0x495
 2021-08-28 16:36:56 +02:00
Proddy e99c9208ad Update pre_release.yml 
on demand
 2021-06-19 14:12:32 +02:00
Proddy 2d96aa1736 Update pre_release.yml 
typo
 2021-06-19 13:32:46 +02:00
Proddy fdbbfe8ddb Update pre_release.yml 
node to v16
 2021-06-19 13:27:47 +02:00
Proddy 94127ad3eb Merge pull request #58 from MichaelDvP/dev_cmd 
Command checks and prefixes
 2021-05-10 18:26:58 +02:00
Proddy e854161da9 Merge pull request #49 from MichaelDvP/dev 
add min/max to values, boiler flags, ww-prefix, ha-prefix to mqtt
 2021-04-25 09:47:07 +02:00
Proddy b4aed240a7 Merge pull request #44 from MichaelDvP/ft_webcallcmd 
mqtt-HA-config dynamically
 2021-04-10 14:31:33 +02:00
Proddy d47fcda0fe Merge pull request #40 from MichaelDvP/dev 
Move texts and some other changes
 2021-03-30 17:10:58 +02:00
Proddy 5d21ba2648 Merge branch 'dev' into dev 2021-03-30 17:09:52 +02:00
Proddy 4a5dbedd37 Update README.md 2021-03-14 23:43:51 +01:00
Proddy 4060d1045e Merge pull request #662 from MichaelDvP/refactor 
add v2.1.1b7 changes, json sizes
 2020-12-15 19:52:14 +01:00
Proddy 8d386c0449 Merge branch 'fb-632-refactorvalues' into refactor 2020-12-15 19:51:55 +01:00
Proddy 32bffcb42f Merge pull request #642 from hvanoch/dev 
Add % as unit of measurement for the valve status
 2020-11-30 12:21:12 +01:00
Proddy e9998425a6 Update check_code.yml 2020-11-22 18:01:39 +01:00
Proddy b93ad1dc90 Merge pull request #619 from MichaelDvP/dev 
Some changes
 2020-11-18 19:09:42 +01:00
Proddy 4504f25016 Merge pull request #613 from hpanther/dev 
Updates to the solar device to handle configuration-related telegrams
 2020-11-17 17:50:00 +01:00
Proddy 6065152e40 Merge pull request #607 from MichaelDvP/dev 
as mentioned in #606
 2020-11-14 00:13:19 +01:00
Proddy b337e106e2 Merge branch 'dev' into dev 2020-11-14 00:13:11 +01:00
Proddy 366f8487a8 Delete weekly-digest.yml 2020-10-29 20:43:02 +01:00
Proddy e68e3a4055 Update bug_report.md 2020-10-29 20:41:50 +01:00
Proddy 33a9ccf7a7 Update questions---troubleshooting.md 2020-10-29 20:40:59 +01:00
Proddy 54b0435153 Delete weekly-digest.yml 2020-10-29 20:39:03 +01:00
Proddy e5f4f1c009 Delete EMS-ESP_check.yml 2020-10-29 20:38:33 +01:00
Proddy 13f8d33e7a Delete EMS-ESP_CI.yml 2020-10-29 20:36:21 +01:00
Proddy a91ba301c2 Delete EMS-ESP_build.yml 2020-10-29 20:36:14 +01:00
Proddy 76b8621b82 Delete EMS-ESP_cpp_make.yml 2020-10-29 20:35:46 +01:00
Proddy 9888ee715e Delete FIRMWARE.md 2020-10-29 20:35:25 +01:00
Proddy 15b752fcdf Merge pull request #577 from Neonox31/fix-devices-temperature-values-use-wrong-format-for-junkers-thermostats 
fix(devices): temperature values use wrong format for junkers thermostats
 2020-10-25 18:45:20 +01:00
Proddy 2fe165b767 Merge pull request #578 from MichaelDvP/dev 
add missing values and formatings
 2020-10-25 18:38:38 +01:00
Proddy 243a467234 Merge branch 'dev' into dev 2020-10-25 18:38:30 +01:00
Proddy 33bc3d5eed Merge pull request #576 from MichaelDvP/dev 
rename topics
 2020-10-25 16:14:13 +01:00
Proddy 4cffadcea2 Merge pull request #572 from MichaelDvP/dev 
fix sensor output on error
 2020-10-22 15:03:53 +02:00
Proddy 47678a69d5 Merge pull request #565 from MichaelDvP/dev 
sensornumbers and mqtt sensor formats
 2020-10-18 16:07:56 +02:00
Proddy e27160305c Merge branch 'dev' into dev 2020-10-18 16:06:12 +02:00
Proddy 7dca8dfe2d Merge pull request #552 from MichaelDvP/dev 
HA config mixing
 2020-10-11 18:56:00 +02:00
Proddy d74ebf8838 Merge pull request #551 from MichaelDvP/dev 
nested publish for mixing, nofrosttemp, designtemp, roominfluence
 2020-10-11 16:56:16 +02:00
Proddy ef9010436e Merge pull request #538 from MichaelDvP/dev 
remove mqtt custom, add thermostat wwtemps, mixing mqtt formats and a…
 2020-10-08 12:59:24 +02:00
Proddy fbd2ed4c39 Merge pull request #535 from MichaelDvP/dev 
small changes, suggestion for thermostat_data
 2020-10-04 19:26:43 +02:00
Proddy 61411a505e Merge pull request #532 from MichaelDvP/dev 
render and parse multible text parameters, add thermostat wwmode
 2020-10-03 21:28:45 +02:00
Proddy 239e51bc2e Merge branch 'dev' into dev 2020-10-03 21:26:09 +02:00
Proddy 6d02929cd9 Merge pull request #530 from Gert05/Gert05-Domoticz-plugin-v2.0 
Add files via upload
 2020-09-30 14:11:57 +02:00
Proddy 95bc089820 Merge pull request #529 from Gert05/Gert05-Domoticz-plugin-v2.0 
Add files via upload
 2020-09-30 13:12:33 +02:00
Proddy b74f99d009 Delete codeql-analysis.yml 2020-09-23 13:16:26 +02:00
Proddy 08df5166c8 only for dev branch 2020-09-20 19:58:32 +02:00
Proddy 0afd6786d2 removed 2020-09-15 21:31:25 +02:00
Proddy fead546d4b Merge pull request #491 from MichaelDvP/dev 
add dallas parasite setting (fix #490), sort settings page
 2020-09-11 14:03:59 +02:00
Proddy be67c42059 Merge pull request #487 from MichaelDvP/dev 
verify large offsets, readback setpoint roomtemp on `cmd:temp`
 2020-09-11 00:09:26 +02:00
Proddy f5c270bb23 Merge pull request #486 from MichaelDvP/dev 
Mixing MM100 fix pump/status, MM10 add valveStatus (-100%..100%)
 2020-09-09 11:47:29 +02:00
Proddy 6f2b1f4509 setup code scanning 2020-09-09 10:25:16 +02:00
Proddy 5d6a2a0deb Merge pull request #483 from MichaelDvP/dev 
add serviceCode change detect, show serviceCode in web
 2020-09-06 12:52:31 +02:00
Proddy a6488840fb Merge pull request #482 from MichaelDvP/dev 
Change for #408 and #476
 2020-09-05 21:10:27 +02:00
Proddy b13bfd3166 Merge pull request #481 from MichaelDvP/dev 
suggestion for #477
 2020-09-05 11:39:12 +02:00
Proddy f2073aa93a Merge pull request #480 from MichaelDvP/dev 
Fix MM100 wwc names (#479) and `cmd:temp` for some thermostats (#478)
 2020-09-04 12:43:52 +02:00
Proddy d6c6c7183e Merge pull request #473 from MichaelDvP/dev 
Fix #467 and master thermostat check
 2020-08-30 16:10:35 +02:00
Proddy a686bc269a Update README.md 
fix firmware URL
 2020-08-30 10:01:39 +02:00
Proddy ba96aa7645 Merge pull request #459 from MichaelDvP/v2_cmd 
menu item highlighting
 2020-08-19 10:45:24 +02:00
Proddy d9f61923c4 Merge pull request #458 from MichaelDvP/v2_cmd 
sensor fix buffer overflow
 2020-08-17 17:57:01 +02:00
Proddy 51807f2678 Merge pull request #457 from MichaelDvP/v2_cmd 
Junkers values as mentioned in #445, save some memory for remote ther…
 2020-08-17 11:44:24 +02:00
Proddy 53ce2105eb Merge pull request #455 from MichaelDvP:v2_cmd 
V2 cmd
 2020-08-14 09:45:39 +02:00
Proddy ddbd19c031 Merge pull request #450 from joanwa/v2 
solar modules: heat exchanger temperature sensor and cylinder primary pump modulation
 2020-08-04 18:57:21 +02:00
Proddy 56c4e043fe Merge pull request #448 from MichaelDvP/v2 
V2 sensor fix esp32
 2020-08-03 10:40:47 +02:00
Proddy 277f12197c Merge pull request #446 from MichaelDvP/v2 
V2
 2020-08-02 08:07:29 +02:00
Proddy ab8e873ab4 Merge pull request #442 from MichaelDvP/v2 
Fix #441
 2020-07-30 21:20:27 +02:00
Proddy 5bad7accf0 Merge pull request #430 from MichaelDvP/v2 
uart as measured in https://github.com/proddy/EMS-ESP/issues/398
 2020-07-21 21:00:22 +02:00
Proddy e9ef79a7c4 local copyu of 1-wire 2020-07-21 15:01:40 +02:00
Proddy 95b2af6cbb Merge pull request #423 from MichaelDvP/web 
some small fixes
 2020-07-07 18:06:40 +02:00
Proddy 991c0f2601 Merge pull request #419 from MichaelDvP/v2 
V2
 2020-07-05 17:46:15 +02:00
Proddy d95da39d5e Merge pull request #417 from MichaelDvP:v2 
V2
 2020-07-01 19:59:42 +02:00
Proddy 4227ebe78e Merge pull request #411 from MichaelDvP/v2 
set first active hc for mqtt and terminal commands, some fixes for #410
 2020-06-25 11:55:38 +02:00
Proddy ff402b2d1f Merge pull request #407 from MichaelDvP/v2 
fix fluctuating bitvalues, fix "send telegram", add solarpump softsta…
 2020-06-23 13:57:01 +02:00
Proddy 65f9e51e95 Merge pull request #406 from MichaelDvP/v2 
RC300 show only active hc, summermode and setpoint
 2020-06-22 16:20:06 +02:00
Proddy 9566f86ac9 Merge pull request #405 from MichaelDvP/v2 
do not call shell while sending
 2020-06-21 18:00:43 +02:00