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

formatting and text changes

Browse Source
This commit is contained in:
proddy
2021-11-10 12:26:59 +01:00
parent 5f2a9b093d
commit e347ac5742
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/devices/generic.cpp
View File

@@ -26,7 +26,6 @@ uuid::log::Logger Generic::logger_{F_(generic), uuid::log::Facility::CONSOLE};
Generic::Generic(uint8_t device_type, uint8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand)
: EMSdevice(device_type, device_id, product_id, version, name, flags, brand) {
// RF-Sensor 0x40 sending temperature in telegram 0x435, see https://github.com/emsesp/EMS-ESP32/issues/103
if (device_id == 0x40) {
register_telegram_type(0x435, F("RFSensorMessage"), false, MAKE_PF_CB(process_RFSensorMessage));

6
src/devices/thermostat.cpp
View File

@@ -659,11 +659,11 @@ void Thermostat::process_RC10Monitor(std::shared_ptr<const Telegram> telegram) {
uint8_t mode = hc->mode * 2;
has_update(telegram->read_value(mode, 0)); // 1: nofrost, 2: night, 4: day
hc->mode = mode / 2; // for enum 0, 1, 2
hc->mode = mode / 2; // for enum 0, 1, 2
has_update(telegram->read_value(hc->setpoint_roomTemp, 1, 1)); // is * 2, force as single byte
has_update(telegram->read_value(hc->curr_roomTemp, 2)); // is * 10
has_update(telegram->read_value(hc->reduceminutes, 5));
hc->hamode = hc->mode == 2 ? 1 : 0; // set special HA mode
hc->hamode = hc->mode == 2 ? 1 : 0; // set special HA mode
}
// type 0xB0 - for reading the mode from the RC10 thermostat (0x17)
@@ -680,7 +680,7 @@ void Thermostat::process_RC10Set(std::shared_ptr<const Telegram> telegram) {
has_update(telegram->read_value(hc->nighttemp, 3));
has_update(telegram->read_value(hc->daytemp, 4));
has_update(telegram->read_value(hc->reducehours, 5));
has_update(telegram->read_value(ibaBuildingType_ ,6));
has_update(telegram->read_value(ibaBuildingType_, 6));
}
// 0xA8 - for reading the mode from the RC20 thermostat (0x17)

2
src/mqtt.cpp
View File

@@ -160,7 +160,7 @@ void Mqtt::loop() {
void Mqtt::show_mqtt(uuid::console::Shell & shell) {
shell.printfln(F("MQTT is %s"), connected() ? uuid::read_flash_string(F_(connected)).c_str() : uuid::read_flash_string(F_(disconnected)).c_str());
shell.printfln(F("MQTT publish fails count: %lu"), mqtt_publish_fails_);
shell.printfln(F("MQTT publish errors: %lu"), mqtt_publish_fails_);
shell.println();
// show subscriptions

9
src/web/WebAPIService.cpp
View File

@@ -59,9 +59,7 @@ void WebAPIService::webAPIService_post(AsyncWebServerRequest * request, JsonVari
// parse the URL looking for query or path parameters
// reporting back any errors
void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject & input) {
auto method = request->method();
// see if the user has admin privelegs
// check if the user has admin privileges (token is included and authorized)
bool is_admin;
EMSESP::webSettingsService.read([&](WebSettings & settings) {
Authentication authentication = _securityManager->authenticateRequest(request);
@@ -84,9 +82,8 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject & input) {
}
emsesp::EMSESP::logger().err(error);
} else {
emsesp::EMSESP::logger().info(F("Command called"));
// if there was not json output from the call, default to the message 'OK'.
// this will be used for example when calling endpoints e.g. /api/thermostat/temp
emsesp::EMSESP::logger().debug(F("API command called successfully"));
// if there was no json output from the call, default to the output message 'OK'.
if (!output.size()) {
output["message"] = "OK";
}