diff --git a/entities/template/binary_sensors/tpl_bsen_ch_dev_status.yaml b/entities/template/binary_sensors/tpl_bsen_ch_dev_status.yaml index fd0c41dc..2c3e0a40 100644 --- a/entities/template/binary_sensors/tpl_bsen_ch_dev_status.yaml +++ b/entities/template/binary_sensors/tpl_bsen_ch_dev_status.yaml @@ -7,5 +7,5 @@ - name: CH Water Pump Status unique_id: dc675ac6-f4d0-4f64-b575-adf974639020 device_class: power - state: "{{ (states('sensor.gosund_sp111_11_watt') | float(0)) > 1000 }}" + state: "{{ (states('sensor.sonoff_pow_r3_02_power') | float(0)) > 1000 }}" icon: mdi:water-pump \ No newline at end of file diff --git a/esphome/sonoff-pow-r3-01.yaml b/esphome/sonoff-pow-r3-01.yaml index 17a7df29..77cb0e25 100644 --- a/esphome/sonoff-pow-r3-01.yaml +++ b/esphome/sonoff-pow-r3-01.yaml @@ -2,7 +2,7 @@ substitutions: esp_board: nodemcu-32s board_name: sonoff-pow-r3-01 room_name: Country House - cse7766_update_interval: 5s + cse7766_update_interval: 2s packages: wifi: !include common/wifi_ch.yaml @@ -12,8 +12,8 @@ esp32: framework: type: esp-idf -#wifi: -# use_address: 192.168.10.149 +wifi: + use_address: 192.168.10.226 web_server: port: 80 @@ -21,7 +21,8 @@ web_server: improv_serial: !remove logger: - baud_rate: 0 + level: INFO + #baud_rate: 0 uart: rx_pin: GPIO16 @@ -70,15 +71,15 @@ sensor: unit_of_measurement: °C id: esp32_temp -# - platform: template -# name: ${board_name} Power Factor -# device_class: power_factor -# id: power_factor -# lambda: return id(w_sensor).state / id(v_sensor).state / id(a_sensor).state; + #- platform: template + # name: ${board_name} Power Factor + # device_class: power_factor + # id: power_factor + # lambda: return id(w_sensor).state / id(v_sensor).state / id(a_sensor).state; - - platform: esp32_hall - name: ${board_name} ESP32 Hall Sensor - update_interval: 60s + #- platform: esp32_hall + # name: ${board_name} ESP32 Hall Sensor + # update_interval: 60s binary_sensor: - platform: gpio @@ -163,14 +164,8 @@ switch: on_turn_off: - delay: 500ms - light.turn_off: switch_led - - platform: restart - name: ${board_name} Restart text_sensor: - - platform: template - name: ${board_name} Uptime - id: uptime_human - icon: mdi:clock-start - platform: wifi_info ip_address: name: ${board_name} IP diff --git a/esphome/sonoff-pow-r3-02.yaml b/esphome/sonoff-pow-r3-02.yaml index d2294ad2..1d8e3496 100644 --- a/esphome/sonoff-pow-r3-02.yaml +++ b/esphome/sonoff-pow-r3-02.yaml @@ -2,7 +2,7 @@ substitutions: esp_board: nodemcu-32s board_name: sonoff-pow-r3-02 room_name: Country House - cse7766_update_interval: 5s + cse7766_update_interval: 2s packages: wifi: !include common/wifi_ch.yaml @@ -12,8 +12,8 @@ esp32: framework: type: esp-idf -#wifi: -# use_address: 192.168.10.149 +wifi: + use_address: 192.168.10.154 web_server: port: 80 @@ -21,7 +21,8 @@ web_server: improv_serial: !remove logger: - baud_rate: 0 + level: INFO + #baud_rate: 0 uart: rx_pin: GPIO16 @@ -76,9 +77,9 @@ sensor: # id: power_factor # lambda: return id(w_sensor).state / id(v_sensor).state / id(a_sensor).state; - - platform: esp32_hall - name: ${board_name} ESP32 Hall Sensor - update_interval: 60s +# - platform: esp32_hall +# name: ${board_name} ESP32 Hall Sensor +# update_interval: 60s binary_sensor: - platform: gpio @@ -163,14 +164,8 @@ switch: on_turn_off: - delay: 500ms - light.turn_off: switch_led - - platform: restart - name: ${board_name} Restart text_sensor: - - platform: template - name: ${board_name} Uptime - id: uptime_human - icon: mdi:clock-start - platform: wifi_info ip_address: name: ${board_name} IP diff --git a/lovelace/views/vi_ch_system.yaml b/lovelace/views/vi_ch_system.yaml index 0c003a87..6002d767 100644 --- a/lovelace/views/vi_ch_system.yaml +++ b/lovelace/views/vi_ch_system.yaml @@ -40,15 +40,26 @@ cards: ###
Розетки
- type: entities entities: - - entity: switch.gosund_sp111_11_switch + - entity: switch.sonoff_pow_r3_02 name: Насос icon: mdi:water-pump - - entity: sensor.gosund_sp111_11_watt + - entity: sensor.sonoff_pow_r3_02_power type: custom:multiple-entity-row name: "Потребление" icon: [] entities: - - entity: sensor.gosund_sp111_11_ampere + - entity: sensor.sonoff_pow_r3_02_current + name: false + - entity: switch.sonoff_pow_r3_01 + name: Септик + #icon: mdi:toilet + icon: mdi:biohazard + - entity: sensor.sonoff_pow_r3_01_power + type: custom:multiple-entity-row + name: "Потребление" + icon: [] + entities: + - entity: sensor.sonoff_pow_r3_01_current name: false - entity: switch.gosund_sp111_01_switch name: Бойлер diff --git a/packages/country_house/pack_ch_energy.yaml b/packages/country_house/pack_ch_energy.yaml index 5e9ec351..4ca84add 100644 --- a/packages/country_house/pack_ch_energy.yaml +++ b/packages/country_house/pack_ch_energy.yaml @@ -512,7 +512,7 @@ ch_energy_pack: socket_ch_water_pump_energy_daily: unique_id: fdd4ae5c-8671-4785-a1f5-664270929cdb name: Water Pump Daily Energy - source: sensor.gosund_sp111_11_todays_usage + source: sensor.sonoff_pow_r3_02_total_daily_energy cycle: daily tariffs: - total @@ -520,7 +520,7 @@ ch_energy_pack: socket_ch_water_pump_energy_monthly: unique_id: e1d44185-e5fb-40ae-a7fb-67048f72baaa name: Water Pump Monthly Energy - source: sensor.gosund_sp111_11_todays_usage + source: sensor.sonoff_pow_r3_02_total_daily_energy cycle: monthly tariffs: - total diff --git a/packages/country_house/pack_ch_misc.yaml b/packages/country_house/pack_ch_misc.yaml index ff02c6e0..ff04a29f 100644 --- a/packages/country_house/pack_ch_misc.yaml +++ b/packages/country_house/pack_ch_misc.yaml @@ -35,17 +35,17 @@ ch_misc_pack: entity_id: switch.gosund_sp111_01_switch from: "off" to: "on" - condition: "{{ is_state('switch.gosund_sp111_11_switch', 'off') }}" + condition: "{{ is_state('switch.sonoff_pow_r3_02', 'off') }}" action: - service: switch.turn_on target: - entity_id: switch.gosund_sp111_11_switch + entity_id: switch.sonoff_pow_r3_02 - alias: Дача - Насос - Оповещение о состоянии id: 5db218dd-eef9-45ab-aa9f-f9e814fdfe62 trigger: - platform: state - entity_id: switch.gosund_sp111_11_switch + entity_id: switch.sonoff_pow_r3_02 not_from: - unavailable - unknown