Add new devices (#34)

* Adding the new SDK + support for extra devices * Adding the new SDK + support for extra devices Co-authored-by: Samuel Dumont <samuel@dataroots.io>
tommyvdz · Jun 12, 2021 · ee4b9e8 · ee4b9e8
1 parent f3ac358
commit ee4b9e8
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 49 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -35,7 +35,7 @@ jobs:
       - run: |
           sudo apt-get install --reinstall unzip wget git ssh tar gzip ca-certificates
           cd /opt;
-          wget -q https://developer.garmin.com/downloads/connect-iq/sdks/connectiq-sdk-lin-4.0.2-2021-05-13-9b3b7f19f.zip -O ciq.zip;
+          wget -q https://developer.garmin.com/downloads/connect-iq/sdks/connectiq-sdk-lin-4.0.3-2021-06-01-b7cc78017.zip -O ciq.zip;
           unzip ciq.zip -d ciq;
           rm -f ciq.zip;
         if: steps.ciq.outputs.cache-hit != 'true'
@@ -104,7 +104,7 @@ jobs:
               export SDK=2.4.0
             elif [[ "$i" =~ ^(approachs62|d2charlie|descentmk1|vivoactive3d)$ ]]; then
               export SDK=3.0.0
-            elif [[ "$i" =~ ^(venud|vivoactive3|vivoactive3mlte|fr645|fr935|d2delta|d2deltapx|d2deltas|descentmk2|fenix5|fenix5s|fenix5x)$ ]]; then
+            elif [[ "$i" =~ ^(vivoactive3|vivoactive3mlte|fr645|fr935|d2delta|d2deltapx|d2deltas|fenix5|fenix5s|fenix5x)$ ]]; then
               export SDK=3.1.0
             else              
               export SDK=3.2.0

diff --git a/README.md b/README.md
@@ -113,7 +113,8 @@ If you find an issue or want to improve this datafield, feel free to open Issues
 | D2 Delta Px                  | ❌                 | ✅                    | HIGH (128KB)     |
 | D2 Delta S                   | ❌                 | ✅                    | HIGH (128KB)     |
 | Descent Mk1                  | ❌                 | ✅                    | HIGH (128KB)     |
-| Descent Mk2/Mk2i             | ✅ (in theory)     | ✅                    | HIGH (128KB)     |
+| Descent Mk2/Mk2i             | ✅                 | ✅                    | HIGH (128KB)     |
+| Descent Mk2s                 | ✅                 | ✅                    | HIGH (128KB)     |
 | Enduro                       | ✅                 | ✅                    | LOW (32KB)       |
 | Fenix 5                      | ❌                 | ✅                    | LOW (32KB)       |
 | Fenix 5S                     | ❌                 | ✅                    | LOW (32KB)       |
@@ -128,12 +129,13 @@ If you find an issue or want to improve this datafield, feel free to open Issues
 | Fenix 6X Pro                 | ✅                 | ✅                    | HIGH (128KB)     |
 | Forerunner 245               | ✅                 | ❌                    | LOW (32KB)       |
 | Forerunner 245M              | ✅                 | ❌                    | HIGH (64KB)      |
+| Forerunner 55                | ✅                 | ❌                    | LOW (32KB)       |
 | Forerunner 645               | ❌                 | ❌                    | LOW (32KB)       |
 | Forerunner 645M              | ✅                 | ❌                    | HIGH (64KB)      |
 | Forerunner 745               | ✅                 | ✅                    | HIGH (64KB)      |
 | Forerunner 935               | ❌                 | ✅                    | LOW (32KB)       |
 | Forerunner 945               | ✅                 | ✅                    | HIGH (128KB)     |
-| Forerunner 945               | ✅                 | ✅                    | HIGH (128KB)     |
+| Forerunner 945 LTE           | ✅                 | ✅                    | HIGH (128KB)     |
 | MARQ Adventurer              | ✅                 | ✅                    | HIGH (128KB)     |
 | MARQ Athlete                 | ✅                 | ✅                    | HIGH (128KB)     |
 | MARQ Aviator                 | ✅                 | ✅                    | HIGH (128KB)     |
@@ -143,7 +145,7 @@ If you find an issue or want to improve this datafield, feel free to open Issues
 | MARQ Expedition              | ✅                 | ✅                    | HIGH (128KB)     |
 | MARQ Golfer                  | ✅                 | ✅                    | HIGH (128KB)     |
 | Venu                         | ✅                 | ❌                    | LOW (32KB)       |
-| Venu (Mercedes-Benz)         | ❌                 | ❌                    | LOW (32KB)       |
+| Venu (Mercedes-Benz)         | ✅                 | ❌                    | LOW (32KB)       |
 | Venu 2                       | ✅                 | ❌                    | HIGH (256KB)     |
 | Venu 2s                      | ✅                 | ❌                    | HIGH (256KB)     |
 | Vivoactive 3                 | ❌                 | ❌                    | LOW (32KB)       |

diff --git a/manifest.xml b/manifest.xml
@@ -11,49 +11,51 @@
             <iq:product id="d2deltapx" />
             <iq:product id="d2deltas" />
             <iq:product id="descentmk1" />
-            <iq:product id="descentmk2" />
             <iq:product id="descentmk2s" />
-            <iq:product id="enduro" />
             <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="fr245" />
-            <iq:product id="fr245m" />
+            <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="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="venu" />
+            <iq:product id="fr945lte" />
             <iq:product id="venu2" />
             <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:product id="vivoactive4" />
+            <iq:product id="fenix6xpro" />
+            <iq:product id="fenix6spro" />
+            <iq:product id="fenix6s" />
+            <iq:product id="fenix6pro" />
+            <iq:product id="fenix6" />
+            <iq:product id="venud" />
+            <iq:product id="venu" />
+            <iq:product id="legacysagarey" />
+            <iq:product id="marqgolfer" />
+            <iq:product id="marqexpedition" />
+            <iq:product id="marqaviator" />
+            <iq:product id="marqdriver" />
+            <iq:product id="marqcommander" />
+            <iq:product id="marqathlete" />
+            <iq:product id="marqadventurer" />
+            <iq:product id="marqcaptain" />
+            <iq:product id="fr945" />
+            <iq:product id="fr245m" />
+            <iq:product id="fr245" />
+            <iq:product id="legacyherofirstavenger" />
+            <iq:product id="enduro" />
+            <iq:product id="descentmk2" />
+            <iq:product id="legacysagadarthvader" />
+            <iq:product id="legacyherocaptainmarvel" />
         </iq:products>
         <iq:permissions>
             <iq:uses-permission id="Ant" />
@@ -65,4 +67,4 @@
         </iq:languages>
         <iq:barrels />
     </iq:application>
-</iq:manifest>
+</iq:manifest>
diff --git a/monkey.jungle b/monkey.jungle
@@ -10,6 +10,7 @@ d2deltapx.sourcePath = source;source-ant
 d2deltas.sourcePath = source;source-ant
 fr245.sourcePath = source;source-ant
 fr245m.sourcePath = source;source-ant
+fr55.sourcePath = source;source-ant
 fr645.sourcePath = source;source-ant
 fr645m.sourcePath = source;source-ant
 legacyherocaptainmarvel.sourcePath = source;source-ant
@@ -36,9 +37,9 @@ d2delta.resourcePath = resources;resources-highmem;resources-hm-240;resources-an
 d2deltapx.resourcePath = resources;resources-highmem;resources-hm-240;resources-ant;resources-noworkout
 d2deltas.resourcePath = resources;resources-highmem;resources-hm-240;resources-ant;resources-noworkout
 descentmk1.resourcePath = resources-highmem;resources-hm-240;resources;resources-noworkout
-descentmk2.resourcePath = resources-highmem;resources-hm-280;resources;resources-noworkout
+descentmk2.resourcePath = resources-highmem;resources-hm-280;resources
 descentmk2s.resourcePath = resources-highmem;resources-hm-240;resources
-enduro.resourcePath = resources;resources-noworkout;resources-lowmem
+enduro.resourcePath = resources;resources-lowmem
 fenix5.resourcePath = resources-lowmem;resources-noworkout;resources
 fenix5plus.resourcePath = resources-highmem;resources-hm-240;resources
 fenix5s.resourcePath = resources;resources-lowmem;resources-36x36;resources-noworkout
@@ -52,11 +53,13 @@ fenix6spro.resourcePath = resources-highmem;resources-hm-240;resources
 fenix6xpro.resourcePath = resources-highmem;resources-hm-280;resources
 fr245.resourcePath = resources-lowmem;resources-ant;resources
 fr245m.resourcePath = resources-ant;resources-highmem;resources-hm-240;resources
+fr55.resourcePath = resources-lowmem;resources-35x35;resources
 fr645.resourcePath = resources-ant;resources-lowmem;resources-noworkout;resources
 fr645m.resourcePath = resources-ant;resources-highmem;resources-hm-240;resources
 fr745.resourcePath = resources-highmem;resources-hm-240;resources
 fr935.resourcePath = resources-lowmem;resources-noworkout;resources-hm-240;resources
 fr945.resourcePath = resources-highmem;resources-hm-240;resources
+fr945lte.resourcePath = resources-highmem;resources-hm-240;resources
 legacyherocaptainmarvel.resourcePath = resources;resources-30x30;resources-lowmem;resources-ant
 legacyherofirstavenger.resourcePath = resources;resources-35x35;resources-lowmem;resources-ant
 legacysagadarthvader.resourcePath = resources;resources-35x35;resources-lowmem;resources-ant
@@ -70,7 +73,7 @@ marqdriver.resourcePath = resources-highmem;resources-hm-240;resources
 marqexpedition.resourcePath = resources-highmem;resources-hm-240;resources
 marqgolfer.resourcePath = resources-highmem;resources-hm-240;resources
 venu.resourcePath = resources;resources-60x60;resources-lowmem;resources-ant
-venud.resourcePath = resources;resources-60x60;resources-ant;resources-noworkout;resources-lowmem
+venud.resourcePath = resources;resources-60x60;resources-lowmem;resources-ant
 venu2.resourcePath = resources;resources-70x70;resources-highmem;resources-hm-416
 venu2s.resourcePath = resources;resources-61x61;resources-highmem;resources-hm-360
 vivoactive3.resourcePath = resources;resources-40x33;resources-ant;resources-noworkout;resources-lowmem
@@ -80,18 +83,21 @@ vivoactive3mlte.resourcePath = resources;resources-40x33;resources-ant;resources
 vivoactive4.resourcePath = resources;resources-35x35;resources-ant;resources-lowmem
 vivoactive4s.resourcePath = resources;resources-30x30;resources-ant;resources-lowmem
 
-round_218_common_excludes = roundone;roundtwo;roundthree;roundfour;roundfive;roundsix
-round_240_common_excludes = roundzero;roundtwo;roundthree;roundfour;roundfive;roundsix
-round_260_common_excludes = roundzero;roundone;roundthree;roundfour;roundfive;roundsix
-round_280_common_excludes = roundzero;roundone;roundtwo;roundfour;roundfive;roundsix
-round_390_common_excludes = roundzero;roundone;roundtwo;roundthree;roundfive;roundsix
-round_360_common_excludes = roundzero;roundone;roundtwo;roundthree;roundfour;roundsix
-round_416_common_excludes = roundzero;roundone;roundtwo;roundthree;roundfour;roundfive
+round_218_common_excludes = roundone;roundtwo;roundthree;roundfour;roundfive;roundsix;roundseven
+round_240_common_excludes = roundzero;roundtwo;roundthree;roundfour;roundfive;roundsix;roundseven
+round_260_common_excludes = roundzero;roundone;roundthree;roundfour;roundfive;roundsix;roundseven
+round_280_common_excludes = roundzero;roundone;roundtwo;roundfour;roundfive;roundsix;roundseven
+round_390_common_excludes = roundzero;roundone;roundtwo;roundthree;roundfive;roundsix;roundseven
+round_360_common_excludes = roundzero;roundone;roundtwo;roundthree;roundfour;roundsix;roundseven
+round_416_common_excludes = roundzero;roundone;roundtwo;roundthree;roundfour;roundfive;roundseven
+round_208_common_excludes = roundzero;roundone;roundtwo;roundthree;roundfour;roundfive;roundsix
 
-low_mem_excludes = medmem;highmem;lowmemlarge
-low_mem_large_excludes = medmem;highmem;lowmemlow
-high_mem_excludes = lowmem;medmem;lowmemlarge;lowmemlow
+low_mem_excludes = highmem;lowmemlarge;lowmemlow
+low_mem_large_excludes = lowmemreg;highmem;lowmemlow
+low_mem_low_excludes = lowmemreg;highmem;lowmemlarge
+high_mem_excludes = lowmem;lowmemlarge;lowmemlow;lowmemreg
 
+round-208x208.excludeAnnotations = $(round_208_common_excludes)
 round-218x218.excludeAnnotations = $(round_218_common_excludes)
 round-240x240.excludeAnnotations = $(round_240_common_excludes)
 round-260x260.excludeAnnotations = $(round_260_common_excludes)
@@ -108,7 +114,7 @@ d2delta.excludeAnnotations = $(d2delta.excludeAnnotations);$(high_mem_excludes);
 d2deltapx.excludeAnnotations = $(d2deltapx.excludeAnnotations);$(high_mem_excludes);noant;workout
 d2deltas.excludeAnnotations = $(d2deltas.excludeAnnotations);$(high_mem_excludes);noant;workout
 descentmk1.excludeAnnotations = $(descentmk1.excludeAnnotations);$(high_mem_excludes);ant;workout
-descentmk2.excludeAnnotations = $(descentmk2.excludeAnnotations);$(high_mem_excludes);ant;workout
+descentmk2.excludeAnnotations = $(descentmk2.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 descentmk2s.excludeAnnotations = $(descentmk2s.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 enduro.excludeAnnotations = $(enduro.excludeAnnotations);$(low_mem_excludes);ant;noworkout
 fenix5.excludeAnnotations = $(fenix5.excludeAnnotations);$(low_mem_excludes);ant;workout
@@ -124,11 +130,13 @@ fenix6spro.excludeAnnotations = $(fenix6spro.excludeAnnotations);$(high_mem_excl
 fenix6xpro.excludeAnnotations = $(fenix6xpro.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 fr245.excludeAnnotations = $(fr245.excludeAnnotations);$(low_mem_excludes);noant;noworkout
 fr245m.excludeAnnotations = $(fr245m.excludeAnnotations);$(high_mem_excludes);noant;noworkout
+fr55.excludeAnnotations = $(fr55.excludeAnnotations);$(low_mem_low_excludes);noant;noworkout
 fr645.excludeAnnotations = $(fr645.excludeAnnotations);$(low_mem_excludes);noant;workout
 fr645m.excludeAnnotations = $(fr645m.excludeAnnotations);$(high_mem_excludes);noant;noworkout
 fr745.excludeAnnotations = $(fr745.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 fr935.excludeAnnotations = $(fr935.excludeAnnotations);$(low_mem_excludes);ant;workout
 fr945.excludeAnnotations = $(fr945.excludeAnnotations);$(high_mem_excludes);ant;noworkout
+fr945lte.excludeAnnotations = $(fr945lte.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 legacyherocaptainmarvel.excludeAnnotations = $(legacyherocaptainmarvel.excludeAnnotations);$(low_mem_excludes);noant;noworkout
 legacyherofirstavenger.excludeAnnotations = $(legacyherofirstavenger.excludeAnnotations);$(low_mem_excludes);noant;noworkout
 legacysagadarthvader.excludeAnnotations = $(legacysagadarthvader.excludeAnnotations);$(low_mem_excludes);noant;noworkout
@@ -142,7 +150,7 @@ marqdriver.excludeAnnotations = $(marqdriver.excludeAnnotations);$(high_mem_excl
 marqexpedition.excludeAnnotations = $(marqexpedition.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 marqgolfer.excludeAnnotations = $(marqgolfer.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 venu.excludeAnnotations = $(venu.excludeAnnotations);$(low_mem_large_excludes);noant;noworkout
-venud.excludeAnnotations = $(venud.excludeAnnotations);$(low_mem_large_excludes);noant;workout
+venud.excludeAnnotations = $(venud.excludeAnnotations);$(low_mem_large_excludes);noant;noworkout
 venu2.excludeAnnotations = $(venu2.excludeAnnotations);$(high_mem_excludes);noant;noworkout
 venu2s.excludeAnnotations = $(venu2s.excludeAnnotations);$(high_mem_excludes);noant;noworkout
 vivoactive3.excludeAnnotations = $(vivoactive3.excludeAnnotations);$(low_mem_excludes);noant;workout

diff --git a/source/RunPowerWorkoutAlertView.mc b/source/RunPowerWorkoutAlertView.mc
@@ -13,7 +13,8 @@ class RunPowerWorkoutAlertView extends WatchUi.DataFieldAlert {
   (:roundfour) hidden var geometry = [ 390, 195, 39, 292 ];
   (:roundfive) hidden var geometry = [ 360, 180, 36, 266 ];
   (:roundsix) hidden var geometry = [ 416, 208, 41, 308 ];
-
+  (:roundseven) hidden var geometry = [ 208, 104, 20, 153 ];
+
   function initialize(high, low, current, parFonts) {
     DataFieldAlert.initialize();
     targetHigh = high;

diff --git a/source/RunPowerWorkoutView.mc b/source/RunPowerWorkoutView.mc
@@ -107,6 +107,8 @@ class RunPowerWorkoutView extends WatchUi.DataField {
       [ 360, 180, 127, 202, 277, 115, 266, 165, 174, 156, 50, 75, 52, 191 ];
   (:roundsix) const geometry =
       [ 416, 208, 147, 234, 320, 133, 308, 193, 202, 187, 55, 87, 60, 221 ];
+  (:roundseven) const geometry =
+      [ 208, 104, 73, 114, 158, 66, 152, 98, 109, 81, 25, 43, 27, 111 ];
 
   function initialize(strydsensor) {
     // read settings
@@ -278,13 +280,18 @@ class RunPowerWorkoutView extends WatchUi.DataField {
     }
   }
 
-  (:lowmemlow) function set_fonts() { fonts = [ 0, 1, 2, 3, 6, 8 ]; }
+  (:lowmemreg) function set_fonts() { fonts = [ 0, 1, 2, 3, 6, 8 ]; }
 
   (:lowmemlarge) function set_fonts() {
     fontOffset = 2;
     fonts = [ 0, 1, 2, 3, 6, 8 ];
   }
 
+  (:lowmemlow) function set_fonts() {
+    fontOffset = -1;
+    fonts = [ 0, 1, 2, 3, 5, 7 ];
+  }
+
   (:highmem) function set_layout() {
     fields = [
       Utils.replaceNull(Application.getApp().getProperty("N1"), 51).toChar(),
@@ -315,7 +322,15 @@ class RunPowerWorkoutView extends WatchUi.DataField {
     lapStartDistance = 0;
   }
 
-  (:lowmem) function set_layout() {
+  (:lowmemreg) function set_layout() {
+    fields = Utils.replaceNull(Application.getApp().getProperty("N"), "368201").toCharArray();
+  }
+
+  (:lowmemlow) function set_layout() {
+    fields = Utils.replaceNull(Application.getApp().getProperty("N"), "368201").toCharArray();
+  }
+
+  (:lowmemlarge) function set_layout() {
     fields = Utils.replaceNull(Application.getApp().getProperty("N"), "368201").toCharArray();
   }