#93 Make derived arrays behave the same as normal array items

BallAerospace · Mar 23, 2015 · 7333a3f · 7333a3f
1 parent 5f91f6c
commit 7333a3f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/cosmos/packets/packet.rb b/lib/cosmos/packets/packet.rb
@@ -357,7 +357,7 @@ def read_item(item, value_type = :CONVERTED, buffer = @buffer)
 
         # Convert from value to state if possible
         if item.states
-          if item.array_size
+          if Array === value
             value = value.map do |val, index|
               if item.states.key(val)
                 item.states.key(val)
@@ -374,7 +374,7 @@ def read_item(item, value_type = :CONVERTED, buffer = @buffer)
             end
           end
         else
-          if item.array_size
+          if Array === value
             value = value.map do |val, index|
               apply_format_string_and_units(item, val, value_type)
             end

diff --git a/spec/packets/packet_spec.rb b/spec/packets/packet_spec.rb
@@ -449,6 +449,12 @@ module Cosmos
         expect(@p.read_item(i, :WITH_UNITS, "\x02\x04")).to eql ["TRUE","FALSE"]
         expect(@p.read("ITEM", :WITH_UNITS, "\x08")).to eql ["0x4 V"]
         expect(@p.read_item(i, :WITH_UNITS, "\x08")).to eql ["0x4 V"]
+        @p.define_item("item2",0, 0, :DERIVED)
+        i = @p.get_item("ITEM2")
+        i.units = "V"
+        i.read_conversion = GenericConversion.new("[1,2,3,4,5]")
+        expect(@p.read("ITEM2", :FORMATTED, "")).to eql ["1", "2", "3", "4", "5"]
+        expect(@p.read("ITEM2", :WITH_UNITS, "")).to eql ["1 V", "2 V", "3 V", "4 V", "5 V"]
       end
     end