Skip to content

Commit

Permalink
182 add support for the latest devices released from garmin (#183)
Browse files Browse the repository at this point in the history
7 new devices. 2 users waiting for this update for Fenix 8.
  • Loading branch information
JosephAbbey authored Sep 6, 2024
2 parents 2e7216b + cd8f5d9 commit b22f119
Show file tree
Hide file tree
Showing 15 changed files with 262 additions and 182 deletions.
1 change: 1 addition & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@
| 2.18 | Bug fix for reporting activity metrics that might be `null` sometimes. This is unsimulatable situation, so this version is a change based on an informed guess. |
| 2.19 | A template to evaluate is now optionally allowed on both `group` and `toggle` menu items. The template to evaluate is non-optional on a `template` menu item. All updates are performed in a single HTTP GET request for efficiency. Bug fix for negative heading values. Vibration now (optionally) confirms toggle menu items being tapped. |
| 2.20 | Simplified the code base now that templates have been requested in all menu items. This means the `template` menu item became a superset of `tap`. Therefore the `tap` code has been has been upgraded to include `template` and the latter deprecated. JSON menu definitions continue to support `template` items by instantiating a `tap` menu item, but the schema marks them as deprecated and users should migrate their menu definitions now. Use the [web editor](https://house-of-abbey.github.io/GarminHomeAssistant/web/) for assistance with changes. |
| 2.21 | Added 7 new devices (`edge1050`, `enduro3`, `fenix843mm`, `fenix847mm`, `fenix8solar47mm`, `fenix8solar51mm`, `fenixe`) and upgraded the SDK to 7.3.0. |
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,6 @@ The `id` attribute values are taken from the same names used in [`strings.xml`](

5. Parameters to tap menu items cannot have their parameter usage verified. If you get this wrong and crash the application, that's your fault not the application's. In this case, start by removing the parameters for the menu item causing the crash, and add them back one at a time until you find your fault. **Please don't give the application a poor review for your bad parameter definition!**

6. We are unable to support Edge 540 and Edge 840 devices at this time. The simulation of both these devices has two unexpected errors when toggling or executing taps. We get both `Communications.NETWORK_RESPONSE_OUT_OF_MEMORY` and `Communications.BLE_QUEUE_FULL` even though the memory usage is about 6% of the available RAM. Based on a lead from user @Petucky, both devices are being re-enabled as testing on a real Edge 840 device has proven successful, however we remain unable to support either devices until the simulator is fixed.
6. We are unable to support Edge 540, Edge 840 and Edge 1050 devices at this time. The simulation of these devices has two unexpected errors when toggling or executing taps. We get both `Communications.NETWORK_RESPONSE_OUT_OF_MEMORY` and `Communications.BLE_QUEUE_FULL` even though the memory usage is about 6% of the available RAM. Based on a lead from user @Petucky, both devices are being re-enabled as testing on a real Edge 840 device has proven successful, however we remain unable to support either devices until the simulator is fixed.

7. We are unable to support HTTP without HTTPS. This is a limitation placed upon us by the Connect IQ API which for security reasons refuses to work with HTTP requests. There is nothing developers can do about this limitation. You will have to put an HTTPS proxy in front of your local Home Assistant to work with this application. See the [Trouble Shooting](TroubleShooting.md#do-it-yourself-setup) guide for an example setup. We would appreciate it if users did not leave poor reviews for the lack of this feature which is beyond our control to fix.
235 changes: 121 additions & 114 deletions manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,122 +37,129 @@
"Monkey C: Edit Products" - Lets you add or remove any product
-->
<iq:products>
<iq:product id="approachs7042mm" />
<iq:product id="approachs7047mm" />
<iq:product id="d2air" />
<iq:product id="d2airx10" />
<iq:product id="d2delta" />
<iq:product id="d2deltapx" />
<iq:product id="d2deltas" />
<iq:product id="d2mach1" />
<iq:product id="descentg1" />
<iq:product id="descentmk2" />
<iq:product id="descentmk2s" />
<iq:product id="approachs7042mm"/>
<iq:product id="approachs7047mm"/>
<iq:product id="d2air"/>
<iq:product id="d2airx10"/>
<iq:product id="d2delta"/>
<iq:product id="d2deltapx"/>
<iq:product id="d2deltas"/>
<iq:product id="d2mach1"/>
<iq:product id="descentg1"/>
<iq:product id="descentmk2"/>
<iq:product id="descentmk2s"/>
<iq:product id="descentmk343mm"/>
<iq:product id="descentmk351mm"/>
<iq:product id="edge1030" />
<iq:product id="edge1030bontrager" />
<iq:product id="edge1030plus" />
<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="edgeexplore" />
<iq:product id="edgeexplore2" />
<iq:product id="enduro" />
<iq:product id="epix2" />
<iq:product id="epix2pro42mm" />
<iq:product id="epix2pro47mm" />
<iq:product id="epix2pro51mm" />
<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="fenix7pro" />
<iq:product id="fenix7pronowifi" />
<iq:product id="fenix7s" />
<iq:product id="fenix7spro" />
<iq:product id="fenix7x" />
<iq:product id="fenix7xpro" />
<iq:product id="fenix7xpronowifi" />
<iq:product id="fenixchronos" />
<iq:product id="edge1030"/>
<iq:product id="edge1030bontrager"/>
<iq:product id="edge1030plus"/>
<iq:product id="edge1040"/>
<iq:product id="edge1050"/>
<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="edgeexplore"/>
<iq:product id="edgeexplore2"/>
<iq:product id="enduro"/>
<iq:product id="enduro3"/>
<iq:product id="epix2"/>
<iq:product id="epix2pro42mm"/>
<iq:product id="epix2pro47mm"/>
<iq:product id="epix2pro51mm"/>
<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="fenix7pro"/>
<iq:product id="fenix7pronowifi"/>
<iq:product id="fenix7s"/>
<iq:product id="fenix7spro"/>
<iq:product id="fenix7x"/>
<iq:product id="fenix7xpro"/>
<iq:product id="fenix7xpronowifi"/>
<iq:product id="fenix843mm"/>
<iq:product id="fenix847mm"/>
<iq:product id="fenix8solar47mm"/>
<iq:product id="fenix8solar51mm"/>
<iq:product id="fenixchronos"/>
<iq:product id="fenixe"/>
<iq:product id="fr165"/>
<iq:product id="fr165m"/>
<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="fr265" />
<iq:product id="fr265s" />
<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="fr965" />
<iq:product id="gpsmap67" />
<iq:product id="instinct2" />
<iq:product id="instinct2s" />
<iq:product id="instinct2x" />
<iq:product id="instinctcrossover" />
<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" />
<iq:product id="marqcaptain" />
<iq:product id="marqcommander" />
<iq:product id="marqdriver" />
<iq:product id="marqexpedition" />
<iq:product id="marqgolfer" />
<iq:product id="montana7xx" />
<iq:product id="venu" />
<iq:product id="venu2" />
<iq:product id="venu2plus" />
<iq:product id="venu2s" />
<iq:product id="venu3" />
<iq:product id="venu3s" />
<iq:product id="venud" />
<iq:product id="venusq" />
<iq:product id="venusq2" />
<iq:product id="venusq2m" />
<iq:product id="venusqm" />
<iq:product id="vivoactive3" />
<iq:product id="vivoactive3m" />
<iq:product id="vivoactive3mlte" />
<iq:product id="vivoactive4" />
<iq:product id="vivoactive4s" />
<iq:product id="vivoactive5" />
<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="fr265"/>
<iq:product id="fr265s"/>
<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="fr965"/>
<iq:product id="gpsmap67"/>
<iq:product id="instinct2"/>
<iq:product id="instinct2s"/>
<iq:product id="instinct2x"/>
<iq:product id="instinctcrossover"/>
<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"/>
<iq:product id="marqcaptain"/>
<iq:product id="marqcommander"/>
<iq:product id="marqdriver"/>
<iq:product id="marqexpedition"/>
<iq:product id="marqgolfer"/>
<iq:product id="montana7xx"/>
<iq:product id="venu"/>
<iq:product id="venu2"/>
<iq:product id="venu2plus"/>
<iq:product id="venu2s"/>
<iq:product id="venu3"/>
<iq:product id="venu3s"/>
<iq:product id="venud"/>
<iq:product id="venusq"/>
<iq:product id="venusq2"/>
<iq:product id="venusq2m"/>
<iq:product id="venusqm"/>
<iq:product id="vivoactive3"/>
<iq:product id="vivoactive3m"/>
<iq:product id="vivoactive3mlte"/>
<iq:product id="vivoactive4"/>
<iq:product id="vivoactive4s"/>
<iq:product id="vivoactive5"/>
</iq:products>
<!--
Use "Monkey C: Edit Permissions" from the Visual Studio Code command
palette to update permissions.
-->
<iq:permissions>
<iq:uses-permission id="Background" />
<iq:uses-permission id="BluetoothLowEnergy" />
<iq:uses-permission id="Communications" />
<iq:uses-permission id="Positioning" />
<iq:uses-permission id="Background"/>
<iq:uses-permission id="BluetoothLowEnergy"/>
<iq:uses-permission id="Communications"/>
<iq:uses-permission id="Positioning"/>
</iq:permissions>
<!--
Use "Monkey C: Edit Languages" from the Visual Studio Code command
Expand All @@ -161,45 +168,45 @@
<iq:languages>
<iq:language>ara</iq:language>
<iq:language>bul</iq:language>
<iq:language>zhs</iq:language>
<iq:language>zht</iq:language>
<iq:language>hrv</iq:language>
<iq:language>ces</iq:language>
<iq:language>dan</iq:language>
<iq:language>dut</iq:language>
<iq:language>deu</iq:language>
<iq:language>gre</iq:language>
<iq:language>dut</iq:language>
<iq:language>eng</iq:language>
<iq:language>est</iq:language>
<iq:language>fin</iq:language>
<iq:language>fre</iq:language>
<iq:language>gre</iq:language>
<iq:language>heb</iq:language>
<iq:language>hrv</iq:language>
<iq:language>hun</iq:language>
<iq:language>ind</iq:language>
<iq:language>ita</iq:language>
<iq:language>jpn</iq:language>
<iq:language>kor</iq:language>
<iq:language>lav</iq:language>
<iq:language>lit</iq:language>
<iq:language>zsm</iq:language>
<iq:language>nob</iq:language>
<iq:language>pol</iq:language>
<iq:language>por</iq:language>
<iq:language>slo</iq:language>
<iq:language>ron</iq:language>
<!-- <iq:language>rus</iq:language> -->
<iq:language>slo</iq:language>
<iq:language>slv</iq:language>
<iq:language>spa</iq:language>
<iq:language>swe</iq:language>
<iq:language>tha</iq:language>
<iq:language>tur</iq:language>
<iq:language>ukr</iq:language>
<iq:language>vie</iq:language>
<iq:language>zhs</iq:language>
<iq:language>zht</iq:language>
<iq:language>zsm</iq:language>
</iq:languages>
<!--
Use "Monkey C: Configure Monkey Barrel" from the Visual Studio Code
command palette to edit the included barrels.
-->
<iq:barrels />
<iq:barrels/>
</iq:application>
</iq:manifest>
22 changes: 18 additions & 4 deletions monkey.jungle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ project.manifest = manifest.xml
#
# The icons need to scale as a ratio of screen size 48:416 pixels
#
# Icon 53 48 46 42 37 32 30 28 26 24 21 18
# Screen 454 416 390 360 320 280 260 240 218 208 176 156
# Icon 55 53 48 46 42 37 32 30 28 26 24 21 18
# Screen 480 454 416 390 360 320 280 260 240 218 208 176 156

# Screen Size 390x390 launcher icon size 70x70
approachs7042mm.resourcePath = $(approachs7042mm.resourcePath);resources-launcher-70-70;resources-icons-46
Expand Down Expand Up @@ -64,6 +64,8 @@ edge1030bontrager.resourcePath = $(edge1030bontrager.resourcePath);resources-lau
edge1030plus.resourcePath = $(edge1030plus.resourcePath);resources-launcher-36-36;resources-icons-32
# Screen Size 282x470 launcher icon size 40x40
edge1040.resourcePath = $(edge1040.resourcePath);resources-launcher-40-40;resources-icons-32
# Screen Size 480x800 launcher icon size 68x68
edge1050.resourcePath = $(edge1050.resourcePath);resources-launcher-68-68;resources-icons-55
# Screen Size 200x265 launcher icon size 35x35
edge520plus.resourcePath = $(edge520plus.resourcePath);resources-launcher-35-35;resources-icons-24
# Screen Size 246x322 launcher icon size 35x35
Expand All @@ -79,6 +81,8 @@ edgeexplore.resourcePath = $(edgeexplore.resourcePath);resources-launcher-36-36;
edgeexplore2.resourcePath = $(edgeexplore2.resourcePath);resources-launcher-36-36;resources-icons-28
# Screen Size 280x280 launcher icon size 40x40
enduro.resourcePath = $(enduro.resourcePath);resources-launcher-40-40;resources-icons-32
# Screen Size 280x280 launcher icon size 40x40
enduro3.resourcePath = $(enduro3.resourcePath);resources-launcher-40-40;resources-icons-32
# Screen Size 416x416 launcher icon size 60x60
epix2.resourcePath = $(epix2.resourcePath);resources-launcher-60-60;resources-icons-48
# Screen Size 390x390 launcher icon size 60x60
Expand Down Expand Up @@ -108,8 +112,6 @@ fenix7.resourcePath = $(fenix7.resourcePath);resources-launcher-40-40;resources-
# Screen Size 260x260 launcher icon size 40x40
fenix7pro.resourcePath = $(fenix7pro.resourcePath);resources-launcher-40-40;resources-icons-30
fenix7pronowifi.resourcePath = $(fenix7pronowifi.resourcePath);resources-launcher-40-40;resources-icons-30
# Screen Size 218x218 launcher icon size 36x36
fenixchronos.resourcePath = $(fenixchronos.resourcePath);resources-launcher-36-36;resources-icons-26
# Screen Size 240x240 launcher icon size 40x40
fenix7s.resourcePath = $(fenix7s.resourcePath);resources-launcher-40-40;resources-icons-28
# Screen Size 240x240 launcher icon size 40x40
Expand All @@ -119,6 +121,18 @@ fenix7x.resourcePath = $(fenix7x.resourcePath);resources-launcher-40-40;resource
# Screen Size 280x280 launcher icon size 40x40
fenix7xpro.resourcePath = $(fenix7xpro.resourcePath);resources-launcher-40-40;resources-icons-32
fenix7xpronowifi.resourcePath = $(fenix7xpronowifi.resourcePath);resources-launcher-40-40;resources-icons-32
# Screen Size 416x416 launcher icon size 60x60
fenix843mm.resourcePath = $(fenix843mm.resourcePath);resources-launcher-60-60;resources-icons-48
# Screen Size 454x454 launcher icon size 65x65
fenix847mm.resourcePath = $(fenix847mm.resourcePath);resources-launcher-65-65;resources-icons-53
# Screen Size 260x260 launcher icon size 40x40
fenix8solar47mm.resourcePath = $(fenix8solar47mm.resourcePath);resources-launcher-40-40;resources-icons-30
# Screen Size 280x280 launcher icon size 40x40
fenix8solar51mm.resourcePath = $(fenix8solar51mm.resourcePath);resources-launcher-40-40;resources-icons-32
# Screen Size 218x218 launcher icon size 36x36
fenixchronos.resourcePath = $(fenixchronos.resourcePath);resources-launcher-36-36;resources-icons-26
# Screen Size 416x416 launcher icon size 60x60
fenixe.resourcePath = $(fenixe.resourcePath);resources-launcher-60-60;resources-icons-48
# Screen Size 390 x 390 launcher icon size 54x54
fr165.resourcePath = $(descentmk2s.resourcePath);resources-launcher-54-54;resources-icons-46
# Screen Size 390 x 390 launcher icon size 54x54
Expand Down
23 changes: 23 additions & 0 deletions resources-icons-55/drawables.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!--
Distributed under MIT Licence
See https://github.com/house-of-abbey/GarminHomeAssistant/blob/main/LICENSE.
GarminHomeAssistant is a Garmin IQ application written in Monkey C and routinely
tested on a Venu 2 device. The source code is provided at:
https://github.com/house-of-abbey/GarminHomeAssistant.
J D Abbey & P A Abbey, 28 December 2022
References:
* https://fonts.google.com/icons
-->

<drawables>
<bitmap id="ErrorIcon" filename="error.svg"/>
<bitmap id="GroupTypeIcon" filename="group_type.svg"/>
<bitmap id="TapTypeIcon" filename="tap_type.svg"/>
<bitmap id="InfoTypeIcon" filename="info_type.svg"/>
</drawables>
1 change: 1 addition & 0 deletions resources-icons-55/error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions resources-icons-55/group_type.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b22f119

Please sign in to comment.