remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-11-07 18:18:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 315-add-screenshots-to-numericmd

Browse Source 
Signed-off-by: Philip Abbey <philipabbey@users.noreply.github.com>
This commit is contained in:
Philip Abbey
2025-11-04 20:50:24 +00:00
committed by GitHub
parent 4119665817 4943c87edb
commit d8b82f23e4
24 changed files with 563 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
Devices.md Normal file
View File

@@ -0,0 +1,194 @@
# Device Support & Characterisation
A page just to note a practical limit on support for some older devices.
## Application Memory Usage
On an `instinct2x` device:
| Version | Free Memory (bytes) on `instinct2x`| Free Memory (bytes) on `venu2`|
|:-------:|-----------------------------------:|------------------------------:|
| 3.5 | 62,360 | - |
| 3.6 | 65,696 | 53,832 |
A user has reported a maximum of 26 items with Ver 3.5. This measurement has shown that each menu item requires about 1.0~1.2 kB. Using the worked example below it is possible to predict how many menu items your particular device might be able to support by using indicative figures.
## Worked Example
As a worked example, for Ver 3.6 working on an `instinct2x` device:
| Feature | Memory (bytes) | Cost (bytes) |
|--------------------------------------|---------------:|-------------:|
| Declared available to application | 98,304 | |
| Measured available to application | 94,112 | (4,192 less) |
| Application used | 65,696 | |
| Free before fetching menu definition | 28,416 | |
| Free after fetching menu definition | 15,792 | 12,624 |
| Free after construction | 936 | 14,856 |
Our test menu presently contains a mix of 28 items, consisting of nested group, toggle, tap, info and numeric items with templates. So each item requires (12,624 + 14,856) / 28 = 982 bytes.
## Garmin Devices
The following table details all the devices as at 1 October 2025 and whether they are supported by Garmin HomeAssistant. The available application memory is also detailed so that it can be compared to an application version listed above. Of particular concern are the 'Instinct' range of devices, being the smallest we currently support. New feature requests are now being vetted against how they might affect our ability to support the 'Instinct' range of devices. At some point support may have to be withdrawn in order to allow the Garmin HomeAssistant application to grow further.
| Device | Supported | Application Memory |
|----------------------------|:---------:|--------------------:|
| d2bravo | N | 65,536 |
| d2bravo_titanium | N | 65,536 |
| fenix3 | N | 65,536 |
| fenix3_hr | N | 65,536 |
| fr230 | N | 65,536 |
| fr235 | N | 65,536 |
| fr630 | N | 65,536 |
| fr920xt | N | 65,536 |
| vivoactive | N | 65,536 |
| descentg1 | Y | 98,304 |
| instinct2 | Y | 98,304 |
| instinct2s | Y | 98,304 |
| instinct2x | Y | 98,304 |
| instinctcrossover | Y | 98,304 |
| approachs60 | N | 131,072 |
| enduro | Y | 131,072 |
| fenix5 | Y | 131,072 |
| fenix5s | Y | 131,072 |
| fenix6 | Y | 131,072 |
| fenix6s | Y | 131,072 |
| fenixchronos | Y | 131,072 |
| fr245 | Y | 131,072 |
| fr55 | Y | 131,072 |
| fr645 | Y | 131,072 |
| fr735xt | N | 131,072 |
| fr935 | Y | 131,072 |
| instinct3solar45mm | Y | 131,072 |
| instincte40mm | Y | 131,072 |
| instincte45mm | Y | 131,072 |
| venusq | Y | 131,072 |
| vivoactive3 | Y | 131,072 |
| vivoactive3d | N | 131,072 |
| vivoactive_hr | N | 131,072 |
| edge_520 | N | 262,144 |
| fr255 | Y | 524,288 |
| fr255s | Y | 524,288 |
| approachs50 | Y | 786,432 |
| approachs7042mm | Y | 786,432 |
| approachs7047mm | Y | 786,432 |
| d2airx10 | Y | 786,432 |
| d2mach1 | Y | 786,432 |
| descentg2 | Y | 786,432 |
| descentmk343mm | Y | 786,432 |
| descentmk351mm | Y | 786,432 |
| enduro3 | Y | 786,432 |
| epix2 | Y | 786,432 |
| epix2pro42mm | Y | 786,432 |
| epix2pro47mm | Y | 786,432 |
| epix2pro47mmsystem7preview | Y | 786,432 |
| epix2pro51mm | Y | 786,432 |
| fenix7 | Y | 786,432 |
| fenix7pro | Y | 786,432 |
| fenix7pronowifi | Y | 786,432 |
| fenix7s | Y | 786,432 |
| fenix7spro | Y | 786,432 |
| fenix7x | Y | 786,432 |
| fenix7xpro | Y | 786,432 |
| fenix7xpronowifi | Y | 786,432 |
| fenix843mm | Y | 786,432 |
| fenix847mm | Y | 786,432 |
| fenix8pro47mm | Y | 786,432 |
| fenix8solar47mm | Y | 786,432 |
| fenix8solar51mm | Y | 786,432 |
| fenixe | Y | 786,432 |
| fr165 | Y | 786,432 |
| fr165m | Y | 786,432 |
| fr255m | Y | 786,432 |
| fr255sm | Y | 786,432 |
| fr265 | Y | 786,432 |
| fr265s | Y | 786,432 |
| fr57042mm | Y | 786,432 |
| fr57047mm | Y | 786,432 |
| fr955 | Y | 786,432 |
| fr965 | Y | 786,432 |
| fr970 | Y | 786,432 |
| instinct3amoled45mm | Y | 786,432 |
| instinct3amoled50mm | Y | 786,432 |
| instinctcrossoveramoled | Y | 786,432 |
| marq2 | Y | 786,432 |
| marq2aviator | Y | 786,432 |
| system8preview | N | 786,432 |
| venu2 | Y | 786,432 |
| venu2plus | Y | 786,432 |
| venu2s | Y | 786,432 |
| venu3 | Y | 786,432 |
| venu3s | Y | 786,432 |
| venu441mm | Y | 786,432 |
| venu445mm | Y | 786,432 |
| venusq2 | Y | 786,432 |
| venusq2m | Y | 786,432 |
| venux1 | Y | 786,432 |
| vivoactive5 | Y | 786,432 |
| vivoactive6 | Y | 786,432 |
| approachs62 | N | 1,048,576 |
| d2air | Y | 1,048,576 |
| edge1030 | Y | 1,048,576 |
| edge1030bontrager | Y | 1,048,576 |
| edge1030plus | Y | 1,048,576 |
| edge1040 | Y | 1,048,576 |
| edge1050 | Y | 1,048,576 |
| edge520plus | Y | 1,048,576 |
| edge530 | Y | 1,048,576 |
| edge540 | Y | 1,048,576 |
| edge550 | Y | 1,048,576 |
| edge820 | Y | 1,048,576 |
| edge830 | Y | 1,048,576 |
| edge840 | Y | 1,048,576 |
| edge850 | Y | 1,048,576 |
| edgeexplore | Y | 1,048,576 |
| edgeexplore2 | Y | 1,048,576 |
| edgemtb | Y | 1,048,576 |
| edge_1000 | N | 1,048,576 |
| epix | N | 1,048,576 |
| fr645m | Y | 1,048,576 |
| legacyherocaptainmarvel | Y | 1,048,576 |
| legacyherofirstavenger | Y | 1,048,576 |
| legacysagadarthvader | Y | 1,048,576 |
| legacysagarey | Y | 1,048,576 |
| venu | Y | 1,048,576 |
| venud | Y | 1,048,576 |
| venusqm | Y | 1,048,576 |
| vivoactive3m | Y | 1,048,576 |
| vivoactive3mlte | Y | 1,048,576 |
| vivoactive4 | Y | 1,048,576 |
| vivoactive4s | Y | 1,048,576 |
| d2charlie | N | 1,310,720 |
| d2delta | Y | 1,310,720 |
| d2deltapx | Y | 1,310,720 |
| d2deltas | Y | 1,310,720 |
| descentmk1 | N | 1,310,720 |
| descentmk2 | Y | 1,310,720 |
| descentmk2s | Y | 1,310,720 |
| fenix5plus | Y | 1,310,720 |
| fenix5splus | Y | 1,310,720 |
| fenix5x | Y | 1,310,720 |
| fenix5xplus | Y | 1,310,720 |
| fenix6pro | Y | 1,310,720 |
| fenix6spro | Y | 1,310,720 |
| fenix6xpro | Y | 1,310,720 |
| fr245m | Y | 1,310,720 |
| fr745 | Y | 1,310,720 |
| fr945 | Y | 1,310,720 |
| fr945lte | Y | 1,310,720 |
| marqadventurer | Y | 1,310,720 |
| marqathlete | Y | 1,310,720 |
| marqaviator | Y | 1,310,720 |
| marqcaptain | Y | 1,310,720 |
| marqcommander | Y | 1,310,720 |
| marqdriver | Y | 1,310,720 |
| marqexpedition | Y | 1,310,720 |
| marqgolfer | Y | 1,310,720 |
| gpsmap66 | Y | 2,359,296 |
| gpsmap67 | Y | 2,359,296 |
| gpsmap86 | N | 2,359,296 |
| gpsmaph1 | Y | 2,359,296 |
| montana7xx | Y | 2,359,296 |
| oregon7xx | N | 2,359,296 |
| rino7xx | N | 2,359,296 |

84
README.md
View File

@@ -81,7 +81,7 @@ Example schema:
"name": "Food is Ready!", "name": "Food is Ready!",
"type": "tap", "type": "tap",
"tap_action": { "tap_action": {
"service": "script.turn_on", "action": "script.turn_on",
"confirm": true "confirm": true
} }
}, },
@@ -132,7 +132,7 @@ Example schema:
"name": "Turn off USBs", "name": "Turn off USBs",
"type": "tap", "type": "tap",
"tap_action": { "tap_action": {
"service": "automation.trigger" "action": "automation.trigger"
} }
}, },
{ {
@@ -140,7 +140,7 @@ Example schema:
"name": "TV Lights Scene", "name": "TV Lights Scene",
"type": "tap", "type": "tap",
"tap_action": { "tap_action": {
"service": "scene.turn_on", "action": "scene.turn_on",
"pin": true "pin": true
} }
}, },
@@ -150,7 +150,7 @@ Example schema:
"type": "numeric", "type": "numeric",
"entity": "climate.room", "entity": "climate.room",
"tap_action": { "tap_action": {
"service": "climate.set_temperature", "action": "climate.set_temperature",
"picker": { "picker": {
"step": 0.5, "step": 0.5,
"start": 10, "start": 10,
@@ -171,7 +171,7 @@ The example above illustrates how to configure:
* Lights or switches (`toggle`), <img src="images/toggle_icon.png" height="20"> * Lights or switches (`toggle`), <img src="images/toggle_icon.png" height="20">
* Enables for automations (`toggle`), <img src="images/toggle_icon.png" height="20"> * Enables for automations (`toggle`), <img src="images/toggle_icon.png" height="20">
* Script invocation (`tap`) * Script invocation (`tap`)
* Service invocation, e.g. Scene setting, (`tap`) * Action invocation, e.g. Scene setting, (`tap`)
* A sub-menu to open (`group`) * A sub-menu to open (`group`)
* A numeric item (`numeric`), which allows you to set a numeric value e.g. for heating or a dimmer. This is [explained more fully](examples/Numeric.md) in its own examples page. * A numeric item (`numeric`), which allows you to set a numeric value e.g. for heating or a dimmer. This is [explained more fully](examples/Numeric.md) in its own examples page.
* You can also display the status of devices (`info`) which is essentially a `tap` with no action * You can also display the status of devices (`info`) which is essentially a `tap` with no action
@@ -192,17 +192,26 @@ The following table indicates how HomeAssistant entity types can map to the Garm
| Thermostat | ❌ | ❌ | ✅ | ✅ | | Thermostat | ❌ | ❌ | ✅ | ✅ |
| Amplifier | ❌ | ❌ | ✅ | ✅ | | Amplifier | ❌ | ❌ | ✅ | ✅ |
| Any other entity | ❌ | ❌ | ✅ | ❌ | | Any other entity | ❌ | ❌ | ✅ | ❌ |
| Any service | ✅ | ❌ | ❌ | ❌ | | Any action | ✅ | ❌ | ❌ | ❌ |
Multiple templates are evaluated in a single HTTP request to update their status. Only the toggle items have the on/off <img src="images/toggle_icon.png" height="20"> icon. NB. All `tap` and `numeric` items must specify a `service` tag in the `tap_action` object (see example below). Multiple templates are evaluated in a single HTTP request to update their status. Only the toggle items have the on/off <img src="images/toggle_icon.png" height="20"> icon. NB. All `tap` and `numeric` items must specify a `action` tag in the `tap_action` object (see example below).
You can now specify alternative texts to use instead of "On" and "Off", e.g. "Locked" and "Unlocked" or "Open" and "Closed" through the use of a [template menu item](examples/Templates.md). But wouldn't having locks operated from your watch be a security concern ;-) ? You can now specify alternative texts to use instead of "On" and "Off", e.g. "Locked" and "Unlocked" or "Open" and "Closed" through the use of a [template menu item](examples/Templates.md). But wouldn't having locks operated from your watch be a security concern ;-) ?
The [schema](https://raw.githubusercontent.com/house-of-abbey/GarminHomeAssistant/main/config.schema.json) is checked by using a URL directly back to this GitHub source repository, so you do not need to install that file. You can just copy & paste your entity names from the YAML configuration files used to configure HomeAssistant. With a submenu, there's a difference between `title` and `name`. The `name` goes on the menu item, and the `title` at the head of the submenu. If your dashboard definition fails to meet the schema, the application will simply drop items with the wrong field names without warning to protect itself. The [schema](https://raw.githubusercontent.com/house-of-abbey/GarminHomeAssistant/main/config.schema.json) is checked by using a URL directly back to this GitHub source repository, so you do not need to install that file. You can just copy & paste your entity names from the YAML configuration files used to configure HomeAssistant. With a submenu, there's a difference between `title` and `name`. The `name` goes on the menu item, and the `title` at the head of the submenu. If your dashboard definition fails to meet the schema, the application will simply drop items with the wrong field names without warning to protect itself.
### Old deprecated format ### Old Deprecated Formats
Version 1.5 brought in a change to the JSON schema so the following old format remains useable but is no longer favoured. The schema now marks it as 'deprecated' to nudge people over. There are two reasons for the changes to the schema:
1. HomeAssistant made changes we feel we should track for consistency.
2. Retrospectively we decided there was a better way, just like HomeAssistant did. For these changes we apologise.
#### Service Field
Version 1.5 brought in a change to the JSON schema so the following old format remains useable but is no longer favoured.
> [!IMPORTANT] Deprecated:
```json ```json
{ {
@@ -213,7 +222,9 @@ Version 1.5 brought in a change to the JSON schema so the following old format r
} }
``` ```
The above should be replaced by the following: Version 3.6 brought another change to the JSON schema to follow HomeAssistant's renaming of `service` to `action`.
> [!IMPORTANT] Deprecated:
```json ```json
{ {
@@ -226,7 +237,54 @@ The above should be replaced by the following:
} }
``` ```
This allows the `confirm` and `pin` fields to be accommodated in the `tap_action` along side the `service` tag, and follows the HomeAssistant YAML format more closely. The above should be replaced by the following:
```json
{
"entity": "scene.tv_light",
"name": "TV Lights Scene",
"type": "tap",
"tap_action": {
"action": "scene.turn_on"
}
}
```
This allows the `confirm` and `pin` fields to be accommodated in the `tap_action` along side the `action` tag, and follows the HomeAssistant YAML format more closely.
#### Exit Field
Version 2.31 added an "exit on tap" feature. In retrospect this field should have been nested inside the `tap_action` object.
> [!IMPORTANT] Deprecated:
```json
{
"entity": "automation.turn_off_stuff",
"name": "Turn off Stuff",
"type": "tap",
"tap_action": {
"action": "automation.trigger"
},
"exit": true
}
```
The above should be replaced by the following:
```json
{
"entity": "automation.turn_off_stuff",
"name": "Turn off Stuff",
"type": "tap",
"tap_action": {
"action": "automation.trigger",
"exit": true
},
}
```
A future move to v3.x will remove support for all deprecated JSON elements to simplify code. **Please ensure you track the schema changes in readiness.**
### More Examples ### More Examples
@@ -238,7 +296,7 @@ This allows the `confirm` and `pin` fields to be accommodated in the `tap_action
## Editing the JSON file ## Editing the JSON file
You have options. The first is what we use. You have options. The first is what we use.
1. **Best!** Use the GarminHomeAssistant [Web-based Editor](https://house-of-abbey.github.io/GarminHomeAssistant/web/) which includes `entity` and `service` name completion and validation by fetching data from your own HomeAssistant instance. _Pretty nifty eh?_ The other method listed below do not add this convenience and checking. 1. **Best!** Use the GarminHomeAssistant [Web-based Editor](https://house-of-abbey.github.io/GarminHomeAssistant/web/) which includes `entity` and `action` name completion and validation by fetching data from your own HomeAssistant instance. _Pretty nifty eh?_ The other method listed below do not add this convenience and checking.
2. Use the [Studio Code Server](https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863) addon for HomeAssistant. You can then edit your JSON file in place. 2. Use the [Studio Code Server](https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863) addon for HomeAssistant. You can then edit your JSON file in place.
3. Locally installed VSCode, or if not installed, try 3. Locally installed VSCode, or if not installed, try
4. The on-line version at https://vscode.dev/, which works really well. 4. The on-line version at https://vscode.dev/, which works really well.
@@ -385,6 +443,8 @@ Check the latest unresolved [issues](https://github.com/house-of-abbey/GarminHom
9. When using Wi-Fi or LTE to toggle a light, the `toggle` will fail when the default or current state of the application's menu does not match the state of the light. The same applies to a cover or other thing that can be toggled. This is because the application is unable to initialise the menu with the current state without Bluetooth. Hence the Wi-Fi/LTE functionality is best used with `tap` items only. 9. When using Wi-Fi or LTE to toggle a light, the `toggle` will fail when the default or current state of the application's menu does not match the state of the light. The same applies to a cover or other thing that can be toggled. This is because the application is unable to initialise the menu with the current state without Bluetooth. Hence the Wi-Fi/LTE functionality is best used with `tap` items only.
10. There are memory limits, particularly for older devices. Please see the [explanation of the memory limits](Devices.md) and device support.
# Authors & Contributors # Authors & Contributors
For an up to date list of all authors and contributors, please check the [contributor's page](https://github.com/house-of-abbey/GarminHomeAssistant/graphs/contributors). Thank you all for improving this application. For an up to date list of all authors and contributors, please check the [contributor's page](https://github.com/house-of-abbey/GarminHomeAssistant/graphs/contributors). Thank you all for improving this application.

194
config.schema.json
View File

@@ -47,7 +47,8 @@
"$ref": "#/$defs/enabled" "$ref": "#/$defs/enabled"
}, },
"exit": { "exit": {
"$ref": "#/$defs/exit" "$ref": "#/$defs/exit",
"deprecated": true
} }
}, },
"required": [ "required": [
@@ -58,6 +59,7 @@
"additionalProperties": false "additionalProperties": false
}, },
"template": { "template": {
"deprecated": true,
"oneOf": [ "oneOf": [
{ {
"type": "object", "type": "object",
@@ -112,26 +114,14 @@
"description": "Use 'info' or 'tap' instead." "description": "Use 'info' or 'tap' instead."
}, },
"tap_action": { "tap_action": {
"$ref": "#/$defs/tap_action", "$ref": "#/$defs/tap_action_tap"
"properties": {
"service": {
"$ref": "#/$defs/service"
},
"data": {
"type": "object",
"title": "Your services's parameters",
"description": "The object containing the parameters and their values to be passed to the entity. No schema checking can be done here, you are on your own! On application crash, remove the parameters."
}
},
"required": [
"service"
]
}, },
"enabled": { "enabled": {
"$ref": "#/$defs/enabled" "$ref": "#/$defs/enabled"
}, },
"exit": { "exit": {
"$ref": "#/$defs/exit" "$ref": "#/$defs/exit",
"deprecated": true
} }
}, },
"required": [ "required": [
@@ -185,32 +175,20 @@
"$ref": "#/$defs/content" "$ref": "#/$defs/content"
}, },
"service": { "service": {
"$ref": "#/$defs/service", "$ref": "#/$defs/action",
"deprecated": true, "deprecated": true,
"title": "Schema change:", "title": "Schema change:",
"description": "Use 'tap_action' instead to mirror Home Assistant." "description": "Use 'tap_action' instead to mirror Home Assistant."
}, },
"tap_action": { "tap_action": {
"$ref": "#/$defs/tap_action", "$ref": "#/$defs/tap_action_tap"
"properties": {
"service": {
"$ref": "#/$defs/service"
},
"data": {
"type": "object",
"title": "Your services's parameters",
"description": "The object containing the parameters and their values to be passed to the entity. No schema checking can be done here, you are on your own! On application crash, remove the parameters."
}
},
"required": [
"service"
]
}, },
"enabled": { "enabled": {
"$ref": "#/$defs/enabled" "$ref": "#/$defs/enabled"
}, },
"exit": { "exit": {
"$ref": "#/$defs/exit" "$ref": "#/$defs/exit",
"deprecated": true
} }
}, },
"required": [ "required": [
@@ -277,8 +255,8 @@
"tap_action": { "tap_action": {
"$ref": "#/$defs/tap_action", "$ref": "#/$defs/tap_action",
"properties": { "properties": {
"service": { "action": {
"$ref": "#/$defs/service" "$ref": "#/$defs/action"
}, },
"picker": { "picker": {
"type": "object", "type": "object",
@@ -304,8 +282,8 @@
}, },
"data_attribute": { "data_attribute": {
"type": "string", "type": "string",
"title": "Attribute on the service data", "title": "Attribute on the action data",
"description": "Attribute on the service data for the value to set." "description": "Attribute on the action data for the value to set."
} }
}, },
"required": [ "required": [
@@ -317,7 +295,7 @@
} }
}, },
"required": [ "required": [
"service", "action",
"picker" "picker"
] ]
}, },
@@ -356,7 +334,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"const": "light.turn_on" "const": "light.turn_on"
}, },
"picker": { "picker": {
@@ -368,10 +346,12 @@
"const": "brightness" "const": "brightness"
}, },
"min": { "min": {
"const": 0 "type": "integer",
"minimum": 0
}, },
"max": { "max": {
"const": 255, "type": "integer",
"max": 255,
"description": "Lights are not a percentage." "description": "Lights are not a percentage."
} }
} }
@@ -392,7 +372,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"const": "input_number.set_value" "const": "input_number.set_value"
}, },
"picker": { "picker": {
@@ -423,7 +403,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"const": "number.set_value" "const": "number.set_value"
}, },
"picker": { "picker": {
@@ -454,7 +434,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"const": "fan.set_percentage" "const": "fan.set_percentage"
}, },
"picker": { "picker": {
@@ -466,10 +446,12 @@
"const": "percentage" "const": "percentage"
}, },
"min": { "min": {
"const": 0 "type": "integer",
"minimum": 0
}, },
"max": { "max": {
"const": 100 "type": "integer",
"maximum": 100
} }
} }
} }
@@ -489,7 +471,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"const": "valve.set_valve_position" "const": "valve.set_valve_position"
}, },
"picker": { "picker": {
@@ -501,10 +483,12 @@
"const": "position" "const": "position"
}, },
"min": { "min": {
"const": 0 "type": "integer",
"minimum": 0
}, },
"max": { "max": {
"const": 100 "type": "integer",
"maximum": 100
} }
} }
} }
@@ -526,7 +510,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"enum": [ "enum": [
"cover.set_position", "cover.set_position",
"cover.set_tilt_position" "cover.set_tilt_position"
@@ -541,7 +525,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"const": "cover.set_tilt_position" "const": "cover.set_tilt_position"
} }
} }
@@ -552,7 +536,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"const": "cover.set_tilt_position" "const": "cover.set_tilt_position"
}, },
"picker": { "picker": {
@@ -564,10 +548,12 @@
"const": "tilt_position" "const": "tilt_position"
}, },
"min": { "min": {
"const": 0 "type": "integer",
"minimum": 0
}, },
"max": { "max": {
"const": 100 "type": "integer",
"maximum": 100
} }
} }
} }
@@ -579,7 +565,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"const": "cover.set_position" "const": "cover.set_position"
}, },
"picker": { "picker": {
@@ -591,10 +577,12 @@
"const": "position" "const": "position"
}, },
"min": { "min": {
"const": 0 "type": "integer",
"minimum": 0
}, },
"max": { "max": {
"const": 100 "type": "integer",
"maximum": 100
} }
} }
} }
@@ -617,7 +605,7 @@
"properties": { "properties": {
"tap_action": { "tap_action": {
"properties": { "properties": {
"service": { "action": {
"const": "media_player.volume_set" "const": "media_player.volume_set"
}, },
"picker": { "picker": {
@@ -629,10 +617,13 @@
"const": "volume_level" "const": "volume_level"
}, },
"min": { "min": {
"const": 0 "type": "number",
"minimum": 0
}, },
"max": { "max": {
"const": 1 "type": "number",
"maximum": 1,
"description": "Fraction [0,1], not percentage."
} }
} }
} }
@@ -652,7 +643,7 @@
"tap_action": { "tap_action": {
"properties": { "properties": {
"properties": { "properties": {
"service": { "action": {
"const": "climate.set_temperature" "const": "climate.set_temperature"
}, },
"picker": { "picker": {
@@ -686,7 +677,7 @@
}, },
"type": { "type": {
"title": "Menu item type", "title": "Menu item type",
"description": "One of 'info', 'tap', 'toggle' or 'group'." "description": "One of 'info', 'tap', 'toggle', 'group' or 'numeric'."
}, },
"items": { "items": {
"type": "array", "type": "array",
@@ -696,7 +687,7 @@
"type": "tap", "type": "tap",
"name": "Example", "name": "Example",
"tap_action": { "tap_action": {
"service": "notify.notify", "action": "notify.notify",
"data": { "data": {
"message": "Example" "message": "Example"
} }
@@ -718,7 +709,7 @@
"name": "Example", "name": "Example",
"entity": "light.example", "entity": "light.example",
"tap_action": { "tap_action": {
"service": "light.turn_on", "action": "light.turn_on",
"picker": { "picker": {
"attribute": "brightness", "attribute": "brightness",
"data_attribute": "brightness", "data_attribute": "brightness",
@@ -733,7 +724,7 @@
"name": "Example", "name": "Example",
"entity": "input_number.example", "entity": "input_number.example",
"tap_action": { "tap_action": {
"service": "input_number.set_value", "action": "input_number.set_value",
"picker": { "picker": {
"data_attribute": "value", "data_attribute": "value",
"min": 0, "min": 0,
@@ -747,7 +738,7 @@
"name": "Example", "name": "Example",
"entity": "number.example", "entity": "number.example",
"tap_action": { "tap_action": {
"service": "number.set_value", "action": "number.set_value",
"picker": { "picker": {
"data_attribute": "value", "data_attribute": "value",
"min": 0, "min": 0,
@@ -761,14 +752,13 @@
"name": "Example", "name": "Example",
"entity": "fan.example", "entity": "fan.example",
"tap_action": { "tap_action": {
"service": "fan.set_percentage", "action": "fan.set_percentage",
"picker": { "picker": {
"attribute": "percentage", "attribute": "percentage",
"data_attribute": "percentage", "data_attribute": "percentage",
"min": 0, "min": 0,
"max": 100, "max": 100,
"step": 1, "step": 1
"display_format": "%.0f%%"
} }
} }
}, },
@@ -777,7 +767,7 @@
"name": "Example", "name": "Example",
"entity": "valve.example", "entity": "valve.example",
"tap_action": { "tap_action": {
"service": "valve.set_valve_position", "action": "valve.set_valve_position",
"picker": { "picker": {
"attribute": "position", "attribute": "position",
"data_attribute": "position", "data_attribute": "position",
@@ -792,7 +782,7 @@
"name": "Example", "name": "Example",
"entity": "cover.example", "entity": "cover.example",
"tap_action": { "tap_action": {
"service": "cover.set_position", "action": "cover.set_position",
"picker": { "picker": {
"attribute": "position", "attribute": "position",
"data_attribute": "position", "data_attribute": "position",
@@ -807,7 +797,7 @@
"name": "Example", "name": "Example",
"entity": "cover.example", "entity": "cover.example",
"tap_action": { "tap_action": {
"service": "cover.set_tilt_position", "action": "cover.set_tilt_position",
"picker": { "picker": {
"attribute": "tilt_position", "attribute": "tilt_position",
"data_attribute": "tilt_position", "data_attribute": "tilt_position",
@@ -822,7 +812,7 @@
"name": "Example", "name": "Example",
"entity": "media_player.example", "entity": "media_player.example",
"tap_action": { "tap_action": {
"service": "media_player.volume_set", "action": "media_player.volume_set",
"picker": { "picker": {
"attribute": "volume_level", "attribute": "volume_level",
"data_attribute": "volume_level", "data_attribute": "volume_level",
@@ -837,7 +827,7 @@
"name": "Example", "name": "Example",
"entity": "climate.example", "entity": "climate.example",
"tap_action": { "tap_action": {
"service": "climate.set_temperature", "action": "climate.set_temperature",
"picker": { "picker": {
"attribute": "temperature", "attribute": "temperature",
"data_attribute": "temperature" "data_attribute": "temperature"
@@ -944,14 +934,56 @@
"title": "Home Assistant entity name", "title": "Home Assistant entity name",
"pattern": "^[^.]+\\.[^.]+$" "pattern": "^[^.]+\\.[^.]+$"
}, },
"service": { "action": {
"type": "string", "type": "string",
"title": "Home Assistant service name", "title": "Home Assistant action name",
"pattern": "^[^.]+\\.[^.]+$" "pattern": "^[^.]+\\.[^.]+$"
}, },
"tap_action_tap": {
"allOf": [
{
"title": "Tap Action",
"description": "'confirm' and 'pin' fields are optional. 'action' is required.",
"properties": {
"service": {
"$ref": "#/$defs/action",
"deprecated": true
},
"action": {
"$ref": "#/$defs/action"
},
"data": {
"type": "object",
"title": "Your actions's parameters",
"description": "The object containing the parameters and their values to be passed to the entity. No schema checking can be done here, you are on your own! On application crash, remove the parameters."
}
},
"oneOf": [
{
"required": [
"action"
],
"not": {
"required": [
"service"
]
}
},
{
"required": [
"service"
]
}
]
},
{
"$ref": "#/$defs/tap_action"
}
]
},
"tap_action": { "tap_action": {
"type": "object", "type": "object",
"title": "Action", "title": "Tap Action",
"description": "'confirm' and 'pin' fields are optional.", "description": "'confirm' and 'pin' fields are optional.",
"properties": { "properties": {
"confirm": { "confirm": {
@@ -959,16 +991,22 @@
}, },
"pin": { "pin": {
"$ref": "#/$defs/pin" "$ref": "#/$defs/pin"
},
"exit": {
"$ref": "#/$defs/exit"
} }
} }
}, },
"content": { "content": {
"title": "Home Assistant Template", "title": "Home Assistant Template",
"description": "Jinja2 template defining the text to display. Must be included in an 'info'. Optional in a 'toggle', 'tap' and 'group'. Special characters may not render in the glance context.", "description": "Jinja2 template defining the text to display. Must be included in an 'info'. Optional in a 'toggle', 'tap', 'numeric' and 'group'. Special characters may not render in the glance context.",
"type": "string" "type": "string"
}, },
"confirm": { "confirm": {
"type": ["boolean", "string"], "type": [
"boolean",
"string"
],
"default": false, "default": false,
"title": "Confirmation", "title": "Confirmation",
"description": "Optional confirmation of the action before execution as a precaution. Use a Boolean for the default message. Specify a string to display a specific confirmation message." "description": "Optional confirmation of the action before execution as a precaution. Use a Boolean for the default message. Specify a string to display a specific confirmation message."

14
examples/Actions.md
View File

@@ -11,7 +11,7 @@ A simple example using a scene as a `tap` menu item.
"name": "Telly Scene", "name": "Telly Scene",
"type": "tap", "type": "tap",
"tap_action": { "tap_action": {
"service": "scene.turn_on" "action": "scene.turn_on"
} }
}, },
``` ```
@@ -70,7 +70,7 @@ Note that for notify events, you _must_ not supply an `entity_id` or the API cal
"name": "Message", "name": "Message",
"type": "tap", "type": "tap",
"tap_action": { "tap_action": {
"service": "notify.mobile_app_on_phone", "action": "notify.mobile_app_on_phone",
"data": { "data": {
"title": "This is a title", "title": "This is a title",
"message": "This is the message" "message": "This is the message"
@@ -81,9 +81,9 @@ Note that for notify events, you _must_ not supply an `entity_id` or the API cal
``` ```
> [!IMPORTANT] > [!IMPORTANT]
> Be careful with the value of the `service` field. > Be careful with the value of the `action` field.
Note that the `service` field will need to be a locally custom `script.<something>` as soon as any `data` fields are populated and not something more generic like `script.turn_on`. If the `service` field is wrong, the application will fail with a [`Communications.INVALID_HTTP_BODY_IN_NETWORK_RESPONSE`](https://developer.garmin.com/connect-iq/api-docs/Toybox/Communications.html) error in the response from your HomeAssistant and show the error message as _"No JSON returned from HTTP request"_ on your device. In the [web-based editor](https://house-of-abbey.github.io/GarminHomeAssistant/web/) you can use the standard developer tools to observe an `HTTP 400` error which the application does not see. Here we are limited by the [Garmin Connect IQ](https://developer.garmin.com/connect-iq/overview/) software development kit (SDK). We do not have enough information at the point of execution in the application to determine the cause of the error. Nor is there an immediately obvious way of identifying this issue using the JSON schema checks. Note that the `action` field will need to be a locally custom `script.<something>` as soon as any `data` fields are populated and not something more generic like `script.turn_on`. If the `action` field is wrong, the application will fail with a [`Communications.INVALID_HTTP_BODY_IN_NETWORK_RESPONSE`](https://developer.garmin.com/connect-iq/api-docs/Toybox/Communications.html) error in the response from your HomeAssistant and show the error message as _"No JSON returned from HTTP request"_ on your device. In the [web-based editor](https://house-of-abbey.github.io/GarminHomeAssistant/web/) you can use the standard developer tools to observe an `HTTP 400` error which the application does not see. Here we are limited by the [Garmin Connect IQ](https://developer.garmin.com/connect-iq/overview/) software development kit (SDK). We do not have enough information at the point of execution in the application to determine the cause of the error. Nor is there an immediately obvious way of identifying this issue using the JSON schema checks.
## Exit on Tap ## Exit on Tap
@@ -95,9 +95,9 @@ You can choose individual items that will quit after they have completed their a
"name": "Turn off Stuff", "name": "Turn off Stuff",
"type": "tap", "type": "tap",
"tap_action": { "tap_action": {
"service": "automation.trigger" "action": "automation.trigger",
},
"exit": true "exit": true
},
} }
``` ```
@@ -111,7 +111,7 @@ If you would like to temporarily disable an item in your menu, e.g. for seasonal
"name": "Turn off Stuff", "name": "Turn off Stuff",
"type": "tap", "type": "tap",
"tap_action": { "tap_action": {
"service": "automation.trigger" "action": "automation.trigger"
}, },
"enabled": false "enabled": false
} }

10
examples/Switches.md
View File

@@ -48,12 +48,12 @@ switch:
friendly_name: <name> friendly_name: <name>
value_template: <value> value_template: <value>
turn_on: turn_on:
service: <service> action: <action>
data: data:
entity_id: <entity> entity_id: <entity>
<attribute>: <value> <attribute>: <value>
turn_off: turn_off:
service: <service> action: <action>
data: data:
entity_id: <entity> entity_id: <entity>
<attribute>: <value> <attribute>: <value>
@@ -90,11 +90,11 @@ switch:
friendly_name: Cover friendly_name: Cover
value_template: "{{ is_state('cover.cover', 'open') }}" value_template: "{{ is_state('cover.cover', 'open') }}"
turn_on: turn_on:
service: cover.open_cover action: cover.open_cover
data: data:
entity_id: cover.cover entity_id: cover.cover
turn_off: turn_off:
service: cover.close_cover action: cover.close_cover
data: data:
entity_id: cover.cover entity_id: cover.cover
``` ```
@@ -118,8 +118,10 @@ You can choose individual items that will quit after they have completed their a
"entity": "light.hall_light", "entity": "light.hall_light",
"name": "Hall Light & Quit", "name": "Hall Light & Quit",
"type": "toggle", "type": "toggle",
"tap_action" {
"exit": true "exit": true
} }
}
``` ```
## Disable Menu Item ## Disable Menu Item

10
examples/Templates.md
View File

@@ -116,7 +116,7 @@ Note: Only when you use the `tap_action` field do you also need to include the `
"type": "tap", "type": "tap",
"content": "{% if is_state('binary_sensor.garage_connected', 'on') %}{{state_translated('cover.garage_door')}} - {{state_attr('cover.garage_door', 'current_position')}}%{%else%}Unconnected{% endif %}", "content": "{% if is_state('binary_sensor.garage_connected', 'on') %}{{state_translated('cover.garage_door')}} - {{state_attr('cover.garage_door', 'current_position')}}%{%else%}Unconnected{% endif %}",
"tap_action": { "tap_action": {
"service": "cover.toggle", "action": "cover.toggle",
"pin": true "pin": true
} }
} }
@@ -173,7 +173,7 @@ An example of a dimmer light with 4 brightness settings 0..3. Here our light wor
"type": "tap", "type": "tap",
"content": "{% if not (is_state('light.green_house', 'off') or is_state('light.green_house', 'unavailable')) %}{{ (((state_attr('light.green_house', 'brightness') | float) / 255 * 100) | round(0)) | int }}%{% else %}Off{% endif %}", "content": "{% if not (is_state('light.green_house', 'off') or is_state('light.green_house', 'unavailable')) %}{{ (((state_attr('light.green_house', 'brightness') | float) / 255 * 100) | round(0)) | int }}%{% else %}Off{% endif %}",
"tap_action": { "tap_action": {
"service": "light.turn_on", "action": "light.turn_on",
"data": { "data": {
"brightness_pct": 12 "brightness_pct": 12
} }
@@ -184,7 +184,7 @@ An example of a dimmer light with 4 brightness settings 0..3. Here our light wor
"name": "LEDs 1", "name": "LEDs 1",
"type": "tap", "type": "tap",
"tap_action": { "tap_action": {
"service": "light.turn_on", "action": "light.turn_on",
"data": { "data": {
"brightness_pct": 37 "brightness_pct": 37
} }
@@ -196,7 +196,7 @@ An example of a dimmer light with 4 brightness settings 0..3. Here our light wor
"type": "tap", "type": "tap",
"content": "{% if not (is_state('light.green_house', 'off') or is_state('light.green_house', 'unavailable')) %}{{ (((state_attr('light.green_house', 'brightness') | float) / 255 * 100) | round(0)) | int }}%{% else %}Off{% endif %}", "content": "{% if not (is_state('light.green_house', 'off') or is_state('light.green_house', 'unavailable')) %}{{ (((state_attr('light.green_house', 'brightness') | float) / 255 * 100) | round(0)) | int }}%{% else %}Off{% endif %}",
"tap_action": { "tap_action": {
"service": "light.turn_on", "action": "light.turn_on",
"data": { "data": {
"brightness_pct": 62 "brightness_pct": 62
} }
@@ -208,7 +208,7 @@ An example of a dimmer light with 4 brightness settings 0..3. Here our light wor
"type": "tap", "type": "tap",
"content": "{% if not (is_state('light.green_house', 'off') or is_state('light.green_house', 'unavailable')) %}{{ (((state_attr('light.green_house', 'brightness') | float) / 255 * 100) | round(0))| int }}%{% else %}Off{% endif %}", "content": "{% if not (is_state('light.green_house', 'off') or is_state('light.green_house', 'unavailable')) %}{{ (((state_attr('light.green_house', 'brightness') | float) / 255 * 100) | round(0))| int }}%{% else %}Off{% endif %}",
"tap_action": { "tap_action": {
"service": "light.turn_on", "action": "light.turn_on",
"data": { "data": {
"brightness_pct": 87 "brightness_pct": 87
} }

7
iconResize.py
View File

@@ -44,15 +44,22 @@ Half = 2
# Original icons for 416x416 screen size with 48x48 icons # Original icons for 416x416 screen size with 48x48 icons
original = (96, 48, 24) original = (96, 48, 24)
# The icons need to scale as a ratio of screen size 48:416 pixels
#
# Icon 55 53 48 46 42 37 32 30 28 26 24 21 19 18
# Screen 480 454 416 390 360 320 280 260 240 218 208 176 166 156
# Convert icons to different screen sizes by these parameters # Convert icons to different screen sizes by these parameters
lookup = { lookup = {
# Doub Sing Half # Doub Sing Half
# 0 1 2 # 0 1 2
480: (110, 55, 28),
454: (106, 53, 27), 454: (106, 53, 27),
# 416: ( 96, 48, 24), # 416: ( 96, 48, 24),
390: ( 90, 46, 23), 390: ( 90, 46, 23),
360: ( 84, 42, 21), 360: ( 84, 42, 21),
320: ( 74, 38, 19), 320: ( 74, 38, 19),
295: ( 68, 34, 17), # Especially for the instinct3amoled50mm device that clip the icons
280: ( 64, 32, 16), 280: ( 64, 32, 16),
260: ( 60, 30, 15), 260: ( 60, 30, 15),
240: ( 56, 28, 14), 240: ( 56, 28, 14),

2
launcherIconResize.py
View File

@@ -40,7 +40,7 @@ output_dir_prefix = 'resources-launcher-'
input_dir = output_dir_prefix + '70-70' input_dir = output_dir_prefix + '70-70'
# Convert icons to different screen sizes by these parameters # Convert icons to different screen sizes by these parameters
lookup = [26, 30, 33, 35, 36, 40, 54, 60, 61, 62, 65, 80] lookup = [26, 30, 33, 35, 36, 38, 40, 52, 54, 56, 60, 61, 62, 65, 68, 80]
# Delete all but the original 48x48 icon directories # Delete all but the original 48x48 icon directories
for entry in os.listdir("."): for entry in os.listdir("."):

14
source/HomeAssistantMenuItemFactory.mc
View File

@@ -97,7 +97,7 @@ class HomeAssistantMenuItemFactory {
//! @param label Menu item label. //! @param label Menu item label.
//! @param entity_id Home Assistant Entity ID (optional) //! @param entity_id Home Assistant Entity ID (optional)
//! @param template Template for Home Assistant to render (optional) //! @param template Template for Home Assistant to render (optional)
//! @param service Template for Home Assistant to render (optional) //! @param action Action to run on Home Assistant (optional)
//! @param data Sourced from the menu JSON, this is the `data` field from the `tap_action` field. //! @param data Sourced from the menu JSON, this is the `data` field from the `tap_action` field.
//! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin. //! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin.
// //
@@ -105,7 +105,7 @@ class HomeAssistantMenuItemFactory {
label as Lang.String or Lang.Symbol, label as Lang.String or Lang.Symbol,
entity_id as Lang.String?, entity_id as Lang.String?,
template as Lang.String?, template as Lang.String?,
service as Lang.String?, action as Lang.String?,
data as Lang.Dictionary?, data as Lang.Dictionary?,
options as { options as {
:exit as Lang.Boolean, :exit as Lang.Boolean,
@@ -124,12 +124,12 @@ class HomeAssistantMenuItemFactory {
for (var i = 0; i < keys.size(); i++) { for (var i = 0; i < keys.size(); i++) {
options[keys[i]] = mMenuItemOptions.get(keys[i]); options[keys[i]] = mMenuItemOptions.get(keys[i]);
} }
if (service != null) { if (action != null) {
options[:icon] = mTapTypeIcon; options.put(:icon, mTapTypeIcon);
return new HomeAssistantTapMenuItem( return new HomeAssistantTapMenuItem(
label, label,
template, template,
service, action,
data, data,
options, options,
mHomeAssistantService mHomeAssistantService
@@ -155,7 +155,7 @@ class HomeAssistantMenuItemFactory {
label as Lang.String or Lang.Symbol, label as Lang.String or Lang.Symbol,
entity_id as Lang.String?, entity_id as Lang.String?,
template as Lang.String?, template as Lang.String?,
service as Lang.String?, action as Lang.String?,
picker as Lang.Dictionary, picker as Lang.Dictionary,
options as { options as {
:exit as Lang.Boolean, :exit as Lang.Boolean,
@@ -176,7 +176,7 @@ class HomeAssistantMenuItemFactory {
return new HomeAssistantNumericMenuItem( return new HomeAssistantNumericMenuItem(
label, label,
template, template,
service, action,
data, data,
picker, picker,
options, options,

33
source/HomeAssistantNumericMenuItem.mc
View File

@@ -22,7 +22,7 @@ using Toybox.Graphics;
// //
class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem { class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
private var mHomeAssistantService as HomeAssistantService?; private var mHomeAssistantService as HomeAssistantService?;
private var mService as Lang.String?; private var mAction as Lang.String?;
private var mConfirm as Lang.Boolean or Lang.String or Null; private var mConfirm as Lang.Boolean or Lang.String or Null;
private var mExit as Lang.Boolean; private var mExit as Lang.Boolean;
private var mPin as Lang.Boolean; private var mPin as Lang.Boolean;
@@ -35,11 +35,11 @@ class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
//! //!
//! @param label Menu item label. //! @param label Menu item label.
//! @param template Menu item template. //! @param template Menu item template.
//! @param service Menu item service. //! @param action Menu item action.
//! @param data Data to supply to the service call. //! @param data Data to supply to the action call.
//! @param exit Should the service call complete and then exit? //! @param exit Should the action call complete and then exit?
//! @param confirm Should the service call be confirmed to avoid accidental invocation? //! @param confirm Should the action call be confirmed to avoid accidental invocation?
//! @param pin Should the service call be protected with a PIN for some low level of security? //! @param pin Should the action call be protected with a PIN for some low level of security?
//! @param icon Icon to use for the menu item. //! @param icon Icon to use for the menu item.
//! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin. //! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin.
//! @param haService Shared Home Assistant service object that will perform the required call. Only //! @param haService Shared Home Assistant service object that will perform the required call. Only
@@ -48,7 +48,7 @@ class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
function initialize( function initialize(
label as Lang.String or Lang.Symbol, label as Lang.String or Lang.Symbol,
template as Lang.String, template as Lang.String,
service as Lang.String?, action as Lang.String?,
data as Lang.Dictionary?, data as Lang.Dictionary?,
picker as Lang.Dictionary, picker as Lang.Dictionary,
options as { options as {
@@ -60,7 +60,7 @@ class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
}?, }?,
haService as HomeAssistantService haService as HomeAssistantService
) { ) {
mService = service; mAction = action;
mData = data; mData = data;
mPicker = picker; mPicker = picker;
mExit = options[:exit]; mExit = options[:exit];
@@ -93,7 +93,8 @@ class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
} }
} }
function callService() as Void {
function callAction() as Void {
var hasTouchScreen = System.getDeviceSettings().isTouchScreen; var hasTouchScreen = System.getDeviceSettings().isTouchScreen;
if (mPin && hasTouchScreen) { if (mPin && hasTouchScreen) {
var pin = Settings.getPin(); var pin = Settings.getPin();
@@ -119,8 +120,8 @@ class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
WatchUi.pushView( WatchUi.pushView(
dialog, dialog,
new WifiLteExecutionConfirmDelegate({ new WifiLteExecutionConfirmDelegate({
:type => "service", :type => "action",
:service => mService, :action => mAction,
:data => mData, :data => mData,
:exit => mExit, :exit => mExit,
}, dialog), }, dialog),
@@ -155,18 +156,18 @@ class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
function onConfirm(b as Lang.Boolean) as Void { function onConfirm(b as Lang.Boolean) as Void {
var dataAttribute = mPicker["data_attribute"]; var dataAttribute = mPicker["data_attribute"];
if (dataAttribute == null) { if (dataAttribute == null) {
//return without call service if no data attribute is set to avoid crash //return without call action if no data attribute is set to avoid crash
WatchUi.popView(WatchUi.SLIDE_RIGHT); WatchUi.popView(WatchUi.SLIDE_RIGHT);
return; return;
} }
var entity_id = mData["entity_id"]; var entity_id = mData["entity_id"];
if (entity_id == null) { if (entity_id == null) {
//return without call service if no entity_id is set to avoid crash //return without call action if no entity_id is set to avoid crash
WatchUi.popView(WatchUi.SLIDE_RIGHT); WatchUi.popView(WatchUi.SLIDE_RIGHT);
return; return;
} }
mHomeAssistantService.call( mHomeAssistantService.call(
mService, mAction,
{ {
"entity_id" => entity_id.toString(), "entity_id" => entity_id.toString(),
dataAttribute.toString() => mValue dataAttribute.toString() => mValue
@@ -218,7 +219,7 @@ class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
WatchUi.requestUpdate(); WatchUi.requestUpdate();
} }
//! Set the Picker's value. Needed to set new value via the Service call //! Set the Picker's value. Needed to set new value via the Action call
//! //!
//! @param value New value to set. //! @param value New value to set.
// //
@@ -228,7 +229,7 @@ class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
//! Get the Picker's value. //! Get the Picker's value.
//! //!
//! Needed to set new value via the Service call //! Needed to set new value via the Action call
// //
public function getValue() as Lang.Number or Lang.Float { public function getValue() as Lang.Number or Lang.Float {
return mValue; return mValue;

2
source/HomeAssistantNumericPicker.mc
View File

@@ -61,7 +61,7 @@ class HomeAssistantNumericPicker extends WatchUi.Picker {
// //
public function onConfirm(value as Lang.Number or Lang.Float) as Void { public function onConfirm(value as Lang.Number or Lang.Float) as Void {
mItem.setValue(value); mItem.setValue(value);
mItem.callService(); mItem.callAction();
} }
} }

20
source/HomeAssistantService.mc
View File

@@ -34,7 +34,7 @@ class HomeAssistantService {
} }
} }
//! Callback function after completing the POST request to call a service. //! Callback function after completing the POST request to call an action.
//! //!
//! @param responseCode Response code. //! @param responseCode Response code.
//! @param data Response data. //! @param data Response data.
@@ -87,7 +87,7 @@ class HomeAssistantService {
break; break;
case 200: case 200:
// System.println("HomeAssistantService onReturnCall(): Service executed."); // System.println("HomeAssistantService onReturnCall(): Action executed.");
getApp().forceStatusUpdates(); getApp().forceStatusUpdates();
var d = data as Lang.Array; var d = data as Lang.Array;
var toast = WatchUi.loadResource($.Rez.Strings.Executed) as Lang.String; var toast = WatchUi.loadResource($.Rez.Strings.Executed) as Lang.String;
@@ -118,13 +118,13 @@ class HomeAssistantService {
} }
} }
//! Invoke a service call for a menu item. //! Invoke a action call for a menu item.
//! //!
//! @param service The Home Assistant service to be run, e.g. from the JSON `service` field. //! @param action The Home Assistant action to be run, e.g. from the JSON `action` field.
//! @param data Data to be supplied to the service call. //! @param data Data to be supplied to the action call.
// //
function call( function call(
service as Lang.String, action as Lang.String,
data as Lang.Dictionary?, data as Lang.Dictionary?,
exit as Lang.Boolean exit as Lang.Boolean
) as Void { ) as Void {
@@ -136,8 +136,8 @@ class HomeAssistantService {
WatchUi.pushView( WatchUi.pushView(
dialog, dialog,
new WifiLteExecutionConfirmDelegate({ new WifiLteExecutionConfirmDelegate({
:type => "service", :type => "action",
:service => service, :action => action,
:data => data, :data => data,
:exit => exit, :exit => exit,
}, dialog), }, dialog),
@@ -151,9 +151,9 @@ class HomeAssistantService {
ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoInternet) as Lang.String); ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoInternet) as Lang.String);
} else { } else {
// Can't use null for substring() parameters due to API version level. // Can't use null for substring() parameters due to API version level.
var url = Settings.getApiUrl() + "/services/" + service.substring(0, service.find(".")) + "/" + service.substring(service.find(".")+1, service.length()); var url = Settings.getApiUrl() + "/services/" + action.substring(0, action.find(".")) + "/" + action.substring(action.find(".")+1, action.length());
// System.println("HomeAssistantService call() URL=" + url); // System.println("HomeAssistantService call() URL=" + url);
// System.println("HomeAssistantService call() service=" + service); // System.println("HomeAssistantService call() action=" + action);
var entity_id = ""; var entity_id = "";
if (data != null) { if (data != null) {

8
source/HomeAssistantSyncDelegate.mc
View File

@@ -50,9 +50,9 @@ class HomeAssistantSyncDelegate extends Communications.SyncDelegate {
var url; var url;
switch (type) { switch (type) {
case "service": case "action":
var service = WifiLteExecutionConfirmDelegate.mCommandData[:service]; var action = WifiLteExecutionConfirmDelegate.mCommandData[:action];
url = Settings.getApiUrl() + "/services/" + service.substring(0, service.find(".")) + "/" + service.substring(service.find(".")+1, service.length()); url = Settings.getApiUrl() + "/services/" + action.substring(0, action.find(".")) + "/" + action.substring(action.find(".")+1, action.length());
var entity_id = ""; var entity_id = "";
if (data != null) { if (data != null) {
entity_id = data.get("entity_id"); entity_id = data.get("entity_id");
@@ -78,7 +78,7 @@ class HomeAssistantSyncDelegate extends Communications.SyncDelegate {
private function performRequest(url as Lang.String, data as Lang.Dictionary?) { private function performRequest(url as Lang.String, data as Lang.Dictionary?) {
Communications.makeWebRequest( Communications.makeWebRequest(
url, url,
data, // May include {"entity_id": xxxx} for service calls data, // May include {"entity_id": xxxx} for action calls
{ {
:method => Communications.HTTP_REQUEST_METHOD_POST, :method => Communications.HTTP_REQUEST_METHOD_POST,
:headers => Settings.augmentHttpHeaders({ :headers => Settings.augmentHttpHeaders({

30
source/HomeAssistantTapMenuItem.mc
View File

@@ -17,11 +17,11 @@ using Toybox.Lang;
using Toybox.WatchUi; using Toybox.WatchUi;
using Toybox.Graphics; using Toybox.Graphics;
//! Menu button that triggers a service. //! Menu button that triggers an action.
// //
class HomeAssistantTapMenuItem extends HomeAssistantMenuItem { class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
private var mHomeAssistantService as HomeAssistantService; private var mHomeAssistantService as HomeAssistantService;
private var mService as Lang.String?; private var mAction as Lang.String?;
private var mConfirm as Lang.Boolean or Lang.String or Null; private var mConfirm as Lang.Boolean or Lang.String or Null;
private var mExit as Lang.Boolean; private var mExit as Lang.Boolean;
private var mPin as Lang.Boolean; private var mPin as Lang.Boolean;
@@ -31,11 +31,11 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
//! //!
//! @param label Menu item label. //! @param label Menu item label.
//! @param template Menu item template. //! @param template Menu item template.
//! @param service Menu item service. //! @param action Menu item action.
//! @param data Data to supply to the service call. //! @param data Data to supply to the action call.
//! @param exit Should the service call complete and then exit? //! @param exit Should the action call complete and then exit?
//! @param confirm Should the service call be confirmed to avoid accidental invocation? //! @param confirm Should the action call be confirmed to avoid accidental invocation?
//! @param pin Should the service call be protected with a PIN for some low level of security? //! @param pin Should the action call be protected with a PIN for some low level of security?
//! @param icon Icon to use for the menu item. //! @param icon Icon to use for the menu item.
//! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin. //! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin.
//! @param haService Shared Home Assistant service object that will perform the required call. Only //! @param haService Shared Home Assistant service object that will perform the required call. Only
@@ -44,7 +44,7 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
function initialize( function initialize(
label as Lang.String or Lang.Symbol, label as Lang.String or Lang.Symbol,
template as Lang.String, template as Lang.String,
service as Lang.String?, action as Lang.String?,
data as Lang.Dictionary?, data as Lang.Dictionary?,
options as { options as {
:alignment as WatchUi.MenuItem.Alignment, :alignment as WatchUi.MenuItem.Alignment,
@@ -65,16 +65,16 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
); );
mHomeAssistantService = haService; mHomeAssistantService = haService;
mService = service; mAction = action;
mData = data; mData = data;
mExit = options[:exit]; mExit = options[:exit];
mConfirm = options[:confirm]; mConfirm = options[:confirm];
mPin = options[:pin]; mPin = options[:pin];
} }
//! Call a Home Assistant service only after checks have been done for confirmation or PIN entry. //! Call a Home Assistant action only after checks have been done for confirmation or PIN entry.
// //
function callService() as Void { function callAction() as Void {
var hasTouchScreen = System.getDeviceSettings().isTouchScreen; var hasTouchScreen = System.getDeviceSettings().isTouchScreen;
if (mPin && hasTouchScreen) { if (mPin && hasTouchScreen) {
var pin = Settings.getPin(); var pin = Settings.getPin();
@@ -99,8 +99,8 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
WatchUi.pushView( WatchUi.pushView(
dialog, dialog,
new WifiLteExecutionConfirmDelegate({ new WifiLteExecutionConfirmDelegate({
:type => "service", :type => "action",
:service => mService, :action => mAction,
:data => mData, :data => mData,
:exit => mExit, :exit => mExit,
}, dialog), }, dialog),
@@ -133,8 +133,8 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
//! @param b Ignored. It is included in order to match the expected function prototype of the callback method. //! @param b Ignored. It is included in order to match the expected function prototype of the callback method.
// //
public function onConfirm(b as Lang.Boolean) as Void { public function onConfirm(b as Lang.Boolean) as Void {
if (mService != null) { if (mAction != null) {
mHomeAssistantService.call(mService, mData, mExit); mHomeAssistantService.call(mAction, mData, mExit);
} }
} }

12
source/HomeAssistantToggleMenuItem.mc
View File

@@ -33,7 +33,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
//! //!
//! @param label Menu item label. //! @param label Menu item label.
//! @param template Menu item template. //! @param template Menu item template.
//! @param data Data to supply to the service call. //! @param data Data to supply to the action call.
//! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin. //! @param options Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin.
// //
function initialize( function initialize(
@@ -220,7 +220,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
} }
} }
//! Handles the response from a Home Assistant service or state call and updates the toggle UI. //! Handles the response from a Home Assistant action or state call and updates the toggle UI.
//! //!
//! @param data An array of dictionaries, each representing a Home Assistant entity state. //! @param data An array of dictionaries, each representing a Home Assistant entity state.
// //
@@ -293,9 +293,9 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
} }
} }
//! Call a Home Assistant service only after checks have been done for confirmation or PIN entry. //! Call a Home Assistant action only after checks have been done for confirmation or PIN entry.
// //
function callService(b as Lang.Boolean) as Void { function callAction(b as Lang.Boolean) as Void {
var hasTouchScreen = System.getDeviceSettings().isTouchScreen; var hasTouchScreen = System.getDeviceSettings().isTouchScreen;
if (mPin && hasTouchScreen) { if (mPin && hasTouchScreen) {
// Undo the toggle // Undo the toggle
@@ -354,7 +354,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
setState(b); setState(b);
} }
//! Displays a confirmation dialog before executing a service call via Wi-Fi/LTE. //! Displays a confirmation dialog before executing an action call via Wi-Fi/LTE.
//! //!
//! @param s Desired state: `true` to turn on, `false` to turn off. //! @param s Desired state: `true` to turn on, `false` to turn off.
// //
@@ -382,7 +382,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
//! @param id The entity ID, e.g., `"switch.kitchen"`. //! @param id The entity ID, e.g., `"switch.kitchen"`.
//! @param s Desired state: `true` for "turn_on", `false` for "turn_off". //! @param s Desired state: `true` for "turn_on", `false` for "turn_off".
//! //!
//! @return Full service URL string. //! @return Full action URL string.
// //
private static function getUrl(id as Lang.String, s as Lang.Boolean) as Lang.String { private static function getUrl(id as Lang.String, s as Lang.Boolean) as Lang.String {
var url = Settings.getApiUrl() + "/services/"; var url = Settings.getApiUrl() + "/services/";

30
source/HomeAssistantView.mc
View File

@@ -47,7 +47,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
var content = items[i].get("content") as Lang.String?; var content = items[i].get("content") as Lang.String?;
var entity = items[i].get("entity") as Lang.String?; var entity = items[i].get("entity") as Lang.String?;
var tap_action = items[i].get("tap_action") as Lang.Dictionary?; var tap_action = items[i].get("tap_action") as Lang.Dictionary?;
var service = items[i].get("service") as Lang.String?; // Deprecated schema var action = items[i].get("service") as Lang.String?; // Deprecated schema
var confirm = false as Lang.Boolean or Lang.String or Null; var confirm = false as Lang.Boolean or Lang.String or Null;
var pin = false as Lang.Boolean?; var pin = false as Lang.Boolean?;
var data = null as Lang.Dictionary?; var data = null as Lang.Dictionary?;
@@ -57,10 +57,13 @@ class HomeAssistantView extends WatchUi.Menu2 {
enabled = items[i].get("enabled"); // Optional enabled = items[i].get("enabled"); // Optional
} }
if (items[i].get("exit") != null) { if (items[i].get("exit") != null) {
exit = items[i].get("exit"); // Optional exit = items[i].get("exit"); // Deprecated
} }
if (tap_action != null) { if (tap_action != null) {
service = tap_action.get("service"); action = tap_action.get("service"); // Deprecated
if (tap_action.get("action") != null) {
action = tap_action.get("action"); // Optional
}
data = tap_action.get("data"); // Optional data = tap_action.get("data"); // Optional
if (tap_action.get("confirm") != null) { if (tap_action.get("confirm") != null) {
confirm = tap_action.get("confirm"); // Optional confirm = tap_action.get("confirm"); // Optional
@@ -68,6 +71,9 @@ class HomeAssistantView extends WatchUi.Menu2 {
if (tap_action.get("pin") != null) { if (tap_action.get("pin") != null) {
pin = tap_action.get("pin"); // Optional pin = tap_action.get("pin"); // Optional
} }
if (tap_action.get("exit") != null) {
exit = tap_action.get("exit"); // Optional
}
} }
if (type != null && name != null && enabled) { if (type != null && name != null && enabled) {
if (type.equals("toggle") && entity != null) { if (type.equals("toggle") && entity != null) {
@@ -81,12 +87,12 @@ class HomeAssistantView extends WatchUi.Menu2 {
:pin => pin :pin => pin
} }
)); ));
} else if (type.equals("tap") && service != null) { } else if (type.equals("tap") && action != null) {
addItem(HomeAssistantMenuItemFactory.create().tap( addItem(HomeAssistantMenuItemFactory.create().tap(
name, name,
entity, entity,
content, content,
service, action,
data, data,
{ {
:exit => exit, :exit => exit,
@@ -103,7 +109,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
name, name,
entity, entity,
content, content,
service, action,
data, data,
{ {
:exit => false, :exit => false,
@@ -117,7 +123,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
name, name,
entity, entity,
content, content,
service, action,
data, data,
{ {
:exit => exit, :exit => exit,
@@ -126,7 +132,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
} }
)); ));
} }
} else if (type.equals("numeric") && service != null) { } else if (type.equals("numeric") && action != null) {
if (tap_action != null) { if (tap_action != null) {
var picker = tap_action.get("picker") as Lang.Dictionary?; var picker = tap_action.get("picker") as Lang.Dictionary?;
if (picker != null) { if (picker != null) {
@@ -134,7 +140,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
name, name,
entity, entity,
content, content,
service, action,
picker, picker,
{ {
:exit => exit, :exit => exit,
@@ -150,7 +156,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
name, name,
entity, entity,
content, content,
service, action,
data, data,
{ {
:exit => false, :exit => false,
@@ -267,11 +273,11 @@ class HomeAssistantViewDelegate extends WatchUi.Menu2InputDelegate {
if (item instanceof HomeAssistantToggleMenuItem) { if (item instanceof HomeAssistantToggleMenuItem) {
var haToggleItem = item as HomeAssistantToggleMenuItem; var haToggleItem = item as HomeAssistantToggleMenuItem;
// System.println(haToggleItem.getLabel() + " " + haToggleItem.getId() + " " + haToggleItem.isEnabled()); // System.println(haToggleItem.getLabel() + " " + haToggleItem.getId() + " " + haToggleItem.isEnabled());
haToggleItem.callService(haToggleItem.isEnabled()); haToggleItem.callAction(haToggleItem.isEnabled());
} else if (item instanceof HomeAssistantTapMenuItem) { } else if (item instanceof HomeAssistantTapMenuItem) {
var haItem = item as HomeAssistantTapMenuItem; var haItem = item as HomeAssistantTapMenuItem;
// System.println(haItem.getLabel() + " " + haItem.getId()); // System.println(haItem.getLabel() + " " + haItem.getId());
haItem.callService(); haItem.callAction();
} else if (item instanceof HomeAssistantNumericMenuItem) { } else if (item instanceof HomeAssistantNumericMenuItem) {
var haItem = item as HomeAssistantNumericMenuItem; var haItem = item as HomeAssistantNumericMenuItem;
// System.println(haItem.getLabel() + " " + haItem.getId()); // System.println(haItem.getLabel() + " " + haItem.getId());

10
source/WifiLteExecutionConfirmDelegate.mc
View File

@@ -25,7 +25,7 @@ using Toybox.Timer;
class WifiLteExecutionConfirmDelegate extends WatchUi.ConfirmationDelegate { class WifiLteExecutionConfirmDelegate extends WatchUi.ConfirmationDelegate {
public static var mCommandData as { public static var mCommandData as {
:type as Lang.String, :type as Lang.String,
:service as Lang.String?, :action as Lang.String?,
:data as Lang.Dictionary?, :data as Lang.Dictionary?,
:url as Lang.String?, :url as Lang.String?,
:id as Lang.Number?, :id as Lang.Number?,
@@ -40,8 +40,8 @@ class WifiLteExecutionConfirmDelegate extends WatchUi.ConfirmationDelegate {
//! //!
//! @param options A dictionary describing the command to be executed:<br> //! @param options A dictionary describing the command to be executed:<br>
//! `{`<br> //! `{`<br>
//! &emsp; `:type: as Lang.String,` // The command type, either `"service"` or `"entity"`.<br> //! &emsp; `:type: as Lang.String,` // The command type, either `"action"` or `"entity"`.<br>
//! &emsp; `:service: as Lang.String?,` // (For type `"service"`) The Home Assistant service to call (e.g., "light.turn_on").<br> //! &emsp; `:action: as Lang.String?,` // (For type `"action"`) The Home Assistant action to call (e.g., "light.turn_on").<br>
//! &emsp; `:url: as Lang.Dictionary?,` // (For type `"entity"`) The full Home Assistant entity API URL.<br> //! &emsp; `:url: as Lang.Dictionary?,` // (For type `"entity"`) The full Home Assistant entity API URL.<br>
//! &emsp; `:callback: as Lang.String?,` // (For type `"entity"`) A callback method (Method<data as Dictionary>) to handle the response.<br> //! &emsp; `:callback: as Lang.String?,` // (For type `"entity"`) A callback method (Method<data as Dictionary>) to handle the response.<br>
//! &emsp; `:data: as Lang.Method?,` // (Optional) A dictionary of data to send with the request.<br> //! &emsp; `:data: as Lang.Method?,` // (Optional) A dictionary of data to send with the request.<br>
@@ -52,7 +52,7 @@ class WifiLteExecutionConfirmDelegate extends WatchUi.ConfirmationDelegate {
function initialize( function initialize(
cOptions as { cOptions as {
:type as Lang.String, :type as Lang.String,
:service as Lang.String?, :action as Lang.String?,
:data as Lang.Dictionary?, :data as Lang.Dictionary?,
:url as Lang.String?, :url as Lang.String?,
:callback as Lang.Method?, :callback as Lang.Method?,
@@ -73,7 +73,7 @@ class WifiLteExecutionConfirmDelegate extends WatchUi.ConfirmationDelegate {
mConfirmationView = view; mConfirmationView = view;
mCommandData = { mCommandData = {
:type => cOptions[:type], :type => cOptions[:type],
:service => cOptions[:service], :action => cOptions[:action],
:data => cOptions[:data], :data => cOptions[:data],
:url => cOptions[:url], :url => cOptions[:url],
:callback => cOptions[:callback], :callback => cOptions[:callback],

5
web/index.html
View File

@@ -1,3 +1,4 @@
<!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
@@ -7,7 +8,7 @@
<link <link
rel="stylesheet" rel="stylesheet"
data-name="vs/editor/editor.main" data-name="vs/editor/editor.main"
href="https://www.unpkg.com/monaco-editor@0.52.2/min/vs/editor/editor.main.css" /> href="https://www.unpkg.com/monaco-editor@0.54.0/min/vs/editor/editor.main.css" />
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
@@ -453,7 +454,7 @@ http:
</div> </div>
</dialog> </dialog>
<script src="https://www.unpkg.com/monaco-editor@0.52.2/min/vs/loader.js"></script> <script src="https://www.unpkg.com/monaco-editor@0.54.0/min/vs/loader.js"></script>
<script src="https://www.unpkg.com/json-ast-comments@1.1.1/lib/json.js"></script> <script src="https://www.unpkg.com/json-ast-comments@1.1.1/lib/json.js"></script>
<script src="https://www.unpkg.com/toastify-js@1.12.0/src/toastify.js"></script> <script src="https://www.unpkg.com/toastify-js@1.12.0/src/toastify.js"></script>
<script src="https://code.iconify.design/1/1.0.6/iconify.min.js"></script> <script src="https://code.iconify.design/1/1.0.6/iconify.min.js"></script>

68
web/main.js
View File

@@ -101,12 +101,12 @@ async function get_areas() {
} }
/** /**
* Get all services in HomeAssistant. * Get all actions in HomeAssistant.
* @returns {Promise<[string, { name: string; description: string; fields: * @returns {Promise<[string, { name: string; description: string; fields:
* Record<string, { name: string; description: string; example: string; * Record<string, { name: string; description: string; example: string;
* selector: unknown; required?: boolean }> }][]>} [id, data] * selector: unknown; required?: boolean }> }][]>} [id, data]
*/ */
async function get_services() { async function get_actions() {
try { try {
const res = await fetch(api_url + '/services', { const res = await fetch(api_url + '/services', {
method: 'GET', method: 'GET',
@@ -122,15 +122,15 @@ async function get_services() {
document.querySelector('#api_url').classList.remove('invalid'); document.querySelector('#api_url').classList.remove('invalid');
document.querySelector('#api_token').classList.remove('invalid'); document.querySelector('#api_token').classList.remove('invalid');
const data = await res.json(); const data = await res.json();
const services = []; const actions = [];
for (const d of data) { for (const d of data) {
for (const service in d.services) { for (const action in d.services) {
services.push([`${d.domain}.${service}`, d.services[service]]); actions.push([`${d.domain}.${action}`, d.services[action]]);
} }
} }
return services; return actions;
} catch (e) { } catch (e) {
console.error('Error fetching services:', e); console.error('Error fetching actions:', e);
document.querySelector('#api_url').classList.add('invalid'); document.querySelector('#api_url').classList.add('invalid');
return []; return [];
} }
@@ -176,11 +176,11 @@ async function get_schema() {
* @param {Record<string, string>} areas * @param {Record<string, string>} areas
* @param {[string, { name: string; description: string; fields: * @param {[string, { name: string; description: string; fields:
* Record<string, { name: string; description: string; example: string; * Record<string, { name: string; description: string; example: string;
* selector: unknown; required?: boolean }> }][]} services * selector: unknown; required?: boolean }> }][]} actions
* @param {{}} schema * @param {{}} schema
* @returns {Promise<{}>} * @returns {Promise<{}>}
*/ */
async function generate_schema(entities, devices, areas, services, schema) { async function generate_schema(entities, devices, areas, actions, schema) {
schema.$defs.entity = { schema.$defs.entity = {
enum: Object.keys(entities), enum: Object.keys(entities),
}; };
@@ -192,12 +192,18 @@ async function generate_schema(entities, devices, areas, services, schema) {
}; };
const oneOf = []; const oneOf = [];
for (const [id, data] of services) { for (const [id, data] of actions) {
const i_properties = { const i_properties = {
action: {
title: data.name,
description: data.description,
const: id,
},
service: { service: {
title: data.name, title: data.name,
description: data.description, description: data.description,
const: id, const: id,
deprecated: true,
}, },
data: { data: {
type: 'object', type: 'object',
@@ -393,12 +399,16 @@ async function generate_schema(entities, devices, areas, services, schema) {
properties: i_properties, properties: i_properties,
}); });
} }
schema.$defs.tap_action = { schema.$defs.tap_action_tap = {
type: 'object', type: 'object',
oneOf: oneOf, oneOf: oneOf,
properties: { properties: {
action: {
type: 'string',
},
service: { service: {
type: 'string', type: 'string',
deprecated: true,
}, },
confirm: { confirm: {
$ref: '#/$defs/confirm', $ref: '#/$defs/confirm',
@@ -411,8 +421,16 @@ async function generate_schema(entities, devices, areas, services, schema) {
properties: {}, properties: {},
}, },
}, },
anyOf: [
{
required: ['action'],
},
{
required: ['service'],
},
],
}; };
delete schema.$defs.tap.properties.service; delete schema.$defs.tap.properties.action;
delete schema.$schema; delete schema.$schema;
return schema; return schema;
@@ -450,22 +468,22 @@ let entities;
let devices; let devices;
/** @type {Awaited<ReturnType<typeof get_areas>>} */ /** @type {Awaited<ReturnType<typeof get_areas>>} */
let areas; let areas;
/** @type {Awaited<ReturnType<typeof get_services>>} */ /** @type {Awaited<ReturnType<typeof get_actions>>} */
let services; let actions;
let schema; let schema;
async function loadSchema() { async function loadSchema() {
[entities, devices, areas, services, schema] = await Promise.all([ [entities, devices, areas, actions, schema] = await Promise.all([
get_entities(), get_entities(),
get_devices(), get_devices(),
get_areas(), get_areas(),
get_services(), get_actions(),
get_schema(), get_schema(),
]); ]);
if (window.makeMarkers) { if (window.makeMarkers) {
window.makeMarkers(); window.makeMarkers();
} }
try { try {
schema = await generate_schema(entities, devices, areas, services, schema); schema = await generate_schema(entities, devices, areas, actions, schema);
} catch {} } catch {}
console.log(schema); console.log(schema);
if (window.m && window.modelUri) { if (window.m && window.modelUri) {
@@ -811,14 +829,16 @@ require(['vs/editor/editor.main'], async () => {
const runAction = editor.addCommand( const runAction = editor.addCommand(
0, 0,
async function (_, action) { async function (_, tap) {
const service = action.tap_action.service.split('.'); const action = (tap.tap_action.action ?? tap.tap_action.service).split(
let data = action.tap_action.data; '.'
);
let data = tap.tap_action.data;
if (data) { if (data) {
data.entity_id = action.entity; data.entity_id = tap.entity;
} else { } else {
data = { data = {
entity_id: action.entity, entity_id: tap.entity,
}; };
} }
const t = toast({ const t = toast({
@@ -826,7 +846,7 @@ require(['vs/editor/editor.main'], async () => {
}); });
try { try {
const res = await fetch( const res = await fetch(
api_url + '/services/' + service[0] + '/' + service[1], api_url + '/services/' + action[0] + '/' + action[1],
{ {
method: 'POST', method: 'POST',
headers: { headers: {
@@ -1152,7 +1172,7 @@ require(['vs/editor/editor.main'], async () => {
if (node.type === 'property') { if (node.type === 'property') {
if (node.key[0].value === 'tap_action') { if (node.key[0].value === 'tap_action') {
const d = get(data, path); const d = get(data, path);
if (d.tap_action.service) { if (d.tap_action.action ?? d.tap_action.service) {
lenses.push({ lenses.push({
range: { range: {
startLineNumber: node.key[0].range.start.line + 1, startLineNumber: node.key[0].range.start.line + 1,

2
web/package.json
View File

@@ -13,7 +13,7 @@
"@types/toastify-js": "1.12.0", "@types/toastify-js": "1.12.0",
"@vscode/webview-ui-toolkit": "1.4.0", "@vscode/webview-ui-toolkit": "1.4.0",
"json-ast-comments": "1.1.1", "json-ast-comments": "1.1.1",
"monaco-editor": "0.52.2", "monaco-editor": "0.54.2",
"prettier": "^3.6.2", "prettier": "^3.6.2",
"serve": "^14.2.1" "serve": "^14.2.1"
} }