diff --git a/.github/ISSUE_TEMPLATE/2-issue_en.yml b/.github/ISSUE_TEMPLATE/2-issue_en.yml index cd6643a7..11404c8d 100644 --- a/.github/ISSUE_TEMPLATE/2-issue_en.yml +++ b/.github/ISSUE_TEMPLATE/2-issue_en.yml @@ -1,6 +1,6 @@ --- name: Bug report -description: Intergration or entity is not working right +description: Integration or entity is not working right labels: ["bug"] body: - type: input @@ -11,7 +11,7 @@ body: validations: required: true attributes: - label: Intergration version + label: Integration version placeholder: 0.3.18 - type: input validations: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 3cc9bda0..cd1bcd2d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,7 +2,7 @@ ## Reason & Detail -## Releted issue +## Related issue fix #X diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e269bd5e..4c5e5a31 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,10 +44,11 @@ repos: hooks: - id: pyupgrade args: [--py37-plus] - # - repo: https://github.com/codespell-project/codespell - # rev: v2.3.0 - # hooks: - # - id: codespell + - repo: https://github.com/codespell-project/codespell + rev: v2.3.0 + hooks: + - id: codespell + args: ["-L hass", "-w"] - repo: https://github.com/pre-commit/mirrors-mypy rev: v1.10.0 hooks: diff --git a/custom_components/midea_ac_lan/translations/en.json b/custom_components/midea_ac_lan/translations/en.json index 05796b09..6a5bbbc8 100644 --- a/custom_components/midea_ac_lan/translations/en.json +++ b/custom_components/midea_ac_lan/translations/en.json @@ -111,7 +111,7 @@ }, "cmd_body": { "name": "command body", - "description": "The body of command, (not include MSmart protocol head and cheksum at the end)" + "description": "The body of command, (not include MSmart protocol head and checksum at the end)" } } } diff --git a/custom_components/midea_ac_lan/translations/fr.json b/custom_components/midea_ac_lan/translations/fr.json index c40e034e..a8e30090 100644 --- a/custom_components/midea_ac_lan/translations/fr.json +++ b/custom_components/midea_ac_lan/translations/fr.json @@ -116,4 +116,4 @@ } } } -} +} \ No newline at end of file diff --git a/custom_components/midea_ac_lan/translations/hu.json b/custom_components/midea_ac_lan/translations/hu.json index a219272a..9b566241 100644 --- a/custom_components/midea_ac_lan/translations/hu.json +++ b/custom_components/midea_ac_lan/translations/hu.json @@ -50,7 +50,7 @@ "type": "Típus", "ip_address": "IP cím", "port": "Port", - "model": "Modell", + "model": "Model", "subtype": "Altípus", "protocol": "Protokoll", "token": "Token", diff --git a/custom_components/midea_ac_lan/translations/zh-Hans.json b/custom_components/midea_ac_lan/translations/zh-Hans.json index 4e5e5b15..acbcf921 100644 --- a/custom_components/midea_ac_lan/translations/zh-Hans.json +++ b/custom_components/midea_ac_lan/translations/zh-Hans.json @@ -116,4 +116,4 @@ } } } -} +} \ No newline at end of file diff --git a/doc/AC.md b/doc/AC.md index 972231a4..21317132 100644 --- a/doc/AC.md +++ b/doc/AC.md @@ -7,7 +7,7 @@ - Supports fan mode - Supports swing mode - Supports preset mode -- Supports build-in fresh air system +- Supports built-in fresh air system ### Supported Run-Modes @@ -69,7 +69,7 @@ | switch.{DEVICEID}_swing_horizontal | switch | Swing Horizontal | | switch.{DEVICEID}_swing_vertical | switch | Swing Vertical | -## Build-in fresh air system +## Built-in fresh air system Some Midea appliance be named "Fresh Air Appliance", the protocol that actually uses the air conditioner. If your fresh air appliance is identified as an air conditioner, you should check the Fresh Air Fan entity in CONFIGURE, and use this fan entity to control your fresh air appliance.*** diff --git a/doc/B0.md b/doc/B0.md index 978ab9ca..9207ee3b 100644 --- a/doc/B0.md +++ b/doc/B0.md @@ -8,15 +8,27 @@ No default entity. ### Extra entities +<<<<<<< Updated upstream | EntityID | Class | Description | | ----------------------------------------------- | ------------- | ---------------------------------------- | | binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | -| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warnning message) | -| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warnning message) | -| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warnning message) | -| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperatur | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | | sensor.{DEVICEID}\_status | sensor | Current Status | | sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | +======= +| EntityID | Class | Description | +| ----------------------------------------------- | ------------- | ---------------------------------------- | +| binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | +| sensor.{DEVICEID}\_status | sensor | Current Status | +| sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | +>>>>>>> Stashed changes ## Service diff --git a/doc/B0_hans.md b/doc/B0_hans.md index 78e4add8..f528b5f1 100644 --- a/doc/B0_hans.md +++ b/doc/B0_hans.md @@ -8,15 +8,27 @@ ### 额外生成实体 +<<<<<<< Updated upstream | EntityID | 类型 | 名称 | 描述 | | ----------------------------------------------- | ------------- | ---------------------------------------- | ------------------ | | binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | 门状态 | -| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warnning message) | 水箱弹出(警告信息) | -| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warnning message) | 换水提醒(警告信息) | -| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warnning message) | 缺水(警告信息) | -| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperatur | 当前温度 | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | 水箱弹出(警告信息) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | 换水提醒(警告信息) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | 缺水(警告信息) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | 当前温度 | | sensor.{DEVICEID}\_status | sensor | Current Status | 当前状态 | | sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | 剩余时间 | +======= +| EntityID | 类型 | 名称 | 描述 | +| ----------------------------------------------- | ------------- | ---------------------------------------- | ------------------ | +| binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | 门状态 | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | 水箱弹出(警告信息) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | 换水提醒(警告信息) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | 缺水(警告信息) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | 当前温度 | +| sensor.{DEVICEID}\_status | sensor | Current Status | 当前状态 | +| sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | 剩余时间 | +>>>>>>> Stashed changes ## 服务 diff --git a/doc/B1.md b/doc/B1.md index 9b960bef..ca9f8541 100644 --- a/doc/B1.md +++ b/doc/B1.md @@ -8,15 +8,27 @@ No default entity. ### Extra entities +<<<<<<< Updated upstream | EntityID | Class | Description | | ----------------------------------------------- | ------------- | ---------------------------------------- | | binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | -| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warnning message) | -| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warnning message) | -| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warnning message) | -| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperatur | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | | sensor.{DEVICEID}\_status | sensor | Current Status | | sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | +======= +| EntityID | Class | Description | +| ----------------------------------------------- | ------------- | ---------------------------------------- | +| binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | +| sensor.{DEVICEID}\_status | sensor | Current Status | +| sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | +>>>>>>> Stashed changes ## Service diff --git a/doc/B1_hans.md b/doc/B1_hans.md index d9b96750..b3cde851 100644 --- a/doc/B1_hans.md +++ b/doc/B1_hans.md @@ -8,15 +8,27 @@ ### 额外生成实体 +<<<<<<< Updated upstream | EntityID | 类型 | 名称 | 描述 | | ----------------------------------------------- | ------------- | ---------------------------------------- | ------------------ | | binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | 门状态 | -| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warnning message) | 水箱弹出(警告信息) | -| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warnning message) | 换水提醒(警告信息) | -| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warnning message) | 缺水(警告信息) | -| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperatur | 当前温度 | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | 水箱弹出(警告信息) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | 换水提醒(警告信息) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | 缺水(警告信息) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | 当前温度 | | sensor.{DEVICEID}\_status | sensor | Current Status | 当前状态 | | sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | 剩余时间 | +======= +| EntityID | 类型 | 名称 | 描述 | +| ----------------------------------------------- | ------------- | ---------------------------------------- | ------------------ | +| binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | 门状态 | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | 水箱弹出(警告信息) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | 换水提醒(警告信息) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | 缺水(警告信息) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | 当前温度 | +| sensor.{DEVICEID}\_status | sensor | Current Status | 当前状态 | +| sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | 剩余时间 | +>>>>>>> Stashed changes ## 服务 diff --git a/doc/B4_hans.md b/doc/B4_hans.md index 72ea8ed8..0ee6e1d0 100644 --- a/doc/B4_hans.md +++ b/doc/B4_hans.md @@ -8,15 +8,27 @@ ### 额外生成实体 +<<<<<<< Updated upstream | EntityID | 类型 | 名称 | 描述 | | ----------------------------------------------- | ------------- | ---------------------------------------- | ------------------ | | binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | 门状态 | -| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warnning message) | 水箱弹出(警告信息) | -| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warnning message) | 换水提醒(警告信息) | -| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warnning message) | 缺水(警告信息) | -| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperatur | 当前温度 | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | 水箱弹出(警告信息) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | 换水提醒(警告信息) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | 缺水(警告信息) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | 当前温度 | | sensor.{DEVICEID}\_status | sensor | Current Status | 当前状态 | | sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | 剩余时间 | +======= +| EntityID | 类型 | 名称 | 描述 | +| ----------------------------------------------- | ------------- | ---------------------------------------- | ------------------ | +| binary_sensor.{DEVICEID}\_door | binary_sensor | Door Status | 门状态 | +| binary_sensor.{DEVICEID}\_tank_ejected | binary_sensor | Tank Ejected (warning message) | 水箱弹出(警告信息) | +| binary_sensor.{DEVICEID}\_water_change_reminder | binary_sensor | Water Change Reminder (warning message) | 换水提醒(警告信息) | +| binary_sensor.{DEVICEID}\_water_shortage | binary_sensor | Water Shortage (warning message) | 缺水(警告信息) | +| sensor.{DEVICEID}\_current_temperature | sensor | Current Temperature | 当前温度 | +| sensor.{DEVICEID}\_status | sensor | Current Status | 当前状态 | +| sensor.{DEVICEID}\_time_remaining | sensor | Time Remaining | 剩余时间 | +>>>>>>> Stashed changes ## 服务 diff --git a/doc/CE.md b/doc/CE.md index 11d120fc..d292d9eb 100644 --- a/doc/CE.md +++ b/doc/CE.md @@ -1,6 +1,6 @@ # Fresh Air Appliance -***Note: Some Midea appliance be named "Fresh Air Appliance", the protocol that actually uses the air conditioner. If your fresh air appliance is identified as an air conditioner, check out [Build-in fresh air system](CE.md#Build-in%20fresh%20air%20system)*** +***Note: Some Midea appliance be named "Fresh Air Appliance", the protocol that actually uses the air conditioner. If your fresh air appliance is identified as an air conditioner, check out [Built-in fresh air system](CE.md#Built-in%20fresh%20air%20system)*** ## Features