Skip to content

Commit 2353db4

Browse files
tonesto7tonesto7
committed
Merge branch 'master' into beta
2 parents 137f8fd + dd9b916 commit 2353db4

10 files changed

Lines changed: 323 additions & 257 deletions

‎CHANGELOG.html‎

88 Bytes
Binary file not shown.

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
### _**Release (v4.2.4.0) - [March 7th, 2024]**_
2+
3+
#### _***All Apps and Devices***_
4+
5+
- [FIX] Removed getDeviceActivity errors @nh_shotfam.
6+
- [NEW] Added support for newer devices.
7+
8+
### _**Release (v4.2.3.0) - [August 21st, 2023]**_
9+
10+
#### _***All Apps and Devices***_
11+
12+
- [FIX] Fixes submitted by @nh_shotfam.
13+
- [FIX] Fixed some ui issues with the Actions app.
14+
- [FIX] Disabled the GetPlaylists command for now as it's not working.
15+
116
### _**Release (v4.2.2.0) - [December 22nd, 2022]**_
217

318
#### _***All Apps and Devices***_

‎apps/echo-speaks-actions.groovy‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
/* groovylint-disable CompileStatic, MethodCount, MethodSize, UnnecessaryGetter */
12
/**
23
* Echo Speaks Actions (Hubitat)
34
*
4-
* Copyright 2018, 2019, 2020, 2021, 2022, 2023 Anthony Santilli
5+
* Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024 Anthony Santilli
56
* Code Contributions by @nh.schottfam
67
*
78
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -32,8 +33,8 @@ import java.util.concurrent.Semaphore
3233
//************************************************
3334
//* STATIC VARIABLES *
3435
//************************************************
35-
@Field static final String appVersionFLD = '4.2.2.0'
36-
@Field static final String appModifiedFLD = '2022-12-22'
36+
@Field static final String appVersionFLD = '4.2.4.0'
37+
@Field static final String appModifiedFLD = '2024-03-07'
3738
@Field static final Boolean devModeFLD = false
3839
@Field static final String sNULL = (String)null
3940
@Field static final String sBLANK = ''

‎apps/echo-speaks-zones.groovy‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
/* groovylint-disable CompileStatic, MethodCount, MethodSize, UnnecessaryGetter */
12
/**
23
* Echo Speaks - Zones (Hubitat)
34
*
4-
* Copyright 2018, 2019, 2020, 2021, 2022, 2023 Anthony Santilli
5+
* Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024 Anthony Santilli
56
* Code Contributions by @nh.schottfam
67
*
78
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -28,8 +29,8 @@ import java.util.concurrent.Semaphore
2829
//************************************************
2930
//* STATIC VARIABLES *
3031
//************************************************
31-
@Field static final String appVersionFLD = '4.2.2.0'
32-
@Field static final String appModifiedFLD = '2022-12-22'
32+
@Field static final String appVersionFLD = '4.2.4.0'
33+
@Field static final String appModifiedFLD = '2024-03-07'
3334
@Field static final String sNULL = (String)null
3435
@Field static final String sBLANK = ''
3536
@Field static final String sSPACE = ' '

‎apps/echo-speaks.groovy‎

Lines changed: 266 additions & 219 deletions
Large diffs are not rendered by default.

‎drivers/echo-speaks-device.groovy‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
/* groovylint-disable CompileStatic, MethodCount, MethodSize, UnnecessaryGetter */
12
/**
23
* Echo Speaks Device (Hubitat ONLY)
34
*
4-
* Copyright 2018, 2019, 2020, 2021, 2022, 2023 Anthony Santilli
5+
* Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024 Anthony Santilli
56
* Code Contributions by @nh.schottfam
67
*
78
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -25,8 +26,8 @@ import java.text.SimpleDateFormat
2526
//************************************************
2627
//* STATIC VARIABLES *
2728
//************************************************
28-
@Field static final String devVersionFLD = '4.2.2.0'
29-
@Field static final String devModifiedFLD = '2022-12-22'
29+
@Field static final String devVersionFLD = '4.2.4.0'
30+
@Field static final String devModifiedFLD = '2024-03-07'
3031
@Field static final String sNULL = (String)null
3132
@Field static final String sBLANK = ''
3233
@Field static final String sSPACE = ' '
@@ -615,7 +616,7 @@ void refreshData(Boolean full=false) {
615616
// logTrace("permissions: ${state.permissions}")
616617
if((Boolean)state.permissions?.mediaPlayer && (full || mfull || !wsActive)) {
617618
getPlaybackState()
618-
if(!isWHA) { getPlaylists() }
619+
// if(!isWHA) { getPlaylists() }
619620
}
620621
if(!isWHA) {
621622
if (full || mfull) {

‎drivers/echo-speaks-zone-device.groovy‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
/* groovylint-disable CompileStatic, MethodCount, MethodSize, UnnecessaryGetter */
12
/**
2-
* Echo Speaks Zone Device (Hubitat ONLY)
3+
* Echo Speaks Zone Device (Hubitat ONLY)
34
*
4-
* Copyright 2018, 2019, 2020, 2021, 2022, 2023 Anthony Santilli
5+
* Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024 Anthony Santilli
56
* Code Contributions by @nh.schottfam
67
*
78
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -25,8 +26,8 @@ import java.text.SimpleDateFormat
2526
//************************************************
2627
//* STATIC VARIABLES *
2728
//************************************************
28-
@Field static final String devVersionFLD = '4.2.2.0'
29-
@Field static final String devModifiedFLD = '2022-12-22'
29+
@Field static final String devVersionFLD = '4.2.4.0'
30+
@Field static final String devModifiedFLD = '2024-03-07'
3031
@Field static final String sNULL = (String)null
3132
@Field static final String sBLANK = ''
3233
@Field static final String sSPACE = ' '
@@ -97,7 +98,7 @@ metadata {
9798
attribute "volume", "number"
9899
attribute "wakeWords", "enum"
99100
attribute "wasLastSpokenToDevice", "string"
100-
101+
101102
attribute "audioTrackData", "JSON_OBJECT" // To support SharpTools.io Album Art feature
102103

103104
command "replayText"
@@ -258,7 +259,7 @@ String getEchoAccountId() { return (String)state.deviceAccountId ?: sNULL }
258259

259260
Map getEchoDevInfo(String cmd, Boolean ignoreDoNotDisturb=false) {
260261
if(isCommandTypeAllowed(cmd, false, ignoreDoNotDisturb)) {
261-
return [deviceTypeId: getEchoDeviceType(), deviceSerialNumber: getEchoSerial(), deviceOwnerCustomerId: getEchoOwner(), deviceAccountId: getEchoAccountId(), dni: device.deviceNetworkId ]
262+
return [deviceTypeId: getEchoDeviceType(), deviceSerialNumber: getEchoSerial(), deviceOwnerCustomerId: getEchoOwner(), deviceAccountId: getEchoAccountId(), dni: device.deviceNetworkId ]
262263
}
263264
return null
264265
}
@@ -615,7 +616,7 @@ void refreshData(Boolean full=false) {
615616
// logTrace("permissions: ${state.permissions}")
616617
if((Boolean)state.permissions?.mediaPlayer && (full || mfull || !wsActive)) {
617618
getPlaybackState()
618-
if(!isWHA) { getPlaylists() }
619+
// if(!isWHA) { getPlaylists() }
619620
}
620621
if(!isWHA) {
621622
if (full || mfull) {
@@ -1195,7 +1196,7 @@ private String sendAmazonCommand(String method, Map params, Map otherData=null)
11951196
private Map getDeviceData(){
11961197
return [deviceType: getEchoDeviceType(), serialNumber: getEchoSerial(), owner: getEchoOwner(), account: getEchoAccountId(), dni: device.deviceNetworkId]
11971198
//Map getEchoDevInfo(cmd) {
1198-
// return [deviceTypeId: getEchoDeviceType(), deviceSerialNumber: getEchoSerial(), deviceOwnerCustomerId: getEchoOwner(), deviceAccountId: getEchoAccountId(), dni: device.deviceNetworkId ]
1199+
// return [deviceTypeId: getEchoDeviceType(), deviceSerialNumber: getEchoSerial(), deviceOwnerCustomerId: getEchoOwner(), deviceAccountId: getEchoAccountId(), dni: device.deviceNetworkId ]
11991200
}
12001201

12011202
private void sendSequenceCommand(String type, String command, value=null, String callback=sNULL) {

‎packageManifest.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"packageName": "Echo Speaks",
33
"author": "Anthony S.",
4-
"version": "4.2.2.0",
4+
"version": "4.2.4.0",
55
"minimumHEVersion": "2.2.4",
6-
"dateReleased": "2022-12-22",
6+
"dateReleased": "2023-08-21",
77
"documentationLink": "https://tonesto7.github.io/echo-speaks-docs",
88
"communityLink": "https://community.hubitat.com/t/release-echo-speaks-v4/68843",
99
"licenseFile": "",
@@ -16,7 +16,7 @@
1616
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/apps/echo-speaks.groovy",
1717
"required": true,
1818
"oauth": true,
19-
"version": "4.2.2.0"
19+
"version": "4.2.4.0"
2020
},
2121
{
2222
"id": "cd4762db-aa0b-4d32-98ca-06de955dbc33",
@@ -25,7 +25,7 @@
2525
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/apps/echo-speaks-actions.groovy",
2626
"required": true,
2727
"oauth": false,
28-
"version": "4.2.2.0"
28+
"version": "4.2.4.0"
2929
},
3030
{
3131
"id": "50ad91a0-eb51-4d6f-98d2-f1654221baa9",
@@ -34,7 +34,7 @@
3434
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/apps/echo-speaks-zones.groovy",
3535
"required": true,
3636
"oauth": false,
37-
"version": "4.2.2.0"
37+
"version": "4.2.4.0"
3838
}
3939
],
4040
"drivers": [
@@ -44,15 +44,15 @@
4444
"namespace": "tonesto7",
4545
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/drivers/echo-speaks-device.groovy",
4646
"required": true,
47-
"version": "4.2.2.0"
47+
"version": "4.2.4.0"
4848
},
4949
{
5050
"id": "afac5950-3dc0-4109-95ec-79aa3c7ef208",
5151
"name": "Echo Speaks Zone Device",
5252
"namespace": "tonesto7",
5353
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/drivers/echo-speaks-zone-device.groovy",
5454
"required": true,
55-
"version": "4.2.2.0"
55+
"version": "4.2.4.0"
5656
}
5757
]
5858
}

‎packageManifestBeta.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"packageName": "Echo Speaks (Beta)",
33
"author": "Anthony S.",
4-
"version": "4.2.2.0",
4+
"version": "4.2.4.0",
55
"minimumHEVersion": "2.2.4",
6-
"dateReleased": "2022-12-22",
6+
"dateReleased": "2023-08-21",
77
"documentationLink": "https://tonesto7.github.io/echo-speaks-docs",
88
"communityLink": "https://community.hubitat.com/t/beta-echo-speaks-v4/66503",
99
"licenseFile": "",
@@ -16,7 +16,7 @@
1616
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/apps/echo-speaks.groovy",
1717
"required": true,
1818
"oauth": true,
19-
"version": "4.2.2.0"
19+
"version": "4.2.4.0"
2020
},
2121
{
2222
"id": "cd4762db-aa0b-4d32-98ca-06de955dbc33",
@@ -25,7 +25,7 @@
2525
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/apps/echo-speaks-actions.groovy",
2626
"required": true,
2727
"oauth": false,
28-
"version": "4.2.2.0"
28+
"version": "4.2.4.0"
2929
},
3030
{
3131
"id": "50ad91a0-eb51-4d6f-98d2-f1654221baa9",
@@ -34,7 +34,7 @@
3434
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/apps/echo-speaks-zones.groovy",
3535
"required": true,
3636
"oauth": false,
37-
"version": "4.2.2.0"
37+
"version": "4.2.4.0"
3838
}
3939
],
4040
"drivers": [
@@ -44,15 +44,15 @@
4444
"namespace": "tonesto7",
4545
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/drivers/echo-speaks-device.groovy",
4646
"required": true,
47-
"version": "4.2.2.0"
47+
"version": "4.2.4.0"
4848
},
4949
{
5050
"id": "afac5950-3dc0-4109-95ec-79aa3c7ef208",
5151
"name": "Echo Speaks Zone Device",
5252
"namespace": "tonesto7",
5353
"location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/drivers/echo-speaks-zone-device.groovy",
5454
"required": true,
55-
"version": "4.2.2.0"
55+
"version": "4.2.4.0"
5656
}
5757
]
5858
}

‎resources/appData.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
"appDataVer": "4.0",
33
"versions": {
44
"mainApp": {
5-
"ver": "4.2.2.0"
5+
"ver": "4.2.4.0"
66
},
77
"actionApp": {
8-
"ver": "4.2.2.0"
8+
"ver": "4.2.4.0"
99
},
1010
"zoneApp": {
11-
"ver": "4.2.2.0"
11+
"ver": "4.2.4.0"
1212
},
1313
"echoDevice": {
14-
"ver": "4.2.2.0"
14+
"ver": "4.2.4.0"
1515
},
1616
"zoneChildDevice": {
17-
"ver": "4.2.2.0"
17+
"ver": "4.2.4.0"
1818
},
1919
"wsDevice": {
20-
"ver": "4.2.2.0"
20+
"ver": "4.2.4.0"
2121
},
2222
"server": {
2323
"ver": "2.7.0"

0 commit comments

Comments
 (0)