Support more entities for toggle

Signed-off-by: thmichel <thomas.michel@vermessung-michel.de>

.vscode/launch.json

@@ -4,14 +4,6 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
-    {
-      "name": "Python: Current File",
-      "type": "python",
-      "request": "launch",
-      "program": "${file}",
-      "console": "integratedTerminal",
-      "justMyCode": true
-    },
     {
       "type": "monkeyc",
       "request": "launch",

README.md

@@ -81,7 +81,7 @@ Example schema:
       "name": "Food is Ready!",
       "type": "tap",
       "tap_action": {
-        "service": "script.turn_on",
+        "action": "script.turn_on",
         "confirm": true
       }
     },
@@ -132,7 +132,7 @@ Example schema:
       "name": "Turn off USBs",
       "type": "tap",
       "tap_action": {
-        "service": "automation.trigger"
+        "action": "automation.trigger"
       }
     },
     {
@@ -140,10 +140,27 @@ Example schema:
       "name": "TV Lights Scene",
       "type": "tap",
       "tap_action": {
-        "service": "scene.turn_on",
+        "action": "scene.turn_on",
         "pin": true
       }
-    }
+    },
+    {
+    "name": "Heating",
+    "content": "{{ ' %.1f' | format(state_attr('climate.myheating','temperature'))  }}",
+    "type": "numeric",
+        "entity": "climate.myheating",
+        "tap_action": {
+          "action": "climate.set_temperature",
+          "data": {
+              "step": "0.5",
+              "start": "10",
+              "stop": "30",
+              "valueLabel": "temperature",
+              "formatString": "%.1f"
+          }
+        },
+    "pin": false
+    } ,
   ]
 }
 ```
@@ -157,6 +174,7 @@ The example above illustrates how to configure:
 * Script invocation (`tap`)
 * Service invocation, e.g. Scene setting, (`tap`)
 * 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. ValueLabel defines the variable to return. You can optionally set the minimum (start) and maximum (stop) value as well as the step to increase/decrease and a tepmlate how to format the value.
 * You can also display the status of devices (`info`) which is essentially a `tap` with no action
 * All menu items can display the results of evaluating [templates](examples/Templates.md).
 

config.schema.json

@@ -17,11 +17,21 @@
       "$ref": "#/$defs/items"
     }
   },
-  "required": ["title", "items"],
+  "required": [
+    "title",
+    "items"
+  ],
   "additionalProperties": false,
   "$defs": {
     "toggle": {
       "type": "object",
+      "examples": [
+        {
+          "type": "toggle",
+          "name": "Example",
+          "entity": "switch.example"
+        }
+      ],
       "properties": {
         "entity": {
           "$ref": "#/$defs/entity"
@@ -37,15 +47,7 @@
           "$ref": "#/$defs/content"
         },
         "tap_action": {
-          "type": "object",
-          "properties": {
-            "confirm": {
-              "$ref": "#/$defs/confirm"
-            },
-            "pin": {
-              "$ref": "#/$defs/pin"
-            }
-          },
+          "$ref": "#/$defs/tap_action",
           "additionalProperties": false
         },
         "enabled": {
@@ -55,7 +57,11 @@
           "$ref": "#/$defs/exit"
         }
       },
-      "required": ["entity", "name", "type"],
+      "required": [
+        "entity",
+        "name",
+        "type"
+      ],
       "additionalProperties": false
     },
     "template": {
@@ -86,7 +92,11 @@
               "$ref": "#/$defs/enabled"
             }
           },
-          "required": ["name", "content", "type"],
+          "required": [
+            "name",
+            "content",
+            "type"
+          ],
           "additionalProperties": false
         },
         {
@@ -109,7 +119,33 @@
               "description": "Use 'info' or 'tap' instead."
             },
             "tap_action": {
-              "$ref": "#/$defs/tap_action"
+              "$ref": "#/$defs/tap_action",
+              "properties": {
+                "service": {
+                  "$ref": "#/$defs/action",
+                  "deprecated": true
+                },
+                "action": {
+                  "$ref": "#/$defs/action"
+                },
+                "data": {
+                  "type": "object",
+                  "title": "Your action'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."
+                }
+              },
+              "anyOf": [
+                {
+                  "required": [
+                    "service"
+                  ]
+                },
+                {
+                  "required": [
+                    "action"
+                  ]
+                }
+              ]
             },
             "enabled": {
               "$ref": "#/$defs/enabled"
@@ -118,7 +154,12 @@
               "$ref": "#/$defs/exit"
             }
           },
-          "required": ["name", "content", "type", "tap_action"],
+          "required": [
+            "name",
+            "content",
+            "type",
+            "tap_action"
+          ],
           "additionalProperties": false
         }
       ]
@@ -140,11 +181,27 @@
           "$ref": "#/$defs/enabled"
         }
       },
-      "required": ["name", "content", "type"],
+      "required": [
+        "name",
+        "content",
+        "type"
+      ],
       "additionalProperties": false
     },
     "tap": {
       "type": "object",
+      "examples": [
+        {
+          "type": "tap",
+          "name": "Example",
+          "tap_action": {
+            "action": "notify.notify",
+            "data": {
+              "message": "Example"
+            }
+          }
+        }
+      ],
       "properties": {
         "entity": {
           "$ref": "#/$defs/entity"
@@ -160,13 +217,39 @@
           "$ref": "#/$defs/content"
         },
         "service": {
-          "$ref": "#/$defs/entity",
+          "$ref": "#/$defs/action",
           "deprecated": true,
           "title": "Schema change:",
           "description": "Use 'tap_action' instead to mirror Home Assistant."
         },
         "tap_action": {
-          "$ref": "#/$defs/tap_action"
+          "$ref": "#/$defs/tap_action",
+          "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."
+            }
+          },
+          "anyOf": [
+            {
+              "required": [
+                "service"
+              ]
+            },
+            {
+              "required": [
+                "action"
+              ]
+            }
+          ]
         },
         "enabled": {
           "$ref": "#/$defs/enabled"
@@ -175,11 +258,22 @@
           "$ref": "#/$defs/exit"
         }
       },
-      "required": ["name", "type"],
+      "required": [
+        "name",
+        "type"
+      ],
       "additionalProperties": false
     },
     "group": {
       "type": "object",
+      "examples": [
+        {
+          "type": "group",
+          "name": "Example",
+          "title": "Example",
+          "items": []
+        }
+      ],
       "properties": {
         "entity": {
           "$ref": "#/$defs/entity",
@@ -210,9 +304,435 @@
           "$ref": "#/$defs/enabled"
         }
       },
-      "required": ["name", "title", "type", "items"],
+      "required": [
+        "name",
+        "title",
+        "type",
+        "items"
+      ],
       "additionalProperties": false
     },
+    "numeric": {
+      "type": "object",
+      "examples": [
+        {
+          "type": "numeric",
+          "name": "Example",
+          "entity": "light.example",
+          "attribute": "brightness",
+          "action": "light.turn_on",
+          "action_attribute": "brightness",
+          "min": 0,
+          "max": 255,
+          "step": 1
+        },
+        {
+          "type": "numeric",
+          "name": "Example",
+          "entity": "input_number.example",
+          "action": "input_number.set_value",
+          "action_attribute": "value",
+          "min": 0,
+          "max": 100,
+          "step": 1
+        },
+        {
+          "type": "numeric",
+          "name": "Example",
+          "entity": "number.example",
+          "action": "number.set_value",
+          "action_attribute": "value",
+          "min": 0,
+          "max": 100,
+          "step": 1
+        },
+        {
+          "type": "numeric",
+          "name": "Example",
+          "entity": "fan.example",
+          "attribute": "percentage",
+          "action": "fan.set_percentage",
+          "action_attribute": "percentage",
+          "min": 0,
+          "max": 100,
+          "step": 1
+        },
+        {
+          "type": "numeric",
+          "name": "Example",
+          "entity": "valve.example",
+          "attribute": "position",
+          "action": "valve.set_valve_position",
+          "action_attribute": "position",
+          "min": 0,
+          "max": 100,
+          "step": 1
+        },
+        {
+          "type": "numeric",
+          "name": "Example",
+          "entity": "cover.example",
+          "attribute": "position",
+          "action": "cover.set_position",
+          "action_attribute": "position",
+          "min": 0,
+          "max": 100,
+          "step": 1
+        },
+        {
+          "type": "numeric",
+          "name": "Example",
+          "entity": "cover.example",
+          "attribute": "tilt_position",
+          "action": "cover.set_tilt_position",
+          "action_attribute": "tilt_position",
+          "min": 0,
+          "max": 100,
+          "step": 1
+        },
+        {
+          "type": "numeric",
+          "name": "Example",
+          "entity": "media_player.example",
+          "attribute": "volume_level",
+          "action": "media_player.volume_set",
+          "action_attribute": "volume_level",
+          "min": 0,
+          "max": 1,
+          "step": 0.01
+        },
+        {
+          "type": "numeric",
+          "name": "Example",
+          "entity": "climate.example",
+          "attribute": "temperature",
+          "action": "climate.set_temperature",
+          "action_attribute": "temperature",
+          "min": 0,
+          "max": 100,
+          "step": 1
+        }
+      ],
+      "allOf": [
+        {
+          "properties": {
+            "name": {
+              "$ref": "#/$defs/name"
+            },
+            "type": {
+              "$ref": "#/$defs/type",
+              "const": "numeric"
+            },
+            "content": {
+              "$ref": "#/$defs/content"
+            },
+            "tap_action": {
+              "$ref": "#/$defs/tap_action"
+            },
+            "enabled": {
+              "$ref": "#/$defs/enabled"
+            },
+            "exit": {
+              "$ref": "#/$defs/exit"
+            },
+            "min": {
+              "type": "number",
+              "title": "Minimum value"
+            },
+            "max": {
+              "type": "number",
+              "title": "Maximum value"
+            },
+            "step": {
+              "type": "number",
+              "title": "Step size"
+            },
+            "decimals": {
+              "type": "number",
+              "title": "Number of decimals to display",
+              "minimum": 0,
+              "maximum": 10,
+              "default": 1
+            },
+            "entity": {
+              "$ref": "#/$defs/entity"
+            },
+            "attribute": {
+              "type": "string",
+              "title": "Attribute on the entity with the current numeric value. To use the state of the entity, do not specify."
+            },
+            "action": {
+              "$ref": "#/$defs/action"
+            },
+            "action_attribute": {
+              "type": "string",
+              "title": "Attribute on the action data for the value to set."
+            }
+          },
+          "required": [
+            "name",
+            "type",
+            "min",
+            "max",
+            "step",
+            "entity",
+            "action",
+            "action_attribute"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "properties": {
+            "entity": {
+              "pattern": "^(light|input_number|number|fan|valve|cover|media_player|climate)\\.[^.]+$"
+            }
+          },
+          "if": {
+            "properties": {
+              "entity": {
+                "pattern": "^light\\.[^.]+$"
+              }
+            }
+          },
+          "then": {
+            "properties": {
+              "attribute": {
+                "const": "brightness"
+              },
+              "action": {
+                "const": "light.turn_on"
+              },
+              "action_attribute": {
+                "const": "brightness"
+              },
+              "min": {
+                "const": 0
+              },
+              "max": {
+                "const": 255,
+                "description": "Lights are not a percentage."
+              }
+            }
+          },
+          "else": {
+            "if": {
+              "properties": {
+                "entity": {
+                  "pattern": "^input_number\\.[^.]+$"
+                }
+              }
+            },
+            "then": {
+              "properties": {
+                "attribute": {
+                  "const": "value"
+                },
+                "action": {
+                  "const": "input_number.set_value"
+                },
+                "action_attribute": {
+                  "const": "value"
+                }
+              },
+              "not": {
+                "required": [
+                  "attribute"
+                ]
+              }
+            },
+            "else": {
+              "if": {
+                "properties": {
+                  "entity": {
+                    "pattern": "^number\\.[^.]+$"
+                  }
+                }
+              },
+              "then": {
+                "properties": {
+                  "attribute": {
+                    "const": "value"
+                  },
+                  "action": {
+                    "const": "number.set_value"
+                  },
+                  "action_attribute": {
+                    "const": "value"
+                  }
+                },
+                "not": {
+                  "required": [
+                    "attribute"
+                  ]
+                }
+              },
+              "else": {
+                "if": {
+                  "properties": {
+                    "entity": {
+                      "pattern": "^fan\\.[^.]+$"
+                    }
+                  }
+                },
+                "then": {
+                  "properties": {
+                    "attribute": {
+                      "const": "percentage"
+                    },
+                    "action": {
+                      "const": "fan.set_percentage"
+                    },
+                    "action_attribute": {
+                      "const": "percentage"
+                    },
+                    "min": {
+                      "const": 0
+                    },
+                    "max": {
+                      "const": 100
+                    }
+                  }
+                },
+                "else": {
+                  "if": {
+                    "properties": {
+                      "entity": {
+                        "pattern": "^valve\\.[^.]+$"
+                      }
+                    }
+                  },
+                  "then": {
+                    "properties": {
+                      "attribute": {
+                        "const": "position"
+                      },
+                      "action": {
+                        "const": "valve.set_valve_position"
+                      },
+                      "action_attribute": {
+                        "const": "position"
+                      },
+                      "min": {
+                        "const": 0
+                      },
+                      "max": {
+                        "const": 100
+                      }
+                    }
+                  },
+                  "else": {
+                    "if": {
+                      "properties": {
+                        "entity": {
+                          "pattern": "^cover\\.[^.]+$"
+                        }
+                      }
+                    },
+                    "then": {
+                      "properties": {
+                        "attribute": {
+                          "const": "position"
+                        },
+                        "action": {
+                          "const": "cover.set_position"
+                        },
+                        "action_attribute": {
+                          "const": "position"
+                        },
+                        "min": {
+                          "const": 0
+                        },
+                        "max": {
+                          "const": 100
+                        }
+                      }
+                    },
+                    "else": {
+                      "if": {
+                        "properties": {
+                          "entity": {
+                            "pattern": "^cover\\.[^.]+$"
+                          }
+                        }
+                      },
+                      "then": {
+                        "properties": {
+                          "attribute": {
+                            "const": "tilt_position"
+                          },
+                          "action": {
+                            "const": "cover.set_tilt_position"
+                          },
+                          "action_attribute": {
+                            "const": "tilt_position"
+                          },
+                          "min": {
+                            "const": 0
+                          },
+                          "max": {
+                            "const": 100
+                          }
+                        }
+                      },
+                      "else": {
+                        "if": {
+                          "properties": {
+                            "entity": {
+                              "pattern": "^media_player\\.[^.]+$"
+                            }
+                          }
+                        },
+                        "then": {
+                          "properties": {
+                            "attribute": {
+                              "const": "volume_level"
+                            },
+                            "action": {
+                              "const": "media_player.volume_set"
+                            },
+                            "action_attribute": {
+                              "const": "volume_level"
+                            },
+                            "min": {
+                              "const": 0
+                            },
+                            "max": {
+                              "const": 1
+                            }
+                          }
+                        },
+                        "else": {
+                          "if": {
+                            "properties": {
+                              "entity": {
+                                "pattern": "^climate\\.[^.]+$"
+                              }
+                            }
+                          },
+                          "then": {
+                            "properties": {
+                              "attribute": {
+                                "const": "temperature"
+                              },
+                              "action": {
+                                "const": "climate.set_temperature"
+                              },
+                              "action_attribute": {
+                                "const": "temperature"
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      ]
+    },
     "type": {
       "title": "Menu item type",
       "description": "One of 'info', 'tap', 'toggle' or 'group'."
@@ -235,6 +755,9 @@
           },
           {
             "$ref": "#/$defs/group"
+          },
+          {
+            "$ref": "#/$defs/numeric"
           }
         ]
       }
@@ -248,9 +771,9 @@
       "title": "Home Assistant entity name",
       "pattern": "^[^.]+\\.[^.]+$"
     },
-    "service": {
+    "action": {
       "type": "string",
-      "title": "Home Assistant service name",
+      "title": "Home Assistant action name",
       "pattern": "^[^.]+\\.[^.]+$"
     },
     "tap_action": {
@@ -258,22 +781,13 @@
       "title": "Action",
       "description": "'confirm' field is optional.",
       "properties": {
-        "service": {
-          "$ref": "#/$defs/service"
-        },
         "confirm": {
           "$ref": "#/$defs/confirm"
         },
         "pin": {
           "$ref": "#/$defs/pin"
-        },
-        "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"]
+      }
     },
     "content": {
       "title": "Home Assistant Template",
@@ -307,7 +821,10 @@
               "$ref": "#/$defs/content"
             }
           },
-          "required": ["type", "content"]
+          "required": [
+            "type",
+            "content"
+          ]
         },
         {
           "properties": {
@@ -317,7 +834,9 @@
               "const": "status"
             }
           },
-          "required": ["type"]
+          "required": [
+            "type"
+          ]
         }
       ]
     },
@@ -334,4 +853,4 @@
       "description": "Choose to exit the application after this item has been selected. Disabled (false) by default. N.B. Only actionable menu items can have this field added."
     }
   }
-}
+}

examples/Actions.md

@@ -11,7 +11,7 @@ A simple example using a scene as a `tap` menu item.
   "name": "Telly Scene",
   "type": "tap",
   "tap_action": {
-    "service": "scene.turn_on"
+    "action": "scene.turn_on"
   }
 },
 ```
@@ -62,7 +62,7 @@ Note that for notify events, you _must_ not supply an `entity_id` or the API cal
   "name": "Message",
   "type": "tap",
   "tap_action": {
-    "service": "notify.mobile_app_on_phone",
+    "action": "notify.mobile_app_on_phone",
     "data": {
       "title": "This is a title",
       "message": "This is the message"
@@ -73,9 +73,9 @@ Note that for notify events, you _must_ not supply an `entity_id` or the API cal
 ```
 
 > [!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
 
@@ -87,7 +87,7 @@ You can choose individual items that will quit after they have completed their a
   "name": "Turn off Stuff",
   "type": "tap",
   "tap_action": {
-    "service": "automation.trigger"
+    "action": "automation.trigger"
   },
   "exit": true
 }
@@ -103,7 +103,7 @@ If you would like to temporarily disable an item in your menu, e.g. for seasonal
   "name": "Turn off Stuff",
   "type": "tap",
   "tap_action": {
-    "service": "automation.trigger"
+    "action": "automation.trigger"
   },
   "enabled": false
 }

examples/Switches.md

@@ -48,12 +48,12 @@ switch:
         friendly_name: <name>
         value_template: <value>
         turn_on:
-          service: <service>
+          action: <action>
           data:
             entity_id: <entity>
             <attribute>: <value>
         turn_off:
-          service: <service>
+          action: <action>
           data:
             entity_id: <entity>
             <attribute>: <value>
@@ -90,11 +90,11 @@ switch:
         friendly_name: Cover
         value_template: "{{ is_state('cover.cover', 'open') }}"
         turn_on:
-          service: cover.open_cover
+          action: cover.open_cover
           data:
             entity_id: cover.cover
         turn_off:
-          service: cover.close_cover
+          action: cover.close_cover
           data:
             entity_id: cover.cover
 ```

examples/Templates.md

@@ -116,7 +116,7 @@ Note: Only when you use the `tap_action` field do you also need to include the `
   "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 %}",
   "tap_action": {
-    "service": "cover.toggle",
+    "action": "cover.toggle",
     "pin": true
   }
 }
@@ -173,7 +173,7 @@ An example of a dimmer light with 4 brightness settings 0..3. Here our light wor
       "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 %}",
       "tap_action": {
-        "service": "light.turn_on",
+        "action": "light.turn_on",
         "data": {
           "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",
       "type": "tap",
       "tap_action": {
-        "service": "light.turn_on",
+        "action": "light.turn_on",
         "data": {
           "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",
       "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": {
-        "service": "light.turn_on",
+        "action": "light.turn_on",
         "data": {
           "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",
       "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": {
-        "service": "light.turn_on",
+        "action": "light.turn_on",
         "data": {
           "brightness_pct": 87
         }

manifest.xml

@@ -13,218 +13,218 @@
 
   Device Information & References:
   * https://developer.garmin.com/connect-iq/compatible-devices/
-  * https://developer.garmin.com/connect-iq/reference-guides/devices-reference/
+  * https://developer.garmin.com/connect-iq/device-reference/
 
   philipabbey's Test App    id="98c36259-498a-4458-9cef-74a273ad2bc3" type="watch-app"
   Live Application          id="40131e87-31ff-454b-a8e2-92276ee399d6" type="watch-app"
 
 -->
 <iq:manifest version="3" xmlns:iq="http://www.garmin.com/xml/connectiq">
-  <!--
+    <!--
     Use "Monkey C: Edit Application" from the Visual Studio Code command palette
     to update the application attributes.
   -->
-  <iq:application id="98c36259-498a-4458-9cef-74a273ad2bc3" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
-    <!--
+    <iq:application id="971834c4-e4fc-4825-801f-7ac9db0e3044" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
+        <!--
       Use the following from the Visual Studio Code command palette to edit
       the build targets:
       "Monkey C: Set Products by Product Category" - Lets you add all products
                                   that belong to the same product category
       "Monkey C: Edit Products" - Lets you add or remove any product
     -->
-    <iq:products>
-      <iq:product id="approachs50"/>
-      <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="descentg2"/>
-      <iq:product id="descentmk1"/>
-      <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="edge1050"/>
-      <iq:product id="edge520plus"/>
-      <iq:product id="edge530"/>
-      <iq:product id="edge540"/>
-      <iq:product id="edge550"/>
-      <iq:product id="edge820"/>
-      <iq:product id="edge830"/>
-      <iq:product id="edge840"/>
-      <iq:product id="edge850"/>
-      <iq:product id="edgeexplore"/>
-      <iq:product id="edgeexplore2"/>
-      <iq:product id="edgemtb"/>
-      <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="fenix8pro47mm"/>
-      <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="fr57042mm"/>
-      <iq:product id="fr57047mm"/>
-      <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="fr970"/>
-      <iq:product id="gpsmap66"/>
-      <iq:product id="gpsmap67"/>
-      <iq:product id="gpsmaph1"/>
-      <iq:product id="instinct2"/>
-      <iq:product id="instinct2s"/>
-      <iq:product id="instinct2x"/>
-      <iq:product id="instinct3amoled45mm"/>
-      <iq:product id="instinct3amoled50mm"/>
-      <iq:product id="instinct3solar45mm"/>
-      <iq:product id="instinctcrossover"/>
-      <iq:product id="instinctcrossoveramoled"/>
-      <iq:product id="instincte40mm"/>
-      <iq:product id="instincte45mm"/>
-      <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="venu441mm"/>
-      <iq:product id="venu445mm"/>
-      <iq:product id="venud"/>
-      <iq:product id="venusq"/>
-      <iq:product id="venusq2"/>
-      <iq:product id="venusq2m"/>
-      <iq:product id="venusqm"/>
-      <iq:product id="venux1"/>
-      <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="vivoactive6"/>
-    </iq:products>
-    <!--
+        <iq:products>
+            <iq:product id="approachs50"/>
+            <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="descentg2"/>
+            <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="edge1050"/>
+            <iq:product id="edge520plus"/>
+            <iq:product id="edge530"/>
+            <iq:product id="edge540"/>
+            <iq:product id="edge550"/>
+            <iq:product id="edge820"/>
+            <iq:product id="edge830"/>
+            <iq:product id="edge840"/>
+            <iq:product id="edge850"/>
+            <iq:product id="edgeexplore"/>
+            <iq:product id="edgeexplore2"/>
+            <iq:product id="edgemtb"/>
+            <iq:product id="enduro"/>
+            <iq:product id="enduro3"/>
+            <iq:product id="epix2"/>
+            <iq:product id="epix2pro42mm"/>
+            <iq:product id="epix2pro47mm"/>
+            <iq:product id="epix2pro47mmsystem7preview"/>
+            <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="fenix8pro47mm"/>
+            <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="fr57042mm"/>
+            <iq:product id="fr57047mm"/>
+            <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="fr970"/>
+            <iq:product id="gpsmap66"/>
+            <iq:product id="gpsmap67"/>
+            <iq:product id="gpsmaph1"/>
+            <iq:product id="instinct2"/>
+            <iq:product id="instinct2s"/>
+            <iq:product id="instinct2x"/>
+            <iq:product id="instinct3amoled45mm"/>
+            <iq:product id="instinct3amoled50mm"/>
+            <iq:product id="instinct3solar45mm"/>
+            <iq:product id="instinctcrossover"/>
+            <iq:product id="instinctcrossoveramoled"/>
+            <iq:product id="instincte40mm"/>
+            <iq:product id="instincte45mm"/>
+            <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="venu441mm"/>
+            <iq:product id="venu445mm"/>
+            <iq:product id="venud"/>
+            <iq:product id="venusq"/>
+            <iq:product id="venusq2"/>
+            <iq:product id="venusq2m"/>
+            <iq:product id="venusqm"/>
+            <iq:product id="venux1"/>
+            <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="vivoactive6"/>
+        </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:permissions>
-    <!--
+        <iq:permissions>
+            <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
       palette to edit your compatible language list.
     -->
-    <iq:languages>
-      <iq:language>ara</iq:language>
-      <iq:language>bul</iq:language>
-      <iq:language>ces</iq:language>
-      <iq:language>dan</iq:language>
-      <iq:language>deu</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>nob</iq:language>
-      <iq:language>pol</iq:language>
-      <iq:language>por</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>
-    <!--
+        <iq:languages>
+            <iq:language>ara</iq:language>
+            <iq:language>bul</iq:language>
+            <iq:language>ces</iq:language>
+            <iq:language>dan</iq:language>
+            <iq:language>deu</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>nob</iq:language>
+            <iq:language>pol</iq:language>
+            <iq:language>por</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:application>
-</iq:manifest>
+</iq:manifest>

source/HomeAssistantApp.mc

@@ -30,14 +30,14 @@ class HomeAssistantApp extends Application.AppBase {
     private var mHasToast       as Lang.Boolean = false;
     private var mApiStatus      as Lang.String?;
     private var mMenuStatus     as Lang.String?;
-    private var mHaMenu         as HomeAssistantView?;
+    private var mHaMenu         as HomeAssistantView?;  
     private var mGlanceTemplate as Lang.String? = null;
     private var mGlanceText     as Lang.String? = null;
     private var mQuitTimer      as QuitTimer?;
     private var mGlanceTimer    as Timer.Timer?;
     private var mUpdateTimer    as Timer.Timer?;
     // Array initialised by onReturnFetchMenuConfig()
-    private var mItemsToUpdate  as Lang.Array<HomeAssistantToggleMenuItem or HomeAssistantTapMenuItem or HomeAssistantGroupMenuItem>?;
+    private var mItemsToUpdate  as Lang.Array<HomeAssistantToggleMenuItem or HomeAssistantTapMenuItem or HomeAssistantGroupMenuItem or HomeAssistantNumericMenuItem>?;
     private var mIsApp          as Lang.Boolean     = false; // Or Widget
     private var mUpdating       as Lang.Boolean     = false; // Don't start a second chain of updates
     private var mTemplates      as Lang.Dictionary? = null;  // Cache of compiled templates

source/HomeAssistantMenuItemFactory.mc

@@ -99,7 +99,7 @@ class HomeAssistantMenuItemFactory {
     //! @param label     Menu item label.
     //! @param entity_id Home Assistant Entity ID (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 options   Menu item options to be passed on, including both SDK and menu options, e.g. exit, confirm & pin.
     //
@@ -107,7 +107,7 @@ class HomeAssistantMenuItemFactory {
         label     as Lang.String or Lang.Symbol,
         entity_id as Lang.String?,
         template  as Lang.String?,
-        service   as Lang.String?,
+        action   as Lang.String?,
         data      as Lang.Dictionary?,
         options   as {
             :exit    as Lang.Boolean,
@@ -126,12 +126,12 @@ class HomeAssistantMenuItemFactory {
         for (var i = 0; i < keys.size(); i++) {
             options.put(keys[i], mMenuItemOptions.get(keys[i]));
         }
-        if (service != null) {
+        if (action != null) {
             options.put(:icon, mTapTypeIcon);
             return new HomeAssistantTapMenuItem(
                 label,
                 template,
-                service,
+                action,
                 data,
                 options,
                 mHomeAssistantService
@@ -148,7 +148,47 @@ class HomeAssistantMenuItemFactory {
             );
         }
     }
-
+    //! Numeric menu item.
+    //!
+    //! @param definition Items array from the JSON that defines this sub menu.
+    //! @param template   Template for Home Assistant to render (optional)
+    //
+    function numeric(
+        label     as Lang.String or Lang.Symbol,
+        entity_id as Lang.String?,
+        template  as Lang.String?,
+        action   as Lang.String?,
+        data      as Lang.Dictionary?,
+        options   as {
+            :exit    as Lang.Boolean,
+            :confirm as Lang.Boolean,
+            :pin     as Lang.Boolean,
+            :icon    as WatchUi.Bitmap
+        }
+    ) as WatchUi.MenuItem {
+        if (entity_id != null) {
+            if (data == null) {
+                data = { "entity_id" => entity_id };
+                
+            } else {
+                data.put("entity_id", entity_id);
+            }
+        } 
+        var keys = mMenuItemOptions.keys();
+        for (var i = 0; i < keys.size(); i++) {
+            options.put(keys[i], mMenuItemOptions.get(keys[i]));
+        }
+        options.put(:icon, mTapTypeIcon);    
+        
+        return new HomeAssistantNumericMenuItem(
+            label,
+            template,
+            action,
+            data,
+            options,
+            mHomeAssistantService
+        );
+    }
     //! Group menu item.
     //!
     //! @param definition Items array from the JSON that defines this sub menu.

source/HomeAssistantNumericMenuItem.mc

@@ -0,0 +1,182 @@
+//-----------------------------------------------------------------------------------
+//
+// 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.
+//
+// P A Abbey & J D Abbey & Someone0nEarth, 31 October 2023
+//
+//-----------------------------------------------------------------------------------
+
+using Toybox.Lang;
+using Toybox.WatchUi;
+using Toybox.Graphics;
+
+
+//! Menu button with an icon that opens a sub-menu, i.e. group, and optionally renders
+//! a Home Assistant Template.
+//
+class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
+    private var mHomeAssistantService as HomeAssistantService?;
+    private var mAction               as Lang.String?;
+    private var mConfirm              as Lang.Boolean;
+    private var mExit                 as Lang.Boolean;
+    private var mPin                  as Lang.Boolean;
+    private var mData                 as Lang.Dictionary?;
+    private var mValue                as Lang.String?;  
+    private var mFormatString         as Lang.String="%.1f";
+
+
+    //! Class Constructor
+    //!
+    //! @param label     Menu item label.
+    //! @param template  Menu item template.
+    //! @param action   Menu item action.
+    //! @param data      Data to supply to the action call.
+    //! @param exit      Should the action call complete and then exit?
+    //! @param confirm   Should the action call be confirmed to avoid accidental invocation?
+    //! @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 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
+    //!                  one of these objects is created for all menu items to re-use.
+    //
+    function initialize(
+        label     as Lang.String or Lang.Symbol,
+        template  as Lang.String,
+        action   as Lang.String?,
+        data      as Lang.Dictionary?,
+        options   as {
+            :alignment as WatchUi.MenuItem.Alignment,
+            :icon      as Graphics.BitmapType or WatchUi.Drawable or Lang.Symbol,
+            :exit      as Lang.Boolean,
+            :confirm   as Lang.Boolean,
+            :pin       as Lang.Boolean
+        }?,
+        haService as HomeAssistantService
+    ) {
+        mAction               = action;
+        mData                 = data;
+        mExit                 = options[:exit];
+        mConfirm              = options[:confirm];
+        mPin                  = options[:pin];
+        mLabel                = label;
+        mHomeAssistantService = haService;
+
+        HomeAssistantMenuItem.initialize(
+            label,
+            template,
+            {
+                :alignment => options[:alignment],
+                :icon      => options[:icon]
+            } 
+        );
+    }
+
+
+
+    function callAction() as Void {
+        var hasTouchScreen = System.getDeviceSettings().isTouchScreen;
+        if (mPin && hasTouchScreen) {
+            var pin = Settings.getPin();
+            if (pin != null) {
+                var pinConfirmationView = new HomeAssistantPinConfirmationView();
+                WatchUi.pushView(
+                    pinConfirmationView,
+                    new HomeAssistantPinConfirmationDelegate({
+                        :callback    => method(:onConfirm),
+                        :pin         => pin, 
+                        :state       => false,
+                        :view        => pinConfirmationView,
+                    }),
+                    WatchUi.SLIDE_IMMEDIATE
+                );
+            }
+        } else if (mConfirm) {
+            if ((! System.getDeviceSettings().phoneConnected ||
+                 ! System.getDeviceSettings().connectionAvailable) &&
+                Settings.getWifiLteExecutionEnabled()) {
+                var dialogMsg = WatchUi.loadResource($.Rez.Strings.WifiLtePrompt) as Lang.String;
+                var dialog = new WatchUi.Confirmation(dialogMsg);
+                WatchUi.pushView(
+                    dialog,
+                    new WifiLteExecutionConfirmDelegate({
+                        :type    => "action",
+                        :action => mAction,
+                        :data    => mData,
+                        :exit    => mExit,
+                    }, dialog),
+                    WatchUi.SLIDE_LEFT
+                );
+            } else {
+                var view = new HomeAssistantConfirmation();
+                WatchUi.pushView(
+                    view,
+                    new HomeAssistantConfirmationDelegate({
+                        :callback         => method(:onConfirm),
+                        :confirmationView => view,
+                        :state            => false,
+                    }),
+                    WatchUi.SLIDE_IMMEDIATE
+                );
+            }
+        } else {
+            onConfirm(false);
+        }
+    }
+
+   
+
+    //! Callback function after the menu items selection has been (optionally) confirmed.
+    //!
+    //! @param b Ignored. It is included in order to match the expected function prototype of the callback method.
+    //
+    function onConfirm(b as Lang.Boolean) as Void {
+        mHomeAssistantService.call(mAction, {"entity_id"  => mData.get("entity_id").toString(),mData.get("valueLabel").toString() => mValue}, mExit);
+        
+    }
+
+
+ 
+    //! Update the menu item's sub label to display the template rendered by Home Assistant.
+    //!
+    //! @param data The rendered template (typically a string) to be placed in the sub label. This may
+    //!             unusually be a number if the SDK interprets the JSON returned by Home Assistant as such.
+    //
+    function updateState(data as Lang.String or Lang.Dictionary or Lang.Number or Lang.Float or Null) as Void {
+        if (data == null) {
+            setSubLabel($.Rez.Strings.Empty);
+        } else if(data instanceof Lang.Float) {
+            var f = data as Lang.Float;
+            setSubLabel(f.format(mFormatString));
+        } else if(data instanceof Lang.Number) {
+            var f = data.toFloat() as Lang.Float;
+            setSubLabel(f.format(mFormatString));
+        } else if (data instanceof Lang.String){
+            setSubLabel(data);
+        }  
+        else {
+            // The template must return a Float, or the item cannot be formatted locally without error.
+            setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
+        }
+        WatchUi.requestUpdate();
+    }
+
+    //! Set the mValue value.
+    //!
+    //! Needed to set new value via the Service call
+    //
+    function setValue(value as Lang.String) as Void {
+        mValue = value;
+    }
+
+    function getData() as Lang.Dictionary {
+        return mData;
+    }
+    
+}

source/HomeAssistantService.mc

@@ -87,7 +87,7 @@ class HomeAssistantService {
                 break;
 
             case 200:
-                // System.println("HomeAssistantService onReturnCall(): Service executed.");
+                // System.println("HomeAssistantService onReturnCall(): Action executed.");
                 getApp().forceStatusUpdates();
                 var d     = data as Lang.Array;
                 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 data    Data to be supplied to the service call.
+    //! @param action The Home Assistant action to be run, e.g. from the JSON `action` field.
+    //! @param data    Data to be supplied to the action call.
     //
     function call(
-        service as Lang.String,
+        action as Lang.String,
         data    as Lang.Dictionary?,
         exit    as Lang.Boolean
     ) as Void {
@@ -136,8 +136,8 @@ class HomeAssistantService {
             WatchUi.pushView(
                 dialog,
                 new WifiLteExecutionConfirmDelegate({
-                    :type    => "service",
-                    :service => service,
+                    :type    => "action",
+                    :action => action,
                     :data    => data,
                     :exit    => exit,
                 }, dialog),
@@ -151,9 +151,9 @@ class HomeAssistantService {
             ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoInternet) as Lang.String);
         } else {
             // 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() service=" + service);
+            // System.println("HomeAssistantService call() action=" + action);
 
             var entity_id = "";
             if (data != null) {

source/HomeAssistantSyncDelegate.mc

@@ -50,9 +50,9 @@ class HomeAssistantSyncDelegate extends Communications.SyncDelegate {
         var url;
 
         switch (type) {
-            case "service":
-                var service = WifiLteExecutionConfirmDelegate.mCommandData[:service];
-                url = Settings.getApiUrl() + "/services/" + service.substring(0, service.find(".")) + "/" + service.substring(service.find(".")+1, service.length());
+            case "action":
+                var action = WifiLteExecutionConfirmDelegate.mCommandData[:action];
+                url = Settings.getApiUrl() + "/services/" + action.substring(0, action.find(".")) + "/" + action.substring(action.find(".")+1, action.length());
                 var entity_id = "";
                 if (data != null) {
                     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?) {
         Communications.makeWebRequest(
             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,
                 :headers => Settings.augmentHttpHeaders({

source/HomeAssistantTapMenuItem.mc

@@ -21,7 +21,7 @@ using Toybox.Graphics;
 //
 class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
     private var mHomeAssistantService as HomeAssistantService;
-    private var mService              as Lang.String?;
+    private var mAction               as Lang.String?;
     private var mConfirm              as Lang.Boolean;
     private var mExit                 as Lang.Boolean;
     private var mPin                  as Lang.Boolean;
@@ -31,11 +31,11 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
     //!
     //! @param label     Menu item label.
     //! @param template  Menu item template.
-    //! @param service   Menu item service.
-    //! @param data      Data to supply to the service call.
-    //! @param exit      Should the service call complete and then exit?
-    //! @param confirm   Should the service 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 action   Menu item action.
+    //! @param data      Data to supply to the action call.
+    //! @param exit      Should the action call complete and then exit?
+    //! @param confirm   Should the action call be confirmed to avoid accidental invocation?
+    //! @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 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
@@ -44,7 +44,7 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
     function initialize(
         label     as Lang.String or Lang.Symbol,
         template  as Lang.String,
-        service   as Lang.String?,
+        action   as Lang.String?,
         data      as Lang.Dictionary?,
         options   as {
             :alignment as WatchUi.MenuItem.Alignment,
@@ -65,16 +65,16 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
         );
 
         mHomeAssistantService = haService;
-        mService              = service;
+        mAction               = action;
         mData                 = data;
         mExit                 = options[:exit];
         mConfirm              = options[:confirm];
         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;
         if (mPin && hasTouchScreen) {
             var pin = Settings.getPin();
@@ -100,10 +100,10 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
                 WatchUi.pushView(
                     dialog,
                     new WifiLteExecutionConfirmDelegate({
-                        :type    => "service",
-                        :service => mService,
-                        :data    => mData,
-                        :exit    => mExit,
+                        :type   => "action",
+                        :action => mAction,
+                        :data   => mData,
+                        :exit   => mExit,
                     }, dialog),
                     WatchUi.SLIDE_LEFT
                 );
@@ -129,8 +129,8 @@ class HomeAssistantTapMenuItem extends HomeAssistantMenuItem {
     //! @param b Ignored. It is included in order to match the expected function prototype of the callback method.
     //
     function onConfirm(b as Lang.Boolean) as Void {
-        if (mService != null) {
-            mHomeAssistantService.call(mService, mData, mExit);
+        if (mAction != null) {
+            mHomeAssistantService.call(mAction, mData, mExit);
         }
     }
 

source/HomeAssistantToggleMenuItem.mc

@@ -33,7 +33,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
     //!
     //! @param label    Menu item label.
     //! @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.
     //
     function initialize(
@@ -72,10 +72,12 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
     //
     private function setUiToggle(state as Null or Lang.String) as Void {
         if (state != null) {
-            if (state.equals("on") && !isEnabled()) {
-                setEnabled(true);
-            } else if (state.equals("off") && isEnabled()) {
+            if (state.equals("unavailable" || "unknown")) {
+                return;
+            } else if ((state.equals("off") || state.equals("closed")) && isEnabled()) {
                 setEnabled(false);
+            } else if (!isEnabled()) {
+                setEnabled(true);
             }
         }
     }
@@ -295,7 +297,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
 
     //! Call a Home Assistant service 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;
         if (mPin && hasTouchScreen) {
             // Undo the toggle
@@ -377,7 +379,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
     //! @param id The entity ID, e.g., `"switch.kitchen"`.
     //! @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 {
         var url = Settings.getApiUrl() + "/services/";

source/HomeAssistantView.mc

@@ -47,7 +47,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
                 var content    = items[i].get("content")    as Lang.String?;
                 var entity     = items[i].get("entity")     as Lang.String?;
                 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?;
                 var pin        = false                      as Lang.Boolean?;
                 var data       = null                       as Lang.Dictionary?;
@@ -60,7 +60,10 @@ class HomeAssistantView extends WatchUi.Menu2 {
                     exit = items[i].get("exit");             // Optional
                 }
                 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
                     if (tap_action.get("confirm") != null) {
                         confirm = tap_action.get("confirm"); // Optional
@@ -81,12 +84,12 @@ class HomeAssistantView extends WatchUi.Menu2 {
                                 :pin     => pin
                             }
                         ));
-                    } else if (type.equals("tap") && service != null) {
+                    } else if (type.equals("tap") && action != null) {
                         addItem(HomeAssistantMenuItemFactory.create().tap(
                             name,
                             entity,
                             content,
-                            service,
+                            action,
                             data,
                             {
                                 :exit    => exit,
@@ -103,7 +106,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
                                 name,
                                 entity,
                                 content,
-                                service,
+                                action,
                                 data,
                                 {
                                     :exit    => false,
@@ -117,7 +120,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
                                 name,
                                 entity,
                                 content,
-                                service,
+                                action,
                                 data,
                                 {
                                     :exit    => exit,
@@ -126,13 +129,26 @@ class HomeAssistantView extends WatchUi.Menu2 {
                                 }
                             ));
                         }
+                    } else if (type.equals("numeric") && action != null) {
+                        addItem(HomeAssistantMenuItemFactory.create().numeric(
+                            name,
+                            entity,
+                            content,
+                            action,
+                            data,
+                            {
+                                :exit    => exit,
+                                :confirm => confirm,
+                                :pin     => pin
+                            }
+                        ));   
                     } else if (type.equals("info") && content != null) {
                         // Cannot exit from a non-actionable information only menu item.
                         addItem(HomeAssistantMenuItemFactory.create().tap(
                             name,
                             entity,
                             content,
-                            service,
+                            action,
                             data,
                             {
                                 :exit    => false,
@@ -154,7 +170,8 @@ class HomeAssistantView extends WatchUi.Menu2 {
     //!
     //! @return An array of menu items that need to be updated periodically to reflect the latest Home Assistant state.
     //
-    function getItemsToUpdate() as Lang.Array<HomeAssistantToggleMenuItem or HomeAssistantTapMenuItem or HomeAssistantGroupMenuItem or Null> {
+
+    function getItemsToUpdate() as Lang.Array<HomeAssistantToggleMenuItem or HomeAssistantTapMenuItem or HomeAssistantGroupMenuItem  or HomeAssistantNumericMenuItem or Null> {
         var fullList = [];
         var lmi = mItems as Lang.Array<WatchUi.MenuItem>;
 
@@ -167,6 +184,12 @@ class HomeAssistantView extends WatchUi.Menu2 {
                     fullList.add(item);
                 }
                 fullList.addAll(item.getMenuView().getItemsToUpdate());
+            } else if (item instanceof HomeAssistantNumericMenuItem) {
+                // Numeric items can have an optional template to evaluate
+                var nmi = item as HomeAssistantNumericMenuItem;
+                if (nmi.hasTemplate()) {
+                    fullList.add(item);
+                }
             } else if (item instanceof HomeAssistantToggleMenuItem) {
                 fullList.add(item);
             } else if (item instanceof HomeAssistantTapMenuItem) {
@@ -216,7 +239,7 @@ class HomeAssistantViewDelegate extends WatchUi.Menu2InputDelegate {
             // If its started from glance or as an activity, directly exit the widget/app
             // (on widgets without glance, this exit() won't do anything,
             // so the base view will be shown instead, through the popView below this "if body")
-            System.exit();
+            System.exit();  
         }
 
         WatchUi.popView(WatchUi.SLIDE_RIGHT);
@@ -243,11 +266,21 @@ class HomeAssistantViewDelegate extends WatchUi.Menu2InputDelegate {
         if (item instanceof HomeAssistantToggleMenuItem) {
             var haToggleItem = item as HomeAssistantToggleMenuItem;
             // System.println(haToggleItem.getLabel() + " " + haToggleItem.getId() + " " + haToggleItem.isEnabled());
-            haToggleItem.callService(haToggleItem.isEnabled());
+            haToggleItem.callAction(haToggleItem.isEnabled());
         } else if (item instanceof HomeAssistantTapMenuItem) {
             var haItem = item as HomeAssistantTapMenuItem;
             // System.println(haItem.getLabel() + " " + haItem.getId());
-            haItem.callService();
+            haItem.callAction();
+        } else if (item instanceof HomeAssistantNumericMenuItem) {
+            var haItem = item as HomeAssistantNumericMenuItem;
+            // System.println(haItem.getLabel() + " " + haItem.getId());
+            // create new view to select new value
+           
+            var mPickerFactory = new HomeAssistantNumericFactory(haItem.getData());
+           
+            var mPicker = new HomeAssistantNumericPicker(mPickerFactory,haItem);
+            var mPickerDelegate = new HomeAssistantNumericPickerDelegate(mPicker);
+            WatchUi.pushView(mPicker,mPickerDelegate,WatchUi.SLIDE_LEFT);
         } else if (item instanceof HomeAssistantGroupMenuItem) {
             var haMenuItem = item as HomeAssistantGroupMenuItem;
             // System.println("IconMenu: " + haMenuItem.getLabel() + " " + haMenuItem.getId());

source/WifiLteExecutionConfirmDelegate.mc

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

source/factory/HomeAssistantNumericFactory.mc

@@ -0,0 +1,88 @@
+//-----------------------------------------------------------------------------------
+//
+// 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.
+//
+// P A Abbey & J D Abbey & Someone0nEarth, 31 October 2023
+//
+//------------------------------------------------------------
+
+import Toybox.Graphics;
+import Toybox.Lang;
+import Toybox.WatchUi;
+
+//! Factory that controls which numbers can be picked
+class HomeAssistantNumericFactory extends WatchUi.PickerFactory {
+    // define default values in case not contained in data
+    private var mStart as Lang.Float = 0.0;
+    private var mStop as Lang.Float = 100.0;
+    private var mStep as Lang.Float = 1.0;
+    private var mFormatString as Lang.String = "%.2f";
+
+    //! Class Constructor
+    //!
+    public function initialize(data as Lang.Dictionary) {
+        PickerFactory.initialize();
+
+        // Get values from data
+
+        var val = data.get("start");
+        if (val != null) {
+            mStart = val.toString().toFloat();
+        }
+        val = data.get("stop");
+        if (val != null) {
+            mStop = val.toString().toFloat();
+        } 
+        val = data.get("step");
+        if (val != null) {
+            mStep = val.toString().toFloat();
+        } 
+       val = data.get("formatString");
+        if (val != null) {
+            mFormatString = val.toString();
+        } 
+
+    }
+
+    //! Get the index of a number item
+    //! @param value The number to get the index of
+    //! @return The index of the number
+    public function getIndex(value as Float) as Number {
+        return ((value / mStep) - mStart).toNumber();
+    }
+
+    //! Generate a Drawable instance for an item
+    //! @param index The item index
+    //! @param selected true if the current item is selected, false otherwise
+    //! @return Drawable for the item
+    public function getDrawable(index as Number, selected as Boolean) as Drawable? {
+        var value = getValue(index);
+        var text = "No item";
+        if (value instanceof Lang.Float) {
+            text = value.format(mFormatString);
+        }
+        return new WatchUi.Text({:text=>text, :color=>Graphics.COLOR_WHITE, 
+            :locX=>WatchUi.LAYOUT_HALIGN_CENTER, :locY=>WatchUi.LAYOUT_VALIGN_CENTER});
+    }
+
+    //! Get the value of the item at the given index
+    //! @param index Index of the item to get the value of
+    //! @return Value of the item
+    public function getValue(index as Number) as Object? {
+        return mStart + (index * mStep);
+    }
+
+    //! Get the number of picker items
+    //! @return Number of items
+    public function getSize() as Number {
+        return ((mStop - mStart) / mStep).toNumber() + 1;
+    }
+
+}

source/picker/HomeAssistantNumericPicker.mc

@@ -0,0 +1,102 @@
+//-----------------------------------------------------------------------------------
+//
+// 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.
+//
+// P A Abbey & J D Abbey & Someone0nEarth, 31 October 2023
+//
+//------------------------------------------------------------
+
+using Toybox.Application;
+using Toybox.Lang;
+using Toybox.Graphics;
+using Toybox.System;
+using Toybox.WatchUi;
+
+//! Picker that allows the user to choose a float value
+class HomeAssistantNumericPicker extends WatchUi.Picker {
+
+    private var mFactory as HomeAssistantNumericFactory;
+    private var mItem as HomeAssistantNumericMenuItem;
+
+    //! Constructor
+    public function initialize(factory as HomeAssistantNumericFactory, haItem as HomeAssistantNumericMenuItem) {
+
+        mFactory = factory;
+
+
+        var pickerOptions = {:pattern=>[mFactory]};
+        mItem=haItem;
+
+
+        var data = mItem.getData();
+
+        var start = 0.0;
+        var val = data.get("start");
+        if (val != null) {
+            start = val.toString().toFloat();
+        } 
+        var step = 1.0;
+        val = data.get("step");
+        if (val != null) {
+            step = val.toString().toFloat();
+        } 
+        val = haItem.getSubLabel().toFloat();
+        var index = ((val -start) / step).toNumber();
+
+        pickerOptions[:defaults]  =[index];
+
+        var title = new WatchUi.Text({:text=>haItem.getLabel(), :locX=>WatchUi.LAYOUT_HALIGN_CENTER,
+                :locY=>WatchUi.LAYOUT_VALIGN_BOTTOM});
+        pickerOptions[:title] = title;
+
+
+        Picker.initialize(pickerOptions);
+
+    }
+
+
+    //! Get whether the user is done picking
+    //! @param value Value user selected
+    //! @return true if user is done, false otherwise
+    public function onConfirm(value as Lang.String) as Void {
+        mItem.setValue(value);
+        mItem.callAction();
+    }
+
+    
+}
+
+//! Responds to a numeric  picker selection or cancellation
+class HomeAssistantNumericPickerDelegate extends WatchUi.PickerDelegate {
+    private var mPicker as HomeAssistantNumericPicker;
+
+    //! Constructor
+    public function initialize(picker as HomeAssistantNumericPicker) {
+        PickerDelegate.initialize();
+        mPicker = picker;
+    }
+
+    //! Handle a cancel event from the picker
+    //! @return true if handled, false otherwise
+    public function onCancel() as Lang.Boolean {
+        WatchUi.popView(WatchUi.SLIDE_RIGHT);
+        return true;
+    }
+
+    //! Handle a confirm event from the picker
+    //! @param values The values chosen in the picker
+    //! @return true if handled, false otherwise
+    public function onAccept(values as Lang.Array) as Lang.Boolean {
+        var chosenValue = values[0].toString();
+        mPicker.onConfirm(chosenValue);
+        WatchUi.popView(WatchUi.SLIDE_RIGHT);
+        return true;
+    }
+}

web/main.js

@@ -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:
  *     Record<string, { name: string; description: string; example: string;
  *     selector: unknown; required?: boolean }> }][]>} [id, data]
  */
-async function get_services() {
+async function get_actions() {
   try {
     const res = await fetch(api_url + '/services', {
       method: 'GET',
@@ -122,15 +122,15 @@ async function get_services() {
     document.querySelector('#api_url').classList.remove('invalid');
     document.querySelector('#api_token').classList.remove('invalid');
     const data = await res.json();
-    const services = [];
+    const actions = [];
     for (const d of data) {
-      for (const service in d.services) {
-        services.push([`${d.domain}.${service}`, d.services[service]]);
+      for (const action in d.services) {
+        actions.push([`${d.domain}.${action}`, d.services[action]]);
       }
     }
-    return services;
+    return actions;
   } catch (e) {
-    console.error('Error fetching services:', e);
+    console.error('Error fetching actions:', e);
     document.querySelector('#api_url').classList.add('invalid');
     return [];
   }
@@ -154,11 +154,11 @@ async function get_schema() {
  * @param {Record<string, string>} areas
  * @param {[string, { name: string; description: string; fields:
  *     Record<string, { name: string; description: string; example: string;
- *     selector: unknown; required?: boolean }> }][]} services
+ *     selector: unknown; required?: boolean }> }][]} actions
  * @param {{}} schema
  * @returns {Promise<{}>}
  */
-async function generate_schema(entities, devices, areas, services, schema) {
+async function generate_schema(entities, devices, areas, actions, schema) {
   schema.$defs.entity = {
     enum: Object.keys(entities),
   };
@@ -170,7 +170,7 @@ async function generate_schema(entities, devices, areas, services, schema) {
   };
 
   const oneOf = [];
-  for (const [id, data] of services) {
+  for (const [id, data] of actions) {
     const i_properties = {
       service: {
         title: data.name,
@@ -428,22 +428,22 @@ let entities;
 let devices;
 /** @type {Awaited<ReturnType<typeof get_areas>>} */
 let areas;
-/** @type {Awaited<ReturnType<typeof get_services>>} */
-let services;
+/** @type {Awaited<ReturnType<typeof get_actions>>} */
+let actions;
 let schema;
 async function loadSchema() {
-  [entities, devices, areas, services, schema] = await Promise.all([
+  [entities, devices, areas, actions, schema] = await Promise.all([
     get_entities(),
     get_devices(),
     get_areas(),
-    get_services(),
+    get_actions(),
     get_schema(),
   ]);
   if (window.makeMarkers) {
     window.makeMarkers();
   }
   try {
-    schema = await generate_schema(entities, devices, areas, services, schema);
+    schema = await generate_schema(entities, devices, areas, actions, schema);
   } catch {}
   console.log(schema);
   if (window.m && window.modelUri) {