svi 0.3.14 → 0.3.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWM4YjFlMjg0MDc3N2RkMTcwNDE1ZGY0MDA3MTdmM2VhZTkzNTBmOQ==
+    MjYyOTA2MTUzMWFjMzAxMjBiMWE1MzdmODg4OWUwMjhiZjdhNmRlNg==
   data.tar.gz: !binary |-
-    NjkwZGMxMGVhYTRhN2I4Nzk1YzYzNTMxMzhmNjc3YTI5YWE5NTQ2NQ==
+    OTE4MDYxYzQ4ZWIzMTgzOWZjYjc1NGJmZDliNDM5NTVhM2EwNmMxNg==
 SHA512:
   metadata.gz: !binary |-
-    YjczODI1YTFmODY1Y2RiOTc3NjBiYWNhOWJiNzJkZTliMTFjYjgzODczZTFi
-    ODMzOWZjODE5ZWM1NmY4MTBiYTY3N2QxNWFjMDYyZDQ5M2RiM2Y3YWNiNDc2
-    YjBmNTBhYTJhNzQ0MzQxOWI3YWI4YjFiMDA0MjRhMTczN2M0ZGU=
+    MmJmYmNiMWI0ZDhiNDYwNTk5OWZkODkyYTQxMjVjY2QwMWVmYmY0MzE2YjE3
+    YzBjYjhhMmZkMmQ1M2U0MmEzN2U0YTY5NDIyOTRhMzNjZDYxNGQ5Y2Y1NmMx
+    MmJlMzZlZWE2ODNjOGZmNmMxOWIyYjljMzkxZWY5Y2U1ZWFiMTg=
   data.tar.gz: !binary |-
-    ZjI5ZjkwMGQ0MmRiZTQ5MGE0NWU3MWVkZTVkMzAwMmY2NGNiZGZjODg1M2Q2
-    OWRiYzlkNDFhN2Y3MGY2ZjUzNGYxMTNiYzM2MGMzNWM4OGUyNWYyN2RmZTgw
-    ZmZiYmRkZDdkYmUxYWNjMmJhMzBiNjViY2EzMmIyY2IzMjhhMjg=
+    NDQ5NDBlYTU0NWZlMWMyYmUyMjIzMWI5ZGRlMjA1MWE0OGRlZmI1YWQ4YmYy
+    YTZkNThhN2Q4ZWJkYzYxMmRhOGY1NjA3Y2M0NWY5OWYxYWJmZDc1ZmZiMDgz
+    NDc0YjVkNzg3M2ViNDI4ZjRmMDgxY2NiYzBlOWVhMGEzNmU0N2E=

data/bin/svi

@@ -84,6 +84,7 @@ require 'svi/cmd/random'
 require 'svi/cmd/usb'
 require 'svi/cmd/sys'
 require 'svi/cmd/dfu'
+require 'svi/cmd/time'
 
 exit run(ARGV)
 

data/lib/svi/api.generated.rb

@@ -7,18 +7,18 @@ $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 => []                          },
-  :system_get_serial => { :response => [String],                                 :args => [String]                    },
-  :system_get_sysver => { :response => [String],                                 :args => [String]                    },
-  :firmware_get_ver  => { :response => [String, String, String, String, String], :args => []                          },
-  :system_get_appver => { :response => [String],                                 :args => [String]                    },
+#  :system_get_serial => { :response => [String],                                 :args => [String]                    },
+#  :system_get_sysver => { :response => [String],                                 :args => [String]                    },
+#  :firmware_get_ver  => { :response => [String, String, String, String, String], :args => []                          },
+#  :system_get_appver => { :response => [String],                                 :args => [String]                    },
   :random            => { :response => [Integer],                                :args => []                          },
   :gettime           => { :response => [Integer],                                :args => []                          },
   :settime           => { :response => [Integer],                                :args => [Integer]                   },

data/lib/svi/cmd/dfu.rb

@@ -1,7 +1,7 @@
 desc 'Device firmwares update'
 command :dfu do |c|
   c.desc 'Update kernel'
-  arg_name 'firmware.bin'
+  c.arg_name 'firmware.bin'
   c.command :kernel do |kernel|
     kernel.action do |global_opts, opts, args|
       exit_now! 'Invalid arguments' if args.count != 1
@@ -26,7 +26,7 @@ command :dfu do |c|
   end
 
   c.desc 'Update app'
-  arg_name 'firmware.bin'
+  c.arg_name 'firmware.bin'
   c.command :app do |app|
     app.action do |global_opts, opts, args|
       exit_now! 'Invalid arguments' if args.count != 1

data/lib/svi/cmd/lun.rb

@@ -8,10 +8,75 @@ command :lun do |c|
     end
   end
 
-  c.desc 'Get count of active luns'
+  c.desc 'Get or set count of active LUNs'
+  c.arg_name '[count]'
   c.command :count do |count|
-    count.action do
-      puts "Count of active LUNs = #{$dev.lun_get_count[0]}"
+    count.action do |global_opts, opts, args|
+      if args.count == 1
+        res = $dev.lun_set_count args[0].to_i
+
+        puts res[0] == 0 ? 'OK'.light_green : 'Fail'.light_red
+      else
+        puts "Count of active LUNs = #{$dev.lun_get_count[0]}"
+      end
+    end
+  end
+
+  c.desc 'Set LUN mode'
+  c.arg_name 'lun-number mode'
+  c.command :mode do |mode|
+    mode.action do |global_opts, opts, args|
+      res = $dev.lun_set_mode args[0].to_i, args[1].to_i
+
+      puts res[0] == 0 ? 'OK'.light_green : 'Fail'.light_red
+    end
+  end
+
+  c.desc 'LUN journal commands'
+  c.command :journal do |journal|
+    journal.desc 'LUN journal init'
+    journal.arg_name 'lun-number rec-size'
+    journal.command :init do |init|
+      init.action do |global_opts, opts, args|
+        res = $dev.lun_format_ao args[0].to_i, args[1].to_i
+
+        puts res[0] == 0 ? 'OK'.light_green : 'Fail'.light_red
+      end
+    end
+  end
+
+  c.desc 'LUN save table to NVM'
+  c.command :save do |save|
+    save.action do |global_opts, opts, args|
+      res = $dev.lun_save_table
+
+      puts res[0] == 0 ? 'OK'.light_green : 'Fail'.light_red
+    end
+  end
+
+  c.desc 'Get or set table of LUNs'
+  c.arg_name '(lun-number| start size mode flags start size ...)'
+  c.command :table do |table|
+    table.action do |global_opts, opts, args|
+      if args.count == 1
+        res = $dev.lun_get_table args[0].to_i
+
+        if res[0] == 0
+          puts res[1].inspect
+        else
+          puts 'Fail'.light_red
+        end
+      elsif args.count%4 == 0
+        iargs = args.map do |elem|
+          elem.to_i
+        end
+
+        res = $dev.lun_set_table iargs
+
+        puts res[0] == 0 ? 'OK'.light_green : 'Fail'.light_red
+      else
+        puts 'Bad table description'.light_red
+      end
     end
   end
 end

data/lib/svi/cmd/time.rb

@@ -0,0 +1,24 @@
+desc 'RTC'
+command :time do |c|
+  c.desc 'Synchronize time to host'
+  c.command :sync do |sync|
+    sync.action do |global_opts, opts, args|
+      res = $dev.settime(Time.now.to_i)[0]
+
+      puts res[0] == 0 ? 'OK'.light_green : 'Fail'.light_red
+    end
+  end
+
+  c.action do |global_opts, opts, args|
+    res = $dev.gettime[0]
+
+    if res < 200
+      puts "Fail with code #{res}".light_red
+    else
+      puts "#{Time.at res}".light_yellow
+    end
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/svi/version.rb

@@ -1 +1 @@
-VERSION='0.3.14'
+VERSION='0.3.15'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svi
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Levenkov Artem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -33,41 +33,13 @@ dependencies:
 description: Service Interface
 email: alev@mcs51.ru
 executables:
-- usb_reconnect
-- lun_set_mode
-- random
-- system_reset
-- lun_get_count
-- lun_set_count
-- lun_set_table
 - svi
 - svirb
-- lun_save_table
-- settime
-- dfu
-- lun_format_ao
-- gettime
-- led_set
-- lun_get_table
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/dfu
-- bin/gettime
-- bin/led_set
-- bin/lun_format_ao
-- bin/lun_get_count
-- bin/lun_get_table
-- bin/lun_save_table
-- bin/lun_set_count
-- bin/lun_set_mode
-- bin/lun_set_table
-- bin/random
-- bin/settime
 - bin/svi
 - bin/svirb
-- bin/system_reset
-- bin/usb_reconnect
 - lib/svi/api.generated.rb
 - lib/svi/api.rb
 - lib/svi/cmd/app.rb
@@ -77,6 +49,7 @@ files:
 - lib/svi/cmd/lun.rb
 - lib/svi/cmd/random.rb
 - lib/svi/cmd/sys.rb
+- lib/svi/cmd/time.rb
 - lib/svi/cmd/usb.rb
 - lib/svi/sbiif.rb
 - lib/svi/svi.rb

data/bin/dfu

@@ -1,176 +0,0 @@
-#!/usr/bin/ruby19
-
-require 'svi/svi'
-
-require 'optparse'
-require 'optparse/time'
-require 'ostruct'
-
-USAGE = "Usage: dfu [options] filepath"
-ARGS_NUM = 1
-
-def parse_options(args)
-    options = OpenStruct.new
-
-    opt_parser = OptionParser.new do |opts|
-      opts.banner = USAGE
-      options.vid = 0x3241
-      options.pid = 0x9372
-      options.svi_if = 2
-      options.sbi_if = 3
-      options.sbi_if_ep_out = 0x3
-      options.sbi_if_ep_in  = 0x3
-      options.svi_if_ep_out = 0x4
-      options.svi_if_ep_in  = 0x4
-      options.timeout = 10000
-      options.devnum = 0
-      options.devnum_mod = nil
-      options.rescue = false
-      options.verbose = false
-      options.target = :kernel
-
-      opts.on("--app", "Update application") do
-        options.target = :app
-      end
-
-      opts.separator ""
-      opts.separator "Common options:"
-
-      opts.on('--rescue', 'Set when device in rescue mode') do
-        options.svi_if = 0
-        options.rescue = true
-      end
-
-      opts.on("-D", "--device vid:pid", String, "Use appropriate VID/PID") do |vidpid|
-        vidpid = vidpid.split ':' 
-        options.vid = vidpid[0].hex
-        options.pid = vidpid[1].hex
-      end
-
-      opts.on("-N", "--device-number N", Integer, "Use device number N (see device list by --list option)") do |devnum|
-        options.devnum = devnum
-        options.devnum_mod = true
-      end
-
-      opts.on("-T", "--timeout milliseconds", Integer, "Timeout for transfers on both interfaces") do |timeout|
-        options.timeout = timeout
-      end
-
-      opts.on("--svi-if ifnum:epout:epin", String, "Define interface for SVI") do |args|
-        args = args.split ':' 
-        options.svi_if        = args[0].hex
-        options.svi_if_ep_out = args[1].hex
-        options.svi_if_ep_in  = args[2].hex
-      end
-
-      opts.on("--sbi-if ifnum:epout:epin", String, "Define interface for SBI") do |args|
-        args = args.split ':' 
-        options.sbi_if        = args[0].hex
-        options.sbi_if_ep_out = args[1].hex
-        options.sbi_if_ep_in  = args[2].hex
-      end
-
-      opts.on_tail("-l", "--list", "Show devices list only") do
-        USB.new(options.vid, options.pid).svi_devices.each_with_index { |dev, i|
-          puts "#%d %s %s" % [i, dev.manufacturer, dev.product]
-        }
-        exit
-      end
-
-      opts.on("--verbose", "Print maximum information") do
-        options.verbose = true
-      end
-
-      opts.on_tail("-h", "--help", "Show this message") do
-        puts opts
-        exit
-      end
-
-      opts.on_tail("--version", "Show version") do
-        puts SVI_VERSION
-        exit
-      end
-    end
-
-    opt_parser.parse!(args)
-    [options, opt_parser]
-  end
-
-res = parse_options(ARGV)
-options    = res[0]
-opt_parser = res[1]
-
-if ARGV.count != ARGS_NUM
-  p opt_parser 
-  exit 1
-end
-
-argv = ARGV.reverse
-
-firmware_path = Pathname.new(argv.pop).expand_path
-
-devs = USB.new(options.vid, options.pid).svi_devices
-
-if devs.count == 0
-  puts 'Device not found'
-  exit 1
-end
-
-if devs.count > 1 and options.devnum_mod.nil?
-  puts 'There are more than one devices, using device #%d.' % options.devnum
-  puts 'Use option -N to define necessary device.'
-  puts "To view list of devices use -l option.\n\n"
-end
-
-dev = devs[options.devnum]
-
-dev.svi_if = options.svi_if
-dev.svi_if_ep_out = options.svi_if_ep_out
-dev.svi_if_ep_in = options.svi_if_ep_in
-
-dev.sbi_if = options.sbi_if
-dev.sbi_if_ep_out = options.sbi_if_ep_out
-dev.sbi_if_ep_in = options.sbi_if_ep_in
-
-dev.svi_timeout = options.timeout
-dev.sbi_timeout = options.timeout
-
-if options.verbose
-  puts "Configuration:"
-  puts "Device # = %d" % options.devnum
-  puts "idVendor = 0x%04x" % options.vid
-  puts "idProduct = 0x%04x" % options.pid
-  puts "Interface number SVI = %d" % options.svi_if
-  puts "OUT endpoint for SVI = 0x%02x" % options.svi_if_ep_out
-  puts "IN endpoint for SVI = 0x%02x" % (options.svi_if_ep_in | 0x80)
-  puts "Interface number SBI = %d" % options.sbi_if
-  puts "OUT endpoint for SBI = 0x%02x" % options.sbi_if_ep_out
-  puts "IN endpoint for SBI = 0x%02x" % (options.sbi_if_ep_in | 0x80)
-  puts "Timeout for IN operations = %d msec" % options.timeout
-  puts "\n\n"
-end
-
-if options.verbose
-  puts "dfu(%s)" % [firmware_path.to_s]
-end
-
-res = dev.nvm_load_file(1, 0, firmware_path.to_s)
-
-raise "Can't load firmware into buffer" if res != [0]
-
-res = dev.nvm_verify_file(1, 0, firmware_path.to_s)
-
-raise "Can't verify firmware into buffer" if res != [0]
-
-addr = 0x10000 if options.target == :kernel
-addr = 0x20000 if options.target == :app
-
-res = dev.firmware_program addr, firmware_path.size()/512+1, !options.rescue
-
-if options.verbose
-end
-
-p res
-
-# vim: sw=2 sts=2 ts=8:
-

data/bin/gettime

@@ -1,153 +0,0 @@
-#!/usr/bin/ruby19
-
-require 'svi/svi'
-
-require 'optparse'
-require 'optparse/time'
-require 'ostruct'
-
-PROG_NAME = 'gettime'
-USAGE = "Usage: #{PROG_NAME} [options] [time]"
-ARGS_NUM = (0..0)
-
-def parse_options(args)
-    options = OpenStruct.new
-
-    opt_parser = OptionParser.new do |opts|
-      opts.banner = USAGE
-      options.vid = 0x3241
-      options.pid = 0x9372
-      options.svi_if = 2
-      options.sbi_if = 3
-      options.sbi_if_ep_out = 0x3
-      options.sbi_if_ep_in  = 0x3
-      options.svi_if_ep_out = 0x4
-      options.svi_if_ep_in  = 0x4
-      options.timeout = 10000
-      options.devnum = 0
-      options.devnum_mod = nil
-      options.verbose = false
-
-      opts.separator ""
-      opts.separator "Common options:"
-
-      opts.on("-D", "--device vid:pid", String, "Use appropriate VID/PID") do |vidpid|
-        vidpid = vidpid.split ':' 
-        options.vid = vidpid[0].hex
-        options.pid = vidpid[1].hex
-      end
-
-      opts.on("-N", "--device-number N", Integer, "Use device number N (see device list by --list option)") do |devnum|
-        options.devnum = devnum
-        options.devnum_mod = true
-      end
-
-      opts.on("-T", "--timeout milliseconds", Integer, "Timeout for transfers on both interfaces") do |timeout|
-        options.timeout = timeout
-      end
-
-      opts.on("--svi-if ifnum:epout:epin", String, "Define interface for SVI") do |args|
-        args = args.split ':' 
-        options.svi_if = args[0].hex
-        options.svi_if_ep_out = args[1].hex
-        options.svi_if_ep_in = args[2].hex
-      end
-
-      opts.on("--verbose", "Print maximum information") do
-        options.verbose = true
-      end
-
-      opts.on("--sbi-if ifnum:epout:epin", String, "Define interface for SBI") do |args|
-        args = args.split ':' 
-        options.sbi_if = args[0].hex
-        options.sbi_if_ep_out = args[1].hex
-        options.sbi_if_ep_in = args[2].hex
-      end
-
-      opts.on_tail("-l", "--list", "Show devices list only") do
-        USB.new(options.vid, options.pid).svi_devices.each_with_index { |dev, i|
-          puts "#%d %s %s" % [i, dev.manufacturer, dev.product]
-        }
-        exit
-      end
-
-      opts.on_tail("-h", "--help", "Show this message") do
-        puts opts
-        exit
-      end
-
-      opts.on_tail("--version", "Show version") do
-        puts SVI_VERSION
-        exit
-      end
-    end
-
-    opt_parser.parse!(args)
-    [options, opt_parser]
-  end
-
-res = parse_options(ARGV)
-options = res[0]
-opt_parser = res[1]
-
-unless ARGS_NUM.include? ARGV.count
-  p opt_parser 
-  exit 1
-end
-
-args = ARGV.reverse
-
-devs = USB.new(options.vid, options.pid).svi_devices
-
-if devs.count == 0
-  puts 'Device not found'
-  exit 1
-end
-
-if devs.count > 1 and options.devnum_mod.nil?
-  puts 'There are more than one devices, using device #%d.' % options.devnum
-  puts 'Use option -N to define necessary device.'
-  puts "To view list of devices use -l option.\n\n"
-end
-
-dev = devs[options.devnum]
-
-dev.svi_if = options.svi_if
-dev.svi_if_ep_out = options.svi_if_ep_out
-dev.svi_if_ep_in = options.svi_if_ep_in
-
-dev.sbi_if = options.sbi_if
-dev.sbi_if_ep_out = options.sbi_if_ep_out
-dev.sbi_if_ep_in = options.sbi_if_ep_in
-
-dev.svi_timeout = options.timeout
-dev.sbi_timeout = options.timeout
-
-if options.verbose
-  puts "Configuration:"
-  puts "Device # = %d" % options.devnum
-  puts "idVendor = 0x%04x" % options.vid
-  puts "idProduct = 0x%04x" % options.pid
-  puts "Interface number SVI = %d" % options.svi_if
-  puts "OUT endpoint for SVI = 0x%02x" % options.svi_if_ep_out
-  puts "IN endpoint for SVI = 0x%02x" % (options.svi_if_ep_in | 0x80)
-  puts "Interface number SBI = %d" % options.sbi_if
-  puts "OUT endpoint for SBI = 0x%02x" % options.sbi_if_ep_out
-  puts "IN endpoint for SBI = 0x%02x" % (options.sbi_if_ep_in | 0x80)
-  puts "Timeout for IN operations = %d msec" % options.timeout
-  puts "\n\n"
-end
-
-if options.verbose
-end
-
-res = dev.gettime
-
-if options.verbose
-end
-
-p res
-p Time.at res
-
-# vim: sw=2 sts=2 ts=8:
-