Skip to content

Commit 4bd8b3e

Browse files
maca88maca88
committed
Added support for fenix 8, fenix E, Enduro 3 and Forerunner 165
1 parent 857edb7 commit 4bd8b3e

File tree

6 files changed

+62
-5
lines changed

6 files changed

+62
-5
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,14 @@ Bike Lights Control is a [widget](https://developer.garmin.com/connect-iq/connec
5252
- Garmin Varia RTL511
5353
- Garmin Varia RTL515
5454
- Garmin Varia RTL516
55+
- Garmin Varia eRTL615
5556
- Garmin Varia RCT715
5657
- Garmin Varia RCT716
5758
- Garmin Varia HL500
5859
- Garmin Varia UT800
5960
- Giant Recon HL1800
6061
- Magene L508
62+
- Trek CarBack
6163
- Trek Commuter Pro RT
6264
- Cycliq Fly12 CE (supported only by using Individual Light Network)
6365
- Cycliq Fly6 CE (supported only by using Individual Light Network)

‎Source/SmartBikeLights‎

Submodule SmartBikeLights updated 79 files

‎Source/manifest.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<iq:product id="edgeexplore"/>
2828
<iq:product id="edgeexplore2"/>
2929
<iq:product id="enduro"/>
30+
<iq:product id="enduro3"/>
3031
<iq:product id="epix2"/>
3132
<iq:product id="epix2pro42mm"/>
3233
<iq:product id="epix2pro47mm"/>
@@ -44,11 +45,20 @@
4445
<iq:product id="fenix6xpro"/>
4546
<iq:product id="fenix7"/>
4647
<iq:product id="fenix7pro"/>
48+
<iq:product id="fenix7pronowifi"/>
4749
<iq:product id="fenix7s"/>
4850
<iq:product id="fenix7spro"/>
4951
<iq:product id="fenix7x"/>
5052
<iq:product id="fenix7xpro"/>
53+
<iq:product id="fenix7xpronowifi"/>
54+
<iq:product id="fenix843mm"/>
55+
<iq:product id="fenix847mm"/>
56+
<iq:product id="fenix8solar47mm"/>
57+
<iq:product id="fenix8solar51mm"/>
5158
<iq:product id="fenixchronos"/>
59+
<iq:product id="fenixe"/>
60+
<iq:product id="fr165"/>
61+
<iq:product id="fr165m"/>
5262
<iq:product id="fr245"/>
5363
<iq:product id="fr245m"/>
5464
<iq:product id="fr255"/>

‎Source/monkey.jungle‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ edge1040.excludeAnnotations = $(rectangleTouchScreen);staticGlance
3838
edge540.excludeAnnotations = $(rectangleNonTouchScreen);staticGlance
3939
edge840.excludeAnnotations = $(rectangleTouchScreen);staticGlance
4040
enduro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
41+
enduro3.excludeAnnotations = $(roundNonTouchScreen);staticGlance
4142
epix2.excludeAnnotations = $(roundHighResolution);staticGlance
4243
epix2pro42mm.excludeAnnotations = $(roundHighResolution);staticGlance
4344
epix2pro47mm.excludeAnnotations = $(roundHighResolution);staticGlance
@@ -47,10 +48,19 @@ fenix6spro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
4748
fenix6xpro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
4849
fenix7.excludeAnnotations = $(roundNonTouchScreen);staticGlance
4950
fenix7pro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
51+
fenix7pronowifi.excludeAnnotations = $(roundNonTouchScreen);staticGlance
5052
fenix7s.excludeAnnotations = $(roundNonTouchScreen);staticGlance
5153
fenix7spro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
5254
fenix7x.excludeAnnotations = $(roundNonTouchScreen);staticGlance
5355
fenix7xpro.excludeAnnotations = $(roundNonTouchScreen);staticGlance
56+
fenix7xpronowifi.excludeAnnotations = $(roundNonTouchScreen);staticGlance
57+
fenix843mm.excludeAnnotations = $(roundHighResolution);staticGlance
58+
fenix847mm.excludeAnnotations = $(roundHighResolution);staticGlance
59+
fenix8solar47mm.excludeAnnotations = $(roundNonTouchScreen);staticGlance
60+
fenix8solar51mm.excludeAnnotations = $(roundNonTouchScreen);staticGlance
61+
fenixe.excludeAnnotations = $(roundHighResolution);staticGlance
62+
fr165.excludeAnnotations = $(roundHighResolution);staticGlance
63+
fr165m.excludeAnnotations = $(roundHighResolution);staticGlance
5464
fr245m.excludeAnnotations = $(roundNonTouchScreen);staticGlance
5565
fr255.excludeAnnotations = $(roundNonTouchScreen);staticGlance
5666
fr255m.excludeAnnotations = $(roundNonTouchScreen);staticGlance

‎Source/preprocess.config.json‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,35 @@
22
"includeSymbols": {
33
"HEADER": "// <auto-generated>\r\n// This code was generated by a tool.\r\n// Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.\r\n// </auto-generated>",
44
"ANT_NETWORK": "AntPlus.LightNetwork",
5-
"ANT_NETWORK_TEST": "TestNetwork.TestLightNetwork"
5+
"ANT_NETWORK_TEST": "TestNetwork.TestLightNetwork",
6+
7+
"LIGHT_PANEL_MARGIN": "2",
8+
"LIGHT_PANEL_FOOTER_HEIGHT": "20",
9+
"LIGHT_PANEL_BATTERY_OFFSET_Y": "1",
10+
11+
"H_BATTERY_HEIGHT": "17",
12+
"H_BATTERY_WIDTH": "49",
13+
14+
"V_BATTERY_L_WIDTH": "20",
15+
16+
"H_LIGHT_FONT_OFFSET_X": "4",
17+
"T_LIGHT_FONT_OFFSET_X": "2",
18+
"LIGHT_FONT_OFFSET_X": "4",
19+
"LIGHT_HEIGHT": "32",
20+
"LIGHT_OFFSET_X": "25",
21+
22+
"H_LIGHT_L_FONT_OFFSET_X": "4",
23+
"T_LIGHT_L_FONT_OFFSET_X": "4",
24+
"LIGHT_L_HEIGHT": "50",
25+
"LIGHT_L_WIDTH": "68",
26+
"LIGHT_L_V_BATTERY_OFFSET_X": "60",
27+
28+
"TITLE_OFFSET_X": "22",
29+
30+
"CTRL_MODE_OFFSET_X": "8",
31+
"CTRL_MODE_OFFSET_Y": "11",
32+
"CTRL_MODE_L_OFFSET_X": "10",
33+
"CTRL_MODE_L_OFFSET_Y": "14"
634
},
735
"definedSymbols": ["widget", "highMemory"],
836
"outFolder": "source-generated",
@@ -37,7 +65,13 @@
3765
"files": ["SmartBikeLights/Source/SmartBikeLights/source-preprocess/BikeLightsView.mc"],
3866
"definedSymbols": ["round", "nonTouchScreen", "highResolution"],
3967
"includeSymbols": {
40-
"TARGET": ":round :nonTouchScreen :highResolution"
68+
"TARGET": ":round :nonTouchScreen :highResolution",
69+
70+
"LIGHT_OFFSET_X": "36",
71+
"TITLE_OFFSET_X": "32",
72+
"CTRL_MODE_OFFSET_X": "10",
73+
"CTRL_MODE_OFFSET_Y": "14",
74+
"H_BATTERY_WIDTH": "68"
4175
}
4276
},
4377
{

‎Source/source-generated/BikeLightsView.TouchRectangle.mc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,8 @@ class BikeLightsView extends WatchUi.View {
952952
// <TitlePart> := [(:Title:, :TitleY:)+]
953953
var panelData = new [8 + (8 * panelSettings[0]) + totalButtonGroups];
954954
panelData[0] = totalButtonGroups;
955-
var buttonHeight = (height - 20 /* Battery */).toFloat() / totalButtonGroups;
955+
var footerHeight = 20;
956+
var buttonHeight = (height - footerHeight).toFloat() / totalButtonGroups;
956957
var fontResult = [0];
957958
var buttonPadding = margin * 2;
958959
var textPadding = margin * 4;
@@ -1017,7 +1018,7 @@ class BikeLightsView extends WatchUi.View {
10171018
panelData[2] = panelSettings[3] == 0 ? _activityColor : panelSettings[3]; // Button color
10181019
panelData[3] = panelSettings[4]; // Button text color
10191020
panelData[4] = x - (_batteryWidth / 2) - (margin / 2); // Light name x
1020-
panelData[5] = y + ((20 - lightNameHeight - lightNameTopPadding) / 2); // Light name y
1021+
panelData[5] = y + ((footerHeight - lightNameHeight - lightNameTopPadding) / 2); // Light name y
10211022
panelData[6] = x + (lightNameWidth / 2) + (margin / 2); // Battery x
10221023
panelData[7] = y - 1; // Battery y
10231024

0 commit comments

Comments
 (0)