andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 17:29:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

update GH repo

Browse Source
This commit is contained in:
proddy
2021-03-18 20:54:12 +01:00
parent 4a5dbedd37
commit 7885302636
67 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WebAPIService.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/WebAPIService.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/WebDevicesService.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/WebDevicesService.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/WebSettingsService.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/WebSettingsService.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/WebStatusService.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/WebStatusService.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/command.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/command.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

4
src/console.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -65,7 +65,7 @@ void EMSESPShell::display_banner() {
println();
printfln(F("┌──────────────────────────────────────┐"));
printfln(F("│ %sEMS-ESP version %-10s%s │"), COLOR_BOLD_ON, EMSESP_APP_VERSION, COLOR_BOLD_OFF);
printfln(F("│ %s%shttps://github.com/proddy/EMS-ESP%s │"), COLOR_BRIGHT_GREEN, COLOR_UNDERLINE, COLOR_RESET);
printfln(F("│ %s%shttps://github.com/emsesp/EMS-ESP%s │"), COLOR_BRIGHT_GREEN, COLOR_UNDERLINE, COLOR_RESET);
printfln(F("│ │"));
printfln(F("│ type %shelp%s to show available commands │"), COLOR_UNDERLINE, COLOR_RESET);
printfln(F("└──────────────────────────────────────┘"));

2
src/console.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/dallassensor.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/dallassensor.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/device_library.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

10
src/devices/boiler.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -311,7 +311,7 @@ void Boiler::process_UBAMonitorFast(std::shared_ptr<const Telegram> telegram) {
has_update(telegram->read_bitvalue(wWCirc_, 7, 7));
// warm water storage sensors (if present)
// wWStorageTemp2 is also used by some brands as the boiler temperature - see https://github.com/proddy/EMS-ESP/issues/206
// wWStorageTemp2 is also used by some brands as the boiler temperature - see https://github.com/emsesp/EMS-ESP/issues/206
has_update(telegram->read_value(wWStorageTemp1_, 9)); // 0x8300 if not available
has_update(telegram->read_value(wWStorageTemp2_, 11)); // 0x8000 if not available - this is boiler temp
@@ -580,7 +580,7 @@ void Boiler::process_UBAEnergySupplied(std::shared_ptr<const Telegram> telegram)
// 0x2A - MC10Status
// e.g. 88 00 2A 00 00 00 00 00 00 00 00 00 D2 00 00 80 00 00 01 08 80 00 02 47 00
// see https://github.com/proddy/EMS-ESP/issues/397
// see https://github.com/emsesp/EMS-ESP/issues/397
void Boiler::process_MC10Status(std::shared_ptr<const Telegram> telegram) {
has_update(telegram->read_value(mixerTemp_, 14));
has_update(telegram->read_value(tankMiddleTemp_, 18));
@@ -967,7 +967,7 @@ bool Boiler::set_warmwater_activated(const char * value, const int8_t id) {
LOG_INFO(F("Setting boiler warm water active %s"), v ? "on" : "off");
// https://github.com/proddy/EMS-ESP/issues/268
// https://github.com/emsesp/EMS-ESP/issues/268
uint8_t n;
if (EMSbus::is_ht3()) {
n = (v ? 0x08 : 0x00); // 0x08 is on, 0x00 is off
@@ -1020,7 +1020,7 @@ bool Boiler::set_tapwarmwater_activated(const char * value, const int8_t id) {
// Activate / De-activate One Time warm water 0x35
// true = on, false = off
// See also https://github.com/proddy/EMS-ESP/issues/341#issuecomment-596245458 for Junkers
// See also https://github.com/emsesp/EMS-ESP/issues/341#issuecomment-596245458 for Junkers
bool Boiler::set_warmwater_onetime(const char * value, const int8_t id) {
bool v = false;
if (!Helpers::value2bool(value, v)) {

2
src/devices/boiler.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/connect.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/connect.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/controller.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/controller.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/gateway.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/gateway.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/generic.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/generic.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/heatpump.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/heatpump.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

6
src/devices/mixer.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -158,11 +158,11 @@ void Mixer::process_IPMStatusMessage(std::shared_ptr<const Telegram> telegram) {
// Mixer on a MM10 - 0xAB
// e.g. Mixer Module -> All, type 0xAB, telegram: 21 00 AB 00 2D 01 BE 64 04 01 00 (CRC=15) #data=7
// see also https://github.com/proddy/EMS-ESP/issues/386
// see also https://github.com/emsesp/EMS-ESP/issues/386
void Mixer::process_MMStatusMessage(std::shared_ptr<const Telegram> telegram) {
// the heating circuit is determine by which device_id it is, 0x20 - 0x23
// 0x21 is position 2. 0x20 is typically reserved for the WM10 switch module
// see https://github.com/proddy/EMS-ESP/issues/270 and https://github.com/proddy/EMS-ESP/issues/386#issuecomment-629610918
// see https://github.com/emsesp/EMS-ESP/issues/270 and https://github.com/emsesp/EMS-ESP/issues/386#issuecomment-629610918
has_update(telegram->read_value(flowTempHc_, 1)); // is * 10
has_update(telegram->read_bitvalue(pumpStatus_, 3, 2)); // is 0 or 0x64 (100%), check only bit 2

2
src/devices/mixer.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/solar.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/solar.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/switch.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/devices/switch.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

16
src/devices/thermostat.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
// if we're on auto mode, register this thermostat if it has a device id of 0x10, 0x17 or 0x18
// or if its the master thermostat we defined
// see https://github.com/proddy/EMS-ESP/issues/362#issuecomment-629628161
// see https://github.com/emsesp/EMS-ESP/issues/362#issuecomment-629628161
if ((master_thermostat == device_id)
|| ((master_thermostat == EMSESP_DEFAULT_MASTER_THERMOSTAT) && (device_id < 0x19) && ((actual_master_thermostat == EMSESP_DEFAULT_MASTER_THERMOSTAT) || (device_id < actual_master_thermostat)))) {
EMSESP::actual_master_thermostat(device_id);
@@ -177,7 +177,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
// HA will report an error in the climate component if it doesn't have the setpoint temp, current temperatures and the mode (e.g. auto)
// The mode always comes later (1 minute) so we force a read request to suppress HA errors.
// https://github.com/proddy/EMS-ESP/commit/9d5bd11d268a61bbba8dcabacdb96db48b8829ac#commitcomment-48028642
// https://github.com/emsesp/EMS-ESP/commit/9d5bd11d268a61bbba8dcabacdb96db48b8829ac#commitcomment-48028642
for (uint8_t i = 0; i < set_typeids.size(); i++) {
EMSESP::send_read_request(set_typeids[i], device_id);
}
@@ -618,7 +618,7 @@ void Thermostat::process_RC20Monitor_2(std::shared_ptr<const Telegram> telegram)
}
// 0xAD - for reading the mode from the RC20/ES72 thermostat (0x17)
// see https://github.com/proddy/EMS-ESP/issues/334#issuecomment-611698259
// see https://github.com/emsesp/EMS-ESP/issues/334#issuecomment-611698259
// offset: 01-nighttemp, 02-daytemp, 03-mode, 0B-program(1-9), 0D-setpoint_roomtemp(temporary)
void Thermostat::process_RC20Set_2(std::shared_ptr<const Telegram> telegram) {
std::shared_ptr<Thermostat::HeatingCircuit> hc = heating_circuit(telegram);
@@ -765,7 +765,7 @@ void Thermostat::process_RC300Monitor(std::shared_ptr<const Telegram> telegram)
// if manual, take the current setpoint temp at pos 6
// if auto, take the next setpoint temp at pos 7
// pos 3 is the current target temp and sometimes can be 0
// see https://github.com/proddy/EMS-ESP/issues/256#issuecomment-585171426
// see https://github.com/emsesp/EMS-ESP/issues/256#issuecomment-585171426
// pos 3 actual setpoint (optimized), i.e. changes with temporary change, summer/holiday-modes
// pos 6 actual setpoint according to programmed changes eco/comfort
// pos 7 next setpoint in the future, time to next setpoint in pos 8/9
@@ -909,7 +909,7 @@ void Thermostat::process_RC30Set(std::shared_ptr<const Telegram> telegram) {
void Thermostat::process_RC35Monitor(std::shared_ptr<const Telegram> telegram) {
// exit if the 15th byte (second from last) is 0x00, which I think is calculated flow setpoint temperature
// with weather controlled RC35s this value is >=5, otherwise can be zero and our setpoint temps will be incorrect
// see https://github.com/proddy/EMS-ESP/issues/373#issuecomment-627907301
// see https://github.com/emsesp/EMS-ESP/issues/373#issuecomment-627907301
if (telegram->offset > 0 || telegram->message_length < 15) {
return;
}
@@ -1816,7 +1816,7 @@ bool Thermostat::set_temperature(const float temperature, const uint8_t mode, co
} else if (mode_ == HeatingCircuit::Mode::DAY) {
offset = EMS_OFFSET_RC35Set_temp_day;
} else {
offset = EMS_OFFSET_RC35Set_seltemp; // https://github.com/proddy/EMS-ESP/issues/310
offset = EMS_OFFSET_RC35Set_seltemp; // https://github.com/emsesp/EMS-ESP/issues/310
}
} else {
uint8_t modetype = hc->get_mode_type();
@@ -1827,7 +1827,7 @@ bool Thermostat::set_temperature(const float temperature, const uint8_t mode, co
} else if (model == EMS_DEVICE_FLAG_JUNKERS) {
// figure out if we have older or new thermostats, Heating Circuits on 0x65 or 0x79
// see https://github.com/proddy/EMS-ESP/issues/335#issuecomment-593324716)
// see https://github.com/emsesp/EMS-ESP/issues/335#issuecomment-593324716)
bool old_junkers = (has_flags(EMS_DEVICE_FLAG_JUNKERS_OLD));
if (!old_junkers) {
switch (mode) {

4
src/devices/thermostat.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -180,7 +180,7 @@ class Thermostat : public EMSdevice {
static constexpr uint8_t EMS_OFFSET_RC20Set_mode = 23; // position of thermostat mode
static constexpr uint8_t EMS_OFFSET_RC20Set_temp = 28; // position of thermostat setpoint temperature
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_mode = 3; // ES72 - see https://github.com/proddy/EMS-ESP/issues/334
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_mode = 3; // ES72 - see https://github.com/emsesp/EMS-ESP/issues/334
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_temp_night = 1; // ES72
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_temp_day = 2; // ES72

2
src/emsdevice.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/emsdevice.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

4
src/emsesp.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -652,7 +652,7 @@ void EMSESP::process_UBADevices(std::shared_ptr<const Telegram> telegram) {
// if we haven't already detected this device, request it's version details, unless its us (EMS-ESP)
// when the version info is received, it will automagically add the device
// always skip modem device 0x0D, it does not reply to version request
// see https://github.com/proddy/EMS-ESP/issues/460#issuecomment-709553012
// see https://github.com/emsesp/EMS-ESP/issues/460#issuecomment-709553012
if ((device_id != EMSbus::ems_bus_id()) && !(EMSESP::device_exists(device_id)) && (device_id != 0x0D) && (device_id != 0x0C)) {
LOG_DEBUG(F("New EMS device detected with ID 0x%02X. Requesting version information."), device_id);
send_read_request(EMSdevice::EMS_TYPE_VERSION, device_id);

2
src/emsesp.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/emsesp_stub.hpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/emsfactory.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/helpers.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/helpers.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/locale_EN.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/main.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/mqtt.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/mqtt.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/roomcontrol.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

2
src/roomcontrol.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

4
src/shower.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -99,7 +99,7 @@ void Shower::send_mqtt_stat(bool state, bool force) {
}
char s[7];
Mqtt::publish(F("shower_active"), Helpers::render_boolean(s, state)); // https://github.com/proddy/EMS-ESP/issues/369
Mqtt::publish(F("shower_active"), Helpers::render_boolean(s, state)); // https://github.com/emsesp/EMS-ESP/issues/369
// if we're in HA mode make sure we've first sent out the HA MQTT Discovery config topic
if ((Mqtt::ha_enabled()) && (!ha_configdone_ || force)) {

2
src/shower.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

4
src/system.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -131,7 +131,7 @@ void System::syslog_init(bool refresh) {
syslog_enabled_ = false;
}
// in case service is still running, this flushes the queue - https://github.com/proddy/EMS-ESP/issues/496
// in case service is still running, this flushes the queue - https://github.com/emsesp/EMS-ESP/issues/496
if (!syslog_enabled_) {
syslog_.log_level((uuid::log::Level)-1);
syslog_.mark_interval(0);

2
src/system.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

6
src/telegram.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -180,10 +180,10 @@ void RxService::add(uint8_t * data, uint8_t length) {
// work out depending on the type, where the data message block starts and the message length
// EMS 1 has type_id always in data[2], if it gets a ems+ inquiry it will reply with FF but short length
// i.e. sending 0B A1 FF 00 01 D8 20 CRC to a MM10 Mixer (ems1.0), the reply is 21 0B FF 00 CRC
// see: https://github.com/proddy/EMS-ESP/issues/380#issuecomment-633663007
// see: https://github.com/emsesp/EMS-ESP/issues/380#issuecomment-633663007
if (data[2] != 0xFF || length < 6) {
// EMS 1.0
// also handle F7, F9 as EMS 1.0, see https://github.com/proddy/EMS-ESP/issues/109#issuecomment-492781044
// also handle F7, F9 as EMS 1.0, see https://github.com/emsesp/EMS-ESP/issues/109#issuecomment-492781044
type_id = data[2];
message_data = data + 4;
message_length = length - 5;

2
src/telegram.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

12
src/test/test.cpp
View File

@@ -1,6 +1,6 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -442,7 +442,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
shell.printfln(F("Testing adding a TC100 thermostat to the EMS bus..."));
// add a thermostat
add_device(0x18, 202); // Bosch TC100 - https://github.com/proddy/EMS-ESP/issues/474
add_device(0x18, 202); // Bosch TC100 - https://github.com/emsesp/EMS-ESP/issues/474
// 0x0A
uart_telegram({0x98, 0x0B, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00});
@@ -497,7 +497,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
add_device(0x10, 158); // RC300
add_device(0x48, 189); // KM200
// see https://github.com/proddy/EMS-ESP/issues/390
// see https://github.com/emsesp/EMS-ESP/issues/390
uart_telegram_withCRC("90 48 FF 04 01 A6 5C");
uart_telegram_withCRC("90 48 FF 00 01 A6 4C");
@@ -552,7 +552,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
if (command == "cr100") {
shell.printfln(F("Testing CR100"));
add_device(0x18, 157); // Bosch CR100 - https://github.com/proddy/EMS-ESP/issues/355
add_device(0x18, 157); // Bosch CR100 - https://github.com/emsesp/EMS-ESP/issues/355
// RCPLUSStatusMessage_HC1(0x01A5)
// 98 00 FF 00 01 A5 00 CF 21 2E 00 00 2E 24 03 25 03 03 01 03 25 00 C8 00 00 11 01 03 (no CRC)
@@ -756,7 +756,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
add_device(0x08, 123); // Nefit Trendline
// add a thermostat
add_device(0x18, 157); // Bosch CR100 - https://github.com/proddy/EMS-ESP/issues/355
add_device(0x18, 157); // Bosch CR100 - https://github.com/emsesp/EMS-ESP/issues/355
// RCPLUSStatusMessage_HC1(0x01A5) - HC1
uart_telegram({0x98, 0x00, 0xFF, 0x00, 0x01, 0xA5, 0x00, 0xCF, 0x21, 0x2E, 0x00, 0x00, 0x2E, 0x24, 0x03, 0x25, 0x03, 0x03, 0x01, 0x03, 0x25, 0x00, 0xC8, 0x00, 0x00, 0x11, 0x01, 0x03});
@@ -829,7 +829,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
uart_telegram({0x1B, 0x5B, 0xFD, 0x2D, 0x9E, 0x3A, 0xB6, 0xE5, 0x02, 0x20, 0x33, 0x30, 0x32, 0x3A, 0x20, 0x5B, 0x73, 0xFF, 0xFF, 0xCB, 0xDF, 0xB7, 0xA7, 0xB5, 0x67, 0x77, 0x77, 0xE4, 0xFF, 0xFD, 0x77, 0xFF});
}
// https://github.com/proddy/EMS-ESP/issues/380#issuecomment-633663007
// https://github.com/emsesp/EMS-ESP/issues/380#issuecomment-633663007
if (command == "rx3") {
shell.printfln(F("Testing rx3..."));

2
src/test/test.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify

4
src/uart/emsuart_esp32.cpp
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
*/
/*
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/proddy/EMS-ESP/issues/380
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/emsesp/EMS-ESP/issues/380
*/
#if defined(ESP32)

4
src/uart/emsuart_esp32.h
View File

@@ -1,5 +1,5 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* EMS-ESP - https://github.com/emsesp/EMS-ESP
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
@@ -18,7 +18,7 @@
/*
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/proddy/EMS-ESP/issues/380
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/emsesp/EMS-ESP/issues/380
*/
#if defined(ESP32)

2
src/version.h
View File

@@ -1,2 +1,2 @@
#define EMSESP_APP_VERSION "3.0.0b7"
#define EMSESP_APP_VERSION "3.0.1b0"
#define EMSESP_PLATFORM "ESP32"