lignite 0.5.0 → 0.6.0

data/lib/lignite/parameter_declarer.rb

@@ -15,94 +15,94 @@ module Lignite
     # Declare an 8-bit input parameter
     # @param name [Symbol] parameter name
     def in8(name)
-      parameters.param(name, 1, PAR8, IN)
+      parameters.param(name, 1, 1, PAR8, IN)
     end
 
     # Declare an 8-bit output parameter
     # @param name [Symbol] parameter name
     def out8(name)
-      parameters.param(name, 1, PAR8, OUT)
+      parameters.param(name, 1, 1, PAR8, OUT)
     end
 
     # Declare an 8-bit input+output parameter
     # @param name [Symbol] parameter name
     def io8(name)
-      parameters.param(name, 1, PAR8, IN | OUT)
+      parameters.param(name, 1, 1, PAR8, IN | OUT)
     end
 
     # Declare a 16-bit input parameter
     # @param name [Symbol] parameter name
     def in16(name)
-      parameters.param(name, 2, PAR16, IN)
+      parameters.param(name, 2, 1, PAR16, IN)
     end
 
     # Declare a 16-bit output parameter
     # @param name [Symbol] parameter name
     def out16(name)
-      parameters.param(name, 2, PAR16, OUT)
+      parameters.param(name, 2, 1, PAR16, OUT)
     end
 
     # Declare a 16-bit input+output parameter
     # @param name [Symbol] parameter name
     def io16(name)
-      parameters.param(name, 2, PAR16, IN | OUT)
+      parameters.param(name, 2, 1, PAR16, IN | OUT)
     end
 
     # Declare a 32-bit input parameter
     # @param name [Symbol] parameter name
     def in32(name)
-      parameters.param(name, 4, PAR32, IN)
+      parameters.param(name, 4, 1, PAR32, IN)
     end
 
     # Declare a 32-bit output parameter
     # @param name [Symbol] parameter name
     def out32(name)
-      parameters.param(name, 4, PAR32, OUT)
+      parameters.param(name, 4, 1, PAR32, OUT)
     end
 
     # Declare a 32-bit input+output parameter
     # @param name [Symbol] parameter name
     def io32(name)
-      parameters.param(name, 4, PAR32, IN | OUT)
+      parameters.param(name, 4, 1, PAR32, IN | OUT)
     end
 
     # Declare a floating-point input parameter
     # @param name [Symbol] parameter name
     def inf(name)
-      parameters.param(name, 4, PARF, IN)
+      parameters.param(name, 4, 1, PARF, IN)
     end
 
     # Declare a floating-point output parameter
     # @param name [Symbol] parameter name
     def outf(name)
-      parameters.param(name, 4, PARF, OUT)
+      parameters.param(name, 4, 1, PARF, OUT)
     end
 
     # Declare a floating-point input+output parameter
     # @param name [Symbol] parameter name
     def iof(name)
-      parameters.param(name, 4, PARF, IN | OUT)
+      parameters.param(name, 4, 1, PARF, IN | OUT)
     end
 
     # Declare a string input parameter
     # @param name [Symbol] parameter name
     # @param size [Integer] maximum string size, including the terminating 0
     def ins(name, size)
-      parameters.param(name, size, PARS, IN)
+      parameters.param(name, 1, size, PARS, IN)
     end
 
     # Declare a string output parameter
     # @param name [Symbol] parameter name
     # @param size [Integer] maximum string size, including the terminating 0
     def outs(name, size)
-      parameters.param(name, size, PARS, OUT)
+      parameters.param(name, 1, size, PARS, OUT)
     end
 
     # Declare a string input+output parameter
     # @param name [Symbol] parameter name
     # @param size [Integer] maximum string size, including the terminating 0
     def ios(name, size)
-      parameters.param(name, size, PARS, IN | OUT)
+      parameters.param(name, 1, size, PARS, IN | OUT)
     end
   end
 end

data/lib/lignite/variables.rb

@@ -1,8 +1,5 @@
 module Lignite
   # Allocate local or global variables
-  # FIXME: the user can make bad alignment, resulting in VMError at runtime
-  # bad:  data8 :speed; data32 :tacho; output_read(...)
-  # good  data32 :tacho; data8 :speed; output_read(...)
   class Variables
     include Bytes
 
@@ -15,19 +12,27 @@ module Lignite
       @param_decl_bytes = ""
     end
 
-    # declare
-    def add(id, size, unpacker)
+    # Declare a variable/parameter *id*
+    # @param id [Symbol]
+    # @param size [Integer] byte size of one element of the data
+    # @param count [Integer] 1 for scalars, more for arrays
+    # @param unpacker [String] for String#unpack for direct commands
+    def add(id, size, count, unpacker)
       raise "Duplicate variable #{id}" if @vars.key?(id)
-      @vars[id] = { offset: @offset, size: size }
-      @offset += size
+      @offset = align(@offset, size)
+      @vars[id] = { offset: @offset, size: size * count }
+      @offset += size * count
       @unpacker += unpacker
     end
 
     # declare a subroutine parameter
-    def param(name, size, size_code, direction)
+    def param(name, size, count, size_code, direction)
       raise "Duplicate parameter #{name}" if @vars.key?(name)
+      unless @offset == align(@offset, size)
+        raise "Misaligned parameter #{name} of size #{size} at #{@offset}"
+      end
       nonsense_unpacker = "," # FIXME: better
-      add(name, size, nonsense_unpacker)
+      add(name, size, count, nonsense_unpacker)
 
       @param_count += 1
       @param_decl_bytes += u8(size_code | direction)
@@ -57,32 +62,39 @@ module Lignite
       values = buf.unpack(@unpacker)
       values.size == 1 ? values.first : values
     end
+
+    private
+
+    # Round *n* up to a next multiple of *size*
+    def align(n, size)
+      (n + size - 1).div(size) * size
+    end
   end
 
   # `variables` are {Variables}
   module VariableDeclarer
     def data8(id)
-      variables.add(id, 1, "C")
+      variables.add(id, 1, 1, "C")
     end
 
     def data16(id)
-      variables.add(id, 2, "S<")
+      variables.add(id, 2, 1, "S<")
     end
 
     def data32(id)
-      variables.add(id, 4, "L<")
+      variables.add(id, 4, 1, "L<")
     end
 
     def dataf(id)
-      variables.add(id, 4, "e")
+      variables.add(id, 4, 1, "e")
     end
 
     def datas(id, size)
-      variables.add(id, size, "a#{size}")
+      variables.add(id, 1, size, "a#{size}")
     end
 
     def array8(id, count)
-      variables.add(id, count * 1, "C#{count}")
+      variables.add(id, 1, count, "C#{count}")
     end
   end
 end

data/lignite.gemspec

@@ -33,6 +33,7 @@ TXT
     "data/lignite-btaddr",
     "data/sysops.yml",
     "examples/bobbee.rb",
+    "examples/gyro-sensor.rb",
     "examples/hello.rb",
     "examples/hello.yml",
     "examples/light-sensor.rb",
@@ -47,6 +48,7 @@ TXT
     "lib/lignite/assembler.rb",
     "lib/lignite/body_compiler.rb",
     "lib/lignite/bytes.rb",
+    "lib/lignite/condition.rb",
     "lib/lignite/connection.rb",
     "lib/lignite/connection/bluetooth.rb",
     "lib/lignite/connection/replay.rb",
@@ -59,6 +61,7 @@ TXT
     "lib/lignite/enums.rb.erb",
     "lib/lignite/ev3_ops.rb",
     "lib/lignite/ev3_tool.rb",
+    "lib/lignite/jump_offset.rb",
     "lib/lignite/logger.rb",
     "lib/lignite/message.rb",
     "lib/lignite/motors.rb",

data/spec/data/HelloWorld.rb

@@ -1,6 +1,6 @@
 vmthread :MAIN do
-  ui_draw_fillwindow(0x00, 0, 0)
-  ui_draw_text(1, 10, 50, "Hello, world!")
+  ui_draw_fillwindow(BG_COLOR, 0, 0)
+  ui_draw_text(FG_COLOR, 10, 50, "Hello, world!")
   ui_draw_update
   ui_button_wait_for_press
 end

data/spec/data/Performance.rb

@@ -437,7 +437,7 @@ sub :Test_JR do
 
   loop_while lambda {
     # TEST ***********************************************
-    jr(Complex(0, 2))
+    jr(0)
     # ****************************************************
     add32(1, :Counter, :Counter)
   }, Lt32.new(:Counter, TIMES)

data/spec/data/ev3tool_download.yml

@@ -1,3 +1,5 @@
 ---
-- SEND: 0100019400102e2e2f70726a732f6576657273746f726d2f6576657273746f726d2e72626600
-- RECV: 0100039400a3040000004c45474fa304000065000e0004000000b8000000000000001a0000001a02000000000000000000002202000000000000000000003702000000000000000000004c02000000000000000000005b02000000000000000000006a02000000000000000000008302000000000000000000009c0200000000000000000000e8020000000000000a0000004c0300000000000004000000b60300000000000004000000fa03000000000000040000006e0400000000000000000000821b08841200841300820000820000841c01820000820000842e2e2f617070732f427269636b2050726f6772616d2f4f6e427269636b496d616765313200841101840500823500821900844556335253544f524d0084003000603000617c0462991d00021d000140991d0003812100014005820b0030014a30014b30014c30016364600282380068600e8232008e820000820100487d0948014e3160483000606d488202008215006948820a00820d007d02846f6b004e5194026251960548991d0000003f01443c444d414d821600424a8214009402628472696768740030014a4082030030004a991d00021d0001443c444d644d0a821500424b821300940262846c6566740030014b4082030030004b991d000381210001443c444d684d1b823500424c823300940262842e2e2f617070732f427269636b2050726f6772616d2f4f6e427269636b536f756e6430340030014c4082030030004c0b42638220ff0a300061a30007000a300061b100068164820000830000000000a600060a300061b1000681ce820000830000000000a600060a300061a5000222a500041ea600060a300061a500021ea5000422a600060aae0001816483000000008338040000830000000000a600010aae0001819c83000000008338040000830000000000a600010a300061b00006814b820000830000000000ae0001816483000000008338040000830000000000a60007aa0001ae0001819c83000000008338040000830000000000a60001aa0001a30006000a300161318132484161825700b10006816448830000000000a60006416182430036828a024085404486444161823400194882ffff484161822900b10006816448830000000000a60006416182150036821405408540448644194882ffff48426182d2ff0a300061b10006816482c80083fa00000001a60006aa0006b1000681648238ff83fa00000001a60006aa0006b10006816482c80083fa00000001a60006aa0006b1000681648238ff83fa00000001a60006aa0006a30006008583c80000004086409402628468657900960a30006194026284736e65657a6500b10006819c820000832c01000001a60006aa0006b100068164820000832c01000001a60040a30006000a300061940262846c65667400968583c8000000408640b0000681328238ff835e01000001a60006aa00068583c800000040864094026284726967687400968583c8000000408640b00006813282c80083c201000001a60006aa0006b0000681328238ff839600000001a60006aa0006a30006000a300061a3000f00940262842e2e2f617070732f427269636b2050726f6772616d2f4f6e427269636b536f756e64313100963000630a0000000000040000006e0400
+- SEND: 01000194e8032e2e2f70726a732f6576657273746f726d2f6576657273746f726d2e72626600
+- RECV: 0100039400a3040000024c45474fa304000065000e0004000000b8000000000000001a0000001a02000000000000000000002202000000000000000000003702000000000000000000004c02000000000000000000005b02000000000000000000006a02000000000000000000008302000000000000000000009c0200000000000000000000e8020000000000000a0000004c0300000000000004000000b60300000000000004000000fa03000000000000040000006e0400000000000000000000821b08841200841300820000820000841c01820000820000842e2e2f617070732f427269636b2050726f6772616d2f4f6e427269636b496d616765313200841101840500823500821900844556335253544f524d0084003000603000617c0462991d00021d000140991d0003812100014005820b0030014a30014b30014c30016364600282380068600e8232008e820000820100487d0948014e3160483000606d488202008215006948820a00820d007d02846f6b004e5194026251960548991d0000003f01443c444d414d821600424a8214009402628472696768740030014a4082030030004a991d00021d0001443c444d644d0a821500424b821300940262846c6566740030014b4082030030004b991d000381210001443c444d684d1b823500424c823300940262842e2e2f617070732f427269636b2050726f6772616d2f4f6e427269636b536f756e6430340030014c4082030030004c0b42638220ff0a300061a30007000a300061b100068164820000830000000000a600060a300061b1000681ce820000830000000000a600060a300061a5000222a500041ea600060a300061a500021ea5000422a600060aae0001816483000000008338040000830000000000a600010aae0001819c83000000008338040000830000000000a600010a300061b00006814b820000830000000000ae0001816483000000008338040000830000000000a60007aa0001ae0001819c83000000008338040000830000000000a60001aa0001a30006000a300161318132484161825700b10006816448830000000000a60006416182430036828a024085404486444161823400194882ffff484161822900b10006816448830000000000a60006416182150036821405408540448644194882ffff48426182d2ff0a300061b10006816482c80083fa00000001a60006aa0006b1000681648238ff83fa00000001a60006aa0006b10006816482c80083fa00000001a60006aa0006b1000681648238ff83fa00000001a60006aa0006a30006008583c80000004086409402628468657900960a30006194026284736e65657a6500b10006819c820000832c01000001a60006aa0006b100068164820000832c01000001a600
+- SEND: 0200019502e803
+- RECV: 02000395080206aa0006858332000000408640a30006000a300061940262846c65667400968583c8000000408640b0000681328238ff835e01000001a60006aa00068583c800000040864094026284726967687400968583c8000000408640b00006813282c80083c201000001a60006aa0006b0000681328238ff839600000001a60006aa0006a30006000a300061a3000f00940262842e2e2f617070732f427269636b2050726f6772616d2f4f6e427269636b536f756e64313100963000630a

data/spec/ev3_tool_spec.rb

@@ -52,10 +52,13 @@ describe Lignite::Ev3Tool do
 
     it "communicates the right thing" do
       expected_file_contents = File.read("#{datadir}/everstorm.rbf", mode: "rb")
+      e1 = expected_file_contents[0...1000]
+      e2 = expected_file_contents[1000..-1]
       f = double("File")
       expect(File).to receive(:open).with("everstorm.rbf", "w").and_yield(f)
       allow(File).to receive(:open).and_call_original
-      expect(f).to receive(:write).with(expected_file_contents)
+      expect(f).to receive(:write).with(e1)
+      expect(f).to receive(:write).with(e2)
 
       expect { subject.download("../prjs/everstorm/everstorm.rbf") }.not_to raise_error
     end

data/tools/ops_from_yml

@@ -93,6 +93,8 @@ def param_handler(par)
   when "PAR8", "PAR16", "PAR32", "PARF", "PARV"
     :param_simple
   when "PARNO"
+    :param_n_multiple
+  when "PARVALUES"
     :param_multiple
   else
     raise TODO, "Unhandled param type #{par_type}"
@@ -116,10 +118,16 @@ end
 def rendered_op4(oname, odesc, ovalue, cvalue, params) # rubocop:disable Metrics/MethodLength
   s = ""
 
+  # (..., PARVALUES, PAR8) means that there is a variable number of parameters
+  # of type PAR8. But since we do not check types yet, let's treat that
+  # like PARNO, which is a variable number of parameters of unspecified type.
+  params = params[0..-2] if params.fetch(-2, {})["type"] == "PARVALUES"
+
   param_handlers = params.map { |par| param_handler(par) }
 
   param_names = params.map do |par|
-    (par["type"] == "PARNO" ? "*" : "") + par["name"].downcase
+    star = ["PARNO", "PARVALUES"].include?(par["type"]) ? "*" : ""
+    star + par["name"].downcase
   end
   param_decl = param_names.join ", "
   param_decl = "(#{param_decl})" unless param_decl.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lignite
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Martin Vidner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -154,6 +154,7 @@ files:
 - data/lignite-btaddr
 - data/sysops.yml
 - examples/bobbee.rb
+- examples/gyro-sensor.rb
 - examples/hello.rb
 - examples/hello.yml
 - examples/light-sensor.rb
@@ -168,6 +169,7 @@ files:
 - lib/lignite/assembler.rb
 - lib/lignite/body_compiler.rb
 - lib/lignite/bytes.rb
+- lib/lignite/condition.rb
 - lib/lignite/connection.rb
 - lib/lignite/connection/bluetooth.rb
 - lib/lignite/connection/replay.rb
@@ -180,6 +182,7 @@ files:
 - lib/lignite/enums.rb.erb
 - lib/lignite/ev3_ops.rb
 - lib/lignite/ev3_tool.rb
+- lib/lignite/jump_offset.rb
 - lib/lignite/logger.rb
 - lib/lignite/message.rb
 - lib/lignite/motors.rb