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.

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

Rolling up beta to production #1044

Merged
merged 24 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b381889
fix: add support for an additional matter color temperature light fin…
Con-Tejus Oct 17, 2023
38a73d2
Merge pull request #1019 from SmartThingsCommunity/CHAD-11890-switch-…
Con-Tejus Oct 17, 2023
4e4b74e
Added NEXENTRO Switching Actuator Fingerprints (#975)
JuniorInsta Oct 17, 2023
343c004
Eve Weather Pull Request (#968)
jacobvoegele Oct 17, 2023
8820bae
Add fingerprint for Netatmo Smart 2-in-1 Sensor (#804)
Oct 18, 2023
d57678a
Hue bugfix bridge offline every driver restart
cjswedes Aug 21, 2023
6e83abd
fix: Update refresh to poll connectivity status
dljsjr Aug 22, 2023
63214e1
Merge pull request #926 from SmartThingsCommunity/fix/hue-poll-connec…
dljsjr Oct 18, 2023
bedab4e
fix: Don't emit events for bulbs known offline
dljsjr Aug 23, 2023
d2c0e06
add certifiedpreferences.doNotDisturbPlayback for L42ms
Seong-Yeol-Park Oct 19, 2023
65540ac
fixup! fix: Don't emit events for bulbs known offline
cjswedes Aug 24, 2023
18aaccb
fixup! fix: Don't emit events for bulbs known offline
dljsjr Oct 19, 2023
b4b4fd0
Merge pull request #931 from SmartThingsCommunity/fix/hue-dont-emit-e…
dljsjr Oct 19, 2023
c94dfb6
fix: Only allow a single discovery handler
dljsjr Oct 19, 2023
4a5455a
Merge pull request #1023 from SmartThingsCommunity/fix/hue-disallow-m…
dljsjr Oct 19, 2023
80b766b
Merge pull request #1022 from Seong-Yeol-Park/harman-l42ms-preference
dljsjr Oct 19, 2023
13975e0
Adding SONOFF matter device:MINIR4M (#955)
lisongjun12 Oct 20, 2023
a3a2f07
Matter Switch: Manufacture fingerprint for Sengled A19
Kianoosh5 Oct 20, 2023
88f690e
Merge branch 'main' into bugfix/sengled-4448-36866-profile-patch
lelandblue Oct 20, 2023
914d43e
Merge pull request #1025 from SmartThingsCommunity/bugfix/sengled-444…
kianooshkarami Oct 21, 2023
042dc53
MTR-497 don't switch profiles if the lock doesn't support tamper
greens Oct 20, 2023
5452581
Merge pull request #1027 from SmartThingsCommunity/bugfix/MTR-497
greens Oct 23, 2023
42158ec
Revert "remove presets from L42ms" (#1018)
alon-tchelet Oct 24, 2023
f53613d
Merge pull request #1033 from SmartThingsCommunity/main
greens Oct 24, 2023
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
6 changes: 5 additions & 1 deletion drivers/SmartThings/harman-luxury/profiles/l42ms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ components:
version: 1
- id: audioTrackData
version: 1
- id: mediaPresets
version: 1
- id: mediaPlayback
version: 1
- id: mediaTrackControl
Expand All @@ -20,4 +22,6 @@ components:
version: 1
categories:
- name: Speaker

preferences:
- preferenceId: certifiedpreferences.doNotDisturbPlayback
explicit: true
8 changes: 6 additions & 2 deletions drivers/SmartThings/matter-lock/src/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,12 @@ local function device_added(driver, device)
device:emit_event(capabilities.tamperAlert.tamper.clear())
local eps = device:get_endpoints(DoorLock.ID, {feature_bitmap = DoorLock.types.DoorLockFeature.PIN_CREDENTIALS})
if #eps == 0 then
device.log.debug("Device does not support lockCodes")
device:try_update_metadata({profile = "lock-without-codes"})
if device:supports_capability_by_id(capabilities.tamperAlert.ID) then
device.log.debug("Device does not support lockCodes. Switching profile.")
device:try_update_metadata({profile = "lock-without-codes"})
else
device.log.debug("Device supports neither lock codes nor tamper. Unable to switch profile.")
end
else
local req = im.InteractionRequest(im.InteractionRequest.RequestType.READ, {})
req:merge(DoorLock.attributes.MaxPINCodeLength:read(device, eps[1]))
Expand Down
12 changes: 12 additions & 0 deletions drivers/SmartThings/matter-sensor/fingerprints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,23 @@ matterManufacturer:
vendorId: 0x130a
productId: 0x004D
deviceProfileName: contact-battery
- id: "Eve/Weather"
deviceLabel: Eve Weather
vendorId: 0x130a
productId: 0x0057
deviceProfileName: temperature-humidity-battery

- id: "TUO/ContactDoorAndWindow"
deviceLabel: TUO Contact Sensor
vendorId: 0x141E
productId: 0x0002
deviceProfileName: contact-battery
# Legrand
- id: "Legrand/Netatmo/Smart-2-in-1-Sensor"
deviceLabel: Netatmo Smart 2-in-1 Sensor
vendorId: 0x1021
productId: 0x0001
deviceProfileName: motion-contact-battery

matterGeneric:
- id: "matter/contact/sensor"
Expand Down
25 changes: 23 additions & 2 deletions drivers/SmartThings/matter-switch/fingerprints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ matterManufacturer:
productId: 0x5E
deviceProfileName: power-energy-powerConsumption

#GE
#GE
- id: "GELightingSavant/Bulb/A19"
deviceLabel: Cync Full Color A19
vendorId: 0x1339
Expand Down Expand Up @@ -59,14 +59,29 @@ matterManufacturer:
vendorId: 0x115a
productId: 0x44
deviceProfileName: light-color-level-2700K-6500K

#SONOFF
- id: "SONOFF MINIR4M"
deviceLabel: Smart Plug-in Unit
vendorId: 0x1321
productId: 0x0002
deviceProfileName: plug-binary
#Yeelight
- id: "Yeelight Smart Lamp"
deviceLabel: Yeelight Smart Lamp
vendorId: 0x1312
productId: 0x01
deviceProfileName: light-level-colorTemperature-2710k-6500k

# Sengled
# Not WWST Certified: As of the device's software release of "780014029", the device reports itself with device type of 0x10C,
# which is primarily used for Lighting devices with only Color Temperature, but the device supports color control. Adding this
# fingerprint to account for the color functionality
- id: "Sengled-Light-Bulb-W41-N15A"
deviceLabel: Sengled LED Smart Light Bulb (A19)
vendorId: 0x1160
productId: 0x9002
deviceProfileName: light-color-level-2700K-6500K

#Bridge devices need manufacturer specific fingerprints until
#bridge support is released to all hubs. This is because of the way generic
#fingerprints work for bridges joined prior to hubs being able to support them
Expand Down Expand Up @@ -146,6 +161,12 @@ matterGeneric:
- id: 0x0101 # Dimmable Light
- id: 0x010C # Color Temperature Light
deviceProfileName: light-level-colorTemperature
- id: "matter/colorTemperature/light/3"
deviceLabel: Matter Color Temperature Light
deviceTypes:
- id: 0x0100 # OnOff Light
- id: 0x010C # Color Temperature Light
deviceProfileName: light-level-colorTemperature
- id: "matter/color/light"
deviceLabel: Matter Color Light
deviceTypes:
Expand Down
8 changes: 8 additions & 0 deletions drivers/SmartThings/philips-hue/src/disco.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ local HueDiscovery = {
light_state_disco_cache = {},
ServiceType = SERVICE_TYPE,
Domain = DOMAIN,
discovery_active = false
}

local supported_resource_types = {
Expand All @@ -33,7 +34,13 @@ process_discovered_light
---@param _ table
---@param should_continue function
function HueDiscovery.discover(driver, _, should_continue)
if HueDiscovery.discovery_active then
log.info("Hue discovery already in progress, ignoring new discovery request")
return
end

log.info_with({ hub_logs = true }, "Starting Hue discovery")
HueDiscovery.discovery_active = true

while should_continue() do
local known_identifier_to_device_map = {}
Expand All @@ -54,6 +61,7 @@ function HueDiscovery.discover(driver, _, should_continue)
end)
socket.sleep(1.0)
end
HueDiscovery.discovery_active = false
log.info_with({ hub_logs = true }, "Ending Hue discovery")
end

Expand Down
Loading