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

Pool #104

Merged
merged 6 commits into from
Sep 8, 2021
Merged

Pool #104

merged 6 commits into from
Sep 8, 2021

Conversation

Sunbuzz
Copy link
Contributor

@Sunbuzz Sunbuzz commented Sep 1, 2021

This commit includes more work on the pool values coming from MP 100, and some new values on telegram 048D & 048F.
also fixed issue with having 2 of the same product_id, by checking device_type before updating (see #103 )
Added device_id:
{240, DeviceType::CONTROLLER, F("Rego 3000"), DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x09,
{172, DeviceType::THERMOSTAT, F("IVT Rego 2000/3000"), DeviceFlags::EMS_DEVICE_FLAG_RC300}, // 0x10 &
{204, DeviceType::MIXER, F("MP100"), DeviceFlags::EMS_DEVICE_FLAG_MP},
Added "IVT" as Brand.

…added some parameters to telegram 0x48D & 0x48F
…added some parameters to telegram 0x48D & 0x48F
src/device_library.h Outdated Show resolved Hide resolved
src/devices/boiler.cpp Outdated Show resolved Hide resolved
@proddy
Copy link
Contributor

proddy commented Sep 7, 2021

ok to merge @MichaelDvP ?

@MichaelDvP
Copy link
Contributor

Yes, ok

@Sunbuzz
Copy link
Contributor Author

Sunbuzz commented Sep 8, 2021

Yes, Please do.

@proddy proddy merged commit d7678b3 into emsesp:dev Sep 8, 2021
@Sunbuzz Sunbuzz deleted the pool branch September 22, 2021 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants