remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-05-01 13:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Amended "no activity" condition

Browse Source 
Back to using elapsed time.
This commit is contained in:
Philip Abbey
2024-01-29 19:06:58 +00:00
parent 55423c4eb7
commit 69ddb0f197
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/BackgroundServiceDelegate.mc
View File

@ -106,14 +106,14 @@ class BackgroundServiceDelegate extends System.ServiceDelegate {
var activity = Activity.getProfileInfo().sport; var activity = Activity.getProfileInfo().sport;
var sub_activity = Activity.getProfileInfo().subSport; var sub_activity = Activity.getProfileInfo().subSport;
// We need to check if we are actually tracking any activity as the enumerated type does not include "No Sport". // We need to check if we are actually tracking any activity as the enumerated type does not include "No Sport".
System.println("activityTrackingOn = " + System.getDeviceSettings().activityTrackingOn); if ((Activity.getActivityInfo() != null) and
if (!System.getDeviceSettings().activityTrackingOn) { ((Activity.getActivityInfo().elapsedTime == null) or
(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;
} }
System.println("activity = " + activity);
data.add({ data.add({
"state" => activity, "state" => activity,
"type" => "sensor", "type" => "sensor",

8
source/WebhookManager.mc
View File

@ -186,7 +186,9 @@ class WebhookManager {
// System.println("WebhookManager onReturnRegisterWebhookSensor(): Registering next sensor: Activity"); // System.println("WebhookManager onReturnRegisterWebhookSensor(): Registering next sensor: Activity");
if (Activity has :getProfileInfo) { if (Activity has :getProfileInfo) {
var activity = Activity.getProfileInfo().sport; var activity = Activity.getProfileInfo().sport;
if (!System.getDeviceSettings().activityTrackingOn) { if ((Activity.getActivityInfo() != null) and
((Activity.getActivityInfo().elapsedTime == null) or
(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;
@ -204,7 +206,9 @@ class WebhookManager {
// System.println("WebhookManager onReturnRegisterWebhookSensor(): Registering next sensor: Activity"); // System.println("WebhookManager onReturnRegisterWebhookSensor(): Registering next sensor: Activity");
if (Activity has :getProfileInfo) { if (Activity has :getProfileInfo) {
var sub_activity = Activity.getProfileInfo().subSport; var sub_activity = Activity.getProfileInfo().subSport;
if (!System.getDeviceSettings().activityTrackingOn) { if ((Activity.getActivityInfo() != null) and
((Activity.getActivityInfo().elapsedTime == null) or
(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
sub_activity = -1; sub_activity = -1;