Skip to content

Commit 275b68d

Browse files
tonesto7tonesto7
authored
Merge branch 'master' into beta
2 parents 2520d15 + d75b9b9 commit 275b68d

11 files changed

+165
-610
lines changed

‎.github/workflows/stale.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ name: Mark stale issues and pull requests
22

33
on:
44
schedule:
5-
- cron: "0 8 * * *"
5+
- cron: "0 8 * * *"
6+
workflow_dispatch:
67

78
jobs:
89
stale:
910

1011
runs-on: ubuntu-latest
1112

1213
steps:
13-
- uses: actions/stale@v1
14+
- uses: actions/stale@v8
1415
with:
1516
repo-token: ${{ secrets.GITHUB_TOKEN }}
1617
stale-issue-message: 'This issue has been marked stale automatically after no activity for the last 180 days.'
@@ -21,5 +22,6 @@ jobs:
2122
close-pr-message: 'This PR has been closed automatically after 187 days of no activity.'
2223
days-before-stale: 180
2324
days-before-close: 7
24-
close-issue-label: 'Stale Issue'
25-
exempt-issue-labels: 'Never Stale'
25+
close-issue-label: 'closed-due-to-age'
26+
close-pr-label: 'closed-due-to-age'
27+
exempt-issue-labels: 'Never Stale, Keep Open'

‎CHANGELOG.html‎

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +0,0 @@
1-
<!DOCTYPE html>
2-
<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
3-
<head>
4-
<meta charset="utf-8" />
5-
<meta name="generator" content="pandoc" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
7-
<title>CHANGELOG</title>
8-
<style>
9-
code{white-space: pre-wrap;}
10-
span.smallcaps{font-variant: small-caps;}
11-
span.underline{text-decoration: underline;}
12-
div.column{display: inline-block; vertical-align: top; width: 50%;}
13-
div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
14-
ul.task-list{list-style: none;}
15-
</style>
16-
<!--[if lt IE 9]>
17-
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
18-
<![endif]-->
19-
</head>
20-
<body>
21-
<h3 id="release-v4.2.4.0---march-7th-2024"><em><strong>Release (v4.2.4.0) - [March 7th, 2024]</strong></em></h3>
22-
<h4 id="all-apps-and-devices"><em><strong><em>All Apps and Devices</em></strong></em></h4>
23-
<ul>
24-
<li>[FIX] Removed getDeviceActivity errors <span class="citation" data-cites="nh_shotfam">@nh_shotfam</span>.</li>
25-
<li>[NEW] Added support for newer devices.</li>
26-
</ul>
27-
<h3 id="release-v4.2.3.0---august-21st-2023"><em><strong>Release (v4.2.3.0) - [August 21st, 2023]</strong></em></h3>
28-
<h4 id="all-apps-and-devices-1"><em><strong><em>All Apps and Devices</em></strong></em></h4>
29-
<ul>
30-
<li>[FIX] Fixes submitted by <span class="citation" data-cites="nh_shotfam">@nh_shotfam</span>.</li>
31-
<li>[FIX] Fixed some ui issues with the Actions app.</li>
32-
<li>[FIX] Disabled the GetPlaylists command for now as it’s not working.</li>
33-
</ul>
34-
<h3 id="release-v4.2.2.0---december-22nd-2022"><em><strong>Release (v4.2.2.0) - [December 22nd, 2022]</strong></em></h3>
35-
<h4 id="all-apps-and-devices-2"><em><strong><em>All Apps and Devices</em></strong></em></h4>
36-
<ul>
37-
<li>[FIX] Fixes submitted by <span class="citation" data-cites="nh_shotfam">@nh_shotfam</span>.</li>
38-
<li>[FIX] Fixed some ui issues with the Actions app.</li>
39-
</ul>
40-
<h3 id="release-v4.2.1.2---december-20th-2022"><em><strong>Release (v4.2.1.2) - [December 20th, 2022]</strong></em></h3>
41-
<h4 id="all-apps-and-devices-3"><em><strong><em>All Apps and Devices</em></strong></em></h4>
42-
<ul>
43-
<li>[FIX] Fixes for cloneing zones and actions.</li>
44-
<li>[NEW] Support for 5th gen echo dot and other devices.</li>
45-
<li>[FIX] Cleanups and optimizations.</li>
46-
</ul>
47-
<h3 id="release-v4.2.0.8---november-28th-2022"><em><strong>Release (v4.2.0.8) - [November 28th, 2022]</strong></em></h3>
48-
<h4 id="all-apps-and-devices-4"><em><strong><em>All Apps and Devices</em></strong></em></h4>
49-
<ul>
50-
<li>[FIX] Tweaks for Local Server Installs.</li>
51-
</ul>
52-
<h3 id="release-v4.2.0.7---may-5th-2022"><em><strong>Release (v4.2.0.7) - [May 5th, 2022]</strong></em></h3>
53-
<h4 id="all-apps-and-devices-5"><em><strong><em>All Apps and Devices</em></strong></em></h4>
54-
<ul>
55-
<li>[FIX] Fix for new heroku deployments not working.</li>
56-
</ul>
57-
<h3 id="release-v4.2.0.6---may-5th-2022"><em><strong>Release (v4.2.0.6) - [May 5th, 2022]</strong></em></h3>
58-
<h4 id="all-apps-and-devices-6"><em><strong><em>All Apps and Devices</em></strong></em></h4>
59-
<ul>
60-
<li>[FIX] Fix for latest version not showing it’s up to date.</li>
61-
</ul>
62-
<h3 id="release-v4.2.0.5---april-28th-2022"><em><strong>Release (v4.2.0.5) - [April 28th, 2022]</strong></em></h3>
63-
<h4 id="all-apps-and-devices-7"><em><strong><em>All Apps and Devices</em></strong></em></h4>
64-
<ul>
65-
<li>[FIX] NoOp command description error</li>
66-
</ul>
67-
<h3 id="release-v4.2.0.4---april-21st-2022"><em><strong>Release (v4.2.0.4) - [April 21st, 2022]</strong></em></h3>
68-
<h4 id="all-apps-and-devices-8"><em><strong><em>All Apps and Devices</em></strong></em></h4>
69-
<ul>
70-
<li>[FIX] Fixed version requirement from last update.</li>
71-
</ul>
72-
<h3 id="release-v4.2.0.3---april-21st-2022"><em><strong>Release (v4.2.0.3) - [April 21st, 2022]</strong></em></h3>
73-
<h4 id="all-apps-and-devices-9"><em><strong><em>All Apps and Devices</em></strong></em></h4>
74-
<ul>
75-
<li>[FIX] Volume Restore issue resolved.</li>
76-
<li>[FIX] Bug fixes and optimizations.</li>
77-
</ul>
78-
<h3 id="release-v4.2.0.2---april-18th-2022"><em><strong>Release (v4.2.0.2) - [April 18th, 2022]</strong></em></h3>
79-
<h4 id="all-apps-and-devices-10"><em><strong><em>All Apps and Devices</em></strong></em></h4>
80-
<ul>
81-
<li>[FIX] Volume Restore issue resolved.</li>
82-
<li>[FIX] Bug fixes and optimizations.</li>
83-
</ul>
84-
<h3 id="release-v4.2.0.1---april-14th-2022"><em><strong>Release (v4.2.0.1) - [April 14th, 2022]</strong></em></h3>
85-
<h4 id="all-apps-and-devices-11"><em><strong><em>All Apps and Devices</em></strong></em></h4>
86-
<ul>
87-
<li>[FIX] Volume Restore issue resolved.</li>
88-
<li>[FIX] Bug fixes and optimizations.</li>
89-
</ul>
90-
<h3 id="release-v4.2.0.0---april-1st-2022"><em><strong>Release (v4.2.0.0) - [April 1st, 2022]</strong></em></h3>
91-
<h4 id="all-apps-and-devices-12"><em><strong><em>All Apps and Devices</em></strong></em></h4>
92-
<ul>
93-
<li>[NEW] Updated notification quiet time restrictions to match the same code structure as those in ES Actions.</li>
94-
<li>[NEW] Added new commands for speech and announcements to bypass alexa do not disturb restrictions to speak for emergency scenarios.</li>
95-
<li>[NEW] Added the ability to eliminate duplicate notifications for certain zigbee locks. There is a toggle in the actions settings for locks only.</li>
96-
<li>[NEW] Updated device support list with latest devices reported.</li>
97-
<li>[FIX] Added new setting to device to ignore device online/offline status (On by default).</li>
98-
<li>[REMOVED] Removed WebSocket device until I get time to update it or move it to a local server.</li>
99-
</ul>
100-
</body>
101-
</html>

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,25 @@
1+
### _**Release (v4.3.0.1) - [September 10th, 2025]**_
2+
3+
#### _***All Apps and Devices***_
4+
5+
- [FIX] Fixed 404 errors on devices with getPlaybackState command (Thanks @khan-hubitat).
6+
- [FIX] Fixed issue with code version checking when devices or apps are disabled in hubitat.
7+
8+
### _**Release (v4.3.0.0) - [September 9th, 2025]**_
9+
10+
#### _***All Apps and Devices***_
11+
12+
- [FIX] Added server host override Thanks @jtp10181.
13+
- [FIX] Added support for 5th gen echo dot and other devices. Thanks @jtp10181.
14+
- [REMOVED] Removed Alexa Guard features as they are no longer supported by Amazon.
15+
116
### _**Release (v4.2.4.0) - [March 7th, 2024]**_
217

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

520
- [FIX] Removed getDeviceActivity errors @nh_shotfam.
621
- [NEW] Added support for newer devices.
22+
- [FIX] Added this placeholder for testing
723

824
### _**Release (v4.2.3.0) - [August 21st, 2023]**_
925

‎apps/echo-speaks-actions.groovy‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Echo Speaks Actions (Hubitat)
44
*
5-
* Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024 Anthony Santilli
5+
* Copyright 2018-2025 Anthony Santilli
66
* Code Contributions by @nh.schottfam
77
*
88
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -33,8 +33,8 @@ import java.util.concurrent.Semaphore
3333
//************************************************
3434
//* STATIC VARIABLES *
3535
//************************************************
36-
@Field static final String appVersionFLD = '4.2.4.0'
37-
@Field static final String appModifiedFLD = '2024-03-07'
36+
@Field static final String appVersionFLD = '4.3.0.1'
37+
@Field static final String appModifiedFLD = '2025-09-10'
3838
@Field static final Boolean devModeFLD = false
3939
@Field static final String sNULL = (String)null
4040
@Field static final String sBLANK = ''
@@ -2843,13 +2843,14 @@ def alarmEvtHandler(evt) {
28432843
if(!ok2Run) logDebug("alarmEvtHandler | Skipping event ${eN} value: ${eV}, did not match ${lT} ${lE}")
28442844
}
28452845

2846-
public guardEventHandler(String guardState) {
2847-
Map evt = [name: "guard", displayName: "Alexa Guard", value: guardState, date: new Date(), device: [id: null]]
2848-
if(isTrc())logTrace("${evt.name} Event | Device: ${evt.displayName} | Value: (${strCapitalize(evt.value)})")
2849-
Boolean ok= ((Boolean)state.handleGuardEvents && settings.trig_guard && (sANY in (List)settings.trig_guard || guardState in (List)settings.trig_guard))
2850-
eventCompletion(evt, ok, false, null, "guardEventHandler", guardState, (String)evt.displayName)
2851-
if(!ok) logDebug("guardEventHandler | Skipping event guard value: ${guardState}, did not match ${state.handleGuardEvents} ${settings.trig_guard}")
2852-
}
2846+
// DISABLED: Alexa Guard features disabled
2847+
// public guardEventHandler(String guardState) {
2848+
// Map evt = [name: "guard", displayName: "Alexa Guard", value: guardState, date: new Date(), device: [id: null]]
2849+
// if(isTrc())logTrace("${evt.name} Event | Device: ${evt.displayName} | Value: (${strCapitalize(evt.value)})")
2850+
// Boolean ok= ((Boolean)state.handleGuardEvents && settings.trig_guard && (sANY in (List)settings.trig_guard || guardState in (List)settings.trig_guard))
2851+
// eventCompletion(evt, ok, false, null, "guardEventHandler", guardState, (String)evt.displayName)
2852+
// if(!ok) logDebug("guardEventHandler | Skipping event guard value: ${guardState}, did not match ${state.handleGuardEvents} ${settings.trig_guard}")
2853+
// }
28532854

28542855
void eventCompletion(evt, Boolean ok2Run, Boolean dco, Integer dcw, String meth, evtVal,
28552856
String evtDis, Boolean aftRepEvt=false, Boolean allDevsResp=false) {
@@ -5880,7 +5881,7 @@ public Map getSettingsAndStateMap() {
58805881
// actions
58815882
"tierSchedActive",
58825883
// zones
5883-
"zoneConditionsOk", "configStatusMap", "tsDtMap", "dateInstalled", "handleGuardEvents", "startTime", "stopTime", "alexaGuardState", "appFlagsMap",
5884+
"zoneConditionsOk", "configStatusMap", "tsDtMap", "dateInstalled", /* "handleGuardEvents", */ "startTime", "stopTime", /* "alexaGuardState", */ "appFlagsMap", // DISABLED: Alexa Guard features disabled
58845885
"dupPendingSetup", "dupOpenedByUser"
58855886

58865887
]

‎apps/echo-speaks-zones.groovy‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Echo Speaks - Zones (Hubitat)
44
*
5-
* Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024 Anthony Santilli
5+
* Copyright 2018-2025 Anthony Santilli
66
* Code Contributions by @nh.schottfam
77
*
88
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -29,8 +29,8 @@ import java.util.concurrent.Semaphore
2929
//************************************************
3030
//* STATIC VARIABLES *
3131
//************************************************
32-
@Field static final String appVersionFLD = '4.2.4.0'
33-
@Field static final String appModifiedFLD = '2024-03-07'
32+
@Field static final String appVersionFLD = '4.3.0.1'
33+
@Field static final String appModifiedFLD = '2025-09-10'
3434
@Field static final String sNULL = (String)null
3535
@Field static final String sBLANK = ''
3636
@Field static final String sSPACE = ' '
@@ -712,9 +712,10 @@ void relayChildInitiatedRefresh() {
712712
parent.childInitiatedRefresh()
713713
}
714714

715-
String relayGetAlexaGuardStatus() {
716-
parent.getAlexaGuardStatus()
717-
}
715+
// DISABLED: Alexa Guard features disabled
716+
// String relayGetAlexaGuardStatus() {
717+
// parent.getAlexaGuardStatus()
718+
// }
718719
/*
719720
Boolean RelayGetDndEnabled(String serial) {
720721
parent.getDndEnabled(serial)
@@ -2364,7 +2365,7 @@ public Map getSettingsAndStateMap() {
23642365
// actions
23652366
"tierSchedActive",
23662367
// zones
2367-
"zoneConditionsOk", "configStatusMap", "tsDtMap", "dateInstalled", "handleGuardEvents", "startTime", "stopTime", "alexaGuardState", "appFlagsMap",
2368+
"zoneConditionsOk", "configStatusMap", "tsDtMap", "dateInstalled", /* "handleGuardEvents", */ "startTime", "stopTime", /* "alexaGuardState", */ "appFlagsMap", // DISABLED: Alexa Guard features disabled
23682369
"dupPendingSetup", "dupOpenedByUser"
23692370
]
23702371
data.state = state?.findAll { !((String)it?.key in stskip) }

0 commit comments

Comments
 (0)