config.schema.json

@@ -295,7 +295,7 @@
           "entity": "light.example",
           "attribute": "brightness",
           "service": "light.turn_on",
-          "service_attribute": "brightness",
+          "data_attribute": "brightness",
           "min": 0,
           "max": 255,
           "step": 1
@@ -305,7 +305,7 @@
           "name": "Example",
           "entity": "input_number.example",
           "service": "input_number.set_value",
-          "service_attribute": "value",
+          "data_attribute": "value",
           "min": 0,
           "max": 100,
           "step": 1
@@ -315,7 +315,7 @@
           "name": "Example",
           "entity": "number.example",
           "service": "number.set_value",
-          "service_attribute": "value",
+          "data_attribute": "value",
           "min": 0,
           "max": 100,
           "step": 1
@@ -326,10 +326,11 @@
           "entity": "fan.example",
           "attribute": "percentage",
           "service": "fan.set_percentage",
-          "service_attribute": "percentage",
+          "data_attribute": "percentage",
           "min": 0,
           "max": 100,
-          "step": 1
+          "step": 1,
+          "display_format": "%.0f%%"
         },
         {
           "type": "numeric",
@@ -337,7 +338,7 @@
           "entity": "valve.example",
           "attribute": "position",
           "service": "valve.set_valve_position",
-          "service_attribute": "position",
+          "data_attribute": "position",
           "min": 0,
           "max": 100,
           "step": 1
@@ -348,7 +349,7 @@
           "entity": "cover.example",
           "attribute": "position",
           "service": "cover.set_position",
-          "service_attribute": "position",
+          "data_attribute": "position",
           "min": 0,
           "max": 100,
           "step": 1
@@ -359,7 +360,7 @@
           "entity": "cover.example",
           "attribute": "tilt_position",
           "service": "cover.set_tilt_position",
-          "service_attribute": "tilt_position",
+          "data_attribute": "tilt_position",
           "min": 0,
           "max": 100,
           "step": 1
@@ -370,7 +371,7 @@
           "entity": "media_player.example",
           "attribute": "volume_level",
           "service": "media_player.volume_set",
-          "service_attribute": "volume_level",
+          "data_attribute": "volume_level",
           "min": 0,
           "max": 1,
           "step": 0.01
@@ -381,10 +382,7 @@
           "entity": "climate.example",
           "attribute": "temperature",
           "service": "climate.set_temperature",
-          "service_attribute": "temperature",
+          "data_attribute": "temperature"
-          "min": 0,
-          "max": 100,
-          "step": 1
         }
       ],
       "allOf": [
@@ -411,36 +409,37 @@
             },
             "min": {
               "type": "number",
-              "title": "Minimum value"
+              "title": "Minimum Value"
             },
             "max": {
               "type": "number",
-              "title": "Maximum value"
+              "title": "Maximum Value"
             },
             "step": {
               "type": "number",
-              "title": "Step size"
+              "title": "Step Size"
             },
-            "decimals": {
+            "display_format": {
-              "type": "number",
+              "type": "string",
-              "title": "Number of decimals to display",
+              "title": "Display Format",
-              "minimum": 0,
+              "description": "A C-Style format string for displaying the value in the UI. https://developer.garmin.com/connect-iq/api-docs/Toybox/Lang/Number.html#format-instance_function",
-              "maximum": 10,
+              "default": "%.1f"
-              "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."
+              "title": "Attribute on the entity",
+              "description": "Attribute on the entity with the current numeric value. To use the state of the entity, do not specify."
             },
             "service": {
               "$ref": "#/$defs/service"
             },
-            "service_attribute": {
+            "data_attribute": {
               "type": "string",
-              "title": "Attribute on the service data for the value to set."
+              "title": "Attribute on the service data",
+              "description": "Attribute on the service data for the value to set."
             }
           },
           "required": [
@@ -451,7 +450,7 @@
             "step",
             "entity",
             "service",
-            "service_attribute"
+            "data_attribute"
           ],
           "additionalProperties": false
         },
@@ -476,7 +475,7 @@
               "service": {
                 "const": "light.turn_on"
               },
-              "service_attribute": {
+              "data_attribute": {
                 "const": "brightness"
               },
               "min": {
@@ -504,7 +503,7 @@
                 "service": {
                   "const": "input_number.set_value"
                 },
-                "service_attribute": {
+                "data_attribute": {
                   "const": "value"
                 }
               },
@@ -530,7 +529,7 @@
                   "service": {
                     "const": "number.set_value"
                   },
-                  "service_attribute": {
+                  "data_attribute": {
                     "const": "value"
                   }
                 },
@@ -556,7 +555,7 @@
                     "service": {
                       "const": "fan.set_percentage"
                     },
-                    "service_attribute": {
+                    "data_attribute": {
                       "const": "percentage"
                     },
                     "min": {
@@ -583,7 +582,7 @@
                       "service": {
                         "const": "valve.set_valve_position"
                       },
-                      "service_attribute": {
+                      "data_attribute": {
                         "const": "position"
                       },
                       "min": {
@@ -610,7 +609,7 @@
                         "service": {
                           "const": "cover.set_position"
                         },
-                        "service_attribute": {
+                        "data_attribute": {
                           "const": "position"
                         },
                         "min": {
@@ -637,7 +636,7 @@
                           "service": {
                             "const": "cover.set_tilt_position"
                           },
-                          "service_attribute": {
+                          "data_attribute": {
                             "const": "tilt_position"
                           },
                           "min": {
@@ -664,7 +663,7 @@
                             "service": {
                               "const": "media_player.volume_set"
                             },
-                            "service_attribute": {
+                            "data_attribute": {
                               "const": "volume_level"
                             },
                             "min": {
@@ -691,7 +690,7 @@
                               "service": {
                                 "const": "climate.set_temperature"
                               },
-                              "service_attribute": {
+                              "data_attribute": {
                                 "const": "temperature"
                               }
                             }
@@ -714,24 +713,92 @@
     "items": {
       "type": "array",
       "items": {
-        "oneOf": [
+        "allOf": [
           {
-            "$ref": "#/$defs/toggle"
+            "properties": {
+              "type": {
+                "enum": [
+                  "toggle",
+                  "template",
+                  "tap",
+                  "info",
+                  "group",
+                  "numeric"
+                ]
+              }
+            }
           },
           {
-            "$ref": "#/$defs/template"
+            "if": {
-          },
+              "properties": {
-          {
+                "type": {
-            "$ref": "#/$defs/tap"
+                  "const": "toggle"
-          },
+                }
-          {
+              }
-            "$ref": "#/$defs/info"
+            },
-          },
+            "then": {
-          {
+              "$ref": "#/$defs/toggle"
-            "$ref": "#/$defs/group"
+            },
-          },
+            "else": {
-          {
+              "if": {
-            "$ref": "#/$defs/numeric"
+                "properties": {
+                  "type": {
+                    "const": "template"
+                  }
+                }
+              },
+              "then": {
+                "$ref": "#/$defs/template"
+              },
+              "else": {
+                "if": {
+                  "properties": {
+                    "type": {
+                      "const": "tap"
+                    }
+                  }
+                },
+                "then": {
+                  "$ref": "#/$defs/tap"
+                },
+                "else": {
+                  "if": {
+                    "properties": {
+                      "type": {
+                        "const": "info"
+                      }
+                    }
+                  },
+                  "then": {
+                    "$ref": "#/$defs/info"
+                  },
+                  "else": {
+                    "if": {
+                      "properties": {
+                        "type": {
+                          "const": "group"
+                        }
+                      }
+                    },
+                    "then": {
+                      "$ref": "#/$defs/group"
+                    },
+                    "else": {
+                      "if": {
+                        "properties": {
+                          "type": {
+                            "const": "numeric"
+                          }
+                        }
+                      },
+                      "then": {
+                        "$ref": "#/$defs/numeric"
+                      }
+                    }
+                  }
+                }
+              }
+            }
           }
         ]
       }