Skip to content

Commit

Permalink
Revert "[Bar 300] Issues - device don't operate about 'stop' command (#…
Browse files Browse the repository at this point in the history
…1797)"

This reverts commit 3743756.
  • Loading branch information
lelandblue committed Jan 13, 2025
1 parent 1e7eec4 commit 4dcce6d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
2 changes: 2 additions & 0 deletions drivers/SmartThings/jbl/profiles/jbl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ components:
enabledValues:
- 'playing'
- 'paused'
- 'stopped'
- key: "{{enumCommands}}"
enabledValues:
- 'play'
- 'pause'
- 'stop'
- id: mediaTrackControl
version: 1
- id: audioMute
Expand Down
11 changes: 1 addition & 10 deletions drivers/SmartThings/jbl/src/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,6 @@ local function device_init(driver, device)

refresh(driver, device, nil)
device:set_field(fields._INIT, true, { persist = false })

device:emit_event(capabilities.mediaPlayback.supportedPlaybackCommands({
capabilities.mediaPlayback.commands.play.NAME,
capabilities.mediaPlayback.commands.pause.NAME,
}))

device:emit_event(capabilities.mediaTrackControl.supportedTrackControlCommands({
capabilities.mediaTrackControl.commands.nextTrack.NAME,
capabilities.mediaTrackControl.commands.previousTrack.NAME,
}))
end

local lan_driver = Driver("jbl",
Expand All @@ -214,6 +204,7 @@ local lan_driver = Driver("jbl",
[capabilities.mediaPlayback.ID] = {
[capabilities.mediaPlayback.commands.play.NAME] = jbl_capability_handler.playback_play_handler,
[capabilities.mediaPlayback.commands.pause.NAME] = jbl_capability_handler.playback_pause_handler,
[capabilities.mediaPlayback.commands.stop.NAME] = jbl_capability_handler.playback_stop_handler,
},
[capabilities.audioNotification.ID] = {
[capabilities.audioNotification.commands.playTrack.NAME] = jbl_capability_handler.audioNotification_handler,
Expand Down
3 changes: 1 addition & 2 deletions drivers/SmartThings/jbl/src/jbl/api.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ 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 cosock = require "cosock"

local jbl_api = {}
Expand Down Expand Up @@ -69,7 +68,7 @@ function jbl_api.new_device_manager(bridge_ip, bridge_info, socket_builder)

return setmetatable(
{
headers = st_utils.deep_copy(ADDITIONAL_HEADERS),
headers = ADDITIONAL_HEADERS,
client = RestClient.new(base_url, socket_builder),
base_url = base_url,
}, jbl_api
Expand Down
5 changes: 5 additions & 0 deletions drivers/SmartThings/jbl/src/jbl/capability_handler.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ local function smartthings_playback_capability_handler(driver, device, capabilit
local st_status_to_jbl_playback_status_table = {
paused = "pause",
playing = "play",
stopped = "stop",
}

local conn_info = device:get_field(fields.CONN_INFO)
Expand All @@ -33,6 +34,10 @@ function capability_handler.playback_pause_handler(driver, device, args)
smartthings_playback_capability_handler(driver, device, "paused")
end

function capability_handler.playback_stop_handler(driver, device, args)
smartthings_playback_capability_handler(driver, device, "stopped")
end

function capability_handler.next_track_handler(driver, device, args)
local conn_info = device:get_field(fields.CONN_INFO)
log.info(string.format("media_track_control.next_track_handler : dni = %s", device.device_network_id))
Expand Down
1 change: 1 addition & 0 deletions drivers/SmartThings/jbl/src/jbl/device_manager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ end
local jbl_playback_state_to_smartthings_playback_status_table = {
paused = "paused",
playing = "playing",
stopped = "stopped",
}

function device_manager.handle_status(driver, device, status)
Expand Down

0 comments on commit 4dcce6d

Please sign in to comment.