Align with rel.645 OpenZWave Driver.h enums

ansible_callback.rb

@@ -108,7 +108,7 @@ def fire_callback(event, target=nil, *args)
             if defined?(@callbacks) and @callbacks.is_a?Hash then
                 [@callbacks[event],  @callbacks[:default]].each { |hsh|
                     if hsh.is_a?Hash then
-                        puts "#{self}.fire_callback, event #{event}: about to fire: #{hsh.inspect}"
+                        #puts "#{self}.fire_callback, event #{event}: about to fire: #{hsh.inspect}"
                         if target.nil? then 
                             # add all targets to the list of procs to call
                             # including the default 
@@ -124,7 +124,7 @@ def fire_callback(event, target=nil, *args)
             # time to fire callbacks 
             cb_procs.flatten.compact.each { |cb_proc|
                 raise "ooops, found a #{cb_proc.class} stored as a callback!" unless cb_proc.is_a?Proc                    
-                puts "firing #{event} callback, args: #{args.inspect}" 
+                # puts "firing #{event} callback, args: #{args.inspect}" 
                 cb_proc.call(self, event.to_s, *args)                    
             }
         end

ansible_value.rb

@@ -33,24 +33,40 @@ module AnsibleValue
 
     include AnsibleCallback
 
+    # every AnsibleValue has a previous and a current value. Note that previous_value
+    # is nil until the second call to set()  
     attr_reader :previous_value, :current_value
+
+    # timestamp of last value update
     attr_reader :last_update
+
+    # generic hash of flags
     attr_reader :flags
 
-    # return true if a value's instance variable (whose symbol is iv_symbol) matches a filter value (as a regexp)
-    # e.g. value.matches?(:name => /elias/, :telephone => /210/)
-    def matches?(hash)
-        raise "#{self.class}: AnsibleValue.match? single argument must be a hash.." unless hash.is_a?Hash
+    # returns true if a value's internal state matches using a hashmap, where each
+    #   - key: is a symbol (the name of an instance variable)
+    #   - value: is a Regexp (instance varriable matches regexp)
+    #           OR an Array (instance var is contained in array)
+    #           OR a Range (instance var in included in the range)
+    #           OR a plain object (instance var == object)
+    # e.g. value.matches?(:name => /son$/, :age => 21..30)
+    #           return true if a value's :name ends in son (Ericsson) and is aged between 21 and 30
+    # it is used to implement a simplistic O(n) AnsibleValue searching facility
+    def matches?(filtermap)
+        raise "#{self.class}: AnsibleValue.match? single argument must be a Hash!" unless filtermap.is_a?Hash
         result = true 
-        hash.each { |iv_symbol, filter|
-            raise "#{self.class}: AnsibleValue.match?(hash)'s keys must be Symbols.." unless iv_symbol.is_a?Symbol
+        filtermap.each { |iv_symbol, filter|
+            raise "#{self.class}: Keys of AnsibleValue.match?(filtermap) must be Symbols!" unless iv_symbol.is_a?Symbol
             if respond_to?(iv_symbol) and (val = instance_eval(iv_symbol.to_s)) then
                 #puts "match.val(#{iv_symbol}) == #{val.inspect}" if $DEBUG
                 result = result & case filter
                 # if the filter is a regular expression, use it to match the instance value
                 when Regexp then filter.match(val.to_s)
                 # if the filter is an array, use set intersection
                 when Array then (filter & val).length > 0
+                # if the filter is a Range, use range inclusion
+                when Range then (filter === val)
+                # otherwise use plain equality
                 else filter == val
                 end
             else

config.rb

@@ -92,3 +92,11 @@ module OpenZWave
     $:.push("/home/ekarak/ozw/Thrift4OZW/gen-rb")
 
 end
+
+# from  http://snippets.dzone.com/posts/show/2785
+module Kernel
+private
+    def this_method_name
+      caller[0] =~ /`([^']*)'/ and $1
+    end
+end

devices/ansible_dimmer.rb

@@ -22,7 +22,7 @@
 http://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License
 =end
 
-require 'ansible_device'
+require 'devices/ansible_switch'
 
 module Ansible
 

devices/ansible_switch.rb

@@ -22,8 +22,6 @@
 http://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License
 =end
 
-require 'ansible_device'
-
 module Ansible
 
     #

test1.rb

@@ -39,6 +39,7 @@
 sleep(3)
 
 S = AnsibleValue[:_nodeId => 2, :_genre => 1]
+AD = AnsibleValue[:_nodeId => 3, :_genre => 1]
 D = AnsibleValue[:_nodeId => 5, :_genre => 1]
 K = AnsibleValue[:_nodeId => 6, :_genre => 1]
 

test2.rb

@@ -31,7 +31,7 @@
 
 require 'config'
 
-KNX = Ansible::KNX::KNX_Transceiver.new(Ansible::KNX_URL)
+KNX = Ansible::KNX::KNX_Transceiver.new(Ansible::KNX::KNX_URL)
 # monitor all KNX activity
 KNX.add_callback(:onKNXtelegram) { | sender, cb, frame |
     if frame.dst_addr < 4048 then

test3.rb

@@ -64,7 +64,7 @@
         :_nodeId => 2,  
         :_genre => OpenZWave::RemoteValueGenre::ValueGenre_Basic][0]
     ZWDimmer = AnsibleValue[ 
-         :_nodeId => 5,  
+         :_nodeId => 3,  
          :_genre => OpenZWave::RemoteValueGenre::ValueGenre_User,
          :_commandClassId => 38, #SWITCH_MULTILEVEL
          :_valueIndex => 0][0]
@@ -85,12 +85,12 @@
 
     # map my ACT HomePro Lamp module to KNX
     DIMMER = Dimmer.new(
-        :master_control => ZWDimmer,
-        :switch         => KNXValue.new("1.001", "1/0/40"), 
-        :switch_status  => KNXValue.new("1.001", "1/0/41"),
-        :dimming        => KNXValue.new('5.001', "1/0/42"), 
-        :dimming_status => KNXValue.new('5.001', "1/0/43"),
-        :scene          => KNXValue.new('18.001', "1/0/44")
+        :master_control => ZWDimmer, # ZWave node 3
+        :switch         => KNXValue.new("1.001", "1/0/30"), 
+        :switch_status  => KNXValue.new("1.001", "1/0/31"),
+        :dimming        => KNXValue.new('5.001', "1/0/32"), 
+        :dimming_status => KNXValue.new('5.001', "1/0/33"),
+        :scene          => KNXValue.new('18.001', "1/0/34")
     )
 
     # map my garden lights to ZWave

transceiver.rb

@@ -57,7 +57,9 @@ def run
         def stop()
             @thread.stop
         end
-
+
+        attr_reader :all_devices
+
     end
 
 end        

zwave/types/valuetype_list.rb

@@ -32,30 +32,41 @@ module ValueType_List
 
             # define type-specific OZW::Manager API calls
             def read_operation
-                raise 'FIXME'
-                return :GetValueListItems
+                init_value_list 
+                return :GetValueListSelection_Int32
             end
 
             def write_operation
-                raise 'FIXME'
+                init_value_list 
                 return :SetValueListSelection
             end
 
             #
             def as_canonical_value()
-                puts 'TODO'
+              init_value_list 
+              selection_index = manager_send(:GetValueListSelection, self)
+              selection = @value_list[selection_index] 
+              raise "Selection index #{selection} out of bounds" unless selection.is_a?String
             end
 
-            #
+            # convert string to value list index
             def to_protocol_value(new_val)
-                result = nil
-                if [TrueClass, FalseClass].include?(new_val.class)
-                    result = new_val ? 1 : 0
-                end
+              init_value_list 
+              raise "ValueType_List: string '#{new_val}' not found in ValueListItems!"
+              return @value_list.index(new_val)
             end 
 
             # return a human-readable representation of a ZWave frame
             def explain
+              init_value_list 
+              @value_list[@current_value] 
+            end
+
+            # initialize value list array
+            def init_value_list 
+              unless @value_list.nil?
+                @value_list = manager_send(:GetValueListItems, self)
+              end
             end
         end