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
1,131 Commits 6 Branches 30 Tags
7253299469a28c3b8b93a49fc360ad8656be16d3
Commit Graph
57 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 cb35277b07 Merge pull request #276 from MichaelDvP/MM10 
MM10 mixer dat added, fixes #270
 2019-12-30 14:48:53 +00: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 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 6a72deffd2 Update README.md 2019-10-14 13:16:00 +02:00
Proddy cda27cb12e Update README.md 2019-10-14 10:16:40 +02:00
Proddy 59f1aade56 Update README.md 2019-10-14 10:14:52 +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 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 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 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
Proddy 2b6a4f7ae0 Merge pull request #40 from geezerrr/patch-1 2019-01-22 16:59:38 +01:00
Proddy b51018c43a Merge pull request #33 from SpaceTeddy/master 
RC35: MQTT day/night/auto mode; sets setpoint temperature in type 0x3D depends on current night/day Mode
 2019-01-12 14:47:15 +01:00
Proddy 30deb03e58 Delete rename_fw.py 2019-01-10 16:39:27 +01:00
Proddy c2c7876628 Delete checkcode.py 2019-01-10 16:39:18 +01:00
Proddy 53b7531bdd Merge pull request #20 from Bonusbartus/master 
made some changes to make detecting tapwater active easier. might also make the gas calculation possible?
 2018-12-28 22:37:16 +01:00
Proddy a172546203 Merge pull request #16 from codacy-badger/codacy-badge 
Add a Codacy badge to README.md
 2018-12-25 13:21:20 +01:00
Proddy d2d3e3db8b Update issue templates 2018-12-23 14:28:58 +01:00
Proddy d3a07d22b5 Created new LICENSE 2018-12-23 13:56:03 +01:00
proddy 2617bcd628 Delete .clang-format 2018-05-16 09:07:16 +02:00
proddy f24c3664e9 Delete .travis.yml 2018-05-16 09:06:11 +02:00
proddy 20f946fef3 Delete extra_script.py 2018-05-16 09:06:02 +02:00
proddy ec6c9f2da0 Delete Bug_report.md 2018-05-16 08:58:24 +02:00
proddy 049a4c6e0e Delete Feature_request.md 2018-05-16 08:58:17 +02:00
proddy 0c6cb280e9 Update issue templates 2018-05-15 20:42:34 +02:00
proddy d6a27e5846 Merge pull request #1 from proddy/add-code-of-conduct-1 
Create CODE_OF_CONDUCT.md
 2018-05-15 20:38:21 +02:00
proddy 45eedc7ff9 Create CODE_OF_CONDUCT.md 2018-05-15 20:38:09 +02:00
proddy 58ca5c176e Delete README.md 2018-05-14 07:50:00 +02:00
proddy 7b0208fa47 Delete LICENSE 2018-05-14 07:49:53 +02:00
proddy e7af1fba76 Initial commit 2018-03-29 08:35:27 +02:00