100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Proddy	d06465132c	Merge pull request #1943 from mattreim/dev ... Add German translation	2024-08-16 15:44:31 +02:00
Proddy	a8895290bc	Merge pull request #1942 from MichaelDvP/dev ... some small fixes	2024-08-16 15:33:33 +02:00
Proddy	1672cc84ef	Merge pull request #1931 from proddy/dev ... Web changes #1920	2024-08-16 13:49:32 +02:00
Proddy	cde8ba0e9e	Merge branch 'dev' into dev	2024-08-10 15:07:44 +02:00
Proddy	dc53ff42f6	Merge branch 'emsesp:dev' into dev	2024-08-07 09:30:51 +02:00
Proddy	f10d8757b8	Merge pull request #1928 from MichaelDvP/dev ... do not close local shell #1926	2024-08-07 09:30:39 +02:00
Proddy	d807f2fa21	Merge branch 'emsesp:dev' into dev	2024-08-07 09:30:05 +02:00
Proddy	0e8655862e	Merge pull request #1927 from mattreim/dev	2024-08-05 14:23:15 +02:00
Proddy	968cd7de5f	Merge branch 'emsesp:dev' into dev	2024-08-05 10:51:39 +02:00
Proddy	8e52af2338	Merge branch 'emsesp:dev' into dev	2024-08-05 07:00:45 +02:00
Proddy	38ae744a10	Merge pull request #1925 from mattreim/dev ... Fix modules translation	2024-08-05 06:00:53 +02:00
Proddy	a9bbbc025f	Merge branch 'emsesp:dev' into dev	2024-08-04 22:03:59 +02:00
Proddy	aa807c3b78	Merge pull request #1924 from mattreim/dev ... Add modules helper to i18n	2024-08-04 21:45:15 +02:00
Proddy	574f685d93	Merge pull request #1923 from mattreim/dev ... Added more German translation and google translation to boiler pump characteristic	2024-08-04 20:17:18 +02:00
Proddy	1f2f77b833	Merge pull request #1921 from MichaelDvP/dev ... switchProgMode offset 13 to 19, increase length of raw custom entities	2024-08-04 16:15:34 +02:00
Proddy	1a11aa50ac	Merge pull request #1919 from MichaelDvP/dev ... fix switchProgMode #1903	2024-08-04 14:58:33 +02:00
Proddy	9a23d4e2b3	Merge pull request #1914 from proddy/dev ... various changes, work in progress	2024-08-03 13:25:36 +02:00
Proddy	71183d81e5	Merge branch 'emsesp:dev' into dev	2024-08-03 13:24:54 +02:00
Proddy	276a19648e	Merge pull request #1917 from MichaelDvP/dev ... fix #1910 and small changes	2024-08-03 13:24:40 +02:00
Proddy	cd79e73693	Merge branch 'dev' into dev	2024-08-02 09:16:31 +02:00
Proddy	e109e383c0	Merge pull request #1913 from MichaelDvP/dev ... fix sonar complains	2024-08-02 09:13:30 +02:00
Proddy	d0b01812e6	Merge pull request #1912 from MichaelDvP/dev ... scheduler: change to std::string	2024-08-02 08:30:30 +02:00
Proddy	279d40636c	Merge pull request #1907 from MichaelDvP/dev ... refactor common commands	2024-08-01 19:25:54 +02:00
Proddy	ab06c53720	Merge pull request #1901 from proddy/dev ... updates to scheduler web	2024-07-28 19:50:29 +02:00
Proddy	4b136fb7ee	Merge pull request #1900 from proddy/dev ... updates to scheduler web ui for #1893	2024-07-28 09:27:05 +02:00
Proddy	0a7f3ae930	Merge pull request #1899 from MichaelDvP/dev ... scheduler single and fixes	2024-07-26 21:47:39 +02:00
Proddy	8f082dfd68	Merge pull request #1895 from proddy/dev ... some renaming, more logs	2024-07-26 13:33:03 +02:00
Proddy	593593d3bb	Merge pull request #1891 from proddy/dev ... camelCase, added free_caps to webUI, renamed EMSESPStatus endpoint to Hardware	2024-07-25 15:20:03 +02:00
Proddy	1b666a07dc	Merge pull request #1888 from proddy/dev ... fix system command	2024-07-24 17:59:59 +02:00
Proddy	bcd1b90bc5	Merge branch 'emsesp:dev' into dev	2024-07-23 18:58:07 +02:00
Proddy	dfe85b9ba7	Merge pull request #1885 from MichaelDvP/dev ... fix command prefix parsing #1884	2024-07-23 10:49:11 +02:00
Proddy	e90f80d690	Merge pull request #1883 from proddy/dev ... refactor web file structure and seperate settings from status	2024-07-23 10:28:49 +02:00
Proddy	60368a32c3	Merge branch 'emsesp:dev' into dev	2024-07-22 14:46:44 +02:00
Proddy	9c20e93b3c	Merge pull request #1881 from proddy/dev ... add back button	2024-07-21 19:14:44 +02:00
Proddy	152b7bdee2	Merge pull request #1880 from proddy/dev ... fix downloading of 16M firmware bins	2024-07-21 14:45:11 +02:00
Proddy	169e8be5ee	Merge pull request #1879 from proddy/dev ... fixes to api	2024-07-21 13:00:28 +02:00
Proddy	55476a7828	Merge pull request #1877 from MichaelDvP/dev ... schedule onChange optimize queue	2024-07-21 09:27:18 +02:00
Proddy	e4decb53b0	Merge pull request #1876 from MichaelDvP/dev ... scheduler async, command use string, lowercase	2024-07-20 20:15:31 +02:00
Proddy	d35dd1a9c4	Merge pull request #1875 from proddy/dev ... add test for URI in scheduler	2024-07-20 16:32:11 +02:00
Proddy	87548f9322	Merge pull request #1874 from proddy/dev ... web updates and scheduler	2024-07-20 15:49:55 +02:00
Proddy	a0ba0e8af9	Merge pull request #1873 from MichaelDvP/dev ... Scheduler web access and others	2024-07-20 09:47:17 +02:00
Proddy	5603360aab	Merge pull request #1872 from proddy/dev ... more minor changes	2024-07-19 13:51:37 +02:00
Proddy	5b4d392640	Merge pull request #1869 from MichaelDvP/dev ... add RT800 remote #1867, use ems_bus_id for raw telegrams if src is not set(0)	2024-07-18 14:54:15 +02:00
Proddy	a7dcb32931	Merge pull request #1868 from proddy/dev ... minor changes	2024-07-18 11:26:52 +02:00
Proddy	d135fa3a66	Merge branch 'dev' into dev	2024-07-18 11:26:44 +02:00
Proddy	af0e8db8ea	Merge pull request #1866 from MichaelDvP/dev ... fix value info for second thermostat	2024-07-15 23:26:40 +02:00
Proddy	1afc21d565	Merge pull request #1865 from proddy/dev ... moved Device model to Hardware Status page (was System Status)	2024-07-15 21:36:54 +02:00
Proddy	e15f0e7d6d	Merge branch 'emsesp:dev' into dev	2024-07-15 21:35:46 +02:00
Proddy	4cfcb33b4f	Merge pull request #1864 from MichaelDvP/dev ... set `remotehum` as CMD	2024-07-15 21:35:30 +02:00
Proddy	686ed20222	Merge pull request #1863 from MichaelDvP/dev ... add CMD to api/mqtt to show it in ioBroker, etc.	2024-07-15 11:42:41 +02:00
Proddy	96bb220b36	Merge pull request #1855 from proddy/dev ... Implements Feature: message notification #1854	2024-07-14 23:46:16 +02:00
Proddy	611f02f81b	Merge pull request #1853 from mheyse/fix/modbus-test ... Only include mocked modbus data structures in standalone builds.	2024-07-07 09:02:03 +02:00
Proddy	9cb6b800cb	Merge pull request #1851 from proddy/dev ... small change to make sure flags are set in Scheduler with a Timer	2024-07-06 19:27:46 +02:00
Proddy	8a4218206d	Merge pull request #1850 from MichaelDvP/dev ... custom name null and fix HA CMD	2024-07-06 19:06:37 +02:00
Proddy	dec7e2ec68	Merge pull request #1847 from proddy/dev ... minor updates	2024-07-06 12:40:38 +02:00
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