Skip to content

Commit

Permalink
2023.10.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Yonsm committed Oct 31, 2023
1 parent 9dac07a commit 02dff8b
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .HA_VERSION
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2023.4.4
2023.10.5
10 changes: 10 additions & 0 deletions automations/sleeping.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@
data:
entity_id: climate.er_tong_fang_kong_diao
fan_mode: 自动
- service: climate.set_temperature
data:
entity_id: climate.zhu_wo_kong_diao
temperature: 22
hvac_mode: cool
- service: climate.set_temperature
data:
entity_id: climate.er_tong_fang_kong_diao
temperature: 24
hvac_mode: cool
- service: fan.turn_off
entity_id: fan.er_tong_fang_feng_shan
- service: fan.turn_off
Expand Down
4 changes: 2 additions & 2 deletions automations/washer.yaml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
- service: vacuum.send_command
data:
entity_id: vacuum.yu_shi_xi_yi_ji
command: turn_on;Mode=0;appoint
command: turn_on;Mode=0;sleep;appoint

- alias: 浴室按钮长按—预约洗烘
trigger:
Expand All @@ -59,7 +59,7 @@
- service: vacuum.send_command
data:
entity_id: vacuum.yu_shi_xi_yi_ji
command: turn_on;Mode=2;appoint
command: turn_on;Mode=2;sleep;appoint

- alias: 浴室按钮双击—取消预约
trigger:
Expand Down
15 changes: 7 additions & 8 deletions configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ zone:
# map:
logbook:
history:
logger:
default: warning
logs:
custom_components: debug

recorder:
purge_keep_days: 2
exclude:
domains:
- sun
Expand All @@ -70,14 +77,6 @@ history:
- input_select
- input_boolean

logger:
default: warning
logs:
custom_components: debug

recorder:
purge_keep_days: 2

# tts:
# - platform: baidu
# app_id: !secret baidu_app_id
Expand Down
14 changes: 8 additions & 6 deletions extras/test/test_modbus.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
from pymodbus.client.sync import ModbusTcpClient as ModbusClient
from pymodbus.transaction import ModbusRtuFramer as ModbusFramer

# import socket
# s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
# s.settimeout(5)
# s.connect(('ModBus', 8899))
# s.sendall(b'\x55\xAA\x55\x00\x25\x80\x03\xA8') # For USR initialize
# s.close()
import socket
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(5)
s.connect(('192.168.1.60', 8899))
s.sendall(b'\x55\xAA\x55\x00\x25\x80\x03\xA8') # For USR initialize
s.close()



ATTR_MAP = {
'temperature': {'registers': [3, 6, 9, 12], 'register_type': 'input'},
Expand Down
16 changes: 8 additions & 8 deletions fans.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
- platform: zhimijia
model: zhimi.fan.v3
name: 儿童房风扇
did: 63038010
- platform: zhimijia
model: zhimi.fan.fa1
name: 书房风扇
did: 242978949
# - platform: zhimijia
# model: zhimi.fan.v3
# name: 儿童房风扇
# did: 63038010
# - platform: zhimijia
# model: zhimi.fan.fa1
# name: 书房风扇
# did: 242978949
# - platform: zhimijia
# model: zhimi.fan.za3
# name: 定南风扇
Expand Down
2 changes: 1 addition & 1 deletion modules/ZhiMiJia
2 changes: 1 addition & 1 deletion modules/ZhiModBus

0 comments on commit 02dff8b

Please sign in to comment.