remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-11-03 16:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix for activity reporting

Browse Source 
Added 'has' clauses around additional ActivityMonitor.Info fields that are not present on all devices.
This commit is contained in:
Philip Abbey
2024-08-24 12:28:54 +01:00
parent 769731bff2
commit 5558e25bda
2 changed files with 46 additions and 38 deletions
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. |

83
source/WebhookManager.mc
View File

@@ -208,7 +208,8 @@ class WebhookManager {
function registerWebhookSensors() { function registerWebhookSensors() {
var activityInfo = ActivityMonitor.getInfo(); var activityInfo = ActivityMonitor.getInfo();
var heartRate = Activity.getActivityInfo().currentHeartRate; var heartRate = Activity.getActivityInfo().currentHeartRate;
var unavailable = WatchUi.loadResource($.Rez.Strings.Unavailable) as Lang.String;
var sensors = [ var sensors = [
{ {
@@ -224,59 +225,64 @@ class WebhookManager {
"disabled" => !Settings.isSensorsLevelEnabled() "disabled" => !Settings.isSensorsLevelEnabled()
}, },
{ {
"device_class" => "battery_charging", "device_class" => "battery_charging",
"name" => "Battery is Charging", "name" => "Battery is Charging",
"state" => System.getSystemStats().charging, "state" => System.getSystemStats().charging,
"type" => "binary_sensor", "type" => "binary_sensor",
"unique_id" => "battery_is_charging", "unique_id" => "battery_is_charging",
"icon" => System.getSystemStats().charging ? "mdi:battery-plus" : "mdi:battery-minus", "icon" => System.getSystemStats().charging ? "mdi:battery-plus" : "mdi:battery-minus",
"entity_category" => "diagnostic", "entity_category" => "diagnostic",
"disabled" => !Settings.isSensorsLevelEnabled() "disabled" => !Settings.isSensorsLevelEnabled()
}, },
{ {
"name" => "Steps today", "name" => "Steps today",
"state" => activityInfo.steps == null ? "unknown" : activityInfo.steps, "state" => activityInfo.steps == null ? unavailable : activityInfo.steps,
"type" => "sensor", "type" => "sensor",
"unique_id" => "steps_today", "unique_id" => "steps_today",
"icon" => "mdi:walk", "icon" => "mdi:walk",
"state_class" => "total", "state_class" => "total",
"disabled" => !Settings.isSensorsLevelEnabled() "disabled" => !Settings.isSensorsLevelEnabled()
}, },
{ {
"name" => "Heart rate", "name" => "Heart rate",
"state" => heartRate == null ? "unknown" : heartRate, "state" => heartRate == null ? unavailable : heartRate,
"type" => "sensor", "type" => "sensor",
"unique_id" => "heart_rate", "unique_id" => "heart_rate",
"icon" => "mdi:heart-pulse", "icon" => "mdi:heart-pulse",
"unit_of_measurement" => "bpm", "unit_of_measurement" => "bpm",
"state_class" => "measurement", "state_class" => "measurement",
"disabled" => !Settings.isSensorsLevelEnabled() "disabled" => !Settings.isSensorsLevelEnabled()
},
{
"name" => "Floors climbed today",
"state" => activityInfo.floorsClimbed == null ? "unknown" : activityInfo.floorsClimbed,
"type" => "sensor",
"unique_id" => "floors_climbed_today",
"icon" => "mdi:stairs-up",
"state_class" => "total",
"disabled" => !Settings.isSensorsLevelEnabled()
},
{
"name" => "Floors descended today",
"state" => activityInfo.floorsDescended == null ? "unknown" : activityInfo.floorsDescended,
"type" => "sensor",
"unique_id" => "floors_descended_today",
"icon" => "mdi:stairs-down",
"state_class" => "total",
"disabled" => !Settings.isSensorsLevelEnabled()
} }
]; ];
if (ActivityMonitor.Info has :floorsClimbed) {
sensors.add({
"name" => "Floors climbed today",
"state" => activityInfo.floorsClimbed == null ? unavailable : activityInfo.floorsClimbed,
"type" => "sensor",
"unique_id" => "floors_climbed_today",
"icon" => "mdi:stairs-up",
"state_class" => "total",
"disabled" => !Settings.isSensorsLevelEnabled()
});
}
if (ActivityMonitor.Info has :floorsDescended) {
sensors.add({
"name" => "Floors descended today",
"state" => activityInfo.floorsDescended == null ? unavailable : activityInfo.floorsDescended,
"type" => "sensor",
"unique_id" => "floors_descended_today",
"icon" => "mdi:stairs-down",
"state_class" => "total",
"disabled" => !Settings.isSensorsLevelEnabled()
});
}
if (ActivityMonitor.Info has :respirationRate) { if (ActivityMonitor.Info has :respirationRate) {
sensors.add({ sensors.add({
"name" => "Respiration rate", "name" => "Respiration rate",
"state" => activityInfo.respirationRate == null ? "unknown" : activityInfo.respirationRate, "state" => activityInfo.respirationRate == null ? unavailable : activityInfo.respirationRate,
"type" => "sensor", "type" => "sensor",
"unique_id" => "respiration_rate", "unique_id" => "respiration_rate",
"icon" => "mdi:lungs", "icon" => "mdi:lungs",
@@ -287,14 +293,15 @@ 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))) {
// Indicate no activity with -1, not part of Garmin's activity codes. // Indicate no activity with -1, not part of Garmin's activity codes.
// https://developer.garmin.com/connect-iq/api-docs/Toybox/Activity.html#Sport-module // https://developer.garmin.com/connect-iq/api-docs/Toybox/Activity.html#Sport-module
activity = -1; activity = -1;
sub_activity = -1; sub_activity = -1;
} }
sensors.add({ sensors.add({