mirror of
https://github.com/Laxilef/OTGateway.git
synced 2026-05-07 09:48:24 +05:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6292305143 | |||
| 4775d36f1b | |||
| 1f895690db | |||
| 13e8bedf3f | |||
| 3a6bb03456 | |||
| 7fcca3c4aa | |||
| 2f6bd237c7 | |||
| e4d1ba7d7b |
@@ -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:
|
||||
|
||||
+2
-2
@@ -4,12 +4,12 @@
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"cssnano": "^7.0.2",
|
||||
"cssnano": "^8.0.0",
|
||||
"cssnano-preset-advanced": "^7.0.2",
|
||||
"gulp": "^5.0.0",
|
||||
"gulp-concat": "^2.6.1",
|
||||
"gulp-gzip": "^1.4.2",
|
||||
"gulp-html-minifier-terser": "^7.1.0",
|
||||
"gulp-html-minifier-terser": "^8.0.0",
|
||||
"gulp-jsonminify": "^1.1.0",
|
||||
"gulp-postcss": "^10.0.0",
|
||||
"gulp-terser": "^2.1.0",
|
||||
|
||||
+2
-4
@@ -26,11 +26,9 @@ lib_deps =
|
||||
gyverlibs/GyverPID@^3.3.2
|
||||
gyverlibs/GyverBlinker@^1.1.1
|
||||
pstolarz/OneWireNg@^0.14.1
|
||||
;milesburton/DallasTemperature@^4.0.5
|
||||
https://github.com/Laxilef/Arduino-Temperature-Control-Library#fix_85c
|
||||
milesburton/DallasTemperature@^4.0.6
|
||||
laxilef/TinyLogger@^1.1.1
|
||||
lib_ignore =
|
||||
paulstoffregen/OneWire
|
||||
lib_ignore = OneWire
|
||||
build_type = ${secrets.build_type}
|
||||
build_flags =
|
||||
-mtext-section-literals
|
||||
|
||||
@@ -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;
|
||||
|
||||
+11
-6
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+8
-11
@@ -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) {
|
||||
|
||||
@@ -320,7 +320,7 @@
|
||||
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
let actionTimer = null;
|
||||
let actionLongPress = false;
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
setTimeout(async function onLoadPage() {
|
||||
try {
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
const fillData = (data) => {
|
||||
setInputValue("[name='hostname']", data.hostname);
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
<script>
|
||||
document.addEventListener("DOMContentLoaded", async () => {
|
||||
const lang = new Lang(document.getElementById("lang"));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
const container = document.querySelector("article");
|
||||
const templateNode = container.querySelector("#template");
|
||||
|
||||
@@ -925,7 +925,7 @@
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
let etChart = null;
|
||||
let etChartConfig = {
|
||||
|
||||
@@ -105,7 +105,7 @@
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
const lang = new Lang(document.getElementById('lang'));
|
||||
lang.build();
|
||||
await lang.build();
|
||||
|
||||
setupRestoreBackupForm('#restore');
|
||||
setupUpgradeForm('#upgrade');
|
||||
|
||||
Reference in New Issue
Block a user