andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 13:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,788 Commits 6 Branches 30 Tags
18421d3d1ec930de6924c59f9313c023da8770d3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Proddy 05161e7a39 Merge pull request #402 from MichaelDvP/v2 
Uart mode 5
 2020-06-19 20:29:38 +02:00
Proddy fdd1c117d6 Merge pull request #401 from MichaelDvP/v2 
fix for #397
 2020-06-17 17:28:25 +02:00
Proddy 3c8f2aff8a Merge branch 'v2' into v2 2020-06-17 17:28:09 +02:00
Proddy 15aa7d72db Merge pull request #400 from MichaelDvP/v2 
updated uart
 2020-06-16 15:11:01 +02:00
Proddy e346e0521f Merge pull request #399 from MichaelDvP/v2 
Uart and small fixes
 2020-06-14 13:50:15 +02:00
Proddy 685c97bb22 Merge pull request #396 from MichaelDvP/v2 
uart response
 2020-06-06 14:10:58 +02:00
Proddy 514d535aa1 Merge pull request #394 from MichaelDvP/v2 
Add a virtual room controller
 2020-06-04 20:49:35 +02:00
Proddy 9fe21c42b9 Merge pull request #393 from MichaelDvP/v2 
Terminal values/commands boiler and thermostat
 2020-06-03 18:46:35 +02:00
Proddy 14b7e80506 Merge pull request #392 from MichaelDvP/v2 
V2
 2020-06-03 12:18:16 +02:00
Proddy 1a5be8e404 Merge pull request #376 from MichaelDvP/SM_energy 
SM200 energy to 32 bit, fixes #372
 2020-04-28 18:46:03 +02:00
Proddy 2eefb7a688 Merge pull request #366 from MichaelDvP/RC20N 
new Rc20, fix #361
 2020-04-22 16:20:14 +02:00
Proddy e0dd9b4068 Merge branch 'dev' into RC20N 2020-04-22 16:19:51 +02:00
Proddy 2545361984 Merge pull request #352 from ypaindaveine/dev 
Added retrieving settings (0xA5) (validated on RC30N), and MQTT cmd t…
 2020-03-23 11:30:26 +01:00
Proddy f626e0a004 Merge pull request #338 from ypaindaveine/dev 
Dev
 2020-03-01 16:46:53 +01:00
Proddy bcd80cb1ec Update README.md 2020-02-07 12:30:39 +01:00
Proddy 06305e85f9 Update README.md 2020-02-07 12:29:31 +01:00
Proddy 4d60a5c732 Merge pull request #319 from MichaelDvP/dev 
revert back subscription of only active heating circuits
 2020-02-02 10:39:40 +01:00
Proddy 97343c3998 Merge pull request #315 from MichaelDvP/MM10 
MM200 added (#299)
 2020-01-30 20:48:32 +01:00
Proddy 8f564ab1f7 fix link to supported devices 2020-01-16 10:30:56 +01:00
Proddy 05ed1e74b5 Update README.md 2020-01-16 10:29:51 +01:00
Proddy f3f1f23b83 Update README.md 2020-01-16 10:28:55 +01:00
Proddy bf12ef313c Delete FUNDING.yaml 2020-01-12 20:59:17 +01:00
Proddy 89f3ce98a1 Create FUNDING.yml 2020-01-12 20:59:07 +01:00
Proddy e3940c3797 Create FUNDING.yaml 
keeping in sync with master
 2020-01-12 20:58:21 +01:00
Proddy e4cf074c66 Create weekly-digest.yml 2020-01-12 20:56:18 +01:00
Proddy d58b50225f Create weekly-digest.yml 2020-01-12 20:55:21 +01:00
Proddy 16e3fc4499 Update README.md 2020-01-11 14:36:19 +01:00
Proddy 2e4b1a985c Update README.md 2020-01-09 15:55:49 +01:00
Proddy f1373b6c04 Update README.md 2020-01-09 15:47:53 +01:00
Proddy e36dc26f78 Update README.md 2020-01-09 15:46:37 +01:00
Proddy 7c50464133 Delete list.txt 2020-01-09 15:39:54 +01:00
Proddy 35a62fdb89 Update index.html 2020-01-09 15:38:01 +01:00
Proddy b7b7764949 Update index.html 2020-01-09 15:36:15 +01:00
Proddy d66acc3100 Create .nojekyll 2020-01-09 15:33:24 +01:00
Proddy 95bcdf3494 Create index.html 2020-01-09 15:20:56 +01:00
Proddy cb35277b07 Merge pull request #276 from MichaelDvP/MM10 
MM10 mixer dat added, fixes #270
 2019-12-30 14:48:53 +00:00
Proddy 5215d93199 Create FUNDING.yml 2019-11-23 08:19:01 +01:00
Proddy 865ce453f5 Add files via upload 2019-11-19 23:56:32 +01:00
Proddy 666b35d112 Merge pull request #233 from SpaceTeddy/dev 
correct message offset for One time water loading
 2019-11-04 21:34:13 +01:00
Proddy 53ab810677 Update README.md 2019-10-29 18:13:49 +01:00
Proddy b243117fd0 Update README.md 2019-10-29 18:13:27 +01:00
Proddy 621e0932ba Merge pull request #225 from SpaceTeddy:dev 
PR: rename and tap water loading
 2019-10-28 20:06:21 +01:00
Proddy 1378dcf20d Update README.md 2019-10-14 13:33:30 +02:00
Proddy 4eec9ab030 Update README.md 2019-10-14 13:33:09 +02:00
Proddy 14aa1f6473 Update README.md 2019-10-14 13:32:47 +02:00
Proddy 6a72deffd2 Update README.md 2019-10-14 13:16:00 +02:00
Proddy 6ec436a28a Update README.md 2019-10-14 13:15:23 +02:00
Proddy 56b102751d Update README.md 2019-10-14 13:10:48 +02:00
Proddy cda27cb12e Update README.md 2019-10-14 10:16:40 +02:00
Proddy 5ff86fb8e3 Update README.md 2019-10-14 10:16:12 +02:00
Proddy 59f1aade56 Update README.md 2019-10-14 10:14:52 +02:00
Proddy 4fc0512ddd Update issue templates 2019-10-13 12:58:15 +02:00
Proddy 460b5fdb61 Merge pull request #207 from peclik:dev 
more values published over MQTT
 2019-10-11 09:04:54 +02:00
Proddy f6d9fe9a85 Merge pull request #202 from kstaniek:MM100 
Added pump modulation and valve status
 2019-10-06 22:24:14 +02:00
Proddy 6faf7b02c8 Merge pull request #199 from kstaniek:MM100 
MM100 EMS+ Status Message support added
 2019-10-06 20:30:46 +02:00
Proddy 79c4337cc9 Merge pull request #197 from Neonox31:1-feat-thermostats-display-mode-for-fw100-and-fw120-thermostats 
feat(thermostats): display mode for FW100 and FW120 thermostats
 2019-10-06 20:19:04 +02:00
Proddy 70f38fd53f Merge pull request #196 from kstaniek:dev 
Add switch temperature
 2019-10-06 11:50:30 +02:00
Proddy b9360fdc60 added badges 2019-09-23 21:30:16 +02:00
Paul 143e5927ff Delete package-lock.json 2019-09-01 13:53:46 +02:00
Paul 0f78404966 Merge pull request #166 from Neonox31:fix-FW120-erroneous-setpoint-temperature-display 
fix(FW120): erroneous setpoint temperature display
 2019-08-10 22:01:00 +02:00
Proddy 807d1dee0d Merge pull request #164 from reenx:fix_currtemp 
fix curr temp when higher than 25.5
 2019-07-25 09:58:20 +02:00
Proddy df5f94d11c Merge pull request #139 from Vuego123:AddValueForSolarPumpWorkingTime 
Add value for solar pump working time
 2019-06-28 10:36:51 +02:00
Proddy a6a03e6485 Merge pull request #137 from Vuego123/SolarLogginOnly&BugfixSolar 
SolarLoggingOnly&Bugfix
 2019-06-26 11:45:21 +02:00
Proddy f29c5ea9a8 added devices 2019-06-20 10:55:10 +02:00
Proddy fbba74b67d Merge pull request #135 from Vuego123:SplitSolarModuleFromOther 
Split solar module from other devices
 2019-06-20 09:20:34 +02:00
Proddy 61100ace61 Merge pull request #131 from Vuego123:AddedExtraValuesForJunkersISM1 
Added extra values for ISM1
 2019-06-16 16:31:43 +02:00
Proddy 332461c1de Merge pull request #130 from Vuego123:bugfix-FR10-&-FW100-wrong-temp.-divider 
FW100 & FR10 fixed wrong temperature divider
 2019-06-11 22:28:41 +02:00
Proddy 25f79fb0ad Merge pull request #121 from Vuego123:Added-Solar-Module-Junkers-ISM1 
Solar Module Junkers ISM1
 2019-06-08 17:20:05 +02:00
Proddy 7fc1616066 Merge pull request #128 from Vuego123:Added-Thermostat-Junkers-FW100 
Added support for Junkers FW100
 2019-06-08 17:16:20 +02:00
Proddy 1db788afa2 Merge pull request #119 from susisstrolch/dev 
Fixed tx_mode=2
 2019-05-27 14:31:34 +02:00
Proddy fae9f2a8af Merge pull request #113 from susisstrolch/smart-tx 
smart tx - try to fix Tx problems
 2019-05-21 23:41:18 +02:00
Proddy 4e1b0a2842 Set theme jekyll-theme-slate 2019-05-03 13:28:41 +02:00
Proddy a305de6f2b Update README.md 
refer to wiki
 2019-05-01 10:12:07 +02:00
Proddy 9253b7b233 Merge pull request #97 from rknall/dev 
Fixing typo in thermostat configuration
 2019-04-16 23:15:07 +02:00
Proddy 55fb2af5b2 Merge pull request #90 from Xeyame/dev 
Some Fixes for HomeAssistant
 2019-04-05 23:37:53 +02:00
Proddy 20794c5495 Merge pull request #78 from gl3nni3/master 
Ems plus support for the nefit 1010
 2019-04-05 12:48:19 +02:00
Proddy 1cfdd23434 typo 2019-03-19 11:21:48 +01:00
Proddy f965870dc7 Merge pull request #58 from egrekov:master 
Change boiler wwtemp via MQTT
 2019-02-23 14:47:52 +01:00
Proddy 12ddee7b10 Merge pull request #53 from Gert05:master 
Python plugin for Domoticz
 2019-02-20 22:22:18 +01:00
Proddy a18580c997 Merge pull request #41 from geezerrr/patch-2 2019-01-22 16:59:54 +01:00