6.0.0 - Support for Meditation new Garmin activity type.

dliedke · Sep 7, 2023 · ac6cba1 · ac6cba1
1 parent 4e064f5
commit ac6cba1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/HrvAlgorithms/sources/activity/FitSessionSpec.mc b/HrvAlgorithms/sources/activity/FitSessionSpec.mc
@@ -4,6 +4,7 @@ module HrvAlgorithms {
 	class FitSessionSpec {
 		private static const SUB_SPORT_YOGA = 43;
 		private static const SUB_SPORT_BREATHWORKS = 62;
+		private static const SPORT_MEDITATION = 67;
 
 		static function createYoga(sessionName) {
 			return {
@@ -13,11 +14,10 @@ module HrvAlgorithms {
                 };
 		}
 
-		static function createCardio(sessionName) {
+		static function createMeditation(sessionName) {
 			return {
                  :name => sessionName,                              
-                 :sport => ActivityRecording.SPORT_TRAINING,      
-                 :subSport => SUB_SPORT_BREATHWORKS
+                 :sport => SPORT_MEDITATION
                 };
 		}
 	}

diff --git a/Meditate/manifest.xml b/Meditate/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. -->
 <iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="MeditateApp" id="9abb375dcf7c4ace87ff66f4f774f6c8" launcherIcon="@Drawables.launcherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="5.8.1">
+    <iq:application entry="MeditateApp" id="9abb375dcf7c4ace87ff66f4f774f6c8" launcherIcon="@Drawables.launcherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="6.0.0">
         <iq:products>
             <iq:product id="approachs62"/>
             <iq:product id="approachs7042mm"/>

diff --git a/Meditate/resources-por/strings/strings.xml b/Meditate/resources-por/strings/strings.xml
@@ -39,11 +39,11 @@
 
     <string id="menuNewActivityTypeOptions_title">Atividade</string>    
     <string id="menuNewActivityTypeOptions_yoga">Yoga</string>
-    <string id="menuNewActivityTypeOptions_meditating">Respiração</string>
+    <string id="menuNewActivityTypeOptions_meditating">Meditação</string>
 
     <string id="activityTypeMenu_title">Atividade</string>    
     <string id="activityTypeMenu_yoga">Yoga</string>
-    <string id="activityTypeMenu_meditating">Respiração</string>
+    <string id="activityTypeMenu_meditating">Meditação</string>
 
     <string id="menuNewHrvTrackingOptions_title">Monit. VFC</string>    
     <string id="menuNewHrvTrackingOptions_onDetailed">Detalhado (Padrão)</string>
@@ -140,7 +140,7 @@
     <string id="HRVready">VFC Pronto</string>
     <string id="HRVoff">VFC Deslig.</string>
 
-    <string id="about_AppVersion">Meditate 5.8.1</string>
+    <string id="about_AppVersion">Meditate 6.0.0</string>
     <string id="about_vtrifonov">   vtrifonov</string>
     <string id="about_dliedke">     dliedke</string>
 

diff --git a/Meditate/resources/strings/strings.xml b/Meditate/resources/strings/strings.xml
@@ -39,11 +39,11 @@
 
     <string id="menuNewActivityTypeOptions_title">Activity</string>    
     <string id="menuNewActivityTypeOptions_yoga">Yoga</string>
-    <string id="menuNewActivityTypeOptions_meditating">Breathing</string>
+    <string id="menuNewActivityTypeOptions_meditating">Meditating</string>
 
     <string id="activityTypeMenu_title">Activity Type</string>    
     <string id="activityTypeMenu_yoga">Yoga</string>
-    <string id="activityTypeMenu_meditating">Breathing</string>
+    <string id="activityTypeMenu_meditating">Meditating</string>
 
     <string id="menuNewHrvTrackingOptions_title">Hrv Tracking</string>    
     <string id="menuNewHrvTrackingOptions_onDetailed">On Detailed (Default)</string>
@@ -139,7 +139,7 @@
     <string id="HRVready">HRV Ready</string>
     <string id="HRVoff">HRV off</string>
 
-    <string id="about_AppVersion">Meditate 5.8.1</string>
+    <string id="about_AppVersion">Meditate 6.0.0</string>
     <string id="about_vtrifonov">   vtrifonov</string>
     <string id="about_dliedke">     dliedke</string>
 

diff --git a/Meditate/source/activity/MeditateActivity.mc b/Meditate/source/activity/MeditateActivity.mc
@@ -21,7 +21,7 @@ class MediteActivity extends HrvAlgorithms.HrvAndStressActivity {
 			fitSessionSpec = HrvAlgorithms.FitSessionSpec.createYoga(createSessionName(sessionTime, activityNameProperty)); // Due to bug in Connect IQ API for breath activity to get respiration rate, we will use Yoga as default meditate activity
 		}
 		else {
-			fitSessionSpec = HrvAlgorithms.FitSessionSpec.createCardio(createSessionName(sessionTime, activityNameProperty));
+			fitSessionSpec = HrvAlgorithms.FitSessionSpec.createMeditation(createSessionName(sessionTime, activityNameProperty));
 		}
 		me.mMeditateModel = meditateModel;	
 		HrvAlgorithms.HrvAndStressActivity.initialize(fitSessionSpec, meditateModel.getHrvTracking(), heartbeatIntervalsSensor);			

diff --git a/UserGuide.md b/UserGuide.md
@@ -3,7 +3,7 @@
 ## Features
 
 - ability to save the meditation session as Garmin Connect activity
-    - activity type **Meditating** or **Yoga**
+    - activity type **Meditation** or **Yoga**
 - ability to configure multiple meditation/yoga sessions
     - e.g. a 20 min session with 1 min recurring alerts, triggering a different alert on the 10th minute
     - each session supports interval vibration alerts
@@ -111,7 +111,7 @@ Enable/disable screen light during the session using light button or touch the s
           3. last repetative alert
     - Color - the color of the current interval alert used in the graphical controls. Select different colors for each alert to differentiate them during meditation. Select transparent color if you don't want to see visual marks for the alert during meditation
     - Vibe Pattern/Sound - shorter or longer patterns ranging from pulsating or continuous or sound
-- Activity Type - ability to save the session as **Breathing** or **Yoga**. You can configure default activity type for new sessions from the Global Settings ([see section 4](#4-global-settings)).
+- Activity Type - ability to save the session as **Meditation** or **Yoga**. You can configure default activity type for new sessions from the Global Settings ([see section 4](#4-global-settings)).
 - HRV Tracking - determines if HRV and stress are tracked
   - ON - tracks stress and the following HRV metrics
     - RMSSD
@@ -215,4 +215,4 @@ This setting provides the default **HRV Tracking** for new sessions.
 You can set the default activity type for new sessions.
 
 - Yoga
-- Breathing
+- Meditation