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

network connection and powerentities #1302

Merged
merged 45 commits into from
Sep 20, 2023
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
6173e94
add back process dest, fixes #1275, v3.6.1-dev0a
MichaelDvP Sep 2, 2023
b165e1c
fix read int from webpage
MichaelDvP Sep 3, 2023
508f18c
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Sep 3, 2023
fcf16ee
HA register all entities for Custom and Scheduler
MichaelDvP Sep 3, 2023
4c1b662
update packages
MichaelDvP Sep 3, 2023
bd92345
boiler energy counter, stored in nvs
MichaelDvP Sep 3, 2023
a5f5d36
analogsensor counter store to nvs
MichaelDvP Sep 3, 2023
ced63a6
v3.6.1-dev0b, changelog
MichaelDvP Sep 3, 2023
b912779
fix max for ULONG values, save counters every hour, 3.6.1-dev0c
MichaelDvP Sep 4, 2023
06e9b8d
round energy values to full kWh
MichaelDvP Sep 4, 2023
f1034f4
energy values as HA sensors with classes, v3.6.1-dev0e
MichaelDvP Sep 4, 2023
09a1572
change ha-mqtt `t`to `topic`
MichaelDvP Sep 4, 2023
1c4da53
publish energy in api/mqtt with 2 digits
MichaelDvP Sep 5, 2023
e9c3f8c
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Sep 6, 2023
95b8e79
use tasmota modified platform, v3.6.1-dev.1a
MichaelDvP Sep 6, 2023
0ba5d8e
update packages
MichaelDvP Sep 6, 2023
04e43d5
nomPower is always editable
MichaelDvP Sep 6, 2023
6376ed2
platform: esp32 use tasmota w/o tsl, S3 use development
MichaelDvP Sep 6, 2023
c19345c
color wifiicon in selector
MichaelDvP Sep 8, 2023
10c8c2b
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Sep 8, 2023
5e76bfa
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Sep 9, 2023
6a7a963
set esp32s2, esp32c3 to tasmota platform
MichaelDvP Sep 9, 2023
9c16e20
revert 'topic' to 't'
MichaelDvP Sep 9, 2023
7310db6
update packages
MichaelDvP Sep 17, 2023
9d3456c
show scheduler/custom always
MichaelDvP Sep 17, 2023
8a16566
translations
MichaelDvP Sep 17, 2023
d8c298f
network init
MichaelDvP Sep 17, 2023
8d4b43e
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
MichaelDvP Sep 17, 2023
09e2945
add BSSID and Channel to network settings, full_scan
MichaelDvP Sep 18, 2023
a6b0c74
add message "no entries" to analog/temperature/custom/sccheduler
MichaelDvP Sep 18, 2023
42a4c79
dont queue publish on change if not connected, keep flag
MichaelDvP Sep 18, 2023
8b136dd
"no entries" is valid command execution
MichaelDvP Sep 19, 2023
e6bcded
Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev
MichaelDvP Sep 19, 2023
6ab2135
show commands always include internal devices.
MichaelDvP Sep 19, 2023
9f1002d
remove channel from networkSettings
MichaelDvP Sep 19, 2023
951e706
add custom to "show devices"
MichaelDvP Sep 19, 2023
4824152
empty json instead of "no entries"
MichaelDvP Sep 19, 2023
ba7ceca
Network, reconnect without waiting
MichaelDvP Sep 20, 2023
9c33b5c
limit mqtt queue to 300
MichaelDvP Sep 20, 2023
bbc5bc8
sync mqtt client with origin
MichaelDvP Sep 20, 2023
529b46d
update packages needs changed svg handling
MichaelDvP Sep 20, 2023
ad81f84
tag more boiler dhw values
MichaelDvP Sep 20, 2023
96bf1a3
v3.6.2-dev.2, changelog
MichaelDvP Sep 20, 2023
5c484d5
allow empty response in webAPI
MichaelDvP Sep 20, 2023
dcdd8d9
cleanup, adapt comments, packages
MichaelDvP Sep 20, 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
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
  • Loading branch information
MichaelDvP committed Sep 3, 2023
commit 508f18c29bc9073af6d3be673ab8806d6df0ac17

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.