mirror of
https://github.com/Laxilef/OTGateway.git
synced 2026-02-02 23:57:44 +05:00
Compare commits
6 Commits
1.6.0
...
7fcca3c4aa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7fcca3c4aa | ||
|
|
2f6bd237c7 | ||
|
|
e4d1ba7d7b | ||
|
|
b70c212235 | ||
|
|
781b2a1f9c | ||
|
|
10ab75c055 |
@@ -1,5 +1,5 @@
|
||||
# Blueprint for reporting indoor/outdoor temperature to OpenTherm Gateway from any home assistant sensor
|
||||
# Updated: 03.09.2024
|
||||
# Updated: 26.01.2026
|
||||
|
||||
blueprint:
|
||||
name: Report temp to OpenTherm Gateway
|
||||
@@ -15,7 +15,6 @@ blueprint:
|
||||
multiple: false
|
||||
filter:
|
||||
- domain: sensor
|
||||
device_class: temperature
|
||||
target_entity:
|
||||
name: Target entity
|
||||
description: "Usually ``number.opentherm_indoor_temp`` or ``number.opentherm_outdoor_temp``"
|
||||
@@ -38,8 +37,12 @@ condition:
|
||||
value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
|
||||
action:
|
||||
- if:
|
||||
- condition: template
|
||||
value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
|
||||
- condition: or
|
||||
conditions:
|
||||
- condition: template
|
||||
value_template: "{{ (states(source_entity)|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.01 }}"
|
||||
- condition: template
|
||||
value_template: "{{ (as_timestamp(now()) - as_timestamp(states[target_entity].last_updated)) | int(0) > 300 }}"
|
||||
then:
|
||||
- service: number.set_value
|
||||
data:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Blueprint for reporting temperature to OpenTherm Gateway from home assistant weather integration
|
||||
# Updated: 03.09.2024
|
||||
# Updated: 26.01.2026
|
||||
|
||||
blueprint:
|
||||
name: Report temp to OpenTherm Gateway from Weather
|
||||
@@ -37,8 +37,12 @@ condition:
|
||||
value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
|
||||
action:
|
||||
- if:
|
||||
- condition: template
|
||||
value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
|
||||
- condition: or
|
||||
conditions:
|
||||
- condition: template
|
||||
value_template: "{{ (state_attr(source_entity, 'temperature')|float(0) - states(target_entity)|float(0)) | abs | round(2) >= 0.1 }}"
|
||||
- condition: template
|
||||
value_template: "{{ (as_timestamp(now()) - as_timestamp(states[target_entity].last_updated)) | int(0) > 300 }}"
|
||||
then:
|
||||
- service: number.set_value
|
||||
data:
|
||||
|
||||
@@ -25,8 +25,12 @@ lib_deps =
|
||||
gyverlibs/FileData@^1.0.3
|
||||
gyverlibs/GyverPID@^3.3.2
|
||||
gyverlibs/GyverBlinker@^1.1.1
|
||||
https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
|
||||
pstolarz/OneWireNg@^0.14.1
|
||||
;milesburton/DallasTemperature@^4.0.5
|
||||
https://github.com/Laxilef/Arduino-Temperature-Control-Library#fix_85c
|
||||
laxilef/TinyLogger@^1.1.1
|
||||
lib_ignore =
|
||||
paulstoffregen/OneWire
|
||||
build_type = ${secrets.build_type}
|
||||
build_flags =
|
||||
-mtext-section-literals
|
||||
@@ -73,7 +77,7 @@ platform_packages = ${env.platform_packages}
|
||||
lib_deps =
|
||||
${env.lib_deps}
|
||||
nrwiersma/ESP8266Scheduler@^1.2
|
||||
lib_ignore =
|
||||
lib_ignore = ${env.lib_ignore}
|
||||
extra_scripts =
|
||||
post:tools/build.py
|
||||
build_type = ${env.build_type}
|
||||
@@ -92,14 +96,14 @@ check_flags = ${env.check_flags}
|
||||
;platform_packages =
|
||||
; framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
|
||||
; framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
|
||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.35/platform-espressif32.zip
|
||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
|
||||
platform_packages = ${env.platform_packages}
|
||||
board_build.partitions = esp32_partitions.csv
|
||||
lib_deps =
|
||||
${env.lib_deps}
|
||||
laxilef/ESP32Scheduler@^1.0.1
|
||||
nimble_lib = h2zero/NimBLE-Arduino@2.3.7
|
||||
lib_ignore =
|
||||
lib_ignore = ${env.lib_ignore}
|
||||
extra_scripts =
|
||||
post:tools/esp32.py
|
||||
post:tools/build.py
|
||||
|
||||
@@ -135,8 +135,6 @@ protected:
|
||||
tMqtt->disable();
|
||||
}
|
||||
|
||||
Sensors::setConnectionStatusByType(Sensors::Type::MANUAL, !settings.mqtt.enabled || vars.mqtt.connected, false);
|
||||
|
||||
} else {
|
||||
if (this->ntpStarted) {
|
||||
this->ntpStarted = false;
|
||||
|
||||
@@ -241,7 +241,17 @@ protected:
|
||||
|
||||
doc.shrinkToFit();
|
||||
|
||||
this->webServer->sendHeader(F("Content-Disposition"), F("attachment; filename=\"backup.json\""));
|
||||
char filename[64];
|
||||
getFilename(filename, sizeof(filename), "backup");
|
||||
|
||||
char contentDispositionHeaderValue[128];
|
||||
snprintf_P(
|
||||
contentDispositionHeaderValue,
|
||||
sizeof(contentDispositionHeaderValue),
|
||||
PSTR("attachment; filename=\"%s\""),
|
||||
filename
|
||||
);
|
||||
this->webServer->sendHeader(F("Content-Disposition"), contentDispositionHeaderValue);
|
||||
this->bufferedWebServer->send(200, F("application/json"), doc);
|
||||
});
|
||||
|
||||
@@ -839,7 +849,18 @@ protected:
|
||||
|
||||
doc.shrinkToFit();
|
||||
|
||||
this->webServer->sendHeader(F("Content-Disposition"), F("attachment; filename=\"debug.json\""));
|
||||
char filename[64];
|
||||
getFilename(filename, sizeof(filename), "debug");
|
||||
|
||||
char contentDispositionHeaderValue[128];
|
||||
snprintf_P(
|
||||
contentDispositionHeaderValue,
|
||||
sizeof(contentDispositionHeaderValue),
|
||||
PSTR("attachment; filename=\"%s\""),
|
||||
filename
|
||||
);
|
||||
|
||||
this->webServer->sendHeader(F("Content-Disposition"), contentDispositionHeaderValue);
|
||||
this->bufferedWebServer->send(200, F("application/json"), doc, true);
|
||||
});
|
||||
|
||||
@@ -1046,4 +1067,12 @@ protected:
|
||||
this->dnsServer->stop();
|
||||
this->dnsServerEnabled = false;
|
||||
}
|
||||
|
||||
static void getFilename(char* filename, size_t maxSizeFilename, const char* type) {
|
||||
const time_t now = time(nullptr);
|
||||
const tm* localNow = localtime(&now);
|
||||
char localNowValue[20];
|
||||
strftime(localNowValue, sizeof(localNowValue), PSTR("%Y-%m-%d-%H-%M-%S"), localNow);
|
||||
snprintf_P(filename, maxSizeFilename, PSTR("%s_%s_%s.json"), networkSettings.hostname, localNowValue, type);
|
||||
}
|
||||
};
|
||||
@@ -66,7 +66,8 @@ public:
|
||||
}
|
||||
|
||||
protected:
|
||||
const unsigned int disconnectedTimeout = 120000;
|
||||
const unsigned int wiredDisconnectTimeout = 180000u;
|
||||
const unsigned int wirelessDisconnectTimeout = 600000u;
|
||||
const unsigned short dallasSearchInterval = 60000;
|
||||
const unsigned short dallasPollingInterval = 10000;
|
||||
const unsigned short globalPollingInterval = 15000;
|
||||
@@ -1004,12 +1005,16 @@ protected:
|
||||
} else if (rSensor.connected && sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
|
||||
Sensors::setConnectionStatusById(sensorId, false, false);
|
||||
|
||||
} else if (sSensor.type != Sensors::Type::MANUAL && rSensor.connected && (millis() - rSensor.activityTime) > this->disconnectedTimeout) {
|
||||
Sensors::setConnectionStatusById(sensorId, false, false);
|
||||
} else if (rSensor.connected) {
|
||||
if (sSensor.type == Sensors::Type::MANUAL || sSensor.type == Sensors::Type::BLUETOOTH) {
|
||||
if ((millis() - rSensor.activityTime) > this->wirelessDisconnectTimeout) {
|
||||
Sensors::setConnectionStatusById(sensorId, false, false);
|
||||
}
|
||||
|
||||
}/* else if (!rSensor.connected) {
|
||||
rSensor.connected = true;
|
||||
}*/
|
||||
} else if ((millis() - rSensor.activityTime) > this->wiredDisconnectTimeout) {
|
||||
Sensors::setConnectionStatusById(sensorId, false, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
19
src/utils.h
19
src/utils.h
@@ -2109,21 +2109,18 @@ bool jsonToSensorResult(const uint8_t sensorId, const JsonVariantConst src) {
|
||||
return false;
|
||||
}
|
||||
|
||||
auto& dst = Sensors::results[sensorId];
|
||||
bool changed = false;
|
||||
|
||||
// value
|
||||
if (!src[FPSTR(S_VALUE)].isNull()) {
|
||||
float value = src[FPSTR(S_VALUE)].as<float>();
|
||||
|
||||
uint8_t vType = static_cast<uint8_t>(Sensors::ValueType::PRIMARY);
|
||||
if (fabsf(value - dst.values[vType]) > 0.0001f) {
|
||||
dst.values[vType] = roundf(value, 2);
|
||||
changed = true;
|
||||
}
|
||||
return Sensors::setValueById(
|
||||
sensorId,
|
||||
src[FPSTR(S_VALUE)].as<float>(),
|
||||
Sensors::ValueType::PRIMARY,
|
||||
true,
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
return changed;
|
||||
return false;
|
||||
}
|
||||
|
||||
void varsToJson(const Variables& src, JsonVariant dst) {
|
||||
|
||||
Reference in New Issue
Block a user