lignite 0.4.0 → 0.5.0

data/spec/data/VernierReadout.rb

@@ -13,7 +13,7 @@ vmthread :MAIN do
     ui_draw(TEXT, FG_COLOR, 0, 50, "Raw 1")
     ui_draw(SELECT_FONT, NORMAL_FONT)
 
-    input_device(READY_RAW, 0, PORT, 1, 0, 1, :Data1)
+    input_device(READY_RAW, 0, PORT, 1, 0, :Data1)
 
     and32(:Data1, 0xFFFF, :Data1)
     strings(NUMBER_FORMATTED, :Data1, "%-5d", 8, :String)

data/spec/data/p11.c

@@ -0,0 +1,36 @@
+/*! \page subparexample1 Calling Subroutine with Parameters
+ *
+ *  This program shows how to call byte code subroutine with parameters
+ *
+ *  <hr size="1"/>
+ *  \verbatim */
+
+UBYTE     prg[] =                       //  p11
+{                                       //
+  PROGRAMHeader(0,2,2),                 //      VersionInfo,NumberOfObjects,GlobalBytes
+  VMTHREADHeader(0,2),                  //      OffsetToInstructions,LocalBytes
+  SUBCALLHeader(0,2),                   //      OffsetToInstructions,LocalBytes
+                                        //
+                                        //      VMTHREAD1
+                                        //      {
+  opMOVE8_8,LC0(1),LV0(0),              //        LV0  =  1
+  opCALL,LC0(2),LC0(2),LV0(0),LV0(1),   //        SUBCALL(2,2,LV0,LV1)
+  opUI_WRITE,LC0(VALUE8),LV0(1),        //        UI_WRITE(VALUE8,LV1)
+  opUI_WRITE,LC0(PUT_STRING),LCS,'\r',  //        UI_WRITE(PUT_STRING,"\r\n")
+    '\n',0,
+  opUI_FLUSH,                           //        UI_FLUSH
+  opOBJECT_END,                         //      }
+                                        //
+  2,IN_8,OUT_8,                         //      SUBCALL2(InDATA8,OutDATA8)
+                                        //      {
+  opUI_WRITE,LC0(VALUE8),LV0(0),        //        UI_WRITE(VALUE8,LV0)
+  opUI_WRITE,LC0(PUT_STRING),LCS,'\r',  //        UI_WRITE(PUT_STRING,"\r\n")
+    '\n',0,
+  opUI_FLUSH,                           //        UI_FLUSH
+  opMOVE8_8,LV0(0),LV0(1),              //        LV1  =  2
+  opRETURN,                             //      }
+  opOBJECT_END,                         //
+};
+
+/* \endverbatim \ref subpar "Parameter Encoding"
+*/

data/spec/data/p11.rb

@@ -0,0 +1,20 @@
+vmthread :main do
+  data8 :var1
+  data8 :var2
+
+  move8_8(1, :var1)
+  call(:foo, :var1, :var2)
+  ui_write_value8(:var2)
+  ui_write_put_string("\r\n")
+  ui_flush
+end
+
+sub :foo do
+  in8 :par1
+  out8 :par2
+
+  ui_write_value8(:par1)
+  ui_write_put_string("\r\n")
+  ui_flush
+  move8_8(:par1, :par2)
+end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-
 RSpec.configure do |config|
   config.mock_with :rspec do |mocks|
     # If you misremember a method name both in code and in tests,
@@ -30,3 +29,27 @@ end
 def datadir
   File.expand_path("../data", __FILE__)
 end
+
+# for better displays in rspec failure diffs
+def rbf_dump(bytestring, offsets: false)
+  lines = bytestring.bytes.map do |n|
+    format("0x%02x %3d %s", n, n, n.chr.inspect)
+  end
+  if offsets
+    lines.each_with_index do |l, i|
+      l.replace("#{i}: #{l}")
+    end
+  end
+  lines.join "\n"
+end
+
+def expect_rbf_files_same(actual_rbf, expected_rbf)
+  actual_bytes = File.read(actual_rbf, encoding: Encoding::BINARY)
+  expected_bytes = File.read(expected_rbf, encoding: Encoding::BINARY)
+
+  show_offsets = actual_bytes.bytesize == expected_bytes.bytesize
+  actual_dump = rbf_dump(actual_bytes, offsets: show_offsets)
+  expected_dump = rbf_dump(expected_bytes, offsets: show_offsets)
+
+  expect(actual_dump).to eq(expected_dump)
+end

data/tools/ops_from_yml

@@ -90,7 +90,7 @@ end
 def param_handler(par)
   par_type = par["type"]
   case par_type
-  when "PAR8", "PAR16", "PAR32", "PARF"
+  when "PAR8", "PAR16", "PAR32", "PARF", "PARV"
     :param_simple
   when "PARNO"
     :param_multiple

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lignite
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Martin Vidner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-03 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -184,6 +184,8 @@ files:
 - lib/lignite/message.rb
 - lib/lignite/motors.rb
 - lib/lignite/op_compiler.rb
+- lib/lignite/parameter_declarer.rb
+- lib/lignite/rbf_declarer.rb
 - lib/lignite/rbf_object.rb
 - lib/lignite/system_commands.rb
 - lib/lignite/variables.rb
@@ -203,6 +205,9 @@ files:
 - spec/data/NoDebug.lms
 - spec/data/NoDebug.rb
 - spec/data/NoDebug.rbf
+- spec/data/Performance.lms
+- spec/data/Performance.rb
+- spec/data/Performance.rbf
 - spec/data/VernierReadout.lms
 - spec/data/VernierReadout.rb
 - spec/data/VernierReadout.rbf
@@ -212,6 +217,9 @@ files:
 - spec/data/ev3tool_stop.yml
 - spec/data/ev3tool_upload.yml
 - spec/data/everstorm.rbf
+- spec/data/p11.c
+- spec/data/p11.rb
+- spec/data/p11.rbf
 - spec/direct_commands_spec.rb
 - spec/ev3_tool_spec.rb
 - spec/spec_helper.rb