 Proddy
|
af07572b1c
|
Merge pull request #1846 from proddy/dev
default shower detect start time 3 minutes (was 2)
|
2024-07-05 15:19:32 +02:00 |
|
|
Proddy
|
fb517d2521
|
Merge pull request #1845 from proddy/dev
github action update for forks (sonar) and test data cleanup
|
2024-07-04 21:56:35 +02:00 |
|
|
Proddy
|
503f7e8fbb
|
Merge branch 'emsesp:dev' into dev
|
2024-07-04 21:56:08 +02:00 |
|
|
Proddy
|
5f2e6280ac
|
Merge pull request #1844 from MichaelDvP/dev
rename remote sensor to avoid conflict CMD/INT16 in api/thermostat
|
2024-07-04 18:11:56 +02:00 |
|
|
Proddy
|
bab64a3ab3
|
Merge pull request #1843 from MichaelDvP/dev
remotetemp CMD, temperaturesensor id, controlsettings BC400, Boiler/HP
|
2024-07-04 16:52:18 +02:00 |
|
|
Proddy
|
6b6224dead
|
Merge pull request #1840 from mheyse/fix/check-parameter-order
fix: nullptr linter error
|
2024-07-04 10:02:31 +02:00 |
|
|
Proddy
|
a0ca1ce87c
|
Merge pull request #1839 from proddy/dev
minor updates for modbus
|
2024-07-03 22:40:54 +02:00 |
|
|
Proddy
|
9277efd1d7
|
Merge pull request #1832 from mheyse/feat/modbus
feat: add Modbus support
|
2024-07-03 22:14:37 +02:00 |
|
|
Proddy
|
217d90629a
|
Merge pull request #1834 from proddy/dev
Allow device name to be customized
|
2024-07-03 13:29:44 +02:00 |
|
|
Proddy
|
463fbd69c8
|
Merge pull request #1831 from proddy/dev
prep for modbus merge
|
2024-06-29 10:06:38 +01:00 |
|
|
Proddy
|
66470071f6
|
Merge pull request #1830 from MichaelDvP/dev
CR120 fixes #1779
|
2024-06-28 20:59:43 +01:00 |
|
|
Proddy
|
03e5834d59
|
Merge pull request #1802 from SLTKA/feature/pump-characteristic
|
2024-06-28 14:35:03 +01:00 |
|
|
Proddy
|
23fdfd4f26
|
Merge pull request #1829 from proddy/dev
ArduinoJson 7.1.0
|
2024-06-28 08:05:42 +01:00 |
|
|
Proddy
|
021cf8dd70
|
Merge branch 'emsesp:dev' into dev
|
2024-06-28 08:05:17 +01:00 |
|
|
Proddy
|
ffb91ce997
|
Merge pull request #1828 from MichaelDvP/dev
fixes device redetction, command id -1 #1779
|
2024-06-28 07:48:58 +01:00 |
|
|
Proddy
|
ae70ca2079
|
Merge pull request #1827 from proddy/dev
|
2024-06-27 15:12:23 +01:00 |
|
|
Proddy
|
95915611b5
|
Merge pull request #1825 from MichaelDvP/dev
Scheduler fixes and additions
|
2024-06-27 08:14:34 +01:00 |
|
|
Proddy
|
a4ad8f551a
|
Merge pull request #1821 from proddy/dev
minor changes
|
2024-06-25 09:53:21 +01:00 |
|
|
Proddy
|
c7759a71b4
|
Merge pull request #1820 from proddy/dev
export DeviceValues and format Device Values window
|
2024-06-24 20:53:07 +01:00 |
|
|
Proddy
|
e037c0753d
|
Merge pull request #1819 from proddy/dev
fix shower duration
|
2024-06-23 10:39:33 +01:00 |
|
|
Proddy
|
f417b6087b
|
Merge pull request #1818 from MichaelDvP/dev
update pkg, fix changes-number, sort by name(required)
|
2024-06-23 09:38:46 +01:00 |
|
|
Proddy
|
402498d7cb
|
Merge pull request #1817 from MichaelDvP/dev
|
2024-06-22 16:00:16 +01:00 |
|
|
Proddy
|
9098689136
|
Merge pull request #1816 from MichaelDvP/dev
|
2024-06-22 13:17:13 +01:00 |
|
|
Proddy
|
4b3d801312
|
Merge pull request #1814 from proddy/dev
minor cleanup, fix codacy
|
2024-06-21 13:52:32 +01:00 |
|
|
Proddy
|
345c7378ad
|
Merge pull request #1813 from MichaelDvP/dev
scheduler fixes, additions
|
2024-06-21 12:41:00 +01:00 |
|
|
Proddy
|
74506e1775
|
Merge pull request #1812 from MichaelDvP/dev
scheduler conditions
|
2024-06-20 22:21:52 +01:00 |
|
|
Proddy
|
d37e4d7e5f
|
Merge pull request #1811 from MichaelDvP/dev
Make remote timeout editable #1774, dev-16
|
2024-06-20 20:36:08 +01:00 |
|
|
Proddy
|
d8f989543e
|
Merge pull request #1810 from proddy/dev
sonar fix, shower max duration
|
2024-06-20 17:15:18 +01:00 |
|
|
Proddy
|
6ffc466dff
|
Merge pull request #1809 from proddy/dev
fix sonar again
|
2024-06-20 08:35:35 +01:00 |
|
|
Proddy
|
19c93e25ef
|
Merge pull request #1807 from proddy/dev
#1801 shower_duration_min
|
2024-06-20 08:17:16 +01:00 |
|
|
Proddy
|
912826d20e
|
Merge pull request #1805 from MichaelDvP/dev
add model() for CR120 for different modes
|
2024-06-17 18:51:25 +01:00 |
|
|
Proddy
|
55316334d4
|
Merge pull request #1803 from MichaelDvP/dev
fix #1800
|
2024-06-15 16:31:10 +02:00 |
|
|
Proddy
|
0b6f7527e5
|
Merge pull request #1799 from proddy/dev
add Makefile back so sonar tests run again
|
2024-06-14 23:19:18 +02:00 |
|
|
Proddy
|
9bfdb69012
|
Merge pull request #1798 from proddy/dev
formatting, fix MQTT HA
|
2024-06-14 12:33:44 +02:00 |
|
|
Proddy
|
74e0123475
|
Merge pull request #1793 from proddy/dev
Modules
|
2024-06-13 22:20:25 +02:00 |
|
|
Proddy
|
caa6a0b7ae
|
Merge pull request #1792 from proddy/feat_modules
Feat modules
|
2024-06-09 14:03:45 +02:00 |
|
|
Proddy
|
a1d61b4422
|
Merge branch 'emsesp:feat_modules' into feat_modules
|
2024-06-09 13:52:47 +02:00 |
|
|
Proddy
|
66ba2f3218
|
Merge pull request #1791 from proddy/feat_modules
Feat modules
|
2024-06-08 16:01:40 +02:00 |
|
|
Proddy
|
bc53c953e8
|
Merge branch 'emsesp:feat_modules' into feat_modules
|
2024-06-08 16:01:10 +02:00 |
|
|
Proddy
|
ec01dd7581
|
Merge pull request #1790 from proddy/feat_modules
Feat modules
|
2024-06-08 12:27:23 +02:00 |
|
|
Proddy
|
d63bab5982
|
Merge pull request #1788 from proddy/feat_modules
Feat modules
|
2024-06-04 17:21:36 +02:00 |
|
|
Proddy
|
354e9154c5
|
Merge pull request #1785 from proddy/feat_modules
Feat modules
|
2024-05-31 06:04:56 +02:00 |
|
|
Proddy
|
c8300a7a12
|
Merge pull request #1783 from MichaelDvP/dev
dev12, fixes #1774 (change timeout #1680 to 24h) and #1779
|
2024-05-30 22:04:17 +02:00 |
|
|
Proddy
|
9b983a8069
|
Merge pull request #1784 from proddy/feat_modules
Feat modules
|
2024-05-30 22:03:53 +02:00 |
|
|
Proddy
|
00528c8c6d
|
Merge branch 'emsesp:feat_modules' into feat_modules
|
2024-05-30 22:03:35 +02:00 |
|
|
Proddy
|
49bd11dd57
|
Merge pull request #1782 from proddy/feat_modules
Feat modules - add web
|
2024-05-30 18:24:07 +02:00 |
|
|
Proddy
|
44abbcbc22
|
Merge branch 'emsesp:feat_modules' into feat_modules
|
2024-05-30 18:23:35 +02:00 |
|
|
Proddy
|
b9fa689829
|
Merge pull request #1780 from proddy/feat_modules
Feat modules
|
2024-05-29 22:24:40 +02:00 |
|
|
Proddy
|
8ffed9fab7
|
Merge pull request #1769 from proddy/dev
small updates
|
2024-05-18 09:35:30 +02:00 |
|
|
Proddy
|
c8b0e07203
|
Merge branch 'emsesp:dev' into dev
|
2024-05-18 09:35:02 +02:00 |
|
|
Proddy
|
ab9241376b
|
Merge pull request #1763 from MichaelDvP/dev
fix missing vacation date #1712
|
2024-05-14 11:52:13 +02:00 |
|
|
Proddy
|
0b498633d3
|
Merge pull request #1762 from MichaelDvP/dev
fix timout switchoff #1680
|
2024-05-13 08:01:28 +02:00 |
|
|
Proddy
|
9acaf41564
|
Merge pull request #1761 from Bingo2023/patch-1
|
2024-05-10 18:23:23 +02:00 |
|
|
Proddy
|
f8050f3638
|
Merge pull request #1759 from MichaelDvP/dev
|
2024-05-10 15:15:39 +02:00 |
|
|
Proddy
|
24af84f27c
|
Merge pull request #1753 from proddy/dev
add corepack to tagged release
|
2024-05-08 20:43:05 +02:00 |
|
|
Proddy
|
11e887553d
|
Update pre_release.yml
|
2024-05-08 20:30:46 +02:00 |
|
|
Proddy
|
ff3dad26db
|
Merge pull request #1752 from proddy/dev
enable corepack
|
2024-05-08 20:26:58 +02:00 |
|
|
Proddy
|
24dc7489da
|
Merge pull request #1751 from proddy/dev
add back commented web build (was mistake)
|
2024-05-08 20:11:09 +02:00 |
|
|
Proddy
|
2e1b57dcdd
|
Merge pull request #1750 from proddy/dev
yarn updates
|
2024-05-08 19:59:42 +02:00 |
|
|
Proddy
|
660bc633da
|
Merge pull request #1748 from MichaelDvP/dev
dhw tag in HA format 3.4, fix #1747
|
2024-05-07 17:37:15 +02:00 |
|
|
Proddy
|
3bd0567f52
|
Merge pull request #1746 from MichaelDvP/dev
ipv6 permanent, shutdown command (fixed)
|
2024-05-07 10:14:05 +02:00 |
|
|
Proddy
|
9f4aef6d40
|
Merge pull request #1743 from proddy/dev
move esp status from settings page
|
2024-05-05 17:53:21 +02:00 |
|
|
Proddy
|
d829850fc9
|
Merge pull request #1742 from proddy/dev
move restart button to System menu
|
2024-05-05 13:02:03 +02:00 |
|
|
Proddy
|
8084b9141d
|
Merge pull request #1741 from MichaelDvP/dev
rego holiday and fix command with command as value, dev-10
|
2024-05-05 09:52:07 +02:00 |
|
|
Proddy
|
43777f4a15
|
Merge pull request #1739 from proddy/dev
Remove OTA feature #1738
|
2024-05-04 18:56:57 +02:00 |
|
|
Proddy
|
8c88c2ec38
|
Merge pull request #1736 from MichaelDvP/dev
some more id/tag changes
|
2024-05-03 14:01:20 +02:00 |
|
|
Proddy
|
35ee3776ca
|
Merge pull request #1733 from MichaelDvP/dev
fix show commands, add hp input states
|
2024-05-03 09:44:27 +02:00 |
|
|
Proddy
|
cce76c1769
|
Merge pull request #1731 from proddy/dev
fix unbuild flag
|
2024-05-01 22:29:34 +02:00 |
|
|
Proddy
|
14af4a0680
|
Merge pull request #1730 from MichaelDvP/dev
fix thermostat dhw commands #1692
|
2024-04-30 14:38:29 +02:00 |
|
|
Proddy
|
9ed554bef7
|
Merge pull request #1729 from proddy/dev
Dump Telegrams - #1728
|
2024-04-29 20:59:16 +02:00 |
|
|
Proddy
|
5da07db42d
|
Merge pull request #1727 from MichaelDvP/dev
fix compile for S3
|
2024-04-29 16:58:38 +02:00 |
|
|
Proddy
|
dfe56618f2
|
Merge pull request #1726 from MichaelDvP/dev
Compile with arduino 3.0
|
2024-04-29 14:11:06 +02:00 |
|
|
Proddy
|
abbf2e091b
|
Merge pull request #1722 from proddy/dev
small changes
|
2024-04-29 13:09:30 +02:00 |
|
|
Proddy
|
13e7a53e5e
|
Merge pull request #1721 from proddy/dev
progress bar and PL fixes
|
2024-04-26 20:40:25 +02:00 |
|
|
Proddy
|
444bd67f07
|
Merge branch 'emsesp:dev' into dev
|
2024-04-26 20:33:59 +02:00 |
|
|
Proddy
|
aeb10aa6ab
|
Merge pull request #1718 from pswid/dev
Polish translation update
|
2024-04-26 20:33:47 +02:00 |
|
|
Proddy
|
611f37bf2c
|
Merge pull request #1719 from MichaelDvP/dev
Thermostat dhw, mqtt, ..
|
2024-04-26 12:37:53 +02:00 |
|
|
Proddy
|
3270139b01
|
Merge pull request #1711 from MichaelDvP/dev
small fixes, check second dhw circuit
|
2024-04-24 13:51:42 +02:00 |
|
|
Proddy
|
b893b5d609
|
Merge pull request #1707 from MichaelDvP/dev
Rename DeviceValueTypes, add UINT32 for custom entities #1706
|
2024-04-22 19:06:36 +02:00 |
|
|
Proddy
|
01cd3c3587
|
Merge pull request #1705 from proddy/dev
web formatting
|
2024-04-21 21:53:04 +02:00 |
|
|
Proddy
|
66570e6f46
|
Merge branch 'dev' into dev
|
2024-04-21 15:29:19 +02:00 |
|
|
Proddy
|
cafa1cbc90
|
Merge pull request #1698 from MichaelDvP/dev
dhw circuits, fixes for remote, new entities
|
2024-04-21 15:11:03 +02:00 |
|
|
Proddy
|
e095f6bd97
|
Merge pull request #1694 from proddy/dev
web testing cleanup + Tasmota Arduino Core 2.0.15 with IPv6 support, based on IDF 4.4.7 / core 2.0.15
|
2024-04-11 22:08:47 +02:00 |
|
|
Proddy
|
85c8b663b1
|
Merge pull request #1685 from proddy/dev
fix test data (wrong icons in web)
|
2024-04-02 21:09:28 +02:00 |
|
|
Proddy
|
3359f87177
|
Merge pull request #1683 from proddy/dev
updated screenshots, faster log sync
|
2024-03-31 15:50:10 +02:00 |
|
|
Proddy
|
e02a731237
|
Merge pull request #1682 from proddy/dev
minor changes
|
2024-03-30 18:58:59 +01:00 |
|
|
Proddy
|
cd2afd02be
|
Merge pull request #1675 from MichaelDvP/dev2
update sk-language
|
2024-03-27 18:59:41 +05:30 |
|
|
Proddy
|
b7b09a8c93
|
Merge pull request #1674 from MichaelDvP/dev2
fix sk-language #1673, update pkg
|
2024-03-27 17:11:03 +05:30 |
|
|
Proddy
|
8ef8eeb9ec
|
Merge pull request #1672 from MichaelDvP/dev2
dev2 3.7.0-test, merge all changes from dev
|
2024-03-24 17:35:09 +01:00 |
|
|
Proddy
|
6cab020241
|
Merge pull request #1670 from proddy/dev
fix minor lint warnings
|
2024-03-24 09:45:53 +01:00 |
|
|
Proddy
|
6905abf9f4
|
Merge pull request #1669 from proddy/dev
sync issues
|
2024-03-23 22:11:15 +01:00 |
|
|
Proddy
|
8a66c056d8
|
Merge branch 'emsesp:dev' into dev
|
2024-03-23 19:24:29 +01:00 |
|
|
Proddy
|
800528f843
|
Merge pull request #1667 from proddy/dev
changes to web layout (status and settings)
|
2024-03-23 19:18:59 +01:00 |
|
|
Proddy
|
a6a60215d4
|
Merge branch 'dev' into dev
|
2024-03-23 19:18:54 +01:00 |
|
|
Proddy
|
2739712c5b
|
Merge pull request #1661 from MichaelDvP/dev
add telnet command to reboot to previous version #1657
|
2024-03-16 08:41:23 +01:00 |
|
|
Proddy
|
2efb9d18c9
|
Merge pull request #1662 from proddy/dev
small regression fixes from the last messy build I created (sorry!)
|
2024-03-13 18:51:50 +01:00 |
|
|
Proddy
|
e00c30cd4f
|
Merge pull request #1658 from proddy/dev
fix broken web - #1656
|
2024-03-12 23:15:14 +01:00 |
|
|
Proddy
|
27aa57da3c
|
Merge pull request #1655 from proddy/dev
fix compiling local test
|
2024-03-10 21:36:55 +01:00 |
|
|
Proddy
|
9ad80fc74d
|
Merge pull request #1653 from MichaelDvP/dev
CW100/RC100 controlmode, fix emsesp#1650
|
2024-03-10 21:17:34 +01:00 |
|
|
Proddy
|
7fc7c24a20
|
Merge pull request #1654 from proddy/dev
cleanup and making asyncWS cleaner
|
2024-03-10 21:17:21 +01:00 |
|