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
5,382 Commits 6 Branches 30 Tags
d2523fc5d224322c8c4725f81be820cd7b7fc6df
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Proddy d15de88065 Merge pull request #1202 from MichaelDvP/dev2 
github action
 2023-07-03 08:48:24 +02:00
Proddy 2663bc15f4 Merge pull request #1201 from MichaelDvP/dev2 
Merge dev2
 2023-07-02 15:43:16 +02:00
Proddy 449bb4055c Merge pull request #1200 from proddy/dev-alova 
Dev alova - #1112
 2023-07-02 13:09:01 +02:00
Proddy 43dc177a6d Merge pull request #1189 from emsesp/dev_fix 2023-06-04 16:41:39 +02:00
Proddy 46578dbe69 Update roboto.css - fix typo 2023-06-04 12:18:05 +02:00
Proddy d9c2fe0fb9 Merge pull request #1186 from proddy/dev 
suppress lint warning with make
 2023-06-03 11:12:51 +04:00
Proddy ee0e6ed29f Merge pull request #1185 from proddy/dev 
minor updates
 2023-06-03 10:09:59 +04:00
Proddy 26b873da9e Merge pull request #1184 from emsesp/dev-fix 
fix #1182
 2023-05-31 23:18:48 +04:00
Proddy 53c8d9372e Merge pull request #1180 from pswid/dev 2023-05-30 23:04:58 +04:00
Proddy d314e1d050 Merge pull request #1181 from emsesp/dev-fix 2023-05-30 23:03:13 +04:00
Proddy 4a3201f194 Merge pull request #1177 from proddy/dev 
formatting
 2023-05-27 09:43:41 +02:00
Proddy 06e3c0a41f Merge pull request #1176 from MichaelDvP/dev 
AM20, HIU, Ventilation and other
 2023-05-27 08:39:48 +02:00
Proddy 2d70f637c9 Merge pull request #1175 from proddy/dev 
Table sizes
 2023-05-25 20:20:52 +02:00
Proddy cf042271c3 Merge branch 'emsesp:dev' into dev 2023-05-25 20:20:26 +02:00
Proddy 0c1042abc9 Merge pull request #1162 from proddy/dev 
web render update - #1116
 2023-05-24 20:42:36 +02:00
Proddy c3e5e8d6d1 Merge branch 'dev' into dev 2023-04-23 01:05:36 +02:00
Proddy 6f155fab0b Merge pull request #1159 from MichaelDvP/dev 
add writeable setting to custom entities
 2023-04-15 18:32:50 +02:00
Proddy 79bff902e1 Merge pull request #1154 from proddy/dev 
standalone compile issues
 2023-04-06 21:20:42 +02:00
Proddy 0c8a7d51a8 Merge pull request #1151 from MichaelDvP/dev 
Custom telegram handler #1079
 2023-04-06 21:08:28 +02:00
Proddy 05e1bbf86b Merge branch 'dev' into dev 2023-04-06 21:08:18 +02:00
Proddy 004ec92d68 Merge pull request #1153 from proddy/dev 
minor updates, can't remember what
 2023-04-06 20:56:53 +02:00
Proddy 24eccf1e04 Merge branch 'emsesp:dev' into dev 2023-04-02 16:14:01 +02:00
Proddy 1673acd537 Merge pull request #1149 from pswid/dev 
fixed PL and NO translation of "haclimate"
 2023-04-02 10:57:48 +02:00
Proddy d993b356f9 Merge pull request #1150 from minusdreidb/dev 
Fix #1147 - Exhaust temperature always zero on GB125/MC110/RC310
 2023-04-02 10:43:35 +02:00
Proddy 17b108597e Merge pull request #1145 from MichaelDvP/dev 
revert another wrong translation
 2023-03-25 11:12:33 +01:00
Proddy 904403f8fa Merge pull request #1142 from MichaelDvP/dev 
fixes
 2023-03-24 20:32:16 +01:00
Proddy ddad1bbe09 Merge pull request #1141 from proddy/dev 
minor fixes
 2023-03-24 13:36:26 +01:00
Proddy 0674426d29 Merge pull request #1139 from proddy/dev 
use number as table id's - #1126
 2023-03-24 12:14:17 +01:00
Proddy 80ec86361a Merge pull request #1138 from Vikingn/dev 
Norwegian translations added again
 2023-03-24 12:13:56 +01:00
Proddy 274855a19e Merge branch 'emsesp:dev' into dev 2023-03-23 20:40:15 +01:00
Proddy d26d2ae556 Merge pull request #1137 from pswid/dev 
improve view of settings pages (app and mqtt)
 2023-03-23 20:37:06 +01:00
Proddy 93d68996b4 Merge pull request #1128 from MichaelDvP/dev 2023-03-18 14:17:19 +01:00
Proddy e46c5263d9 Merge pull request #1124 from MichaelDvP/dev 
fix device icons in dashboard
 2023-03-15 12:36:08 +01:00
Proddy 0c9c15f854 Merge pull request #1123 from MichaelDvP/dev 
fix translations for EMSESP_EN_ONLY, EMSESP_DE_ONLY
 2023-03-15 08:22:09 +01:00
Proddy 432220dc86 Merge pull request #1122 from proddy/dev 
update ArduinoJson to 6.21.0
 2023-03-14 22:06:17 +01:00
Proddy bac266eadc Merge pull request #1121 from MichaelDvP/dev 
some small fixes
 2023-03-14 18:17:37 +01:00
Proddy 2c572f8099 Merge pull request #1119 from pswid/dev 
fix: tags in names in HA were not translated
 2023-03-14 09:12:15 +01:00
Proddy 354741a81d Merge pull request #1117 from proddy/dev 
add EMSESP_EN_ONLY and EMSESP_DE_ONLY to be safe
 2023-03-12 11:15:57 +01:00
Proddy 1e1baa9781 Update sonar_check.yml 2023-03-12 10:59:22 +01:00
Proddy 94678a6726 Merge pull request #1114 from proddy/dev 
#1112 - web optimizations
 2023-03-12 08:49:45 +01:00
Proddy ae890dab37 Merge pull request #1113 from proddy/dev 
rollback notistack to 2.0.8 so it fits flash
 2023-03-10 17:25:57 +05:30
Proddy c16b9968e1 Merge pull request #1108 from proddy/dev 
fix standalone
 2023-03-08 12:01:24 +05:30
Proddy e1e8c1064a Merge pull request #1107 from MichaelDvP/dev 
add thermostat names, missing turk locale
 2023-03-08 11:49:36 +05:30
Proddy 94ff01bf2c Merge pull request #1106 from pswid/dev 
Polish translation update
 2023-03-08 11:48:57 +05:30
Proddy 8d437c31ce Merge pull request #1105 from MichaelDvP/dev 
scheduler and fixes
 2023-03-06 19:45:52 +01:00
Proddy cdb64a4c15 Merge pull request #1103 from proddy/dev 
#701 scheduler web dialog updates
 2023-03-05 18:28:33 +01:00
Proddy dd200f6d34 Merge pull request #1101 from MichaelDvP/dev 
some case and nullptr checks
 2023-03-04 18:43:08 +01:00
Proddy aba870f0ba Merge pull request #1099 from MichaelDvP/dev 
mqtt/commands for scheduler
 2023-03-04 16:03:34 +01:00
Proddy 78c4a646d2 Merge pull request #1097 from emsesp/fix_RC35Monitor 
fix RC35Monitor active detection
 2023-03-04 11:23:41 +01:00
Proddy f1bb2c75a6 Merge pull request #1095 from proddy/dev 
fix routing issue
 2023-03-03 18:09:52 +01:00
Proddy 666da8d4e3 Merge pull request #1094 from proddy/dev 
edit name from dialog
 2023-03-02 17:15:54 +01:00
Proddy ad936c7f6c Merge pull request #1093 from proddy/dev 
add name as unique id - #701
 2023-03-01 21:50:35 +01:00
Proddy d2c5ae8aa9 Merge pull request #1090 from proddy/dev 
remove project router, make everything from root
 2023-02-28 18:52:01 +01:00
Proddy c8ea1d0c8a Merge pull request #1088 from proddy/dev 
show name not number in device dialog info box
 2023-02-28 17:52:32 +01:00
Proddy e29bc4e56a Merge pull request #1085 from MichaelDvP/dev 
add TR (some translations still missing) #907
 2023-02-28 08:43:12 +01:00
Proddy 77e85f02de Merge pull request #1084 from proddy/dev 
merge with tech-upgrade
 2023-02-27 16:44:50 +01:00
Proddy 4d496de488 Merge pull request #1082 from MichaelDvP/tech-upgrade 
schedule commands timing, retry
 2023-02-27 13:53:49 +01:00
Proddy 31bfc5388c Merge branch 'tech-upgrade' into tech-upgrade 2023-02-27 13:49:02 +01:00
Proddy a6a1d44204 Merge pull request #1075 from MichaelDvP/tech-upgrade 
HA config recreate #1067
 2023-02-21 15:37:42 +01:00
Proddy 050ecd9290 Merge pull request #1069 from MichaelDvP/tech-upgrade 
fix for #1067 and ems-esp restarting
 2023-02-20 19:03:43 +01:00
Proddy 4f91c78b4f Merge pull request #1068 from MichaelDvP/tech-upgrade 
fix for #1067
 2023-02-20 18:10:20 +01:00
Proddy ff1cf12e0c Merge pull request #1038 from proddy/dev 
3.5.1
 2023-02-19 11:29:46 +01:00
Proddy bb6e2b9336 Update CHANGELOG_LATEST.md 2023-02-06 22:34:08 +01:00
Proddy d0166f7f12 Update CHANGELOG.md 2023-02-06 22:33:16 +01:00
Proddy 6a1bc00f04 Merge pull request #949 from proddy/dev 
3.6.0-dev.0
 2023-02-06 22:17:12 +01:00
Proddy de40cb8920 Merge pull request #948 from proddy/dev 
prepare 3.5.0
 2023-02-06 21:29:00 +01:00
Proddy 0b02bb417a Merge pull request #947 from MichaelDvP/dev 
add boiler pump operating mode #944, dev.18
 2023-02-06 21:09:13 +01:00
Proddy e66e2c40a6 Merge pull request #941 from proddy/dev 
minor cleanup
 2023-02-04 14:09:20 +01:00
Proddy 8182b0e95a Merge pull request #940 from MichaelDvP/dev 
Entitiy blacklist (remove from mem, #891) and RC20/30 modes/seltemps #932
 2023-02-04 13:53:21 +01:00
Proddy 6b7da4068c Merge pull request #939 from pswid/dev 
added hyperlink to the EMS-ESP web interface in Home Assistant (IPv4)
 2023-01-30 20:21:32 +01:00
Proddy 887d53528b Merge pull request #937 from proddy/dev 
fix dump_value_info()
 2023-01-30 09:29:13 +01:00
Proddy 33bcb54aaf Merge pull request #936 from pswid/dev 
fixed 1/0 and true/false MQTT/API format options with HA enabled (#931)
 2023-01-30 08:26:17 +01:00
Proddy 74b961ab29 Merge pull request #935 from proddy/dev 
update packages, minor bug in
 2023-01-29 12:17:53 +01:00
Proddy 381afcbb6d Merge pull request #929 from pswid/dev 
PL translation update
 2023-01-28 15:48:22 +01:00
Proddy ede8e7dfce Merge pull request #926 from mvjt/dev 
Additional SV translations#2
 2023-01-22 21:17:53 +01:00
Proddy 9d155d6a0e Merge pull request #927 from proddy/dev 
HA use box for numbers now that HA supports this
 2023-01-22 19:10:12 +01:00
Proddy dd338f5f4b Merge pull request #925 from mvjt/dev 
Additional SV translations
 2023-01-22 17:03:33 +01:00
Proddy 68215f37f5 Merge pull request #924 from proddy/dev 
preparing for 3.5.0 stable
 2023-01-22 13:31:30 +01:00
Proddy 78e6263a2e Merge pull request #923 from MichaelDvP/dev 
fixes and the tested heatpump/heatsource entities
 2023-01-22 13:06:23 +01:00
Proddy 485195e035 Merge pull request #901 from pswid/dev 
added dhw alternating operation
 2023-01-22 10:12:47 +01:00
Proddy b4362a4539 Merge pull request #909 from MichaelDvP/tech-upgrade 
weblog send queue one by one, no json buffer needed
 2023-01-19 16:06:36 +01:00
Proddy 88404bcb56 Merge pull request #887 from proddy/dev 
README update and one change to api_data
 2023-01-05 16:04:01 +01:00
Proddy 74acf2fe0f Merge pull request #885 from proddy/dev 
#872
 2023-01-05 09:45:55 +01:00
Proddy d2e64468d5 Merge pull request #876 from proddy/dev 
Fix Swedish - #874 and #875
 2023-01-01 17:46:46 +01:00
Proddy 6c09134552 Merge pull request #866 from proddy/dev 
add test for #865
 2022-12-30 18:45:11 +01:00
Proddy 2db99a3e32 Merge pull request #864 from proddy/dev 
fix again for #828
 2022-12-30 15:35:01 +01:00
Proddy f055e53987 Merge pull request #858 from proddy/dev 
fix for #828 - show thermostat hc1 and mixer wwc
 2022-12-30 11:48:01 +01:00
Proddy d41e634611 Merge pull request #856 from MichaelDvP/dev 
HA firstrun only delete config, create HA in next loop (mqtt queue)
 2022-12-28 21:05:07 +01:00
Proddy c788f53bb9 Merge pull request #854 from mvjt/dev 
Additional SE translations
 2022-12-28 18:07:56 +01:00
Proddy c4c341922b Merge pull request #851 from proddy/dev 
#828 dump all out entities (standalone only)
 2022-12-28 15:41:07 +01:00
Proddy bb94d56bd0 Merge branch 'emsesp:dev' into dev 2022-12-27 21:19:11 +01:00
Proddy 14f3d9ab12 Merge pull request #849 from MichaelDvP/dev 
fix #846, #848, remove double values hpsuctionGas/hpHotGas, stick to hpTr5/hpTr6
 2022-12-27 21:16:58 +01:00
Proddy 9b66b02e46 Merge branch 'emsesp:dev' into dev 2022-12-27 17:26:00 +01:00
Proddy f53fd74873 Merge pull request #845 from MichaelDvP/dev 
fix copy/paste error
 2022-12-27 11:49:23 +01:00
Proddy ba03add3d3 Merge pull request #842 from MichaelDvP/dev 
fix #841
 2022-12-27 10:27:37 +01:00
Proddy d08a1224e2 Merge pull request #840 from proddy/dev 
added version upgrade/downgrade #832
 2022-12-26 15:07:55 +01:00
Proddy 291da3f7fe Merge pull request #836 from MichaelDvP/dev 
fixes and enhancements #826, #835, #820
 2022-12-24 17:03:01 +01:00
Proddy 290890f6e7 Merge pull request #830 from proddy/dev 
#822 and #829
 2022-12-24 08:09:44 +01:00
Proddy 9802581301 Merge pull request #827 from pswid/dev 
Polish translation update
 2022-12-23 08:01:13 +01:00
Proddy d6de0f6fa8 Merge pull request #825 from pswid/dev 
added "compressor temp." for more hp types
 2022-12-21 09:27:31 +01:00