Skip to content

Commit

Permalink
prepare to release
Browse files Browse the repository at this point in the history
  • Loading branch information
dentra committed Oct 8, 2022
1 parent faf7664 commit e726338
Show file tree
Hide file tree
Showing 10 changed files with 117 additions and 51 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ secrets.yaml
/partitions.csv
CMakeListsPrivate.txt
CMakeLists.txt
Doxygen

/compile_commands.json
/.clang_complete
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
[![Support author][donate-me-shield]][donate-me]
[![PayPal.Me][paypal-me-shield]][paypal-me]

[version-shield]: https://img.shields.io/static/v1?label=Version&message=2022.7.0&color=green
[version-shield]: https://img.shields.io/static/v1?label=Version&message=2022.10.0&color=green
[version]: https://github.com/dentra/esphome-tion/releases/

[license-shield]: https://img.shields.io/static/v1?label=License&message=MIT&color=orange&logo=license
[license]: https://opensource.org/licenses/MIT

[esphome-release-shield]: https://img.shields.io/static/v1?label=ESPHome&message=2022.6&color=green&logo=esphome
[esphome-release-shield]: https://img.shields.io/static/v1?label=ESPHome&message=2022.9&color=green&logo=esphome
[esphome-release]: https://github.com/esphome/esphome/releases/

[open-in-vscode-shield]: https://img.shields.io/static/v1?label=+&message=Open+in+VSCode&color=blue&logo=visualstudiocode
Expand All @@ -31,7 +31,7 @@

Версия на русском языке доступна [здесь](README_ru.md).

This is a ESPHome component to control `Tion 4S`, `Tion Lite` and `Tion 3S` Breezers from ESP32 via BLE protocol.
This is a ESPHome component to control `Tion 4S`, `Tion Lite` and `Tion 3S` Breezers from ESP32 via BLE protocol and `Tion 4S` breezer via ingergation port with any ESP32/ESP8266 dongle.

At this moment the componet is build using climate platform and allows to control:

Expand Down
6 changes: 3 additions & 3 deletions README_ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
[![Support author][donate-me-shield]][donate-me]
[![PayPal.Me][paypal-me-shield]][paypal-me]

[version-shield]: https://img.shields.io/static/v1?label=Version&message=2022.7.0&color=green
[version-shield]: https://img.shields.io/static/v1?label=Version&message=2022.10.0&color=green
[version]: https://github.com/dentra/esphome-tion/releases/

[license-shield]: https://img.shields.io/static/v1?label=License&message=MIT&color=orange&logo=license
[license]: https://opensource.org/licenses/MIT

[esphome-release-shield]: https://img.shields.io/static/v1?label=ESPHome&message=2022.6&color=green&logo=esphome
[esphome-release-shield]: https://img.shields.io/static/v1?label=ESPHome&message=2022.9&color=green&logo=esphome
[esphome-release]: https://github.com/esphome/esphome/releases/

[open-in-vscode-shield]: https://img.shields.io/static/v1?label=+&message=Open+in+VSCode&color=blue&logo=visualstudiocode
Expand All @@ -31,7 +31,7 @@

English version of this page is available [here](README.md).

Компонет ESPHome для управления бризерами `Tion 4S`, `Tion Lite` и `Tion 3S` с помощью ESP32 через BLE протокол.
Компонет ESPHome для управления бризерами `Tion 4S`, `Tion Lite` и `Tion 3S` с помощью ESP32 через BLE протокол и бризером `Tion 4S` посредсвом прямого подключения через интеграционный разъем с помощью стика ESP32/ESP8266 (как уточняйте в чате [Telegram][telegram]).

На текущий момент компонент построен на платформе `climate` и позволяет контролировать:

Expand Down
6 changes: 2 additions & 4 deletions packages/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ logger:
esp32_ble_tracker:

external_components:
- source: github://dentra/esphome-components
components: [crash_info, etl]
- source: $tion_source

ble_client:
mac_address: $tion_mac_address
id: tion_ble_client
29 changes: 29 additions & 0 deletions packages/crash_info.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
crash_info:
id: crash_info_ptr
indicator:
id: crash_info_state_ptr
name: $name Crash state
store_in_flash: false # test save in flash, may lead to not to save because of using dynamic memory
store_free_heap: false
max_stack_frames_size: 40

text_sensor:
- platform: template
id: crash_info_stack_frames_ptr
name: $name Crash stack frames
lambda: |-
if (!id(crash_info_stack_frames_ptr).has_state()) {
if (id(crash_info_state_ptr).state) {
return {id(crash_info_ptr).get_stack_frames()};
}
}
return {};
entity_category: diagnostic
update_interval: 60min

button:
- platform: template
name: $name Reset crash state
on_press:
lambda: id(crash_info_ptr).reset();
entity_category: diagnostic
4 changes: 0 additions & 4 deletions packages/idf.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
substitutions:
framework_type: esp-idf

external_components:
- source: github://pr#3594
components: ["esp32_ble_tracker"]
1 change: 1 addition & 0 deletions packages/restart.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
button:
- platform: restart
name: $name Restart
entity_category: diagnostic
53 changes: 34 additions & 19 deletions tion-3s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,31 @@ wifi:
ssid: $wifi_ssid
password: $wifi_password

button:
- platform: template
name: "$name Pair"
on_press:
lambda: id(tion_climate).pair();
entity_category: config
## Uncomment next 5 lines to enable switch for enable reset pair functionality.
# - platform: template
# name: "$name Reset Pair"
# on_press:
# lambda: id(tion_climate).reset_pair();
# entity_category: config
ble_client:
mac_address: $tion_mac_address
id: tion_ble_client

# Virtual port configuration
vport:
- platform: tion_ble_3s
id: tion3s_ble_vport
ble_client_id: tion_ble_client
# Optional, How often query device state. Default: 60s.
update_interval: 60s
# Optional, Do not disconnect after receiving state. Default: false.
persistent_connection: false
# Optional, Timeout to reconnect if no state answer received. Default: 15s.
state_timeout: 15s
# Optional, Sena a pair command after every connect (experimental feature)
#experimental_always_pair: false
# Optional, Allow to disable other BLE device scanning when breezer is already connected.
disable_scan: false

# Main component configuration.
climate:
- platform: tion_3s
id: tion_climate
ble_client_id: tion_ble_client
vport_id: tion3s_ble_vport
name: "$name"
# Optional, Buzzer control switch.
buzzer:
Expand All @@ -75,12 +83,6 @@ climate:
# Optional, Tion firmware version.
version:
name: "$name Version"
# Optional, Timeout to reconnect if no state answer received. Default: 15s.
state_timeout: 15s
# Optional, How often query device state. Default: 60s.
update_interval: 60s
# Optional, Do not disconnect after receiving state. Default: false.
persistent_connection: false
# Optional, Enable presets. Default: <empty>
# Awailable configurable presets: home, away, boost, comfort, eco, sleep, activity.
# Defaults:
Expand All @@ -107,3 +109,16 @@ climate:
# Optional, display remaining boost time
boost_time_left:
name: $name Boost Time Left

button:
- platform: template
name: "$name Pair"
on_press:
lambda: id(tion3s_ble_vport).pair();
entity_category: config
## Uncomment next 5 lines to enable switch for enable reset pair functionality.
# - platform: template
# name: "$name Reset Pair"
# on_press:
# lambda: id(tion3s_ble_vport).reset_pair();
# entity_category: config
31 changes: 22 additions & 9 deletions tion-4s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,30 @@ wifi:
ssid: $wifi_ssid
password: $wifi_password

ble_client:
mac_address: $tion_mac_address
id: tion_ble_client

# Virtual port configuration
vport:
- platform: tion_ble
id: tion4s_ble_vport
ble_client_id: tion_ble_client
# Optional, How often query device state. Default: 60s.
update_interval: 60s
# Optional, Do not disconnect after receiving state. Default: false.
persistent_connection: false
# Optional, Timeout to reconnect if no state answer received. Default: 15s.
state_timeout: 15s
# Optional, Allow to disable other BLE device scanning when breezer is already connected.
disable_scan: false

# Main component configuration.
climate:
- platform: tion_4s
ble_client_id: tion_ble_client
name: "$name"
# Optional, virtual port id. Default: autodetect
vport_id: tion4s_ble_vport
# Optional, Buzzer control switch.
buzzer:
name: "$name Buzzer"
Expand Down Expand Up @@ -71,12 +90,6 @@ climate:
# Optional, Tion firmware version.
version:
name: "$name Version"
# Optional, Timeout to reconnect if no state answer received. Default: 15s.
state_timeout: 15s
# Optional, How often query device state. Default: 60s.
update_interval: 60s
# Optional, Do not disconnect after receiving state. Default: false.
persistent_connection: false
# Optional, Enable presets. Default: <empty>
# Awailable configurable presets: home, away, boost, comfort, eco, sleep, activity.
# Defaults:
Expand All @@ -90,13 +103,13 @@ climate:
# Boost is a special preset that runs for a period defined by boost_time and then switches back to the previous preset.
presets:
# enable and override "home" preset
home: { fan_speed: 2, target_temperature: 15, mode: heat }
home: { fan_speed: 2, target_temperature: 16, mode: heat }
# enable "away" preset
away:
# enable "boost" preset
boost:
# enable and override "sleep" preset
sleep: { fan_speed: 1, target_temperature: 15, mode: heat }
sleep: { fan_speed: 1, target_temperature: 18, mode: heat }
# Optional, configure boost time
boost_time:
name: $name Boost Time
Expand Down
31 changes: 22 additions & 9 deletions tion-lt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,30 @@ wifi:
ssid: $wifi_ssid
password: $wifi_password

ble_client:
mac_address: $tion_mac_address
id: tion_ble_client

# Virtual port configuration
vport:
- platform: tion_ble
id: tionLt_ble_vport
ble_client_id: tion_ble_client
# Optional, How often query device state. Default: 60s.
update_interval: 60s
# Optional, Do not disconnect after receiving state. Default: false.
persistent_connection: false
# Optional, Timeout to reconnect if no state answer received. Default: 15s.
state_timeout: 15s
# Optional, Allow to disable other BLE device scanning when breezer is already connected. Default: false.
disable_scan: false

# Main climate component configuration.
climate:
- platform: tion_lt
ble_client_id: tion_ble_client
name: "$name"
# Optional, virtual port id. Default: autodetect
vport_id: tionLt_ble_vport
# Optional, Buzzer control switch.
buzzer:
name: "$name Buzzer"
Expand All @@ -68,12 +87,6 @@ climate:
# Optional, Tion firmware version.
version:
name: "$name Version"
# Optional, Timeout to reconnect if no state answer received. Default: 15s.
state_timeout: 15s
# Optional, How often query device state. Default: 60s.
update_interval: 60s
# Optional, Do not disconnect after receiving state. Default: false.
persistent_connection: false
# Optional, Enable presets. Default: <empty>
# Awailable configurable presets: home, away, boost, comfort, eco, sleep, activity.
# Defaults:
Expand All @@ -87,13 +100,13 @@ climate:
# Boost is a special preset that runs for a period defined by boost_time and then switches back to the previous preset.
presets:
# enable and override "home" preset
home: { fan_speed: 2, target_temperature: 15, mode: heat }
home: { fan_speed: 2, target_temperature: 16, mode: heat }
# enable "away" preset
away:
# enable "boost" preset
boost:
# enable and override "sleep" preset
sleep: { fan_speed: 1, target_temperature: 15, mode: heat }
sleep: { fan_speed: 1, target_temperature: 18, mode: heat }
# Optional, configure boost time
boost_time:
name: $name Boost Time
Expand Down

0 comments on commit e726338

Please sign in to comment.