remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-04-30 12:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/house-of-abbey/GarminHomeAssistant

Browse Source
This commit is contained in:
Philip Abbey
2024-08-24 14:30:44 +01:00
parent 1e103069bc 520309729d
commit f2fb7f65a0
3 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY.md
View File

@ -29,3 +29,4 @@
| 2.14 | Cautionary bug fix for the background service code where refactorisation spoilt some API level guard clauses. | | 2.14 | Cautionary bug fix for the background service code where refactorisation spoilt some API level guard clauses. |
| 2.15 | Better support for templates by isolating erroneous returns and marking the menu item. | | 2.15 | Better support for templates by isolating erroneous returns and marking the menu item. |
| 2.16 | Bug fix for lack of phone connection when starting the application. Includes new activity reporting features from [KPWhiver](https://github.com/KPWhiver) covering steps, heart rate, floors climbed and descended, and respiration rate. | | 2.16 | Bug fix for lack of phone connection when starting the application. Includes new activity reporting features from [KPWhiver](https://github.com/KPWhiver) covering steps, heart rate, floors climbed and descended, and respiration rate. |
| 2.17 | Bug fix for reporting activity metrics that are not found on some devices. |

16
source/BackgroundServiceDelegate.mc
View File

@ -150,20 +150,26 @@ class BackgroundServiceDelegate extends System.ServiceDelegate {
"type" => "sensor", "type" => "sensor",
"unique_id" => "heart_rate", "unique_id" => "heart_rate",
"icon" => "mdi:heart-pulse" "icon" => "mdi:heart-pulse"
}, }
{ ];
if (ActivityMonitor.Info has :floorsClimbed) {
data.add({
"state" => activityInfo.floorsClimbed == null ? "unknown" : activityInfo.floorsClimbed, "state" => activityInfo.floorsClimbed == null ? "unknown" : activityInfo.floorsClimbed,
"type" => "sensor", "type" => "sensor",
"unique_id" => "floors_climbed_today", "unique_id" => "floors_climbed_today",
"icon" => "mdi:stairs-up" "icon" => "mdi:stairs-up"
}, });
{ }
if (ActivityMonitor.Info has :floorsDescended) {
data.add({
"state" => activityInfo.floorsDescended == null ? "unknown" : activityInfo.floorsDescended, "state" => activityInfo.floorsDescended == null ? "unknown" : activityInfo.floorsDescended,
"type" => "sensor", "type" => "sensor",
"unique_id" => "floors_descended_today", "unique_id" => "floors_descended_today",
"icon" => "mdi:stairs-down" "icon" => "mdi:stairs-down"
});
} }
];
if (ActivityMonitor.Info has :respirationRate) { if (ActivityMonitor.Info has :respirationRate) {
data.add({ data.add({

18
source/WebhookManager.mc
View File

@ -251,8 +251,11 @@ class WebhookManager {
"unit_of_measurement" => "bpm", "unit_of_measurement" => "bpm",
"state_class" => "measurement", "state_class" => "measurement",
"disabled" => !Settings.isSensorsLevelEnabled() "disabled" => !Settings.isSensorsLevelEnabled()
}, }
{ ];
if (ActivityMonitor.Info has :floorsClimbed) {
sensors.add({
"name" => "Floors climbed today", "name" => "Floors climbed today",
"state" => activityInfo.floorsClimbed == null ? "unknown" : activityInfo.floorsClimbed, "state" => activityInfo.floorsClimbed == null ? "unknown" : activityInfo.floorsClimbed,
"type" => "sensor", "type" => "sensor",
@ -260,8 +263,11 @@ class WebhookManager {
"icon" => "mdi:stairs-up", "icon" => "mdi:stairs-up",
"state_class" => "total", "state_class" => "total",
"disabled" => !Settings.isSensorsLevelEnabled() "disabled" => !Settings.isSensorsLevelEnabled()
}, });
{ }
if (ActivityMonitor.Info has :floorsDescended) {
sensors.add({
"name" => "Floors descended today", "name" => "Floors descended today",
"state" => activityInfo.floorsDescended == null ? "unknown" : activityInfo.floorsDescended, "state" => activityInfo.floorsDescended == null ? "unknown" : activityInfo.floorsDescended,
"type" => "sensor", "type" => "sensor",
@ -269,9 +275,8 @@ class WebhookManager {
"icon" => "mdi:stairs-down", "icon" => "mdi:stairs-down",
"state_class" => "total", "state_class" => "total",
"disabled" => !Settings.isSensorsLevelEnabled() "disabled" => !Settings.isSensorsLevelEnabled()
});
} }
];
if (ActivityMonitor.Info has :respirationRate) { if (ActivityMonitor.Info has :respirationRate) {
sensors.add({ sensors.add({
@ -289,6 +294,7 @@ class WebhookManager {
if (Activity has :getProfileInfo) { if (Activity has :getProfileInfo) {
var activity = Activity.getProfileInfo().sport; var activity = Activity.getProfileInfo().sport;
var sub_activity = Activity.getProfileInfo().subSport; var sub_activity = Activity.getProfileInfo().subSport;
if ((Activity.getActivityInfo() != null) and if ((Activity.getActivityInfo() != null) and
((Activity.getActivityInfo().elapsedTime == null) or ((Activity.getActivityInfo().elapsedTime == null) or
(Activity.getActivityInfo().elapsedTime == 0))) { (Activity.getActivityInfo().elapsedTime == 0))) {