Version 1.36

gcormier9 · Sep 20, 2022 · 973bc96 · 973bc96
1 parent de976be
commit 973bc96
Show file tree

Hide file tree

Showing 4 changed files with 119 additions and 94 deletions.
diff --git a/README.md b/README.md
@@ -294,6 +294,28 @@ Calculate the vertical speed in meter/min or feet/min depending on the watch set
 
 ## Release Notes
 
+### Version 1.36 (by @Likenttt)
+ - Using Connect IQ 4.1.5
+
+| Memory Usage on va3 (28.6 KB)     | Current | Peak    |
+| --------------------------------- |:-------:|:-------:|
+| At startup                        | 25.6 kB | 27.3 kB |
+| 10 sec running                    | 25.6 kB | 27.6 kB |
+| After setting change              | 25.6 kB | 28.5 kB |
+
+| Memory Usage on fenix5 (28.6 KB)  | Current | Peak    |
+| --------------------------------- |:-------:|:-------:|
+| At startup                        | 25.6 kB | 27.5 kB |
+| 10 sec running                    | 25.6 kB | 27.9 kB |
+| After setting change              | 25.6 kB | 28.5 kB |
+
+
+| Memory Usage on fr945 (124.6 KB)  | Current | Peak    |
+| --------------------------------- |:-------:|:-------:|
+| At startup                        | 30.7 kB | 32.8 kB |
+| 10 sec running                    | 30.7 kB | 33.2 kB |
+| After setting change              | 30.7 kB | 33.9 kB |
+
 ### Version 1.35 (by @Likenttt)
  - Add support for fr255,fr255m,fr255s,fr255sm,fr955. These 5 models have 256kB, which is a high memory.
 

diff --git a/manifest.xml b/manifest.xml
@@ -1,90 +1,92 @@
-<!-- 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="GRunApp" id="330ea7d24e114df0bebf05b1dcb74788" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="datafield" version="1.0.0">
-        <iq:products>
-            <iq:product id="approachs62"/>
-            <iq:product id="d2air"/>
-            <iq:product id="d2airx10"/>
-            <iq:product id="d2charlie"/>
-            <iq:product id="d2delta"/>
-            <iq:product id="d2deltapx"/>
-            <iq:product id="d2deltas"/>
-            <iq:product id="descentmk1"/>
-            <iq:product id="descentmk2"/>
-            <iq:product id="descentmk2s"/>
-            <iq:product id="edge1030"/>
-            <iq:product id="edge1030bontrager"/>
-            <iq:product id="edge1030plus"/>
-            <iq:product id="edge130"/>
-            <iq:product id="edge130plus"/>
-            <iq:product id="edge520plus"/>
-            <iq:product id="edge530"/>
-            <iq:product id="edge820"/>
-            <iq:product id="edge830"/>
-            <iq:product id="edgeexplore"/>
-            <iq:product id="enduro"/>
-            <iq:product id="epix2"/>
-            <iq:product id="fenix5"/>
-            <iq:product id="fenix5plus"/>
-            <iq:product id="fenix5s"/>
-            <iq:product id="fenix5splus"/>
-            <iq:product id="fenix5x"/>
-            <iq:product id="fenix5xplus"/>
-            <iq:product id="fenix6"/>
-            <iq:product id="fenix6pro"/>
-            <iq:product id="fenix6s"/>
-            <iq:product id="fenix6spro"/>
-            <iq:product id="fenix6xpro"/>
-            <iq:product id="fenix7"/>
-            <iq:product id="fenix7s"/>
-            <iq:product id="fenix7x"/>
-            <iq:product id="fenixchronos"/>
-            <iq:product id="fr245"/>
-            <iq:product id="fr245m"/>
-            <iq:product id="fr255"/>
-            <iq:product id="fr255m"/>
-            <iq:product id="fr255s"/>
-            <iq:product id="fr255sm"/>
-            <iq:product id="fr55"/>
-            <iq:product id="fr645"/>
-            <iq:product id="fr645m"/>
-            <iq:product id="fr745"/>
-            <iq:product id="fr935"/>
-            <iq:product id="fr945"/>
-            <iq:product id="fr945lte"/>
-            <iq:product id="fr955"/>
-            <iq:product id="legacyherocaptainmarvel"/>
-            <iq:product id="legacyherofirstavenger"/>
-            <iq:product id="legacysagadarthvader"/>
-            <iq:product id="legacysagarey"/>
-            <iq:product id="marqadventurer"/>
-            <iq:product id="marqathlete"/>
-            <iq:product id="marqaviator"/>
-            <iq:product id="marqcaptain"/>
-            <iq:product id="marqcommander"/>
-            <iq:product id="marqdriver"/>
-            <iq:product id="marqexpedition"/>
-            <iq:product id="marqgolfer"/>
-            <iq:product id="oregon7xx"/>
-            <iq:product id="rino7xx"/>
-            <iq:product id="venu"/>
-            <iq:product id="venu2"/>
-            <iq:product id="venu2plus"/>
-            <iq:product id="venu2s"/>
-            <iq:product id="venud"/>
-            <iq:product id="vivoactive3"/>
-            <iq:product id="vivoactive3d"/>
-            <iq:product id="vivoactive3m"/>
-            <iq:product id="vivoactive3mlte"/>
-            <iq:product id="vivoactive4"/>
-            <iq:product id="vivoactive4s"/>
-        </iq:products>
-        <iq:permissions>
-            <iq:uses-permission id="Positioning"/>
-            <iq:uses-permission id="UserProfile"/>
-        </iq:permissions>
-        <iq:languages>
-            <iq:language>eng</iq:language>
-        </iq:languages>
-        <iq:barrels/>
-    </iq:application>
-</iq:manifest>
+<?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="GRunApp" id="330ea7d24e114df0bebf05b1dcb74788" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="datafield" version="1.0.0">
+    <iq:products>
+      <iq:product id="approachs62"/>
+      <iq:product id="d2air"/>
+      <iq:product id="d2airx10"/>
+      <iq:product id="d2charlie"/>
+      <iq:product id="d2delta"/>
+      <iq:product id="d2deltapx"/>
+      <iq:product id="d2deltas"/>
+      <iq:product id="descentmk1"/>
+      <iq:product id="descentmk2"/>
+      <iq:product id="descentmk2s"/>
+      <iq:product id="edge1030"/>
+      <iq:product id="edge1030bontrager"/>
+      <iq:product id="edge1030plus"/>
+      <iq:product id="edge130"/>
+      <iq:product id="edge130plus"/>
+      <iq:product id="edge520plus"/>
+      <iq:product id="edge530"/>
+      <iq:product id="edge820"/>
+      <iq:product id="edge830"/>
+      <iq:product id="edgeexplore"/>
+      <iq:product id="enduro"/>
+      <iq:product id="epix2"/>
+      <iq:product id="fenix5"/>
+      <iq:product id="fenix5plus"/>
+      <iq:product id="fenix5s"/>
+      <iq:product id="fenix5splus"/>
+      <iq:product id="fenix5x"/>
+      <iq:product id="fenix5xplus"/>
+      <iq:product id="fenix6"/>
+      <iq:product id="fenix6pro"/>
+      <iq:product id="fenix6s"/>
+      <iq:product id="fenix6spro"/>
+      <iq:product id="fenix6xpro"/>
+      <iq:product id="fenix7"/>
+      <iq:product id="fenix7s"/>
+      <iq:product id="fenix7x"/>
+      <iq:product id="fenixchronos"/>
+      <iq:product id="fr245"/>
+      <iq:product id="fr245m"/>
+      <iq:product id="fr255"/>
+      <iq:product id="fr255m"/>
+      <iq:product id="fr255s"/>
+      <iq:product id="fr255sm"/>
+      <iq:product id="fr55"/>
+      <iq:product id="fr645"/>
+      <iq:product id="fr645m"/>
+      <iq:product id="fr745"/>
+      <iq:product id="fr935"/>
+      <iq:product id="fr945"/>
+      <iq:product id="fr945lte"/>
+      <iq:product id="fr955"/>
+      <iq:product id="legacyherocaptainmarvel"/>
+      <iq:product id="legacyherofirstavenger"/>
+      <iq:product id="legacysagadarthvader"/>
+      <iq:product id="legacysagarey"/>
+      <iq:product id="marqadventurer"/>
+      <iq:product id="marqathlete"/>
+      <iq:product id="marqaviator"/>
+      <iq:product id="marqcaptain"/>
+      <iq:product id="marqcommander"/>
+      <iq:product id="marqdriver"/>
+      <iq:product id="marqexpedition"/>
+      <iq:product id="marqgolfer"/>
+      <iq:product id="oregon7xx"/>
+      <iq:product id="rino7xx"/>
+      <iq:product id="venu"/>
+      <iq:product id="venu2"/>
+      <iq:product id="venu2plus"/>
+      <iq:product id="venu2s"/>
+      <iq:product id="venud"/>
+      <iq:product id="vivoactive3"/>
+      <iq:product id="vivoactive3d"/>
+      <iq:product id="vivoactive3m"/>
+      <iq:product id="vivoactive3mlte"/>
+      <iq:product id="vivoactive4"/>
+      <iq:product id="vivoactive4s"/>
+    </iq:products>
+    <iq:permissions>
+      <iq:uses-permission id="Positioning"/>
+      <iq:uses-permission id="UserProfile"/>
+    </iq:permissions>
+    <iq:languages>
+      <iq:language>eng</iq:language>
+    </iq:languages>
+    <iq:barrels/>
+  </iq:application>
+</iq:manifest>
diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
@@ -1,5 +1,5 @@
 <properties>
-  <property id="AppVersion" type="string">1.35</property>
+  <property id="AppVersion" type="string">1.36</property>
   <property id="HeaderHeight" type="number">30</property>
   <property id="SingleBackgroundColor" type="boolean">false</property>
   <property id="LapDistance" type="number">0</property>

diff --git a/source/GRunView.mc b/source/GRunView.mc
@@ -159,7 +159,9 @@ class GRunView extends WatchUi.DataField
   function getParameter(paramName, defaultValue)
   {
     var paramValue = Application.Properties.getValue(paramName);
-    if (paramValue == null) {
+    if ( (paramValue == null) || 
+         ((paramValue instanceof Toybox.Lang.String == true) && (defaultValue instanceof Toybox.Lang.String == false)))
+    {
       paramValue = defaultValue;
       Application.Properties.setValue(paramName, defaultValue);
     }
@@ -274,7 +276,6 @@ class GRunView extends WatchUi.DataField
     }
   }
 
-
   function initializeUserData()
   {
     initCompleted = 6;
@@ -1219,7 +1220,7 @@ class GRunView extends WatchUi.DataField
         type == 27 /* OPTION_CURRENT_LAP_PACE */)
     {
       value = round(value);
-      if (value <= 0) { return null; }
+      if (value <= 0 || targetPace <= 0) { return null; }
       if (value < (targetPace - paceRange)) { return Graphics.COLOR_BLUE; } // 0x00AAFF
       if (value > (targetPace + paceRange)) { return Graphics.COLOR_RED; } // 0xFF0000
       return Graphics.COLOR_DK_GREEN; // 0x00AA00