Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testbuild #1482

Merged
merged 141 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
3101f5e
move dhw entities from mixer/solar to new water device, add pool device
MichaelDvP Nov 4, 2023
6bbf4e4
Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Nov 4, 2023
d105c18
fix typos, double entities, publish time water
MichaelDvP Nov 4, 2023
ab6cf78
warning in log on tx-queue overflow
MichaelDvP Nov 4, 2023
4e4258f
enlarge tx queue to 100
MichaelDvP Nov 4, 2023
d18fd49
update packages
MichaelDvP Nov 5, 2023
adcc596
cleanup publishing
MichaelDvP Nov 5, 2023
fa47633
merge pl translations
MichaelDvP Nov 5, 2023
14b3b05
remove unused water values temp_2, temp_6
MichaelDvP Nov 5, 2023
b654316
boiler add input states, remove redundant activity states
MichaelDvP Nov 5, 2023
037a984
version 3.6.3-dev.6c
MichaelDvP Nov 5, 2023
188bfa4
add hp 4-way valve
MichaelDvP Nov 5, 2023
3380915
wwEcoPlus, rename some water entities
MichaelDvP Nov 7, 2023
caca8bf
fix 4-way-valve enum
MichaelDvP Nov 7, 2023
eafeb5c
Merge branch 'dev2' of https://github.com/proddy/EMS-ESP32 into dev2
MichaelDvP Nov 7, 2023
7f7e3c4
Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev2
MichaelDvP Nov 7, 2023
a8a12dd
check second servicecode-char for nonascii 0xF0.
MichaelDvP Nov 7, 2023
c3f487e
update packages
MichaelDvP Nov 7, 2023
2f658a9
add boiler wwSelTempEcoplus
MichaelDvP Nov 8, 2023
4c83f5f
sort water entities
MichaelDvP Nov 11, 2023
5b1f3d2
Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Nov 11, 2023
e0ab208
fix `retTemp`, #1334
MichaelDvP Nov 11, 2023
434ef2b
Merge branch 'dev2x' into dev2
MichaelDvP Nov 11, 2023
0e55caf
Merge branch 'dev2x' into dev2
MichaelDvP Nov 11, 2023
fe772f8
Merge branch 'dev2x' into dev2
MichaelDvP Nov 12, 2023
253eb72
Merge branch 'dev2x' into dev2
MichaelDvP Nov 12, 2023
6699d9a
Merge branch 'dev2x' into dev2
MichaelDvP Nov 12, 2023
1f8a477
RC300/BC400 mode setting
MichaelDvP Nov 13, 2023
bed1650
Merge branch 'dev2x' into dev2
MichaelDvP Nov 13, 2023
f34be2a
test for fixing #1420
MichaelDvP Nov 13, 2023
84fab95
fix RC300 summertemp, mode
MichaelDvP Nov 13, 2023
509122b
fix RC300 wwdisinfectTime
MichaelDvP Nov 13, 2023
e30c476
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Nov 13, 2023
6926f6f
Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Nov 14, 2023
72c0625
Merge branch 'dev2x' into dev2
MichaelDvP Nov 14, 2023
f9e1940
fix crash on entering wrong day for switchtime
MichaelDvP Nov 14, 2023
0d07a9e
add some water entities
MichaelDvP Nov 15, 2023
9c6b9a5
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Nov 15, 2023
1ada18e
3.6.3-dev.9
proddy Nov 15, 2023
bc39b73
auto formatting
proddy Nov 15, 2023
acb453b
fix water: retValve and circ time control
MichaelDvP Nov 15, 2023
50777bd
temporary fix for values/info command
MichaelDvP Nov 15, 2023
722ca34
rollback and fix https://github.com/emsesp/EMS-ESP32/pull/1426
proddy Nov 15, 2023
29f86c9
make standalone work
proddy Nov 15, 2023
cc9819b
fix lint compile warnings
proddy Nov 15, 2023
e4a8999
Merge pull request #1430 from proddy/dev
proddy Nov 16, 2023
0a10e78
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Nov 16, 2023
28a7ceb
fix build on osx - see https://docs.platformio.org/en/latest/projectc…
proddy Nov 16, 2023
64471e4
dev.10
proddy Nov 16, 2023
edee463
replace unstable_useBlocker
proddy Nov 16, 2023
a4062f5
package update
proddy Nov 16, 2023
8cfc540
Merge pull request #1432 from proddy/dev
proddy Nov 16, 2023
00d66c1
package update
proddy Nov 17, 2023
0261669
move JS to ES module
proddy Nov 17, 2023
1c3bc98
Merge pull request #1434 from proddy/dev
proddy Nov 17, 2023
9c8677a
prepare for 3.6.3 release
proddy Nov 18, 2023
e20434d
Merge pull request #1435 from proddy/dev
proddy Nov 18, 2023
9e405c5
3.6.4-dev-0
proddy Nov 18, 2023
873b752
Merge pull request #1436 from proddy/dev
proddy Nov 18, 2023
7962af0
update changelog
proddy Nov 18, 2023
64d46fe
Merge pull request #1437 from proddy/dev
proddy Nov 18, 2023
a17a9b7
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Nov 18, 2023
8fcfb3d
fix crash on wrong thermostat mode command (if not using HA)
MichaelDvP Nov 18, 2023
905b52e
Merge pull request #1438 from MichaelDvP/dev
proddy Nov 18, 2023
b300181
add hosted target
proddy Nov 19, 2023
b503e2b
package update
proddy Nov 19, 2023
049f956
minor cleanup
proddy Nov 19, 2023
dfd9fe4
add EMSESP_DEFAULT_BOARD_PROFILE to CI builds
proddy Nov 19, 2023
2de855e
Merge pull request #1439 from proddy/dev
proddy Nov 19, 2023
aed4596
set/read thermostat mode for RC100-RC300, fix #1440
MichaelDvP Nov 20, 2023
cff5b8c
Merge pull request #1444 from MichaelDvP/dev
proddy Nov 21, 2023
6dba452
patch for 3.6.3 with fixes #1440 #1442
proddy Nov 21, 2023
ad3bf29
Merge branch 'emsesp:dev' into dev
proddy Nov 21, 2023
5ad03fa
Merge pull request #1445 from proddy/dev
proddy Nov 21, 2023
64fb84d
Merge branch 'dev' into dev2
MichaelDvP Nov 21, 2023
4db1c7d
add boostmode/time #1446
MichaelDvP Nov 21, 2023
42e679d
Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev
MichaelDvP Nov 21, 2023
4dcfe8e
get mode for seltemp, fix #1450
MichaelDvP Nov 21, 2023
d06b328
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev
MichaelDvP Nov 21, 2023
4c60545
Merge branch 'dev' into dev2
MichaelDvP Nov 22, 2023
a2eb8df
update packages
MichaelDvP Nov 22, 2023
2edfe0f
add hpPumpMode #1449
MichaelDvP Nov 22, 2023
0818728
update packages
MichaelDvP Nov 22, 2023
1e15f65
get mode for seltemp, fix #1450
MichaelDvP Nov 22, 2023
01a15a5
Merge pull request #1451 from MichaelDvP/dev
proddy Nov 22, 2023
40a79c5
add EMS_DEVICE_FLAG_BC400, sort wwmodes #1452
MichaelDvP Nov 22, 2023
09228e4
update MqttClient
MichaelDvP Nov 23, 2023
bd8472b
fix settings for EMS boilers
MichaelDvP Nov 23, 2023
96a04da
add settings for #1389
MichaelDvP Nov 23, 2023
c61c34f
HIU heating/tapwater-active, always use `EMSdevice::` for flags
MichaelDvP Nov 23, 2023
60beedd
HIU heating/tapwater-active, always use `EMSdevice::` for flags
MichaelDvP Nov 23, 2023
751410c
fix boiler commands to ems telegrams
MichaelDvP Nov 23, 2023
6e08356
Merge pull request #1455 from MichaelDvP/dev
proddy Nov 23, 2023
41443d4
update packages
proddy Nov 24, 2023
24cca67
Merge pull request #1457 from proddy/dev
proddy Nov 24, 2023
19094d4
3.6.5-dev.0
proddy Nov 24, 2023
d36246d
Merge pull request #1458 from proddy/dev
proddy Nov 24, 2023
932a496
revert to react-router-dom 6.19.0 to fix tab-routing-issue
MichaelDvP Nov 24, 2023
740f3b4
Merge branch 'dev' into dev2
MichaelDvP Nov 24, 2023
c3f9d9d
Merge branch 'dev2' of https://github.com/MichaelDvP/EMS-ESP32 into dev2
MichaelDvP Nov 24, 2023
2b486ff
revert package update
MichaelDvP Nov 24, 2023
095255b
revert to react-router-dom 6.19.0 to fix tab-routing-issue
MichaelDvP Nov 24, 2023
b60127c
Merge pull request #1461 from MichaelDvP/dev
proddy Nov 25, 2023
548fdd8
version
MichaelDvP Nov 25, 2023
8898ec9
revert to react-router-dom 6.18.0 to bring blue tab line back
MichaelDvP Nov 26, 2023
e3a7e9f
Merge branch 'dev' into dev2
MichaelDvP Nov 26, 2023
2a6fedc
hetpump energy meters, sync with HP id 0x08
MichaelDvP Nov 26, 2023
c81f579
Merge pull request #1464 from MichaelDvP/dev
proddy Nov 26, 2023
7d6bb6b
add meter heating 0x4AF, offset 24
MichaelDvP Nov 26, 2023
1cbfc91
remove tab from help page
proddy Nov 26, 2023
76901d9
fix router
proddy Nov 26, 2023
8574b44
react-router-dom 6.20.0 minimal
proddy Nov 26, 2023
ba21293
Merge pull request #1465 from proddy/dev
proddy Nov 26, 2023
8b0cf59
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Nov 27, 2023
9118cd7
init for second exhaustTemp value (test.0c)
MichaelDvP Nov 28, 2023
3a36663
package update
proddy Nov 28, 2023
7ce99cb
3.6.5-dev.1
proddy Nov 28, 2023
cb1989b
HA don't set entity_category to Diagnostic/Configuration for EMS enti…
proddy Nov 28, 2023
306baee
Merge pull request #1470 from proddy/dev
proddy Nov 28, 2023
067100d
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Nov 29, 2023
0d4607a
send "step" as string
MichaelDvP Nov 29, 2023
03b6ebd
fix exhaust temperature #1467
MichaelDvP Nov 29, 2023
f83f22a
send step as string to avoid js-rounding issue for 0.1
MichaelDvP Nov 29, 2023
8d778f9
add heatpump energy meters
MichaelDvP Nov 29, 2023
7f794f3
add thermostat heatdelays, instantstart and boost
MichaelDvP Nov 29, 2023
4275d14
add boiler pumpmode and HP heat meter
MichaelDvP Nov 29, 2023
b5633cd
add texts
MichaelDvP Nov 29, 2023
2faa78b
version 3.6.5-dev.2, changelog
MichaelDvP Nov 29, 2023
c1fa5c4
Merge pull request #1471 from MichaelDvP/dev
proddy Nov 29, 2023
c38832e
fix warning
proddy Dec 2, 2023
06bf2f3
rollback dom router changes - https://github.com/emsesp/EMS-ESP32/pul…
proddy Dec 2, 2023
85016d6
Merge branch 'emsesp:dev' into dev
proddy Dec 2, 2023
7efa8ff
Merge pull request #1473 from proddy/dev
proddy Dec 2, 2023
fd5f5d4
add back boil2hyst, fix #1477
MichaelDvP Dec 3, 2023
42ba93b
add checkbox for MQTT-TLS, fix #1474
MichaelDvP Dec 3, 2023
ad577ea
Merge branch 'dev' into dev2
MichaelDvP Dec 3, 2023
f9b8ac6
Merge pull request #1478 from MichaelDvP/dev
proddy Dec 3, 2023
1845d50
add hpMaxPower
MichaelDvP Dec 4, 2023
7b9a04e
add hpMaxPower fix #1475
MichaelDvP Dec 4, 2023
10cabd0
update packages, formatting, changelog
MichaelDvP Dec 4, 2023
4081a55
Merge branch 'dev' into dev2
MichaelDvP Dec 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert to react-router-dom 6.18.0 to bring blue tab line back
  • Loading branch information
MichaelDvP committed Nov 26, 2023
commit 8898ec94190e49a89c5b78c9ff001fbb150d7c54
2 changes: 1 addition & 1 deletion interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"react-dom": "latest",
"react-dropzone": "^14.2.3",
"react-icons": "^4.12.0",
"react-router-dom": "^6.19.0",
"react-router-dom": "6.18.0",
"react-toastify": "^9.1.3",
"sockette": "^2.0.6",
"typesafe-i18n": "^5.26.2",
Expand Down
2 changes: 1 addition & 1 deletion interface/src/framework/security/ManageUsersForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-li
import { useTheme } from '@table-library/react-table-library/theme';
import { useContext, useState } from 'react';

import { useBlocker } from 'react-router-dom';
import { unstable_useBlocker as useBlocker } from 'react-router-dom';
import GenerateToken from './GenerateToken';
import UserForm from './UserForm';
import type { FC } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion interface/src/project/SettingsCustomization.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-li
import { useTheme } from '@table-library/react-table-library/theme';
import { useRequest } from 'alova';
import { useState, useEffect, useCallback } from 'react';
import { useBlocker, useLocation } from 'react-router-dom';
import { unstable_useBlocker as useBlocker, useLocation } from 'react-router-dom';
import { toast } from 'react-toastify';

import EntityMaskToggle from './EntityMaskToggle';
Expand Down
2 changes: 1 addition & 1 deletion interface/src/project/SettingsEntities.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useTheme } from '@table-library/react-table-library/theme';
// eslint-disable-next-line import/named
import { updateState, useRequest } from 'alova';
import { useState, useCallback } from 'react';
import { useBlocker } from 'react-router-dom';
import { unstable_useBlocker as useBlocker } from 'react-router-dom';

import { toast } from 'react-toastify';

Expand Down
2 changes: 1 addition & 1 deletion interface/src/project/SettingsScheduler.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useTheme } from '@table-library/react-table-library/theme';
// eslint-disable-next-line import/named
import { updateState, useRequest } from 'alova';
import { useState, useEffect, useCallback } from 'react';
import { useBlocker } from 'react-router-dom';
import { unstable_useBlocker as useBlocker } from 'react-router-dom';
import { toast } from 'react-toastify';
import SettingsSchedulerDialog from './SettingsSchedulerDialog';
import * as EMSESP from './api';
Expand Down
2 changes: 1 addition & 1 deletion interface/src/utils/useRest.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useRequest, type Method } from 'alova';
import { useState } from 'react';
import { useBlocker } from 'react-router-dom';
import { unstable_useBlocker as useBlocker } from 'react-router-dom';
import { toast } from 'react-toastify';

import { useI18nContext } from 'i18n/i18n-react';
Expand Down
32 changes: 16 additions & 16 deletions interface/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1187,10 +1187,10 @@ __metadata:
languageName: node
linkType: hard

"@remix-run/router@npm:1.12.0":
version: 1.12.0
resolution: "@remix-run/router@npm:1.12.0"
checksum: f984e42cfe855991e1d3067f686f857614f12e8c1c45168a2d98e3fc3a427e232fd0b6cf145173b7cd132faf070702b532c34230a825d933908c54c85077fc69
"@remix-run/router@npm:1.11.0":
version: 1.11.0
resolution: "@remix-run/router@npm:1.11.0"
checksum: 629ec578b9dfd3c5cb5de64a0798dd7846ec5ba0351aa66f42b1c65efb43da8f30366be59b825303648965b0df55b638c110949b24ef94fd62e98117fdfb0c0f
languageName: node
linkType: hard

Expand Down Expand Up @@ -1775,7 +1775,7 @@ __metadata:
react-dom: "npm:latest"
react-dropzone: "npm:^14.2.3"
react-icons: "npm:^4.12.0"
react-router-dom: "npm:^6.19.0"
react-router-dom: "npm:6.18.0"
react-toastify: "npm:^9.1.3"
rollup-plugin-visualizer: "npm:^5.9.2"
sockette: "npm:^2.0.6"
Expand Down Expand Up @@ -7020,27 +7020,27 @@ __metadata:
languageName: node
linkType: hard

"react-router-dom@npm:^6.19.0":
version: 6.19.0
resolution: "react-router-dom@npm:6.19.0"
"react-router-dom@npm:6.18.0":
version: 6.18.0
resolution: "react-router-dom@npm:6.18.0"
dependencies:
"@remix-run/router": "npm:1.12.0"
react-router: "npm:6.19.0"
"@remix-run/router": "npm:1.11.0"
react-router: "npm:6.18.0"
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
checksum: 38312efc11d3ef688062301479a8257a1495a81cd8dd7039c1f81aba6774963df7d21aaee2ba1a3c152857b70f4fb9966a3ccff47aca12212e854dcd6fc4deab
checksum: b0e72603d73172b6c6662afe2faed326753d5bbd9905aa560e3dade7996fc13d19e34e3ed668d2849efd685e2db2f711129c84b1439870e92c9cc91ddc343cf5
languageName: node
linkType: hard

"react-router@npm:6.19.0":
version: 6.19.0
resolution: "react-router@npm:6.19.0"
"react-router@npm:6.18.0":
version: 6.18.0
resolution: "react-router@npm:6.18.0"
dependencies:
"@remix-run/router": "npm:1.12.0"
"@remix-run/router": "npm:1.11.0"
peerDependencies:
react: ">=16.8"
checksum: 5454f4a4d65401430ded8f1033cebe4ccca771c3c827e8329c77dcfd73618ca9a32488fb58722bf6a07afef7d8e7ef22a710aae0f3337e5c20962bf6473d81a3
checksum: a00c8f347b7ffee575f4a7731782e688e3fca458ca5bd970fb41cef66a6851853caa24464155ab438d5879f367b1223a539642a405a865913ffe7e63e53b1245
languageName: node
linkType: hard

Expand Down