svi 0.3.16 → 0.3.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzIxMTk5OWYzZjRkZDlmMDVjMTRkNDljMTk5YWViNWRkNjgyNGUxNw==
+    YWJkMmRmZjkyYzAxZWNmYTcyZmE0OTYxZWZhNmVhZTBmZDA1NGQwMQ==
   data.tar.gz: !binary |-
-    ZDY5ODBiYTNjY2ZhYmU2MTYzMTEwZjgzYzA2ZWE1YjEzMjdkNmNlYg==
+    ZWFlMjQ4ZjQ1ODZlYjQ1Nzc0MmNjMmMzMWI2ZmFlZWUwNmVmMTc4Zg==
 SHA512:
   metadata.gz: !binary |-
-    OGM3NDc1MjhhZTNmZDUxYTM5YWZkODA1YTcyNzExMDcyNThjZTg1MmQwMTJm
-    YTFiZmFlNTNmZGM4MGExZWUzOThlYTI3ZmM4ODg2MWY0NTYwNGI0NDJlZDhm
-    ODY5YWFhOGU4NDg0NzBmYzhiZjA5MzM1NDI3OTU4NWZhM2ZmZjg=
+    ZWNhMmIwYzUxYzlmN2NhYmExNTU2ZTU5YjRkZjBlZDI1NGU3ZjI3NjJiYTY2
+    NDllY2UyYWVjYTc2ZmFkMjEzYjY4ZGMzMjI5ZTI1ODU2M2ZjMDZkZmU0Y2Fi
+    ZjUxNzFiYTdkODUxNDVmYmVkZTEyNjA0MTI0MjFlNDNlZTUyNGE=
   data.tar.gz: !binary |-
-    NDE5NjQ5MDQ3MWVlNmM2MzA3NjdmMzY3ODM5ZmQ1NDBkMTM5YTQ4NDIyZjMy
-    YjY3NDYyY2UxYjAyYTVhYWI0ZWIzNWFlNTNhYTJjYzRiOGMwYjU4ZmUyY2U4
-    ZTdkNTNmOTNiZThlYTI3NTQwMDliNWJmMmI1YmYxODA5MThjOTM=
+    NjkyNTc1MjNhZWZhMWZhYzQxMDk1YjRhN2M4YzE3NTUyZWVkMWVjZWUyN2Ey
+    M2RiMGVlMTc4MWQ4OWQyYTQ4N2UxMTE2NjQ2MGVlNjVhNzU3OTBlYmU4YzZj
+    NzAwZWRkZDZlZTY4YjhkMWI0MzczN2Y1NTI1NjY0NTU2MjJmMWQ=

data/bin/sbi

@@ -0,0 +1,86 @@
+#!/usr/bin/ruby19
+
+require 'gli'
+require 'colorize'
+require 'svi/version'
+require 'svi/vidpid'
+require 'svi/sbiif'
+require 'svi/svi'
+
+include GLI::App
+
+program_desc 'SBI test tool'
+
+accept(VidPid) do |str|
+  VidPid.new(str)
+end
+
+accept(SBIIf) do |str|
+  SBIIf.new(str)
+end
+
+desc 'Use appropriate VID/PID'
+arg_name 'vid:pid'
+default_value VidPid.new '3241:9372'
+flag [:D, 'device'], :type => VidPid
+
+desc 'Use device number N (see device list by --list option)'
+arg_name 'N'
+default_value 0
+flag [:N,'device-number'], :type => Integer
+
+desc 'Timeout for transfers on both interfaces'
+arg_name 'milliseconds'
+default_value 3000
+flag [:T,'timeout'], :type => Integer
+
+desc 'Define interface for SBI'
+arg_name 'ifnum:epout:epin'
+default_value SBIIf.new '1:2:2'
+flag ['sbi-if'], :type => SBIIf
+
+desc 'Show devices list only'
+switch ['l', 'list'], :negatable => false
+
+desc 'Show version'
+switch ['verbose'], :negatable => false
+
+pre do |global_opts, cmd, opts, args|
+  vid = global_opts[:device].vid
+  pid = global_opts[:device].pid
+  $dev = USB.new(vid, pid).svi_devices[global_opts[:N]]
+
+  if $dev
+    $dev.sbi_if = global_opts['sbi-if'].ifnum
+    $dev.sbi_if_ep_in = global_opts['sbi-if'].epin
+    $dev.sbi_if_ep_out = global_opts['sbi-if'].epout
+    $dev.sbi_timeout = global_opts[:timeout]
+  end
+
+  exit_now! 'No devices detected' unless $dev
+
+  true
+end
+
+desc 'Test send-receive sequence'
+arg_name '"data"'
+command :test do |test|
+  test.action do |global_opts, opts, args|
+    exit_now! 'No arguments' unless args.count > 0
+
+    arg = eval %Q{"#{args.join ''}"}
+
+    exit_now! 'Too big message' unless arg.length < 2048
+
+    $dev.sbi_send arg
+
+    res = $dev.sbi_receive 2048
+
+    puts res.inspect.light_yellow
+  end
+end
+
+exit run(ARGV)
+
+# vim: sw=2 sts=2 ts=8:
+

data/bin/svi

@@ -5,7 +5,6 @@ require 'colorize'
 require 'svi/version'
 require 'svi/vidpid'
 require 'svi/sviif'
-require 'svi/sbiif'
 require 'svi/svi'
 
 include GLI::App
@@ -20,10 +19,6 @@ accept(SVIIf) do |str|
   SVIIf.new(str)
 end
 
-accept(SBIIf) do |str|
-  SBIIf.new(str)
-end
-
 desc 'Use appropriate VID/PID'
 arg_name 'vid:pid'
 default_value VidPid.new '3241:9372'
@@ -44,11 +39,6 @@ arg_name 'ifnum:epout:epin'
 default_value SVIIf.new '2:4:4'
 flag ['svi-if'], :type => SVIIf
 
-desc 'Define interface for SBI'
-arg_name 'ifnum:epout:epin'
-default_value SBIIf.new '3:3:3'
-flag ['sbi-if'], :type => SBIIf
-
 desc 'Show devices list only'
 switch ['l', 'list'], :negatable => false
 

data/lib/svi/api.generated.rb

@@ -7,11 +7,11 @@ $svi_api_desc =  {
   :lun_set_mode      => { :response => [Integer],                                :args => [Integer, Integer]          },
   :lun_format_ao     => { :response => [Integer],                                :args => [Integer, Integer]          },
   :lun_save_table    => { :response => [Integer],                                :args => []                          },
-#  :firmware_program  => { :response => [Integer],                                :args => [Integer, Integer]          },
-#  :nvm_write         => { :response => [Integer],                                :args => [Integer, Integer, String]  },
-#  :nvm_read          => { :response => [String, Integer],                        :args => [Integer, Integer, Integer] },
-#  :nvm_open          => { :response => [Integer],                                :args => [Integer]                   },
-#  :nvm_close         => { :response => [Integer],                                :args => [Integer]                   },
+  :firmware_program  => { :response => [Integer],                                :args => [Integer, Integer]          },
+  :nvm_write         => { :response => [Integer],                                :args => [Integer, Integer, String]  },
+  :nvm_read          => { :response => [String, Integer],                        :args => [Integer, Integer, Integer] },
+  :nvm_open          => { :response => [Integer],                                :args => [Integer]                   },
+  :nvm_close         => { :response => [Integer],                                :args => [Integer]                   },
   :led_set           => { :response => [],                                       :args => [Integer, Integer]          },
   :usb_reconnect     => { :response => [],                                       :args => []                          },
   :system_reset      => { :response => [],                                       :args => []                          },

data/lib/svi/cmd/app.rb

@@ -14,10 +14,10 @@ command :app do |c|
     end
   end
 
-  c.desc 'Test is app task exist in device'
+  c.desc 'Test app task presence'
   c.command :exist do |exist|
     exist.action do
-        puts $dev.app_exist[0] == 1 ? 'Application exist' : 'Application is not exist'
+        puts $dev.app_exist[0] == 1 ? 'Application exists' : "Application does not exist"
     end
   end
 

data/lib/svi/cmd/dfu.rb

@@ -17,7 +17,6 @@ command :dfu do |c|
       exit_now! "Can't verify firmware into buffer" if res != [0]
 
       addr = 0x10000
-      #addr = 0x20000 if options.target == :app
 
       res = $dev.firmware_program addr, Pathname.new(filepath).size()/512+1, !global_opts[:rescue]
 

data/lib/svi/version.rb

@@ -1 +1 @@
-VERSION='0.3.16'
+VERSION='0.3.18'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svi
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.18
 platform: ruby
 authors:
 - Levenkov Artem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -73,11 +73,13 @@ dependencies:
 description: Service Interface
 email: alev@mcs51.ru
 executables:
+- sbi
 - svi
 - svirb
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/sbi
 - bin/svi
 - bin/svirb
 - lib/svi/api.generated.rb