Added support for new Edge, Forerunner and MARQ devices

Author: maca88

Source/SmartBikeLights

@@ -18,8 +18,10 @@
             <iq:product id="edge1040"/>
             <iq:product id="edge520plus"/>
             <iq:product id="edge530"/>
+            <iq:product id="edge540"/>
             <iq:product id="edge820"/>
             <iq:product id="edge830"/>
+            <iq:product id="edge840"/>
             <iq:product id="edge_1000"/>
             <iq:product id="edge_520"/>
             <iq:product id="edgeexplore"/>
@@ -47,6 +49,8 @@
             <iq:product id="fr255m"/>
             <iq:product id="fr255s"/>
             <iq:product id="fr255sm"/>
+            <iq:product id="fr265"/>
+            <iq:product id="fr265s"/>
             <iq:product id="fr645"/>
             <iq:product id="fr645m"/>
             <iq:product id="fr735xt"/>
@@ -55,10 +59,13 @@
             <iq:product id="fr945"/>
             <iq:product id="fr945lte"/>
             <iq:product id="fr955"/>
+            <iq:product id="fr965"/>
             <iq:product id="legacyherocaptainmarvel"/>
             <iq:product id="legacyherofirstavenger"/>
             <iq:product id="legacysagadarthvader"/>
             <iq:product id="legacysagarey"/>
+            <iq:product id="marq2"/>
+            <iq:product id="marq2aviator"/>
             <iq:product id="marqadventurer"/>
             <iq:product id="marqathlete"/>
             <iq:product id="marqaviator"/>

Source/manifest.xml

@@ -1,10 +1,13 @@
 project.manifest = manifest.xml
 excludeBase=lowMemory;dataField;monochromeScreen
 
+project.optimization = 2
+project.typecheck = 0
+
 base.sourcePath = source;SmartBikeLights/Source/SmartBikeLights/source-common;source-generated
 
 nonTouchScreen = $(excludeBase);touchScreen;noLightButtons
-rectangleNonTouchScreen = $(nonTouchScreen);round;hasGlance;highResolution
+rectangleNonTouchScreen = $(nonTouchScreen);round;highResolution
 roundNonTouchScreen = $(nonTouchScreen);rectangle;highResolution
 roundHighResolution = $(nonTouchScreen);rectangle;mediumResolution
 rectangleTouchScreen = $(excludeBase);nonTouchScreen;noLightButtons;round;settings;highResolution
@@ -15,12 +18,12 @@ round.excludeAnnotations = $(roundNonTouchScreen);hasGlance
 semiround.excludeAnnotations = $(roundNonTouchScreen);hasGlance
 base.excludeAnnotations = $(rectangle.excludeAnnotations)
 
-# Rectangle non touch screen devices
-edge_520.excludeAnnotations = $(rectangleNonTouchScreen)
-edge520plus.excludeAnnotations = $(rectangleNonTouchScreen)
-edge530.excludeAnnotations = $(rectangleNonTouchScreen)
-venusq.excludeAnnotations = $(rectangleNonTouchScreen)
-venusqm.excludeAnnotations = $(rectangleNonTouchScreen)
+# Rectangle non touch screen devices without glance
+edge_520.excludeAnnotations = $(rectangleNonTouchScreen);hasGlance
+edge520plus.excludeAnnotations = $(rectangleNonTouchScreen);hasGlance
+edge530.excludeAnnotations = $(rectangleNonTouchScreen);hasGlance
+venusq.excludeAnnotations = $(rectangleNonTouchScreen);hasGlance
+venusqm.excludeAnnotations = $(rectangleNonTouchScreen);hasGlance
 
 # High resolution watches without glance
 d2air.excludeAnnotations = $(roundHighResolution);hasGlance
@@ -32,30 +35,37 @@ d2airx10.excludeAnnotations = $(roundHighResolution);staticGlance
 descentmk2.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 descentmk2s.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 edge1040.excludeAnnotations = $(rectangleTouchScreen);staticGlance
+edge540.excludeAnnotations = $(rectangleNonTouchScreen);staticGlance
+edge840.excludeAnnotations = $(rectangleTouchScreen);staticGlance
 enduro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 epix2.excludeAnnotations = $(roundHighResolution);staticGlance
 fenix6pro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fenix6spro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fenix6xpro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
+fenix7.excludeAnnotations = $(roundNonTouchScreen);staticGlance
+fenix7s.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fenix7x.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fr245m.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fr255.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fr255m.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fr255s.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fr255sm.excludeAnnotations = $(roundNonTouchScreen);staticGlance
+fr265.excludeAnnotations = $(roundHighResolution);staticGlance
+fr265s.excludeAnnotations = $(roundHighResolution);staticGlance
 fr745.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fr945.excludeAnnotations = $(roundNonTouchScreen);staticGlance
-fr955.excludeAnnotations = $(roundNonTouchScreen);staticGlance
 fr945lte.excludeAnnotations = $(roundNonTouchScreen);staticGlance
+fr955.excludeAnnotations = $(roundNonTouchScreen);staticGlance
+fr965.excludeAnnotations = $(roundHighResolution);staticGlance
+marq2.excludeAnnotations = $(roundHighResolution);staticGlance
+marq2aviator.excludeAnnotations = $(roundHighResolution);staticGlance
 venu2.excludeAnnotations = $(roundHighResolution);staticGlance
 venu2plus.excludeAnnotations = $(roundHighResolution);staticGlance
 venu2s.excludeAnnotations = $(roundHighResolution);staticGlance
 
 # Static glance
 fenix6.excludeAnnotations = $(roundNonTouchScreen);liveGlance
 fenix6s.excludeAnnotations = $(roundNonTouchScreen);liveGlance
-fenix7.excludeAnnotations = $(roundNonTouchScreen);liveGlance
-fenix7s.excludeAnnotations = $(roundNonTouchScreen);liveGlance
 fr245.excludeAnnotations = $(roundNonTouchScreen);liveGlance
 marqadventurer.excludeAnnotations = $(roundNonTouchScreen);liveGlance
 marqathlete.excludeAnnotations = $(roundNonTouchScreen);liveGlance

Source/monkey.jungle

@@ -0,0 +1,9 @@
+<resources>
+    <!-- Format [[:separatorWidth:, :titleFont:, :titleFontTopPadding:, :displayOffsetX:]
+        :separatorWidth: = Number
+        :titleFont: = 0-8
+        :titleFontTopPadding: = Number
+        :displayOffsetX: = Number
+    -->
+    <jsonData id="Settings">[2, 1, 0, 18]</jsonData>
+</resources>

Source/resources-round-454x454/data.xml

@@ -0,0 +1,5 @@
+<resources>
+    <font id="lightsFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Lights48.fnt" antialias="true" />
+    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery24.fnt" antialias="false" />
+    <font id="controlModeFont" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/ControlMode18.fnt" antialias="true" />
+</resources>

Source/resources-round-454x454/resources.xml

@@ -101,7 +101,8 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
         dc.setColor(fgColor, bgColor);
         dc.clear();
         if (_initializedLights == 0) {
-            dc.drawText(width / 2, height / 2, 2, "No network", 1 /* TEXT_JUSTIFY_CENTER */ | 4 /* TEXT_JUSTIFY_VCENTER */);
+            var text = _individualNetwork ? "Bike Lights" : "No network";
+            dc.drawText(width / 2, height / 2, 2, text, 1 /* TEXT_JUSTIFY_CENTER */ | 4 /* TEXT_JUSTIFY_VCENTER */);
             return;
         }
 
@@ -153,8 +154,9 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
         }
 
         _individualNetwork = configuration[6];
-        if (_individualNetwork != null /* Is enabled */ || _lightNetwork instanceof AntLightNetwork.IndividualLightNetwork) {
-            recreateLightNetwork();
+        if (_individualNetwork != null) {
+            release();
+            return;
         }
 
         initializeLights();
@@ -348,7 +350,7 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
     private function recreateLightNetwork() {
         release();
         _lightNetwork = _individualNetwork != null
-            ? new AntLightNetwork.IndividualLightNetwork(_individualNetwork[0], _individualNetwork[1], _lightNetworkListener)
+            ? null
             : new AntPlus.LightNetwork(_lightNetworkListener);
     }
 

Source/source-generated/BikeLightsGlanceView.HighResolution.mc

@@ -101,7 +101,8 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
         dc.setColor(fgColor, bgColor);
         dc.clear();
         if (_initializedLights == 0) {
-            dc.drawText(width / 2, height / 2, 2, "No network", 1 /* TEXT_JUSTIFY_CENTER */ | 4 /* TEXT_JUSTIFY_VCENTER */);
+            var text = _individualNetwork ? "Bike Lights" : "No network";
+            dc.drawText(width / 2, height / 2, 2, text, 1 /* TEXT_JUSTIFY_CENTER */ | 4 /* TEXT_JUSTIFY_VCENTER */);
             return;
         }
 
@@ -153,8 +154,9 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
         }
 
         _individualNetwork = configuration[6];
-        if (_individualNetwork != null /* Is enabled */ || _lightNetwork instanceof AntLightNetwork.IndividualLightNetwork) {
-            recreateLightNetwork();
+        if (_individualNetwork != null) {
+            release();
+            return;
         }
 
         initializeLights();
@@ -348,7 +350,7 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
     private function recreateLightNetwork() {
         release();
         _lightNetwork = _individualNetwork != null
-            ? new AntLightNetwork.IndividualLightNetwork(_individualNetwork[0], _individualNetwork[1], _lightNetworkListener)
+            ? null
             : new AntPlus.LightNetwork(_lightNetworkListener);
     }
 

Source/source-generated/BikeLightsGlanceView.MediumResolution.mc

@@ -101,7 +101,8 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
         dc.setColor(fgColor, bgColor);
         dc.clear();
         if (_initializedLights == 0) {
-            dc.drawText(width / 2, height / 2, 2, "No network", 1 /* TEXT_JUSTIFY_CENTER */ | 4 /* TEXT_JUSTIFY_VCENTER */);
+            var text = _individualNetwork ? "Bike Lights" : "No network";
+            dc.drawText(width / 2, height / 2, 2, text, 1 /* TEXT_JUSTIFY_CENTER */ | 4 /* TEXT_JUSTIFY_VCENTER */);
             return;
         }
 
@@ -153,8 +154,9 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
         }
 
         _individualNetwork = configuration[6];
-        if (_individualNetwork != null /* Is enabled */ || _lightNetwork instanceof AntLightNetwork.IndividualLightNetwork) {
-            recreateLightNetwork();
+        if (_individualNetwork != null) {
+            release();
+            return;
         }
 
         initializeLights();
@@ -348,7 +350,7 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
     private function recreateLightNetwork() {
         release();
         _lightNetwork = _individualNetwork != null
-            ? new AntLightNetwork.IndividualLightNetwork(_individualNetwork[0], _individualNetwork[1], _lightNetworkListener)
+            ? null
             : new /* #include ANT_NETWORK */(_lightNetworkListener);
     }