Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expedite changes to beta for 12-09-2024 production release #1809

Merged
merged 10 commits into from
Dec 9, 2024
Merged

Expedite changes to beta for 12-09-2024 production release #1809

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
deb0ebe
Add shinasystem's full buttons switch for wwst (#1748)
shinasys Dec 3, 2024
24b56fc
New Device (Matter Switch) Cync Reveal Full Color A21 (#1788)
lelandblue Dec 3, 2024
deffe7b
Add fingerprints for TOTEM S50V/S93/W31V and sort fingerprints for TO…
FrankSpringfield Dec 4, 2024
4e70ee6
New Devices (Matter Switch + Matter Sensor) 1 Heiman Co Sensor and 2 …
lelandblue Dec 4, 2024
7e5692e
fp2: copy additional header (#1793)
hdlee27 Dec 5, 2024
85eb756
Add Zemismart ZM02 multiple language support (#1785)
iris-wy Dec 5, 2024
25b8e0c
Add Zemismart Zm02 Curtian Motor (#1784)
iris-wy Dec 5, 2024
4c8d92e
new-devices-Aqara-T2-bulbs (#1781)
lelandblue Dec 5, 2024
0e5ee42
Adding profile for plug/button device (#1806)
nickolas-deboom Dec 9, 2024
326a4e0
Translation: make translation deploy tolerant of extra newlines
greens Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drivers/Aqara/aqara-presence-sensor/src/fp2/api.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ local log = require "log"
local json = require "st.json"
local RestClient = require "lunchbox.rest"
local utils = require "utils"
local st_utils = require "st.utils"

local fp2_api = {}
fp2_api.__index = fp2_api
Expand Down Expand Up @@ -48,7 +49,7 @@ function fp2_api.new_device_manager(device_ip, bridge_info, socket_builder)

return setmetatable(
{
headers = ADDITIONAL_HEADERS,
headers = st_utils.deep_copy(ADDITIONAL_HEADERS),
socket_builder = socket_builder,
base_url = base_url,
}, fp2_api
Expand Down
5 changes: 5 additions & 0 deletions drivers/SmartThings/matter-sensor/fingerprints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ matterManufacturer:
vendorId: 0x120B
productId: 0x1003
deviceProfileName: smoke
- id: "4619/4103"
deviceLabel: Smart co sensor
vendorId: 0x120B
productId: 0x1007
deviceProfileName: co
# Legrand
- id: "Legrand/Netatmo/Smart-2-in-1-Sensor"
deviceLabel: Netatmo Smart 2-in-1 Sensor
Expand Down
26 changes: 26 additions & 0 deletions drivers/SmartThings/matter-switch/fingerprints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
matterManufacturer:
#Aqara
- id: "4447/6145"
deviceLabel: Aqara LED Bulb T2 RGB CCT
vendorId: 0x115F
productId: 0x1801
deviceProfileName: light-color-level
- id: "4447/6146"
deviceLabel: Aqara LED Bulb T2 CCT
vendorId: 0x115F
productId: 0x1802
deviceProfileName: light-level-colorTemperature-2700K-6500K
#Chengdu
- id: "5218/8197"
deviceLabel: Magic Cube DS001
Expand Down Expand Up @@ -165,6 +176,11 @@ matterManufacturer:
vendorId: 0x1339
productId: 0x007B
deviceProfileName: light-color-level-2000K-7000K
- id: "4921/109"
deviceLabel: Cync Reveal Full Color A21
vendorId: 0x1339
productId: 0x006D
deviceProfileName: light-color-level-2000K-7000K
- id: "4921/111"
deviceLabel: Cync Outdoor Plug
vendorId: 0x1339
Expand Down Expand Up @@ -2379,6 +2395,11 @@ matterManufacturer:
vendorId: 0x139C
productId: 0xD003
deviceProfileName: light-color-level
- id: "5020/43784"
deviceLabel: Zemismart WiFi Smart Switch
vendorId: 0x139C
productId: 0xAB08
deviceProfileName: switch-binary
- id: "5020/43825"
deviceLabel: Zemismart WiFi Smart Switch
vendorId: 0x139C
Expand All @@ -2394,6 +2415,11 @@ matterManufacturer:
vendorId: 0x139C
productId: 0xAB01
deviceProfileName: switch-binary
- id: "5020/43843"
deviceLabel: Zemismart WiFi Smart Switch
vendorId: 0x139C
productId: 0xAB43
deviceProfileName: switch-binary
#TUO
- id: "5150/1"
deviceLabel: "TUO Smart Button"
Expand Down
18 changes: 18 additions & 0 deletions drivers/SmartThings/matter-switch/profiles/plug-button.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: plug-button
components:
- id: main
capabilities:
- id: switch
version: 1
- id: firmwareUpdate
version: 1
- id: refresh
version: 1
categories:
- name: SmartPlug
- id: button
capabilities:
- id: button
version: 1
categories:
- name: RemoteController
5 changes: 5 additions & 0 deletions drivers/SmartThings/matter-window-covering/fingerprints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ matterManufacturer:
vendorId: 0x139C
productId: 0xFF15
deviceProfileName: window-covering
- id: "5020/64050"
deviceLabel: Zemismart ZM02 Smart Curtain
vendorId: 0x139C
productId: 0xFA32
deviceProfileName: window-covering
- id: "5020/64017"
deviceLabel: Zemismart ZM25C Smart Curtain
vendorId: 0x139C
Expand Down
23 changes: 19 additions & 4 deletions drivers/SmartThings/zigbee-lock/fingerprints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,16 @@ zigbeeManufacturer:
manufacturer: TOTEM
model: P30
deviceProfileName: lock-battery
- id: TOTEM/P70
deviceLabel: TOTEM Door Lock
manufacturer: TOTEM
model: P70
deviceProfileName: lock-battery
- id: TOTEM/P90
deviceLabel: TOTEM Door Lock
manufacturer: TOTEM
model: P90
deviceProfileName: lock-battery
- id: TOTEM/Q30
deviceLabel: TOTEM Door Lock
manufacturer: TOTEM
Expand All @@ -165,15 +175,20 @@ zigbeeManufacturer:
manufacturer: TOTEM
model: R71
deviceProfileName: lock-battery
- id: TOTEM/P70
- id: TOTEM/S50V
deviceLabel: TOTEM Door Lock
manufacturer: TOTEM
model: P70
model: S50V
deviceProfileName: lock-battery
- id: TOTEM/P90
- id: TOTEM/S93
deviceLabel: TOTEM Door Lock
manufacturer: TOTEM
model: P90
model: S93
deviceProfileName: lock-battery
- id: TOTEM/W31V
deviceLabel: TOTEM Door Lock
manufacturer: TOTEM
model: W31V
deviceProfileName: lock-battery
zigbeeGeneric:
- id: "genericLock"
Expand Down
10 changes: 10 additions & 0 deletions drivers/SmartThings/zigbee-switch/fingerprints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,16 @@ zigbeeManufacturer:
manufacturer: ShinaSystem
model: SQM300Z3
deviceProfileName: basic-switch
- id: ShinaSystem/SQM300Z4
deviceLabel: SiHAS Switch 1
manufacturer: ShinaSystem
model: SQM300Z4
deviceProfileName: basic-switch
- id: ShinaSystem/SQM300Z6
deviceLabel: SiHAS Switch 1
manufacturer: ShinaSystem
model: SQM300Z6
deviceProfileName: basic-switch
- id: Samsung/SAMSUNG-ITM-Z-002
deviceLabel: Samsung Light
manufacturer: Samsung Electronics
Expand Down
2 changes: 2 additions & 0 deletions drivers/SmartThings/zigbee-switch/src/multi-switch-no-master/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ local MULTI_SWITCH_NO_MASTER_FINGERPRINTS = {
{ mfr = "ShinaSystem", model = "SBM300Z6", children = 5 },
{ mfr = "ShinaSystem", model = "SQM300Z2", children = 1 },
{ mfr = "ShinaSystem", model = "SQM300Z3", children = 2 },
{ mfr = "ShinaSystem", model = "SQM300Z4", children = 3 },
{ mfr = "ShinaSystem", model = "SQM300Z6", children = 5 },
{ model = "E220-KR2N0Z0-HA", children = 1 },
{ model = "E220-KR3N0Z0-HA", children = 2 },
{ model = "E220-KR4N0Z0-HA", children = 3 },
Expand Down
2 changes: 2 additions & 0 deletions tools/localizations/cn.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,6 @@ Aqara Wireless Mini Switch T1,Aqara 无线开关 T1
"WallHero Switch (8 Way)",八位智能开关/场景面板
"WallHero Outlet",智能墙面五孔插座
"WallHero Remote Control (4-Inch)",语音场景(4寸）面板
"Zemismart ZM02 Smart Curtain",Zemismart ZM02 智能窗帘
"Zemismart ZM25C Smart Curtain",Zemismart ZM25C 智能窗帘

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the change that necessitated #1808, so you'll need to include that wherever this is going for the deploy to succeed in CN.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I just added this to the cherry-pick 👍

Loading