No more nested objects in the GroupedLightPut payloads (#30)

Author: thibauult

src/common/Alert.yaml

@@ -0,0 +1,6 @@
+type: object
+description: Joined alert control
+properties:
+  action:
+    type: string
+    example: breathe

…light/schemas/ColorTemperatureDelta.yaml src/common/ColorTemperatureDelta.yamlsrc/light/schemas/ColorTemperatureDelta.yaml renamed to src/common/ColorTemperatureDelta.yaml src/light/schemas/ColorTemperatureDelta.yaml renamed to src/common/ColorTemperatureDelta.yaml

@@ -0,0 +1,6 @@
+type: object
+properties:
+  duration:
+    type: integer
+    minimum: 0
+    description: Duration of a light transition or timed effects in ms.

src/light/schemas/DimmingDelta.yaml src/common/DimmingDelta.yamlsrc/light/schemas/DimmingDelta.yaml renamed to src/common/DimmingDelta.yaml

@@ -0,0 +1,30 @@
+type: object
+description: Feature containing basic signaling properties.
+properties:
+  signal:
+    type: string
+    description: |
+      - `no_signal`: No signal is active. Write “no_signal” to stop active signal.
+      - `on_off`: Toggles between max brightness and Off in fixed color.
+      - `on_off_color`: Toggles between off and max brightness with color provided.
+      - `alternating`: Alternates between 2 provided colors.
+    enum:
+      - no_signal
+      - on_off
+      - on_off_color
+      - alternating
+  duration:
+    type: integer
+    minimum: 0
+    maximum: 65534000
+    description: |
+      Duration has a max of 65534000 ms and a stepsize of 1 second.
+      Values inbetween steps will be rounded.
+      Duration is ignored for `no_signal`.
+  color:
+    type: array
+    minItems: 1
+    maxItems: 2
+    description: List of colors to apply to the signal (not supported by all signals)
+    items:
+      $ref: './Color.yaml'

src/common/Dynamics.yaml

@@ -10,83 +10,16 @@ properties:
   dimming:
     $ref: '../../common/Dimming.yaml'
   dimming_delta:
-    type: object
-    required:
-      - action
-    properties:
-      action:
-        type: string
-        enum:
-          - up
-          - down
-          - stop
-      brightness_delta:
-        type: number
-        minimum: 0
-        maximum: 100
-        description: Brightness percentage of full-scale increase delta to current dimlevel. Clip at Max-level or Min-level.
+    $ref: '../../common//DimmingDelta.yaml'
   color_temperature:
-    type: object
-    description: Joined color temperature control
-    properties:
-      mirek:
-        $ref: '../../common/Mirek.yaml'
+    $ref: '../../common/ColorTemperature.yaml'
   color_temperature_delta:
-    type: object
-    required:
-      - action
-    properties:
-      action:
-        type: string
-        enum:
-          - up
-          - down
-          - stop
-      mirek_delta:
-        $ref: '../../common/Mirek.yaml'
-        description: Mirek delta to current mirek. Clip at mirek_minimum and mirek_maximum of mirek_schema.
+    $ref: '../../common/ColorTemperatureDelta.yaml'
   color:
     $ref: '../../common/Color.yaml'
   alert:
-    type: object
-    description: Joined alert control
-    properties:
-      action:
-        type: string
-        example: breathe
+    $ref: '../../common/Alert.yaml'
   signaling:
-    type: object
-    description: Feature containing basic signaling properties.
-    properties:
-      signal:
-        type: string
-        description: |
-          - `no_signal`: No signal is active. Write “no_signal” to stop active signal.
-          - `on_off`: Toggles between max brightness and Off in fixed color.
-          - `on_off_color`: Toggles between off and max brightness with color provided.
-          - `alternating`: Alternates between 2 provided colors.
-        enum:
-          - no_signal
-          - on_off
-          - on_off_color
-          - alternating
-      duration:
-        type: integer
-        minimum: 0
-        maximum: 65534000
-        description: |
-          Duration has a max of 65534000 ms and a stepsize of 1 second.
-          Values inbetween steps will be rounded.
-          Duration is ignored for `no_signal`.
-      color:
-        type: array
-        description: List of colors to apply to the signal (not supported by all signals)
-        items:
-          $ref: '../../common/Color.yaml'
+    $ref: '../../common/Signaling.yaml'
   dynamics:
-    type: object
-    properties:
-      duration:
-        type: integer
-        minimum: 0
-        description: Duration of a light transition or timed effects in ms.
+    $ref: '../../common/Dynamics.yaml'

src/common/Signaling.yaml

@@ -8,22 +8,19 @@ properties:
   dimming:
     $ref: '../../common/Dimming.yaml'
   dimming_delta:
-    $ref: './DimmingDelta.yaml'
+    $ref: '../../common//DimmingDelta.yaml'
   color_temperature:
     $ref: '../../common/ColorTemperature.yaml'
   color_temperature_delta:
-    $ref: './ColorTemperatureDelta.yaml'
+    $ref: '../../common/ColorTemperatureDelta.yaml'
   color:
-    $ref: './Color.yaml'
+    $ref: '../../common/Color.yaml'
   dynamics:
     $ref: './Dynamics.yaml'
   alert:
-    type: object
-    properties:
-      action:
-        type: string
+    $ref: '../../common/Alert.yaml'
   signaling:
-    $ref: './Signaling.yaml'
+    $ref: '../../common/Signaling.yaml'
   mode:
     type: string
     enum:

src/grouped_light/schemas/GroupedLightPut.yaml

@@ -31,8 +31,4 @@ properties:
           effect:
             $ref: '../../common/SupportedEffects.yaml'
       dynamics:
-        type: object
-        properties:
-          duration:
-            type: integer
-            description: Duration of a light transition or timed effects in ms.
+        $ref: '../../common/Dynamics.yaml'