mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2026-10-28 11:14:58 +00:00
formatting
This commit is contained in:
@@ -108,7 +108,6 @@ static void setup_commands(std::shared_ptr<Commands> const & commands) {
|
|||||||
return std::vector<std::string>{"system", "users", "devices", "log", "ems", "values", "mqtt", "commands"};
|
return std::vector<std::string>{"system", "users", "devices", "log", "ems", "values", "mqtt", "commands"};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// System commands
|
// System commands
|
||||||
//
|
//
|
||||||
@@ -294,7 +293,6 @@ static void setup_commands(std::shared_ptr<Commands> const & commands) {
|
|||||||
EMSESP::network_.reconnect();
|
EMSESP::network_.reconnect();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
commands->add_command(ShellContext::MAIN,
|
commands->add_command(ShellContext::MAIN,
|
||||||
CommandFlags::ADMIN,
|
CommandFlags::ADMIN,
|
||||||
string_vector{F_(set), F_(board_profile)},
|
string_vector{F_(set), F_(board_profile)},
|
||||||
|
|||||||
@@ -237,7 +237,6 @@ const char * const DeviceValue::DeviceValueTAG_mqtt[] = {
|
|||||||
FL_(tag_src15)[0], // "src15"
|
FL_(tag_src15)[0], // "src15"
|
||||||
FL_(tag_src16)[0] // "src16"
|
FL_(tag_src16)[0] // "src16"
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// count #tags once at compile time
|
// count #tags once at compile time
|
||||||
|
|||||||
@@ -1042,5 +1042,4 @@ int16_t Helpers::calc_dew(int16_t temp, uint8_t humi) {
|
|||||||
return dt;
|
return dt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
} // namespace emsesp
|
} // namespace emsesp
|
||||||
|
|||||||
@@ -238,7 +238,6 @@ ModbusMessage Modbus::handleRead(const ModbusMessage & request) {
|
|||||||
key,
|
key,
|
||||||
[](const EntityModbusInfo & a, const EntityModbusInfoKey & b) { return a.isLessThan(b); });
|
[](const EntityModbusInfo & a, const EntityModbusInfoKey & b) { return a.isLessThan(b); });
|
||||||
|
|
||||||
|
|
||||||
if (modbusInfo == std::end(modbus_register_mappings) || !modbusInfo->equals(key)) {
|
if (modbusInfo == std::end(modbus_register_mappings) || !modbusInfo->equals(key)) {
|
||||||
// combination of device_type/tag_type/register_offset does not exist
|
// combination of device_type/tag_type/register_offset does not exist
|
||||||
LOG_ERROR("combination of device_type/tag_type/register_offset does not exist");
|
LOG_ERROR("combination of device_type/tag_type/register_offset does not exist");
|
||||||
@@ -324,7 +323,6 @@ ModbusMessage Modbus::handleWrite(const ModbusMessage & request) {
|
|||||||
|
|
||||||
LOG_DEBUG("Tag %d, offset %d", tag, register_offset);
|
LOG_DEBUG("Tag %d, offset %d", tag, register_offset);
|
||||||
|
|
||||||
|
|
||||||
// binary search in modbus infos
|
// binary search in modbus infos
|
||||||
auto key = EntityModbusInfoKey(device_type, tag_type, register_offset);
|
auto key = EntityModbusInfoKey(device_type, tag_type, register_offset);
|
||||||
auto modbusInfo = std::lower_bound(std::begin(modbus_register_mappings),
|
auto modbusInfo = std::lower_bound(std::begin(modbus_register_mappings),
|
||||||
|
|||||||
@@ -1143,7 +1143,6 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
|
|||||||
EMSESP::send_read_request(0xC2, device_id, 0, 20); // read last errorcode on start (not broadcasted)
|
EMSESP::send_read_request(0xC2, device_id, 0, 20); // read last errorcode on start (not broadcasted)
|
||||||
EMSESP::send_read_request(0xC6, device_id, 0, 21); // read last errorcode on start (not broadcasted)
|
EMSESP::send_read_request(0xC6, device_id, 0, 21); // read last errorcode on start (not broadcasted)
|
||||||
|
|
||||||
|
|
||||||
if (!isHeatPump() && model() != EMSdevice::EMS_DEVICE_FLAG_HIU) {
|
if (!isHeatPump() && model() != EMSdevice::EMS_DEVICE_FLAG_HIU) {
|
||||||
register_telegram_type(0x04, "UBAFactory", true, MAKE_PF_CB(process_UBAFactory), 21);
|
register_telegram_type(0x04, "UBAFactory", true, MAKE_PF_CB(process_UBAFactory), 21);
|
||||||
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &nomPower_, DeviceValueType::UINT8, FL_(nomPower), DeviceValueUOM::KW, MAKE_CF_CB(set_nomPower));
|
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &nomPower_, DeviceValueType::UINT8, FL_(nomPower), DeviceValueUOM::KW, MAKE_CF_CB(set_nomPower));
|
||||||
@@ -2443,7 +2442,6 @@ bool Boiler::set_ww_temp(const char * value, const int8_t id) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set the lower dhw temperature 0xEA
|
// Set the lower dhw temperature 0xEA
|
||||||
bool Boiler::set_ww_temp_low(const char * value, const int8_t id) {
|
bool Boiler::set_ww_temp_low(const char * value, const int8_t id) {
|
||||||
int v;
|
int v;
|
||||||
|
|||||||
@@ -66,7 +66,6 @@ Extension::Extension(uint8_t device_type, uint8_t device_id, uint8_t product_id,
|
|||||||
// register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &errorState_, DeviceValueType::BOOL, FL_(error), DeviceValueUOM::NONE);
|
// register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &errorState_, DeviceValueType::BOOL, FL_(error), DeviceValueUOM::NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// extension(0x15) -W-> Me(0x0B), EM100SetMessage(0x0935), data: 00 00 64 50 14
|
// extension(0x15) -W-> Me(0x0B), EM100SetMessage(0x0935), data: 00 00 64 50 14
|
||||||
// need to be fetched
|
// need to be fetched
|
||||||
void Extension::process_EM100SetMessage(const std::shared_ptr<const Telegram> & telegram) {
|
void Extension::process_EM100SetMessage(const std::shared_ptr<const Telegram> & telegram) {
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ class Extension : public EMSdevice {
|
|||||||
bool set_minT(const char * value, const int8_t id);
|
bool set_minT(const char * value, const int8_t id);
|
||||||
bool set_maxT(const char * value, const int8_t id);
|
bool set_maxT(const char * value, const int8_t id);
|
||||||
|
|
||||||
|
|
||||||
int16_t headerTemp_; // T0
|
int16_t headerTemp_; // T0
|
||||||
uint8_t input_; // IO1
|
uint8_t input_; // IO1
|
||||||
// uint8_t errorState_; // OE1
|
// uint8_t errorState_; // OE1
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ class Heatsource : public EMSdevice {
|
|||||||
void process_amCommandMessage(const std::shared_ptr<const Telegram> & telegram);
|
void process_amCommandMessage(const std::shared_ptr<const Telegram> & telegram);
|
||||||
void process_amExtraMessage(const std::shared_ptr<const Telegram> & telegram);
|
void process_amExtraMessage(const std::shared_ptr<const Telegram> & telegram);
|
||||||
|
|
||||||
|
|
||||||
bool set_vr2Config(const char * value, const int8_t id); // pos 12: off(00)/Keelbypass(01)/(hc1pump(02) only standalone)
|
bool set_vr2Config(const char * value, const int8_t id); // pos 12: off(00)/Keelbypass(01)/(hc1pump(02) only standalone)
|
||||||
bool set_ahsActivated(const char * value, const int8_t id); // pos 00: Alternate heat source activation: No(00),Yes(01)
|
bool set_ahsActivated(const char * value, const int8_t id); // pos 00: Alternate heat source activation: No(00),Yes(01)
|
||||||
bool set_aPumpConfig(const char * value, const int8_t id); // pos 04: Buffer primary pump->Config pump: No(00),Yes(01)
|
bool set_aPumpConfig(const char * value, const int8_t id); // pos 04: Buffer primary pump->Config pump: No(00),Yes(01)
|
||||||
|
|||||||
@@ -115,7 +115,6 @@ class Solar : public EMSdevice {
|
|||||||
// telegram 0x361 Differential control
|
// telegram 0x361 Differential control
|
||||||
uint8_t diffControl_; // is *10
|
uint8_t diffControl_; // is *10
|
||||||
|
|
||||||
|
|
||||||
// telegram 0x380
|
// telegram 0x380
|
||||||
uint8_t climateZone_; // climate zone identifier
|
uint8_t climateZone_; // climate zone identifier
|
||||||
uint16_t collector1Area_; // Area of collector field 1
|
uint16_t collector1Area_; // Area of collector field 1
|
||||||
|
|||||||
@@ -3012,7 +3012,6 @@ bool Thermostat::set_R3000Holiday(const char * value, const int8_t id) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// set pause in hours
|
// set pause in hours
|
||||||
bool Thermostat::set_pause(const char * value, const int8_t id) {
|
bool Thermostat::set_pause(const char * value, const int8_t id) {
|
||||||
auto hc = heating_circuit(id);
|
auto hc = heating_circuit(id);
|
||||||
@@ -3668,7 +3667,6 @@ bool Thermostat::set_reducemode(const char * value, const int8_t id) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// sets the thermostat reducemode for RC35 vacations
|
// sets the thermostat reducemode for RC35 vacations
|
||||||
bool Thermostat::set_vacreducemode(const char * value, const int8_t id) {
|
bool Thermostat::set_vacreducemode(const char * value, const int8_t id) {
|
||||||
auto hc = heating_circuit(id);
|
auto hc = heating_circuit(id);
|
||||||
@@ -3983,7 +3981,6 @@ bool Thermostat::set_wwSwitchTime(const char * value, const int8_t id) {
|
|||||||
}
|
}
|
||||||
char out[sizeof(dhw->wwSwitchTime_)] = {'\0'};
|
char out[sizeof(dhw->wwSwitchTime_)] = {'\0'};
|
||||||
|
|
||||||
|
|
||||||
if (set_switchtime(value, 0x38, out, sizeof(out))) {
|
if (set_switchtime(value, 0x38, out, sizeof(out))) {
|
||||||
if (strlen(out)) {
|
if (strlen(out)) {
|
||||||
has_update(dhw->wwSwitchTime_, out, sizeof(dhw->wwSwitchTime_));
|
has_update(dhw->wwSwitchTime_, out, sizeof(dhw->wwSwitchTime_));
|
||||||
|
|||||||
@@ -233,7 +233,6 @@ void Water::process_IPMParameterWW(const std::shared_ptr<const Telegram> & teleg
|
|||||||
// has_bitupdate(telegram, wwChargeType_, 10, 0); // 0 = charge pump, 0xff = 3-way valve
|
// has_bitupdate(telegram, wwChargeType_, 10, 0); // 0 = charge pump, 0xff = 3-way valve
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 0x1E, only16 bit temperature
|
// 0x1E, only16 bit temperature
|
||||||
// Mixer(0x41) -> Boiler(0x08), HydrTemp(0x1E), data: 01 D8
|
// Mixer(0x41) -> Boiler(0x08), HydrTemp(0x1E), data: 01 D8
|
||||||
void Water::process_IPMHydrTemp(const std::shared_ptr<const Telegram> & telegram) {
|
void Water::process_IPMHydrTemp(const std::shared_ptr<const Telegram> & telegram) {
|
||||||
@@ -399,7 +398,6 @@ bool Water::set_wwRequiredTemp(const char * value, const int8_t id) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool Water::set_wwFlowTempOffset(const char * value, const int8_t id) {
|
bool Water::set_wwFlowTempOffset(const char * value, const int8_t id) {
|
||||||
int n;
|
int n;
|
||||||
if (!Helpers::value2number(value, n)) {
|
if (!Helpers::value2number(value, n)) {
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ class Water : public EMSdevice {
|
|||||||
int8_t wwHystOff_; // Hyst off (default -1)
|
int8_t wwHystOff_; // Hyst off (default -1)
|
||||||
uint8_t wwFlowTempOffset_; // default 40
|
uint8_t wwFlowTempOffset_; // default 40
|
||||||
|
|
||||||
|
|
||||||
void process_SM100wwTemperature(const std::shared_ptr<const Telegram> & telegram);
|
void process_SM100wwTemperature(const std::shared_ptr<const Telegram> & telegram);
|
||||||
void process_SM100wwStatus(const std::shared_ptr<const Telegram> & telegram);
|
void process_SM100wwStatus(const std::shared_ptr<const Telegram> & telegram);
|
||||||
void process_SM100wwStatus2(const std::shared_ptr<const Telegram> & telegram);
|
void process_SM100wwStatus2(const std::shared_ptr<const Telegram> & telegram);
|
||||||
@@ -100,7 +99,6 @@ class Water : public EMSdevice {
|
|||||||
void process_IPMHydrTemp(const std::shared_ptr<const Telegram> & telegram);
|
void process_IPMHydrTemp(const std::shared_ptr<const Telegram> & telegram);
|
||||||
void process_IPMParameterWW(const std::shared_ptr<const Telegram> & telegram);
|
void process_IPMParameterWW(const std::shared_ptr<const Telegram> & telegram);
|
||||||
|
|
||||||
|
|
||||||
bool set_wwSelTemp(const char * value, const int8_t id);
|
bool set_wwSelTemp(const char * value, const int8_t id);
|
||||||
bool set_wwMaxTemp(const char * value, const int8_t id);
|
bool set_wwMaxTemp(const char * value, const int8_t id);
|
||||||
bool set_wwRedTemp(const char * value, const int8_t id);
|
bool set_wwRedTemp(const char * value, const int8_t id);
|
||||||
|
|||||||
@@ -77,7 +77,6 @@ bool Test::test(const std::string & cmd, int8_t id1, int8_t id2) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// the tests take a lot of memory when built for the ESP32
|
// the tests take a lot of memory when built for the ESP32
|
||||||
// so only including the full set in standalone, otherwise a limited selection of basic tests
|
// so only including the full set in standalone, otherwise a limited selection of basic tests
|
||||||
@@ -665,7 +664,6 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
|
|||||||
EMSESP::webAPIService.webAPIService(&request);
|
EMSESP::webAPIService.webAPIService(&request);
|
||||||
Serial.println();
|
Serial.println();
|
||||||
|
|
||||||
|
|
||||||
request.url("/api/thermostat/hc2/entities");
|
request.url("/api/thermostat/hc2/entities");
|
||||||
EMSESP::webAPIService.webAPIService(&request);
|
EMSESP::webAPIService.webAPIService(&request);
|
||||||
Serial.println();
|
Serial.println();
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/emsesp/EMS-ESP/issues/380
|
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/emsesp/EMS-ESP/issues/380
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user