svi 0.2.9 → 0.3.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWVjYWE1YWM1NzM3N2YwZjk1YThiMzc1Y2MzZmM3M2JmZjczOGZiNQ==
+    ZDRlYzA0ZTM0NTE1ZmU2OTZjODIzMzkwZTVmM2RiNGU3MWUxMzg1Ng==
   data.tar.gz: !binary |-
-    MWExMTI5YzYzMWNmMTc5YjgwMmQ5MjE4Mjc0MGVmZWQzYWY1MTU5Ng==
+    YWJiNDJiY2QwNDkwNDVmNDg1N2ExOTVhZmQ5MzEyNmI1MzQ5M2JkZQ==
 SHA512:
   metadata.gz: !binary |-
-    ODE3Njg4Y2M3ZjBjZmUzYTMxZTRlYmU4YmJhZDI0ZTg0Yjg3ZWI0NzAxMDE0
-    NTcyNjIyMjI4NmU4NjkwODM4NGFlYjJlYTg1MTljNDk0MDExZmFlMmU0ZDIw
-    NjEyNzMxNjBiMGVjMjRhZjM0ZDgyZTc3YzYzNjlhOTg5YTljMjM=
+    YjY0YmU3OGM0NTM2ZGJhMzNkMWZiMDg5NDAxZDI2ZWJiNzkyMGQ4MjRiYWVl
+    MTE4YTZhZGY0ODdiMzFjN2QyODYxNTk1NzIwMzA2OGVkOTA0NGFjYWNiNGI3
+    OTFjMGQxNzY2ODVlMWY2Y2I0MzdhNzVlMDdkNTVmNWM0YTU4N2U=
   data.tar.gz: !binary |-
-    NjM3MTRiMDY3ZDM1ZjRhNWNmM2MyNGVmYTgzZTM5M2E0NDU0YTliMDUzMjBl
-    YWE2MTY5ODI4YjlmZDNhZjIxYWI0YTFkNWY4Y2VlNDFiMTlkZWZjMDYyMmY3
-    YTAwMDUzZGI0YzQ4ZmNhODAzNjNlZDEyZDQxYzg5NDA1NzU2OGI=
+    Y2NiMDkzOTA3NzE0NDdmNzgxODc1ZmNjMzYyOTkyMGQ5MjRhOTllZmMyYzY2
+    OTE4MTRmMWE3ODcwOGViYzJmMTZkNWM4ZmQ1N2E5NjgyODMwNGM5ODM4YTll
+    ZmZlZDY3ZDBjNzdlMDA2ZDQ5YmJhMDdlZDE0YjdjODZmM2NkMWE=

data/bin/svi

@@ -1,4 +1,89 @@
 #!/usr/bin/ruby19
 
+require 'gli'
+require 'colorize'
+require 'svi/version'
+require 'svi/vidpid'
+require 'svi/sviif'
+require 'svi/sbiif'
+require 'svi/svi'
+
+include GLI::App
+
+program_desc 'SVI interface tool set'
+
+accept(VidPid) do |str|
+  VidPid.new(str)
+end
+
+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'
+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 SVI'
+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
+
+desc 'Show version'
+switch ['verbose'], :negatable => false
+
+desc 'Rescue mode of device'
+default_value false
+switch ['r', 'rescue'], :negatable => false
+
+pre do |global_opts, cmd, opts, args|
+  $dev = USB.new(global_opts[:device].vid, global_opts[:device].pid).svi_devices[global_opts[:N]]
+
+  if $dev
+    $dev.svi_if = global_opts['svi-if'].ifnum
+    $dev.svi_if_ep_in = global_opts['svi-if'].epin
+    $dev.svi_if_ep_out = global_opts['svi-if'].epout
+    $dev.svi_timeout = global_opts[:timeout]
+  end
+
+  exit_now! 'No devices detected' unless $dev
+
+  true
+end
+
+require 'svi/cmd/list'
+require 'svi/cmd/leds'
+require 'svi/cmd/app'
+require 'svi/cmd/lun'
+require 'svi/cmd/random'
+require 'svi/cmd/usb'
+require 'svi/cmd/sys'
+require 'svi/cmd/dfu'
+
+exit run(ARGV)
+
 # vim: sw=2 sts=2 ts=8:
 

data/lib/svi/cmd/app.rb

@@ -0,0 +1,57 @@
+desc 'app control'
+command :app do |c|
+  c.desc 'Start app task'
+  c.command :start do |start|
+    start.action do
+        $dev.app_start
+    end
+  end
+
+  c.desc 'Stop app task'
+  c.command :stop do |stop|
+    stop.action do
+        $dev.app_stop
+    end
+  end
+
+  c.desc 'Test is app task exist in device'
+  c.command :exist do |exist|
+    exist.action do
+        puts $dev.app_exist[0] == 1 ? 'Application exist' : 'Application is not exist'
+    end
+  end
+
+  c.desc 'Get app size'
+  c.command [:size, :length] do |size|
+    size.action do
+        puts "App size = #{$dev.app_length[0]}"
+    end
+  end
+
+  c.desc 'Get app state'
+  c.command :state do |state|
+    state.action do
+        state = [
+          'UNINIT',
+          'LOADED',
+          'RUN',
+          'SLEEP',
+          'INT_RUN',
+          'INT_SLEEP',
+          'HALTED'
+        ]
+
+        puts "App state = #{state[$dev.app_state[0]]}"
+    end
+  end
+
+  c.desc 'Get app checksum'
+  c.command :crc do |crc|
+    crc.action do
+        puts "App checksum = #{$dev.app_checksum[0].to_s(16)}"
+    end
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/svi/cmd/dfu.rb

@@ -0,0 +1,54 @@
+desc 'Device firmwares update'
+command :dfu do |c|
+  c.desc 'Update kernel'
+  arg_name 'firmware.bin'
+  c.command :kernel do |kernel|
+    kernel.action do |global_opts, opts, args|
+      exit_now! 'Invalid arguments' if args.count != 1
+
+      filepath = args[0]
+
+      res = $dev.nvm_load_file 1, 0, filepath
+
+      exit_now! "Can't load firmware into buffer" if res != [0]
+
+      res = $dev.nvm_verify_file 1, 0, filepath
+
+      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]
+
+      puts res[0] == 0 ? 'OK'.light_green : 'Fail'.light_red
+    end
+  end
+
+  c.desc 'Update app'
+  arg_name 'firmware.bin'
+  c.command :app do |app|
+    app.action do |global_opts, opts, args|
+      exit_now! 'Invalid arguments' if args.count != 1
+
+      filepath = args[0]
+
+      res = $dev.nvm_load_file 1, 0, filepath
+
+      exit_now! "Can't load firmware into buffer" if res != [0]
+
+      res = $dev.nvm_verify_file 1, 0, filepath
+
+      exit_now! "Can't verify firmware into buffer" if res != [0]
+
+      addr = 0x20000
+
+      res = $dev.firmware_program addr, Pathname.new(filepath).size()/512+1, !global_opts[:rescue]
+
+      puts res[0] == 0 ? 'OK'.light_green : 'Fail'.light_red
+    end
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/svi/cmd/leds.rb

@@ -0,0 +1,10 @@
+desc 'leds control'
+arg_name 'led-number value'
+command :led do |c|
+  c.action do |global_opts, opts, args|
+    help_now! 'Invalid arguments number' if args.count != 2
+
+    $dev.led_set args[0].to_i, args[1].to_i
+  end
+end
+

data/lib/svi/cmd/list.rb

@@ -0,0 +1,14 @@
+desc 'list detected devices'
+command :list do |c|
+  c.action do |opts|
+    devs = USB.new(opts[:device].vid, opts[:device].pid).svi_devices
+    
+    if devs.empty?
+      puts 'No devices detected'
+    else
+      devs.each_with_index { |dev, i|
+        puts "##{i} #{dev.manufacturer} #{dev.product}"
+      }
+    end
+  end
+end

data/lib/svi/cmd/lun.rb

@@ -0,0 +1,20 @@
+desc 'LUN control'
+command :lun do |c|
+  c.desc 'Get eMMC capacity (in 512 blocks)'
+  c.command :seccount do |seccount|
+    seccount.action do
+      capacity = $dev.lun_get_seccount[0]
+      puts "eMMC capacity = #{capacity} blocks (#{capacity/2/1024/1024.0} GiB)"
+    end
+  end
+
+  c.desc 'Get count of active luns'
+  c.command :count do |count|
+    count.action do
+      puts "Count of active LUNs = #{$dev.lun_get_count[0]}"
+    end
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/svi/cmd/random.rb

@@ -0,0 +1,9 @@
+desc 'RNG module'
+command :random do |c|
+  c.action do
+    puts "Random number = #{$dev.random[0]}"
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/svi/cmd/sys.rb

@@ -0,0 +1,12 @@
+desc 'System control'
+command :sys do |c|
+  c.desc 'Soft reset device'
+  c.command :reset do |reset|
+    reset.action do
+      $dev.system_reset
+    end
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/svi/cmd/usb.rb

@@ -0,0 +1,12 @@
+desc 'USB control'
+command :usb do |c|
+  c.desc 'Reconnect to device'
+  c.command :reconnect do |reconnect|
+    reconnect.action do
+      $dev.usb_reconnect
+    end
+  end
+end
+
+# vim: sw=2 sts=2 ts=8:
+

data/lib/svi/sbiif.rb

@@ -0,0 +1,57 @@
+class SBIIf
+    @ifnum
+    @epin
+    @epout
+
+    def initialize *args
+        raise ArgumentError, 'function shall accept 0, 1 or 3 arguments' unless [0, 1, 3].include? args.count
+
+        @ifnum, @epin, @epout = 0, 0, 0
+
+        if args.count == 1
+            _args = args[0].to_s.split ':'
+
+            raise ArgumentError, "Invalid string format of vid:pid - #{args[0].to_s}" if _args.count != 3
+
+            args = _args
+        end
+
+        if args.count == 3
+            self.ifnum = args[0]
+            self.epin = args[1]
+            self.epout = args[2]
+        end
+    end
+
+    def ifnum 
+        @ifnum
+    end
+
+    def epin
+        @epin
+    end
+
+    def epout
+        @epout
+    end
+
+    def ifnum= (n)
+        @ifnum = n.to_i
+    end
+
+    def epin= (n)
+        raise ArgumentError, 'Invalid endpoint number' if n.to_i > 0xFF || n.to_i&0x7F > 16
+
+        @epin = n.to_i&0x7F
+    end
+
+    def epout= (n)
+        raise ArgumentError, 'Invalid endpoint number' if n.to_i > 0xFF || n.to_i&0x7F > 16
+
+        @epout = n.to_i&0x7F
+    end
+
+    def to_s
+        "#{@ifnum.to_s}:#{@epin.to_s}:#{@epout.to_s}"
+    end
+end

data/lib/svi/sviif.rb

@@ -0,0 +1,57 @@
+class SVIIf
+    @ifnum
+    @epin
+    @epout
+
+    def initialize *args
+        raise ArgumentError, 'function shall accept 0, 1 or 3 arguments' unless [0, 1, 3].include? args.count
+
+        @ifnum, @epin, @epout = 0, 0, 0
+
+        if args.count == 1
+            _args = args[0].to_s.split ':'
+
+            raise ArgumentError, "Invalid string format of vid:pid - #{args[0].to_s}" if _args.count != 3
+
+            args = _args
+        end
+
+        if args.count == 3
+            self.ifnum = args[0]
+            self.epin = args[1]
+            self.epout = args[2]
+        end
+    end
+
+    def ifnum 
+        @ifnum
+    end
+
+    def epin
+        @epin
+    end
+
+    def epout
+        @epout
+    end
+
+    def ifnum= (n)
+        @ifnum = n.to_i
+    end
+
+    def epin= (n)
+        raise ArgumentError, 'Invalid endpoint number' if n.to_i > 0xFF || n.to_i&0x7F > 16
+
+        @epin = n.to_i&0x7F
+    end
+
+    def epout= (n)
+        raise ArgumentError, 'Invalid endpoint number' if n.to_i > 0xFF || n.to_i&0x7F > 16
+
+        @epout = n.to_i&0x7F
+    end
+
+    def to_s
+        "#{@ifnum.to_s}:#{@epin.to_s}:#{@epout.to_s}"
+    end
+end

data/lib/svi/version.rb

@@ -0,0 +1 @@
+VERSION='0.3.10'

data/lib/svi/vidpid.rb

@@ -0,0 +1,60 @@
+class VidPid
+    @vid
+    @pid
+
+    def initialize *args
+        raise ArgumentError, 'function shall accept 2 arguments max' if args.count > 2
+
+        @vid, @pid = 0, 0
+
+        if args.count == 1
+            _args = args[0].to_s.split ':'
+
+            raise ArgumentError, "Invalid string format of vid:pid - #{args[0].to_s}" if _args.count != 2
+
+            args = _args
+        end
+
+        if args.count == 2
+            self.vid = args[0]
+            self.pid = args[1]
+        end
+    end
+
+    def vid
+        @vid
+    end
+
+    def pid
+        @pid
+    end
+
+    def vid= (vendor)
+        if String === vendor
+            i = vendor.to_i 16
+        else
+            i = vendor.to_i
+        end
+
+        raise ArgumentError, "Invalid vendor #{vendor}" if i < 0 || i > 65535
+
+        @vid = i
+    end
+
+    def pid= (product)
+        if String === product
+            i = product.to_i 16
+        else
+            i = product.to_i
+        end
+
+        raise ArgumentError, "Invalid product #{product}" if i < 0 || i > 65535
+
+        @pid = i
+    end
+
+    def to_s
+        "#{@vid.to_s(16)}:#{@pid.to_s(16)}"
+    end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svi
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Levenkov Artem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -70,7 +70,19 @@ files:
 - bin/usb_reconnect
 - lib/svi/api.generated.rb
 - lib/svi/api.rb
+- lib/svi/cmd/app.rb
+- lib/svi/cmd/dfu.rb
+- lib/svi/cmd/leds.rb
+- lib/svi/cmd/list.rb
+- lib/svi/cmd/lun.rb
+- lib/svi/cmd/random.rb
+- lib/svi/cmd/sys.rb
+- lib/svi/cmd/usb.rb
+- lib/svi/sbiif.rb
 - lib/svi/svi.rb
+- lib/svi/sviif.rb
+- lib/svi/version.rb
+- lib/svi/vidpid.rb
 homepage: http://www.mcs51.ru/svi-utils
 licenses:
 - MIT