fix the display issue with 454x454 screens (#53)

.github/workflows/main.yaml

@@ -104,7 +104,7 @@ jobs:
           echo "$CIQ_DEV_KEY" | base64 -d > /tmp/dev.key
           java -Xms1g -Dfile.encoding=UTF-8 -Dapple.awt.UIElement=true -jar /opt/ciq/bin/monkeybrains.jar -v
           for i in $(grep "product id=" manifest.xml | cut -d \" -f2); do
-            if [[ "$i" =~ ^(d2mach1|venu2|venu2s|venu2plus|fenix7|fenix7s|fenix7x|fenix7pro|fenix7spro|fenix7xpro|fr955|fr965|epix2|epix2pro42mm|epix2pro47mm|epix2pro51mm|fr265|fr265s|fr255|fr255m|fr255sm|fr255s)$ ]]; then
+            if [[ "$i" =~ ^(d2mach1|venu2|venu2s|venu2plus|fenix7|fenix7s|fenix7x|fenix7pro|fenix7spro|fenix7xpro|fr955|fr965|epix2|epix2pro42mm|epix2pro47mm|epix2pro51mm|fr265|fr265s|fr255|fr255m|fr255sm|fr255s|marq2|marq2aviator)$ ]]; then
               export SDK=4.2.0
             elif [[ "$i" =~ ^(d2airx10)$ ]]; then
               export SDK=4.0.0
@@ -161,6 +161,6 @@ jobs:
         run: |
           for file in /tmp/*.prg; do mv "$file" "${file%.prg}-${TAG_NAME}.prg"; done
           mv /tmp/RunPowerWorkout.iq /tmp/RunPowerWorkout-${TAG_NAME}.iq
-          hub release edit $(find /tmp/ -type f \( -name '*.prg' -o -name '*.iq' \) -printf "-a %p ") -m "" "$TAG_NAME"
+          hub release edit $(find /tmp/ -type f \( -name 'RunPowerWorkout*.prg' -o -name '*.iq' \) -printf "-a %p ") -m "" "$TAG_NAME"
           pip install -r cicd/requirements.txt
           python cicd/upload_to_garmin.py

doc/generating_fonts.MD

@@ -0,0 +1,3 @@
+FULL : fontbm --font-file PragatiNarrow-Bold.ttf --output Pragati-74 --font-size 74 --background-color 0,0,0 --texture-size 256x256 --chars 65-90,37,45,47-58
+
+Numbers only : fontbm --font-file PragatiNarrow-Bold.ttf --output Pragati-74 --font-size 74 --background-color 0,0,0 --texture-size 256x256 --chars 48-58

manifest.xml

@@ -66,6 +66,8 @@
             <iq:product id="marqdriver"/>
             <iq:product id="marqexpedition"/>
             <iq:product id="marqgolfer"/>
+            <iq:product id="marq2"/>
+            <iq:product id="marq2aviator"/>
             <iq:product id="venu"/>
             <iq:product id="venu2"/>
             <iq:product id="venu2plus"/>

monkey.jungle

@@ -82,11 +82,13 @@ fr935.resourcePath = resources-lowmem;resources-noworkout;resources-hm-240;resou
 fr945.resourcePath = resources-highmem;resources-hm-240;resources
 fr945lte.resourcePath = resources-highmem;resources-hm-240;resources
 fr955.resourcePath = resources-highmem;resources-hm-260;resources
-fr965.resourcePath = resources;resources-70x70;resources-highmem;resources-hm-416
+fr965.resourcePath = resources;resources-70x70;resources-highmem;resources-hm-454
 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
 legacysagarey.resourcePath = resources;resources-30x30;resources-lowmem;resources-ant
+marq2.resourcePath = resources;resources-60x60;resources-highmem;resources-hm-390
+marq2aviator.resourcePath = resources;resources-60x60;resources-highmem;resources-hm-390
 marqadventurer.resourcePath = resources-highmem;resources-hm-240;resources
 marqathlete.resourcePath = resources-highmem;resources-hm-240;resources
 marqaviator.resourcePath = resources-highmem;resources-hm-240;resources
@@ -187,6 +189,8 @@ legacyherocaptainmarvel.excludeAnnotations = $(legacyherocaptainmarvel.excludeAn
 legacyherofirstavenger.excludeAnnotations = $(legacyherofirstavenger.excludeAnnotations);$(low_mem_excludes);noant;noworkout
 legacysagadarthvader.excludeAnnotations = $(legacysagadarthvader.excludeAnnotations);$(low_mem_excludes);noant;noworkout
 legacysagarey.excludeAnnotations = $(legacysagarey.excludeAnnotations);$(low_mem_excludes);noant;noworkout
+marq2.excludeAnnotations = $(marq2.excludeAnnotations);$(high_mem_excludes);ant;noworkout
+marq2aviator.excludeAnnotations = $(marq2aviator.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 marqadventurer.excludeAnnotations = $(marqadventurer.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 marqathlete.excludeAnnotations = $(marqathlete.excludeAnnotations);$(high_mem_excludes);ant;noworkout
 marqaviator.excludeAnnotations = $(marqaviator.excludeAnnotations);$(high_mem_excludes);ant;noworkout

resources-hm-390/fonts/Pragati-100.fnt

@@ -0,0 +1,15 @@
+info face="Pragati Narrow" size=-100 bold=1 italic=0 charset="" unicode=1 stretchH=100 smooth=0 aa=1 padding=0,0,0,0 spacing=0,0 outline=0
+common lineHeight=169 base=116 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4
+page id=0 file="Pragati-100_0.png"
+chars count=11
+char id=48   x=0     y=65    width=37    height=66    xoffset=3     yoffset=51    xadvance=42    page=0  chnl=15
+char id=49   x=40    y=0     width=38    height=64    xoffset=4     yoffset=52    xadvance=42    page=0  chnl=15
+char id=50   x=111   y=63    width=36    height=65    xoffset=3     yoffset=51    xadvance=42    page=0  chnl=15
+char id=51   x=0     y=131   width=37    height=66    xoffset=2     yoffset=51    xadvance=42    page=0  chnl=15
+char id=52   x=0     y=0     width=40    height=65    xoffset=1     yoffset=51    xadvance=42    page=0  chnl=15
+char id=53   x=74    y=130   width=37    height=65    xoffset=3     yoffset=52    xadvance=42    page=0  chnl=15
+char id=54   x=37    y=65    width=37    height=66    xoffset=3     yoffset=51    xadvance=42    page=0  chnl=15
+char id=55   x=78    y=0     width=38    height=63    xoffset=2     yoffset=53    xadvance=42    page=0  chnl=15
+char id=56   x=37    y=131   width=37    height=66    xoffset=3     yoffset=51    xadvance=42    page=0  chnl=15
+char id=57   x=74    y=64    width=37    height=66    xoffset=3     yoffset=51    xadvance=42    page=0  chnl=15
+char id=58   x=0     y=197   width=13    height=49    xoffset=5     yoffset=67    xadvance=25    page=0  chnl=15

resources-hm-390/fonts/Pragati-160.fnt

@@ -0,0 +1,16 @@
+info face="Pragati Narrow" size=-160 bold=1 italic=0 charset="" unicode=1 stretchH=100 smooth=0 aa=1 padding=0,0,0,0 spacing=0,0 outline=0
+common lineHeight=271 base=186 scaleW=256 scaleH=256 pages=2 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4
+page id=0 file="Pragati-160_0.png"
+page id=1 file="Pragati-160_1.png"
+chars count=11
+char id=48   x=61    y=103   width=59    height=104   xoffset=4     yoffset=84    xadvance=67    page=0  chnl=15
+char id=49   x=0     y=103   width=61    height=101   xoffset=6     yoffset=85    xadvance=67    page=0  chnl=15
+char id=50   x=59    y=0     width=58    height=102   xoffset=5     yoffset=84    xadvance=67    page=1  chnl=15
+char id=51   x=120   y=102   width=59    height=104   xoffset=4     yoffset=84    xadvance=67    page=0  chnl=15
+char id=52   x=0     y=0     width=64    height=103   xoffset=1     yoffset=83    xadvance=67    page=0  chnl=15
+char id=53   x=64    y=0     width=60    height=102   xoffset=4     yoffset=86    xadvance=67    page=0  chnl=15
+char id=54   x=179   y=100   width=59    height=104   xoffset=4     yoffset=84    xadvance=67    page=0  chnl=15
+char id=55   x=124   y=0     width=60    height=100   xoffset=3     yoffset=86    xadvance=67    page=0  chnl=15
+char id=56   x=0     y=0     width=59    height=104   xoffset=4     yoffset=84    xadvance=67    page=1  chnl=15
+char id=57   x=0     y=104   width=59    height=104   xoffset=4     yoffset=84    xadvance=67    page=1  chnl=15
+char id=58   x=184   y=0     width=20    height=77    xoffset=8     yoffset=109   xadvance=40    page=0  chnl=15

resources-hm-390/fonts/Pragati-22.fnt

@@ -0,0 +1,45 @@
+info face="Pragati Narrow" size=-22 bold=1 italic=0 charset="" unicode=1 stretchH=100 smooth=0 aa=1 padding=0,0,0,0 spacing=0,0 outline=0
+common lineHeight=38 base=26 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4
+page id=0 file="Pragati-22_0.png"
+chars count=41
+char id=32   x=0     y=0     width=0     height=0     xoffset=0     yoffset=0     xadvance=5     page=0  chnl=15
+char id=37   x=16    y=0     width=15    height=14    xoffset=0     yoffset=12    xadvance=15    page=0  chnl=15
+char id=45   x=0     y=223   width=6     height=3     xoffset=0     yoffset=19    xadvance=6     page=0  chnl=15
+char id=46   x=3     y=212   width=4     height=3     xoffset=0     yoffset=23    xadvance=5     page=0  chnl=15
+char id=47   x=0     y=196   width=5     height=16    xoffset=0     yoffset=11    xadvance=5     page=0  chnl=15
+char id=48   x=0     y=28    width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=49   x=183   y=0     width=10    height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=50   x=0     y=42    width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=51   x=0     y=56    width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=52   x=0     y=70    width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=53   x=0     y=84    width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=54   x=0     y=98    width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=55   x=0     y=112   width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=56   x=0     y=126   width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=57   x=0     y=140   width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=58   x=0     y=212   width=3     height=11    xoffset=1     yoffset=15    xadvance=6     page=0  chnl=15
+char id=65   x=44    y=0     width=12    height=14    xoffset=0     yoffset=12    xadvance=12    page=0  chnl=15
+char id=66   x=128   y=0     width=11    height=14    xoffset=1     yoffset=12    xadvance=12    page=0  chnl=15
+char id=67   x=56    y=0     width=12    height=14    xoffset=0     yoffset=12    xadvance=12    page=0  chnl=15
+char id=68   x=139   y=0     width=11    height=14    xoffset=1     yoffset=12    xadvance=12    page=0  chnl=15
+char id=69   x=193   y=0     width=10    height=14    xoffset=1     yoffset=12    xadvance=11    page=0  chnl=15
+char id=70   x=0     y=154   width=9     height=14    xoffset=1     yoffset=12    xadvance=10    page=0  chnl=15
+char id=71   x=68    y=0     width=12    height=14    xoffset=0     yoffset=12    xadvance=13    page=0  chnl=15
+char id=72   x=203   y=0     width=10    height=14    xoffset=1     yoffset=12    xadvance=12    page=0  chnl=15
+char id=73   x=253   y=0     width=3     height=14    xoffset=1     yoffset=12    xadvance=5     page=0  chnl=15
+char id=74   x=0     y=168   width=9     height=14    xoffset=0     yoffset=12    xadvance=9     page=0  chnl=15
+char id=75   x=150   y=0     width=11    height=14    xoffset=1     yoffset=12    xadvance=12    page=0  chnl=15
+char id=76   x=0     y=182   width=9     height=14    xoffset=1     yoffset=12    xadvance=10    page=0  chnl=15
+char id=77   x=80    y=0     width=12    height=14    xoffset=1     yoffset=12    xadvance=14    page=0  chnl=15
+char id=78   x=213   y=0     width=10    height=14    xoffset=1     yoffset=12    xadvance=12    page=0  chnl=15
+char id=79   x=31    y=0     width=13    height=14    xoffset=0     yoffset=12    xadvance=13    page=0  chnl=15
+char id=80   x=223   y=0     width=10    height=14    xoffset=1     yoffset=12    xadvance=11    page=0  chnl=15
+char id=82   x=161   y=0     width=11    height=14    xoffset=1     yoffset=12    xadvance=12    page=0  chnl=15
+char id=83   x=172   y=0     width=11    height=14    xoffset=0     yoffset=12    xadvance=11    page=0  chnl=15
+char id=84   x=233   y=0     width=10    height=14    xoffset=0     yoffset=12    xadvance=10    page=0  chnl=15
+char id=85   x=243   y=0     width=10    height=14    xoffset=1     yoffset=12    xadvance=12    page=0  chnl=15
+char id=86   x=92    y=0     width=12    height=14    xoffset=0     yoffset=12    xadvance=11    page=0  chnl=15
+char id=87   x=0     y=0     width=16    height=14    xoffset=0     yoffset=12    xadvance=16    page=0  chnl=15
+char id=88   x=104   y=0     width=12    height=14    xoffset=0     yoffset=12    xadvance=11    page=0  chnl=15
+char id=89   x=116   y=0     width=12    height=14    xoffset=0     yoffset=12    xadvance=11    page=0  chnl=15
+char id=90   x=0     y=14    width=10    height=14    xoffset=0     yoffset=12    xadvance=10    page=0  chnl=15