From 58a9871a01b2189a24e1ca3e4c8770b348b815b8 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 30 Nov 2023 13:33:05 -0500 Subject: [PATCH 1/9] Update aquapi_config.yaml --- aquapi_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aquapi_config.yaml b/aquapi_config.yaml index 63f13c4..64a0bf7 100644 --- a/aquapi_config.yaml +++ b/aquapi_config.yaml @@ -10,7 +10,7 @@ packages: dallas: !include common/temperature_dallas.yaml binary: !include common/binary.yaml aquapi: !include common/aquapi.yaml - # debug: !include common/debug.yaml + debug: !include common/debug.yaml ezo_ph: !include common/ezo_ph.yaml ezo_ec: !include common/ezo_ec.yaml # ezo_hum: !include common/ezo_hum.yaml From 7decdb87b7cbd8434d2d618e75675df6b1dc9068 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 1 Dec 2023 01:27:13 -0500 Subject: [PATCH 2/9] Update aquapi_config.yaml --- aquapi_config.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aquapi_config.yaml b/aquapi_config.yaml index 64a0bf7..a86a7a3 100644 --- a/aquapi_config.yaml +++ b/aquapi_config.yaml @@ -3,7 +3,7 @@ substitutions: name: "aquapi" friendly_name: "AquaPi" # App Version - Updated: 11/2023 - app_version: "1.3.5" + app_version: "1.3.6" packages: device_base: !include common/device_base.yaml @@ -13,8 +13,8 @@ packages: debug: !include common/debug.yaml ezo_ph: !include common/ezo_ph.yaml ezo_ec: !include common/ezo_ec.yaml - # ezo_hum: !include common/ezo_hum.yaml - # ezo_rtd: !include common/ezo_rtd.yaml - # ezo_co2: !include common/ezo_co2.yaml - # ezo_do: !include common/ezo_do.yaml - # ezo_pmp: !include common/ezo_pmp.yaml \ No newline at end of file + ezo_hum: !include common/ezo_hum.yaml + ezo_rtd: !include common/ezo_rtd.yaml + ezo_co2: !include common/ezo_co2.yaml + ezo_do: !include common/ezo_do.yaml + ezo_pmp: !include common/ezo_pmp.yaml \ No newline at end of file From f4c32e438eea57da7c9800204127f5733e38464a Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 21 Dec 2023 19:19:36 -0500 Subject: [PATCH 3/9] minor minor updates --- common/binary.yaml | 8 ++++---- common/temperature_dallas.yaml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common/binary.yaml b/common/binary.yaml index e0b5456..1903eb2 100644 --- a/common/binary.yaml +++ b/common/binary.yaml @@ -1,8 +1,8 @@ substitutions: - opticalLowPin: "32" - opticalHighPin: "33" - auxPin1: "26" - auxPin2: "27" + opticalLowPin: "32" # yellow + opticalHighPin: "33" # blue + auxPin1: "26" # yellow + auxPin2: "27" # blue # Water Level update_water: "60s" diff --git a/common/temperature_dallas.yaml b/common/temperature_dallas.yaml index 766b0c1..60236e6 100644 --- a/common/temperature_dallas.yaml +++ b/common/temperature_dallas.yaml @@ -23,6 +23,8 @@ sensor: icon: mdi:thermometer-lines index: 0 name: "Temperature" + state_class: "measurement" + device_class: "temperature" filters: - calibrate_linear: method: least_squares @@ -39,6 +41,8 @@ sensor: icon: mdi:thermometer-lines index: 1 name: "Temperature 2" + state_class: "measurement" + device_class: "temperature" filters: - calibrate_linear: method: least_squares From 4dbb1aca995840414863b2633ebc0c4fcc269e89 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 22 Dec 2023 17:48:40 -0500 Subject: [PATCH 4/9] Update aquapi_config.yaml --- aquapi_config.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aquapi_config.yaml b/aquapi_config.yaml index a86a7a3..54f1cb7 100644 --- a/aquapi_config.yaml +++ b/aquapi_config.yaml @@ -10,11 +10,11 @@ packages: dallas: !include common/temperature_dallas.yaml binary: !include common/binary.yaml aquapi: !include common/aquapi.yaml - debug: !include common/debug.yaml + # debug: !include common/debug.yaml ezo_ph: !include common/ezo_ph.yaml ezo_ec: !include common/ezo_ec.yaml - ezo_hum: !include common/ezo_hum.yaml - ezo_rtd: !include common/ezo_rtd.yaml - ezo_co2: !include common/ezo_co2.yaml - ezo_do: !include common/ezo_do.yaml - ezo_pmp: !include common/ezo_pmp.yaml \ No newline at end of file + # ezo_hum: !include common/ezo_hum.yaml + # ezo_rtd: !include common/ezo_rtd.yaml + # ezo_co2: !include common/ezo_co2.yaml + # ezo_do: !include common/ezo_do.yaml + # ezo_pmp: !include common/ezo_pmp.yaml \ No newline at end of file From 46f0d58970ebe97ec8b795e04c668019fe62ad28 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 26 Dec 2023 22:57:33 -0500 Subject: [PATCH 5/9] Temp Binary Sensors temp range binary sensors added --- aquapi_config.yaml | 2 +- common/temperature_dallas.yaml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/aquapi_config.yaml b/aquapi_config.yaml index 54f1cb7..c043e93 100644 --- a/aquapi_config.yaml +++ b/aquapi_config.yaml @@ -3,7 +3,7 @@ substitutions: name: "aquapi" friendly_name: "AquaPi" # App Version - Updated: 11/2023 - app_version: "1.3.6" + app_version: "1.4" packages: device_base: !include common/device_base.yaml diff --git a/common/temperature_dallas.yaml b/common/temperature_dallas.yaml index 60236e6..549a580 100644 --- a/common/temperature_dallas.yaml +++ b/common/temperature_dallas.yaml @@ -110,6 +110,34 @@ sensor: lambda: |- return {${cal_100_2}}; +binary_sensor: + - platform: template + name: Ideal Temp + id: ideal_temp + icon: mdi:thermometer-check + filters: + - lambda: |- + if (id(temp_range).state == "OK") { + return true; + } + else { + return false + } + + - platform: template + name: Ideal Temp 2 + id: ideal_temp_2 + icon: mdi:thermometer-check + disabled_by_default: true + filters: + - lambda: |- + if (id(temp_range_2).state == "OK") { + return true; + } + else { + return false + } + text_sensor: # Temperature Range 1 - platform: template From 8adf715b1ca17774353567d625c12e60d879da8b Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 26 Dec 2023 23:01:44 -0500 Subject: [PATCH 6/9] Update temperature_dallas.yaml --- common/temperature_dallas.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/temperature_dallas.yaml b/common/temperature_dallas.yaml index 549a580..23e7f34 100644 --- a/common/temperature_dallas.yaml +++ b/common/temperature_dallas.yaml @@ -121,7 +121,7 @@ binary_sensor: return true; } else { - return false + return false; } - platform: template @@ -135,7 +135,7 @@ binary_sensor: return true; } else { - return false + return false; } text_sensor: From c7ed9a40a7937ae2abf6509acc31438ab5d46e2f Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 26 Dec 2023 23:10:56 -0500 Subject: [PATCH 7/9] Update temperature_dallas.yaml --- common/temperature_dallas.yaml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/common/temperature_dallas.yaml b/common/temperature_dallas.yaml index 23e7f34..4e9d37c 100644 --- a/common/temperature_dallas.yaml +++ b/common/temperature_dallas.yaml @@ -34,6 +34,7 @@ sensor: on_value: then: - component.update: temp_range + - component.update: ideal_temp # Temperature Probe 2 - platform: dallas @@ -53,6 +54,7 @@ sensor: on_value: then: - component.update: temp_range_2 + - component.update: ideal_temp_2 # Convert to Fahrenheit - Temp. 1 - platform: template @@ -112,20 +114,19 @@ sensor: binary_sensor: - platform: template - name: Ideal Temp + name: Ideal Temperature id: ideal_temp icon: mdi:thermometer-check filters: - lambda: |- if (id(temp_range).state == "OK") { return true; - } - else { - return false; + } else { + return {}; } - platform: template - name: Ideal Temp 2 + name: Ideal Temperature 2 id: ideal_temp_2 icon: mdi:thermometer-check disabled_by_default: true @@ -133,9 +134,8 @@ binary_sensor: - lambda: |- if (id(temp_range_2).state == "OK") { return true; - } - else { - return false; + } else { + return {}; } text_sensor: @@ -197,6 +197,7 @@ number: on_value: then: - component.update: temp_range + - component.update: ideal_temp # Temperature 1 when Warm - platform: template @@ -214,6 +215,7 @@ number: on_value: then: - component.update: temp_range + - component.update: ideal_temp # Temperature 2 when Cool - platform: template @@ -232,6 +234,7 @@ number: on_value: then: - component.update: temp_range_2 + - component.update: ideal_temp_2 # Temperature 2 when Warm - platform: template @@ -249,4 +252,5 @@ number: entity_category: "Config" on_value: then: - - component.update: temp_range_2 \ No newline at end of file + - component.update: temp_range_2 + - component.update: ideal_temp_2 \ No newline at end of file From 58932e8645db533d08ca0b4aacfb97e20b5c280d Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 26 Dec 2023 23:16:55 -0500 Subject: [PATCH 8/9] Update temperature_dallas.yaml --- common/temperature_dallas.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/common/temperature_dallas.yaml b/common/temperature_dallas.yaml index 4e9d37c..99c526d 100644 --- a/common/temperature_dallas.yaml +++ b/common/temperature_dallas.yaml @@ -34,7 +34,6 @@ sensor: on_value: then: - component.update: temp_range - - component.update: ideal_temp # Temperature Probe 2 - platform: dallas @@ -54,7 +53,6 @@ sensor: on_value: then: - component.update: temp_range_2 - - component.update: ideal_temp_2 # Convert to Fahrenheit - Temp. 1 - platform: template @@ -197,7 +195,6 @@ number: on_value: then: - component.update: temp_range - - component.update: ideal_temp # Temperature 1 when Warm - platform: template @@ -215,7 +212,6 @@ number: on_value: then: - component.update: temp_range - - component.update: ideal_temp # Temperature 2 when Cool - platform: template @@ -234,7 +230,6 @@ number: on_value: then: - component.update: temp_range_2 - - component.update: ideal_temp_2 # Temperature 2 when Warm - platform: template @@ -252,5 +247,4 @@ number: entity_category: "Config" on_value: then: - - component.update: temp_range_2 - - component.update: ideal_temp_2 \ No newline at end of file + - component.update: temp_range_2 \ No newline at end of file From b4232b79ef6085a705f1e22a9576293b9d1eed23 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 26 Dec 2023 23:20:33 -0500 Subject: [PATCH 9/9] Update temperature_dallas.yaml --- common/temperature_dallas.yaml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/common/temperature_dallas.yaml b/common/temperature_dallas.yaml index 99c526d..dfafd43 100644 --- a/common/temperature_dallas.yaml +++ b/common/temperature_dallas.yaml @@ -115,26 +115,24 @@ binary_sensor: name: Ideal Temperature id: ideal_temp icon: mdi:thermometer-check - filters: - - lambda: |- - if (id(temp_range).state == "OK") { - return true; - } else { - return {}; - } + lambda: |- + if (id(temp_range).state == "OK") { + return true; + } else { + return false; + } - platform: template name: Ideal Temperature 2 id: ideal_temp_2 icon: mdi:thermometer-check disabled_by_default: true - filters: - - lambda: |- - if (id(temp_range_2).state == "OK") { - return true; - } else { - return {}; - } + lambda: |- + if (id(temp_range_2).state == "OK") { + return true; + } else { + return false; + } text_sensor: # Temperature Range 1