ruby_home 0.2.1 → 0.2.6

data/examples/window.rb

@@ -0,0 +1,48 @@
+require "ruby_home"
+
+accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
+window = RubyHome::ServiceFactory.create(:window,
+  target_position: 0, # required
+  position_state: 1, # required
+  current_position: 0, # required
+  name: "window", # optional
+  obstruction_detected: false) # optional
+
+window.target_position.after_update do |target_position|
+  puts "window target position #{target_position}"
+
+  if target_position < window.current_position
+    window.position_state = 0
+  elsif target_position > window.current_position
+    window.position_state = 1
+  end
+
+  sleep 1
+
+  window.current_position = target_position
+  window.position_state = 2
+end
+
+position_state_values = {
+  0 => "Decreasing",
+  1 => "Increasing",
+  2 => "Stopped"
+}
+window.position_state.after_update do |position_state|
+  state = position_state_values[position_state]
+  puts "window position state #{state}"
+end
+
+window.current_position.after_update do |current_position|
+  puts "window current position #{current_position}"
+end
+
+window.obstruction_detected.after_update do |obstruction_detected|
+  if obstruction_detected
+    puts "window obstruction detected"
+  else
+    puts "window no obstruction detected"
+  end
+end
+
+RubyHome.run

data/examples/window_covering.rb

@@ -0,0 +1,72 @@
+require "ruby_home"
+
+accessory_information = RubyHome::ServiceFactory.create(:accessory_information)
+window_covering = RubyHome::ServiceFactory.create(:window_covering,
+  target_position: 0, # required
+  position_state: 1, # required
+  current_position: 0, # required
+  name: "window_covering", # optional
+  obstruction_detected: false, # optional
+  current_vertical_tilt_angle: 0, # optional
+  target_vertical_tilt_angle: 0, # optional
+  current_horizontal_tilt_angle: 0, # optional
+  target_horizontal_tilt_angle: 0) # optional
+
+window_covering.target_position.after_update do |target_position|
+  puts "window covering target position #{target_position}"
+
+  if target_position < window_covering.current_position
+    window_covering.position_state = 0
+  elsif target_position > window_covering.current_position
+    window_covering.position_state = 1
+  end
+
+  sleep 1
+
+  window_covering.current_position = target_position
+  window_covering.position_state = 2
+end
+
+position_state_values = {
+  0 => "Decreasing",
+  1 => "Increasing",
+  2 => "Stopped"
+}
+window_covering.position_state.after_update do |position_state|
+  state = position_state_values[position_state]
+  puts "window covering position state #{state}"
+end
+
+window_covering.current_position.after_update do |current_position|
+  puts "window covering current position #{current_position}"
+end
+
+window_covering.obstruction_detected.after_update do |obstruction_detected|
+  if obstruction_detected
+    puts "window covering obstruction detected"
+  else
+    puts "window covering no obstruction detected"
+  end
+end
+
+window_covering.current_vertical_tilt_angle.after_update do |current_vertical_tilt_angle|
+  puts "window covering current_vertical_tilt_angle #{current_vertical_tilt_angle}"
+end
+
+window_covering.target_vertical_tilt_angle.after_update do |target_vertical_tilt_angle|
+  puts "window covering target_vertical_tilt_angle #{target_vertical_tilt_angle}"
+  sleep 1
+  window_covering.current_vertical_tilt_angle = target_vertical_tilt_angle
+end
+
+window_covering.current_horizontal_tilt_angle.after_update do |current_horizontal_tilt_angle|
+  puts "window covering current_horizontal_tilt_angle #{current_horizontal_tilt_angle}"
+end
+
+window_covering.target_horizontal_tilt_angle.after_update do |target_horizontal_tilt_angle|
+  puts "window covering target_horizontal_tilt_angle #{target_horizontal_tilt_angle}"
+  sleep 1
+  window_covering.current_horizontal_tilt_angle = target_horizontal_tilt_angle
+end
+
+RubyHome.run

data/lib/ruby_home.rb

@@ -1,26 +1,25 @@
-require 'bindata'
-require 'dnssd'
-require 'facets/hash/slice'
-require 'hkdf'
-require 'oj'
-require 'rack'
-require 'rbnacl'
-require 'ruby_home/srp'
-require 'ruby_home/tlv'
-require 'securerandom'
-require 'sinatra/base'
-require 'socket'
-require 'webrick'
-require 'wisper'
-require 'yaml'
+require "dnssd"
+require "facets/hash/slice"
+require "hkdf"
+require "oj"
+require "rack"
+require "rbnacl"
+require "ruby_home/srp"
+require "ruby_home/tlv"
+require "securerandom"
+require "sinatra/base"
+require "socket"
+require "webrick"
+require "wisper"
+require "yaml"
 
 module RubyHome
   [
-    '/ruby_home/hap/**/*.rb',
-    '/ruby_home/http/**/*.rb',
-    '/ruby_home/factories/**/*.rb',
-    '/ruby_home/dns/**/*.rb',
-    '/ruby_home/*.rb'
+    "/ruby_home/hap/**/*.rb",
+    "/ruby_home/http/**/*.rb",
+    "/ruby_home/factories/**/*.rb",
+    "/ruby_home/dns/**/*.rb",
+    "/ruby_home/*.rb"
   ].each do |pattern|
     Dir[File.dirname(__FILE__) + pattern].each { |file| require file }
   end
@@ -37,8 +36,8 @@ module RubyHome
     end
 
     def run
-      trap 'INT'  do shutdown end
-      trap 'TERM' do shutdown end
+      trap("INT") { shutdown }
+      trap("TERM") { shutdown }
 
       greet
       start

data/lib/ruby_home/accessory.rb

@@ -1,4 +1,4 @@
-require_relative 'accessory_collection'
+require_relative "accessory_collection"
 
 module RubyHome
   class Accessory

data/lib/ruby_home/accessory_collection.rb

@@ -25,12 +25,12 @@ module RubyHome
 
     private
 
-      def services
-        accessories.flat_map(&:services)
-      end
+    def services
+      accessories.flat_map(&:services)
+    end
 
-      def characteristics
-        services.flat_map(&:characteristics)
-      end
+    def characteristics
+      services.flat_map(&:characteristics)
+    end
   end
 end

data/lib/ruby_home/accessory_info.rb

@@ -1,10 +1,10 @@
-require_relative 'persistable'
+require_relative "persistable"
 
 module RubyHome
   class AccessoryInfo
     include Persistable
 
-    self.source = 'accessory_info.yml'
+    self.source = "accessory_info.yml"
 
     def self.instance
       @@_instance ||= persisted || create
@@ -14,7 +14,7 @@ module RubyHome
       @@_instance = nil
     end
 
-    USERNAME = -'Pair-Setup'
+    USERNAME = -"Pair-Setup"
 
     def initialize(device_id: nil, paired_clients: [], password: nil, signature_key: nil)
       @device_id = device_id
@@ -44,8 +44,8 @@ module RubyHome
       @paired_clients ||= []
     end
 
-    def add_paired_client(admin: false, identifier: , public_key: )
-      @paired_clients << { admin: admin, identifier: identifier, public_key: public_key }
+    def add_paired_client(identifier:, public_key:, admin: false)
+      @paired_clients << {admin: admin, identifier: identifier, public_key: public_key}
       save
     end
 
@@ -59,22 +59,22 @@ module RubyHome
     end
 
     def signing_key
-      @signing_key ||= RbNaCl::Signatures::Ed25519::SigningKey.new([signature_key].pack('H*'))
+      @signing_key ||= RbNaCl::Signatures::Ed25519::SigningKey.new([signature_key].pack("H*"))
     end
 
     private
 
-      def signature_key
-        @signature_key ||= RbNaCl::Signatures::Ed25519::SigningKey.generate.to_bytes.unpack1('H*')
-      end
-
-      def persisted_attributes
-        {
-          device_id: device_id,
-          paired_clients: paired_clients,
-          password: password,
-          signature_key: signature_key
-        }
-      end
+    def signature_key
+      @signature_key ||= RbNaCl::Signatures::Ed25519::SigningKey.generate.to_bytes.unpack1("H*")
+    end
+
+    def persisted_attributes
+      {
+        device_id: device_id,
+        paired_clients: paired_clients,
+        password: password,
+        signature_key: signature_key
+      }
+    end
   end
 end

data/lib/ruby_home/characteristic.rb

@@ -1,4 +1,4 @@
-require_relative 'characteristic_collection'
+require_relative "characteristic_collection"
 
 module RubyHome
   class DuplicateCharacteristicError < StandardError; end
@@ -19,19 +19,20 @@ module RubyHome
     end
 
     PROPERTIES = {
-      'cnotify' => 'ev',
-      'read' => 'pr',
-      'uncnotify' => nil,
-      'write' => 'pw',
+      "cnotify" => "ev",
+      "read" => "pr",
+      "uncnotify" => nil,
+      "write" => "pw"
     }.freeze
 
-    def initialize(uuid:, name:, description:, format:, unit:, properties:, service: , value_object: )
+    def initialize(uuid:, name:, description:, format:, unit:, properties:, constraints:, service:, value_object:)
       @uuid = uuid
       @name = name
       @description = description
       @format = format
       @unit = unit
       @properties = properties
+      @constraints = constraints
       @service = service
       @value_object = value_object
     end
@@ -44,8 +45,9 @@ module RubyHome
       :format,
       :unit,
       :properties,
+      :constraints,
       :instance_id,
-      :value_object,
+      :value_object
     )
 
     def instance_id=(new_id)
@@ -66,6 +68,10 @@ module RubyHome
       service.instance_id
     end
 
+    def valid_values
+      constraints.fetch("ValidValues", {}).keys.map(&:to_i)
+    end
+
     def method_missing(method_name, *args, &block)
       value.send(method_name, *args, &block)
     end

data/lib/ruby_home/characteristic_collection.rb

@@ -17,7 +17,7 @@ module RubyHome
       @characteristics << characteristic
     end
 
-    alias all to_a
+    alias_method :all, :to_a
 
     def contains_instance_id?(instance_id)
       map(&:instance_id).include?(instance_id)
@@ -25,24 +25,24 @@ module RubyHome
 
     private
 
-      attr_reader :characteristics
+    attr_reader :characteristics
 
-      def define_service_getter(characteristic)
-        service = characteristic.service
+    def define_service_getter(characteristic)
+      service = characteristic.service
 
-        unless service.respond_to?(characteristic.name)
-          service.define_singleton_method(characteristic.name) { characteristic }
-        end
+      unless service.respond_to?(characteristic.name)
+        service.define_singleton_method(characteristic.name) { characteristic }
       end
+    end
 
-      def define_service_setter(characteristic)
-        service = characteristic.service
+    def define_service_setter(characteristic)
+      service = characteristic.service
 
-        unless service.respond_to?("#{characteristic.name}=")
-          service.define_singleton_method("#{characteristic.name}=") do |args|
-            characteristic.value = args
-          end
+      unless service.respond_to?("#{characteristic.name}=")
+        service.define_singleton_method("#{characteristic.name}=") do |args|
+          characteristic.value = args
         end
       end
+    end
   end
 end

data/lib/ruby_home/config/categories.yml

@@ -0,0 +1,39 @@
+---
+:other: 1
+:bridge: 2
+:fan: 3
+:garage_door_opener: 4
+:lightbulb: 5
+:door_lock: 6
+:outlet: 7
+:switch: 8
+:thermostat: 9
+:sensor: 10
+:alarm_system: 11
+:security_system: 11
+:door: 12
+:window: 13
+:window_covering: 14
+:programmable_switch: 15
+:range_extender: 16
+:camera: 17
+:ip_camera: 17
+:video_doorbell: 18
+:air_purifier: 19
+:air_heater: 20
+:air_conditioner: 21
+:air_humidifier: 22
+:air_dehumidifier: 23
+:apple_tv: 24
+:homepod: 25
+:speaker: 26
+:airport: 27
+:sprinkler: 28
+:faucet: 29
+:shower_head: 30
+:television: 31
+:target_controller: 32
+:router: 33
+:audio_receiver: 34
+:tv_set_top_box: 35
+:tv_streaming_stick: 36

data/lib/ruby_home/config/characteristics.yml

@@ -4,8 +4,6 @@
   :uuid: 000000A6-0000-1000-8000-0026BB765291
   :format: uint32
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -18,13 +16,11 @@
   :uuid: 000000B0-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Inactive
@@ -34,24 +30,21 @@
   :uuid: 00000001-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :air_particulate_density
   :description: Air Particulate Density
   :uuid: 00000064-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 1000
     MinimumValue: 0
@@ -61,11 +54,10 @@
   :uuid: 00000065-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': 2.5 μm
@@ -75,8 +67,6 @@
   :uuid: '00000095-0000-1000-8000-0026BB765291'
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -94,24 +84,21 @@
   :uuid: 00000005-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :battery_level
   :description: Battery Level
   :uuid: '00000068-0000-1000-8000-0026BB765291'
   :format: uint8
   :unit: '"percentage"'
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -121,13 +108,11 @@
   :uuid: '00000008-0000-1000-8000-0026BB765291'
   :format: int32
   :unit: '"percentage"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -137,8 +122,6 @@
   :uuid: '00000092-0000-1000-8000-0026BB765291'
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -152,11 +135,10 @@
   :uuid: '00000093-0000-1000-8000-0026BB765291'
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100000
     MinimumValue: 0
@@ -165,11 +147,10 @@
   :uuid: '00000094-0000-1000-8000-0026BB765291'
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100000
     MinimumValue: 0
@@ -178,8 +159,6 @@
   :uuid: '00000069-0000-1000-8000-0026BB765291'
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -193,11 +172,10 @@
   :uuid: '00000090-0000-1000-8000-0026BB765291'
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -206,11 +184,10 @@
   :uuid: '00000091-0000-1000-8000-0026BB765291'
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -219,11 +196,10 @@
   :uuid: '0000008F-0000-1000-8000-0026BB765291'
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Not Charging
@@ -234,13 +210,11 @@
   :uuid: 000000CE-0000-1000-8000-0026BB765291
   :format: uint32
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 500
     MinimumValue: 140
@@ -250,8 +224,6 @@
   :uuid: 0000006A-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -265,13 +237,11 @@
   :uuid: 0000000D-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"celsius"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 35
     MinimumValue: 10
@@ -281,11 +251,10 @@
   :uuid: 000000A9-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Inactive
@@ -296,11 +265,10 @@
   :uuid: 0000006B-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"lux"'
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100000
     MinimumValue: 0.0001
@@ -309,8 +277,6 @@
   :uuid: 0000000E-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -327,11 +293,10 @@
   :uuid: 000000AF-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Inactive
@@ -342,11 +307,10 @@
   :uuid: 000000B1-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Inactive
@@ -358,8 +322,6 @@
   :uuid: 0000000F-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -374,11 +336,10 @@
   :uuid: 0000006C-0000-1000-8000-0026BB765291
   :format: int32
   :unit: '"arcdegrees"'
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 90
     MinimumValue: -90
@@ -388,11 +349,10 @@
   :uuid: 000000B3-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Inactive
@@ -404,11 +364,10 @@
   :uuid: 0000006D-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: '"percentage"'
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -418,11 +377,10 @@
   :uuid: 00000010-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"percentage"'
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -432,11 +390,10 @@
   :uuid: 000000AA-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Fixed
@@ -447,11 +404,10 @@
   :uuid: 00000011-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"celsius"'
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -461,11 +417,10 @@
   :uuid: 000000C1-0000-1000-8000-0026BB765291
   :format: int32
   :unit: '"arcdegrees"'
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 90
     MinimumValue: -90
@@ -475,11 +430,10 @@
   :uuid: 0000006E-0000-1000-8000-0026BB765291
   :format: int32
   :unit: '"arcdegrees"'
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 90
     MinimumValue: -90
@@ -489,24 +443,21 @@
   :uuid: 0000011D-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :filter_change_indication
   :description: Filter Change Indication
   :uuid: 000000AC-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Filter OK
@@ -516,11 +467,10 @@
   :uuid: 000000AB-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -530,33 +480,27 @@
   :uuid: 00000052-0000-1000-8000-0026BB765291
   :format: string
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
-  :constraints: 
+  :constraints:
 - :name: :hardware_revision
   :description: Hardware Revision
   :uuid: 00000053-0000-1000-8000-0026BB765291
   :format: string
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
-  :constraints: 
+  :constraints:
 - :name: :heating_threshold_temperature
   :description: Heating Threshold Temperature
   :uuid: 00000012-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"celsius"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 25
     MinimumValue: 0
@@ -566,23 +510,19 @@
   :uuid: 0000006F-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedWrite
   :properties:
   - write
-  :constraints: 
+  :constraints:
 - :name: :hue
   :description: Hue
   :uuid: 00000013-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"arcdegrees"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 360
     MinimumValue: 0
@@ -592,47 +532,66 @@
   :uuid: 00000014-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedWrite
   :properties:
   - write
-  :constraints: 
+  :constraints:
 - :name: :image_mirroring
   :description: Image Mirroring
   :uuid: 0000011F-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :image_rotation
   :description: Image Rotation
   :uuid: 0000011E-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"arcdegrees"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 270
     MinimumValue: 0
     StepValue: 90
+- :name: :in_use
+  :description: In Use
+  :uuid: 000000D2-0000-1000-8000-0026BB765291
+  :format: uint8
+  :unit: nil
+  :properties:
+  - read
+  - cnotify
+  - uncnotify
+  :constraints:
+    ValidValues:
+      '0': Not in use
+      '1': In use
+- :name: :is_configured
+  :description: Is Configured
+  :uuid: 000000D6-0000-1000-8000-0026BB765291
+  :format: uint8
+  :unit: nil
+  :properties:
+  - read
+  - write
+  - cnotify
+  - uncnotify
+  :constraints:
+    ValidValues:
+      '0': Not Configured
+      '1': Configured
 - :name: :leak_detected
   :description: Leak Detected
   :uuid: 00000070-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -646,18 +605,14 @@
   :uuid: '00000019-0000-1000-8000-0026BB765291'
   :format: tlv8
   :unit: nil
-  :permissions:
-  - securedWrite
   :properties:
   - write
-  :constraints: 
+  :constraints:
 - :name: :lock_current_state
   :description: Lock Current State
   :uuid: 0000001D-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -673,11 +628,10 @@
   :uuid: 0000001C-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Secured Physically, Interior
@@ -694,26 +648,22 @@
   :uuid: 0000001A-0000-1000-8000-0026BB765291
   :format: uint32
   :unit: '"seconds"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :lock_physical_controls
   :description: Lock Physical Controls
   :uuid: 000000A7-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Control Lock Disabled
@@ -723,9 +673,6 @@
   :uuid: 0000001E-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
@@ -740,87 +687,72 @@
   :uuid: 0000001F-0000-1000-8000-0026BB765291
   :format: tlv8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :manufacturer
   :description: Manufacturer
   :uuid: 00000020-0000-1000-8000-0026BB765291
   :format: string
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
-  :constraints: 
+  :constraints:
 - :name: :model
   :description: Model
   :uuid: 00000021-0000-1000-8000-0026BB765291
   :format: string
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
-  :constraints: 
+  :constraints:
 - :name: :motion_detected
   :description: Motion Detected
   :uuid: 00000022-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
   - uncnotify
-  :constraints: 
+  :constraints:
 - :name: :mute
   :description: Mute
   :uuid: 0000011A-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :name
   :description: Name
   :uuid: 00000023-0000-1000-8000-0026BB765291
   :format: string
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
-  :constraints: 
+  :constraints:
 - :name: :night_vision
   :description: Night Vision
   :uuid: 0000011B-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :nitrogen_dioxide_density
   :description: Nitrogen Dioxide Density
   :uuid: 000000C4-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -834,20 +766,16 @@
   :uuid: 00000024-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
   - uncnotify
-  :constraints: 
+  :constraints:
 - :name: :occupancy_detected
   :description: Occupancy Detected
   :uuid: 00000071-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -861,45 +789,38 @@
   :uuid: 00000025-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :optical_zoom
   :description: Optical Zoom
   :uuid: 0000011C-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :outlet_in_use
   :description: Outlet In Use
   :uuid: 00000026-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :ozone_density
   :description: Ozone Density
   :uuid: 000000C3-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -913,54 +834,41 @@
   :uuid: 0000004C-0000-1000-8000-0026BB765291
   :format: tlv8
   :unit: nil
-  :permissions:
-  - read
-  - write
   :properties:
   - read
   - write
-  :constraints: 
+  :constraints:
 - :name: :pair_verify
   :description: Pair Verify
   :uuid: 0000004E-0000-1000-8000-0026BB765291
   :format: tlv8
   :unit: nil
-  :permissions:
-  - read
-  - write
   :properties:
   - read
   - write
-  :constraints: 
+  :constraints:
 - :name: :pairing_features
   :description: Pairing Features
   :uuid: 0000004F-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - read
   :properties:
   - read
-  :constraints: 
+  :constraints:
 - :name: :pairing_pairings
   :description: Pairing Pairings
   :uuid: 00000050-0000-1000-8000-0026BB765291
   :format: tlv8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
-  :constraints: 
+  :constraints:
 - :name: :pm10_density
   :description: PM10 Density
   :uuid: 000000C7-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -974,8 +882,6 @@
   :uuid: 000000C6-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -989,26 +895,38 @@
   :uuid: 00000072-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Decreasing
       '1': Increasing
       '2': Stopped
+- :name: :program_mode
+  :description: Program Mode
+  :uuid: 000000D1-0000-1000-8000-0026BB765291
+  :format: uint8
+  :unit: nil
+  :properties:
+  - read
+  - cnotify
+  - uncnotify
+  :constraints:
+    ValidValues:
+      '0': No program scheduled
+      '1': Program scheduled
+      '2': Program scheduled (Manual Mode)
 - :name: :programmable_switch_event
   :description: Programmable Switch Event
   :uuid: 00000073-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Single Press
@@ -1018,14 +936,12 @@
   :description: Relative Humidity Dehumidifier Threshold
   :uuid: 000000C9-0000-1000-8000-0026BB765291
   :format: float
-  :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
+  :unit: '"percentage"'
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -1034,25 +950,34 @@
   :description: Relative Humidity Humidifier Threshold
   :uuid: 000000CA-0000-1000-8000-0026BB765291
   :format: float
-  :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
+  :unit: '"percentage"'
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
     StepValue: 1
+- :name: :remaining_duration
+  :description: Remaining Duration
+  :uuid: 000000D4-0000-1000-8000-0026BB765291
+  :format: uint32
+  :unit: nil
+  :properties:
+  - read
+  - cnotify
+  - uncnotify
+  :constraints:
+    MaximumValue: 3600
+    MinimumValue: 0
+    StepValue: 1
 - :name: :reset_filter_indication
   :description: Reset Filter Indication
   :uuid: 000000AD-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedWrite
   :properties:
   - write
   :constraints:
@@ -1064,13 +989,11 @@
   :uuid: '00000028-0000-1000-8000-0026BB765291'
   :format: int32
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Clockwise
@@ -1080,13 +1003,11 @@
   :uuid: '00000029-0000-1000-8000-0026BB765291'
   :format: float
   :unit: '"percentage"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -1096,13 +1017,11 @@
   :uuid: 0000002F-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"percentage"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -1112,11 +1031,10 @@
   :uuid: '0000008E-0000-1000-8000-0026BB765291'
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 1
     MinimumValue: 0
@@ -1126,8 +1044,6 @@
   :uuid: 00000066-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -1144,13 +1060,11 @@
   :uuid: 00000067-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Stay Arm
@@ -1162,20 +1076,15 @@
   :uuid: 00000117-0000-1000-8000-0026BB765291
   :format: tlv8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
-  :constraints: 
+  :constraints:
 - :name: :serial_number
   :description: Serial Number
   :uuid: 00000030-0000-1000-8000-0026BB765291
   :format: string
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   :constraints:
@@ -1185,8 +1094,6 @@
   :uuid: 000000CB-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   :constraints:
@@ -1198,33 +1105,40 @@
   :uuid: 000000CD-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   :constraints:
     ValidValues:
       '0': Dots
       '1': Arabic Numerals
+- :name: :set_duration
+  :description: Set Duration
+  :uuid: 000000D3-0000-1000-8000-0026BB765291
+  :format: uint32
+  :unit: nil
+  :properties:
+  - read
+  - write
+  - cnotify
+  - uncnotify
+  :constraints:
+    MaximumValue: 3600
+    MinimumValue: 0
+    StepValue: 1
 - :name: :setup_endpoints
   :description: Setup Endpoints
   :uuid: '00000118-0000-1000-8000-0026BB765291'
   :format: tlv8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
-  :constraints: 
+  :constraints:
 - :name: :slat_type
   :description: Slat Type
   :uuid: 000000C0-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   :constraints:
@@ -1236,8 +1150,6 @@
   :uuid: 00000076-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -1251,19 +1163,16 @@
   :uuid: 00000075-0000-1000-8000-0026BB765291
   :format: bool
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :status_fault
   :description: Status Fault
   :uuid: 00000077-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -1277,8 +1186,6 @@
   :uuid: '00000078-0000-1000-8000-0026BB765291'
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -1292,8 +1199,6 @@
   :uuid: '00000079-0000-1000-8000-0026BB765291'
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -1307,8 +1212,6 @@
   :uuid: 0000007A-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -1322,19 +1225,16 @@
   :uuid: 00000120-0000-1000-8000-0026BB765291
   :format: tlv8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
-  :constraints: 
+  - uncnotify
+  :constraints:
 - :name: :sulphur_dioxide_density
   :description: Sulphur Dioxide Density
   :uuid: 000000C5-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -1348,43 +1248,35 @@
   :uuid: 00000115-0000-1000-8000-0026BB765291
   :format: tlv8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
-  :constraints: 
+  :constraints:
 - :name: :supported_rtp_configuration
   :description: Supported RTP Configuration
   :uuid: 00000116-0000-1000-8000-0026BB765291
   :format: tlv8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
-  :constraints: 
+  :constraints:
 - :name: :supported_video_stream_configuration
   :description: Supported Video Stream Configuration
   :uuid: 00000114-0000-1000-8000-0026BB765291
   :format: tlv8
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
-  :constraints: 
+  :constraints:
 - :name: :swing_mode
   :description: Swing Mode
   :uuid: 000000B6-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Swing Disabled
@@ -1394,13 +1286,11 @@
   :uuid: 000000A8-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Manual
@@ -1410,13 +1300,11 @@
   :uuid: 000000AE-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Excellent
@@ -1427,13 +1315,11 @@
   :uuid: 00000032-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Open
@@ -1443,13 +1329,11 @@
   :uuid: 000000BF-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Manual
@@ -1459,13 +1343,11 @@
   :uuid: 000000B2-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Auto
@@ -1476,13 +1358,11 @@
   :uuid: 00000033-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': 'Off'
@@ -1494,13 +1374,11 @@
   :uuid: 0000007B-0000-1000-8000-0026BB765291
   :format: int32
   :unit: '"arcdegrees"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 90
     MinimumValue: -90
@@ -1510,13 +1388,11 @@
   :uuid: 000000B4-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Humidifier or Dehumidifier
@@ -1527,13 +1403,11 @@
   :uuid: 0000007C-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: '"percentage"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -1543,13 +1417,11 @@
   :uuid: 00000034-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"percentage"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -1559,13 +1431,11 @@
   :uuid: 000000BE-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Manual
@@ -1575,13 +1445,11 @@
   :uuid: 00000035-0000-1000-8000-0026BB765291
   :format: float
   :unit: '"celsius"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 38
     MinimumValue: 10
@@ -1591,13 +1459,11 @@
   :uuid: 000000C2-0000-1000-8000-0026BB765291
   :format: int32
   :unit: '"arcdegrees"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 90
     MinimumValue: -90
@@ -1607,13 +1473,11 @@
   :uuid: 0000007D-0000-1000-8000-0026BB765291
   :format: int32
   :unit: '"arcdegrees"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 90
     MinimumValue: -90
@@ -1623,27 +1487,39 @@
   :uuid: 00000036-0000-1000-8000-0026BB765291
   :format: uint8
   :unit: nil
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     ValidValues:
       '0': Celsius
       '1': Fahrenheit
+- :name: :valve_type
+  :description: Valve Type
+  :uuid: 000000D5-0000-1000-8000-0026BB765291
+  :format: uint8
+  :unit: nil
+  :properties:
+  - read
+  - cnotify
+  - uncnotify
+  :constraints:
+    ValidValues:
+      '0': Generic valve
+      '1': Irrigation
+      '2': Shower head
+      '3': Water faucet
 - :name: :version
   :description: Version
   :uuid: 00000037-0000-1000-8000-0026BB765291
   :format: string
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumLength: 64
 - :name: :voc_density
@@ -1651,8 +1527,6 @@
   :uuid: 000000C8-0000-1000-8000-0026BB765291
   :format: float
   :unit: nil
-  :permissions:
-  - securedRead
   :properties:
   - read
   - cnotify
@@ -1666,13 +1540,11 @@
   :uuid: '00000119-0000-1000-8000-0026BB765291'
   :format: uint8
   :unit: '"percentage"'
-  :permissions:
-  - securedRead
-  - securedWrite
   :properties:
   - read
   - write
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0
@@ -1681,12 +1553,11 @@
   :description: Water Level
   :uuid: 000000B5-0000-1000-8000-0026BB765291
   :format: float
-  :unit: nil
-  :permissions:
-  - securedRead
+  :unit: '"percentage"'
   :properties:
   - read
   - cnotify
+  - uncnotify
   :constraints:
     MaximumValue: 100
     MinimumValue: 0