rbuspirate 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1e9f18b739184a2722b3dd7d8cc4c8d64830291fe9caa93099360ade5ab41e
-  data.tar.gz: e7ad361bd69818d82d73b1fb0942c184808428d835b66c894b70f1843fee4fa3
+  metadata.gz: 980cffb01298ceb60a0a7227b26162b2c1c9a81056f3f1d7533adc5dd1b3cb3a
+  data.tar.gz: 1ee643f76efbce4dd6bbda7a4b8882732ace3f52d49a93db3ca4e09f57ab4b0d
 SHA512:
-  metadata.gz: 67bb082b478a92a839d8d8f5c8d0806ada5944d82cb8edf7de25626890519b6ed3afeae18fb0280c40ba4b503ef1f615a40307d1fad888d58294587160079fc7
-  data.tar.gz: 8f066117c4100121d93ac477d1eea45f815a8e016651ad246e11e5fd81044553de5ada39080aa363323d399249b01d1caaaaaf39006b715bfa051826ff23a3ad
+  metadata.gz: 9c072cc7ee73949c9f790cf42a3e9baeca2cff6a120dce9dcabe559f27d2fda57508299727dcb29c3eb6f30c13ba54d04fab19f1b5a6bfddece3b152883beee7
+  data.tar.gz: e8ca8811d409638776363424d3fac01c7484a3ceadb2d1e42db6a2459e16ef90f5310699f5f5917e8867b5d31a4261707c7664f44a027e99f9c55c4e82028c1d

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in rbuspirate.gemspec
 gemspec
 
-gem "pry", "~> 0.12.2"
+gem "pry", "~> 0.13.0"

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    rbuspirate (0.2.3)
+    rbuspirate (0.2.4)
       serialport (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
-    method_source (0.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
+    method_source (1.0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.1)
     serialport (1.3.1)
 
 PLATFORMS
@@ -20,8 +20,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  pry (~> 0.12.2)
-  rake (~> 10.0)
+  pry (~> 0.13.0)
+  rake (~> 13.0)
   rbuspirate!
 
 BUNDLED WITH

data/lib/rbuspirate.rb

@@ -62,6 +62,30 @@ module Rbuspirate
 
       raise 'Enter to bitbang failied'
     end
+
+    def pin_on_off(power: false, pullup: false, aux: false, mosi: false, clk: false, miso: false, cs: false)
+      argarray = [power, pullup, aux, mosi, clk, miso, cs].freeze
+      argarray.each do |arg|
+        raise ArgumentError, 'Shitty arg' unless [true, false].include?(arg)
+      end
+
+      final_comm = argarray
+                   .each.with_index
+                   .inject(Commands::Config::PINONOFF) do |comm, (arg, idx)|
+                     arg ? (comm | 1 << idx) : (comm)
+                   end
+      @le_port.putc(final_comm)
+      # I don't fucking understand:
+      # "The Bus pirate responds to each update
+      #  with a byte in the same format
+      # that shows the current state of the pins"
+      # So, why response is always a null byte ?
+      resp = @le_port.expect(
+        Responses::PINS_SET, Timeouts::PINONOFF
+      )
+      raise 'Setting pins state failied' unless resp
+    end
+
     [
       [
         :i2c, Commands::I2C::ENTER,

data/lib/rbuspirate/commands.rb

@@ -7,6 +7,8 @@ module Rbuspirate
     CONF_PER = 0b01000000
 
     module Config
+      PINONOFF = 0b10000000
+
       module Peripherals
         POWER = 0b00001000
         PULLUP = 0b00000100
@@ -51,6 +53,8 @@ module Rbuspirate
     module UART
       ENTER = 0b00000011
       START_BRIDGE = 0b00001111
+      ECHO_RX = 0b00000010
+      BULK_WRITE = 0b00010000
 
       module Config
         CONF_UART = 0b10000000

data/lib/rbuspirate/interfaces/uart.rb

@@ -8,7 +8,7 @@ module Rbuspirate
     class UART < Abstract
       attr_reader :bridge, :speed, :power, :pullup, :aux, :cs,
                   :pin_out_33, :parity_data, :stop_bits, :rx_idle,
-                  :port
+                  :port, :speed, :echo_rx
 
       def initialize(serial, bup)
         raise 'Bus pirate must be in uart mode' unless bup.mode == :uart
@@ -16,6 +16,7 @@ module Rbuspirate
         @bridge = false
         @bup = bup
         @le_port = serial
+        @echo_rx = false
       end
 
       def configure_peripherals(...)
@@ -56,6 +57,16 @@ module Rbuspirate
         @speed = bit_speed
       end
 
+      # Not working ?
+      def echo_rx=(echo_state)
+        raise ArgumentError, 'Echo state arg should be false or true' unless [true, false].include?(echo_state)
+        return if echo_state == @echo_rx
+
+        echo_comm = (Commands::UART::ECHO_RX | (echo_state ? 0 : 1))
+        simplex_command(echo_comm, Timeouts::SUCCESS, "Unable to set echo rx state to #{echo_state}")
+        @echo_rx = echo_state
+      end
+
       def config_uart(
         pin_out_33: false, parity_data: :n8, stop_bits: 1, rx_idle: true
       )
@@ -90,20 +101,36 @@ module Rbuspirate
       def enter_bridge
         return @bridge if @bridge
 
-        @le_port.write(Commands::UART::START_BRIDGE.chr)
+        simplex_command(Commands::UART::START_BRIDGE, Timeouts::SUCCESS, 'Unable to enter bridge')
         @bridge = true
         @bup.instance_variable_set(:@needs_reset, true)
         @port = @le_port
       end
 
       def read(bytes = 0)
-        raise 'Enter to bridge mode first' unless @bridge
+        raise 'Enable echo_rx or enter to bridge mode' unless @bridge || @echo_rx
+        # Not working in echo rx mode - firmware bug or expect discards data buffer
         bytes.positive? ? @le_port.read(bytes) : @le_port.read
       end
 
       def write(data)
-        raise 'Enter to bridge mode first' unless @bridge
-        @le_port.write(data.to_s.b)
+        data = data.to_s.b
+        @bridge ? @le_port.write(data) : bulk_write(data)
+      end
+
+      protected
+
+      def bulk_write(data)
+        dbt = data.bytesize
+        unpackstr = 'a16' * (dbt / 16)
+        !(dbt % 16).zero? && unpackstr += "a#{dbt % 16}"
+        data = data.unpack(unpackstr)
+        data.each do |slice|
+          comm = Commands::UART::BULK_WRITE | (slice.bytesize - 1)
+          simplex_command(comm, Timeouts::SUCCESS, 'Unable to write data slice prepare')
+          simplex_command(slice, Timeouts::SUCCESS, 'Unable to write data slice')
+        end
+        dbt
       end
     end
   end

data/lib/rbuspirate/responses.rb

@@ -5,6 +5,7 @@ module Rbuspirate
   module Responses
     BITBANG_MODE = 'BBIO1'
     SUCCESS = 0x01.chr
+    PINS_SET = 0x00.chr
 
     module LE1WIRE
       ENTER = '1W01'

data/lib/rbuspirate/timeouts.rb

@@ -5,6 +5,7 @@ module Rbuspirate
   module Timeouts
     BINARY_RESET = 0.05
     SUCCESS = 0.1
+    PINONOFF = 0.1
 
     module LE1WIRE
       ENTER = 0.2
@@ -26,6 +27,7 @@ module Rbuspirate
 
     module UART
       ENTER = 0.2
+      BULK_WRITE = 5
     end
   end
 end

data/lib/rbuspirate/version.rb

@@ -1,3 +1,3 @@
 module Rbuspirate
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/rbuspirate.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib'] + Dir.glob('lib/**').select(&File.method(:directory?))
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "pry", "~> 0.12"
   spec.add_dependency "serialport", "~> 1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbuspirate
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - sh7d
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement