rbuspirate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5ac21bf23f1ef37bb26f473b2a1af1fedf6f9d0a0acf1ae57b0d4f9bb1ca488
-  data.tar.gz: ab5ef5031437fd16343c12cb9e3001d05698c02fc262f92aab58aeddb3b4f992
+  metadata.gz: c4ff50218ea5120cf13b9bdb2023de3ab94c6130f4bf574d00cbb42509bfb133
+  data.tar.gz: 7f9de8009ee5136201f82eb6a07c7b68d2a68f039519f2b2776ca25a74a58184
 SHA512:
-  metadata.gz: b74422e19fac09ce79f85bbc9e3a51d0868d1972607daffbad6dd19dfafc497095315f5b43f0ad6e17fc81b253e557cbd5636a68a2dae0df7a2315e29d0f4d45
-  data.tar.gz: ff71fbe1589ac130cc8bf301365a3a4e61a18883c91b52de03f69e387b7cad033318851286161c469ac0ea933627b516f14a6c91c58faeee382abda49482fa33
+  metadata.gz: f66a9ea057a856b01ef13e8a91b982869f479308e488ea29df1f6a562987514aa5ef99e0740fa78a4a9610cab2b07164764baf8fdee263fd3c047cc8ccd18147
+  data.tar.gz: 34850f9a893ccc19b098bd2551425e36eb1d735636ecfd8617b374263c73da21385e856a256f86a07000b657f51f8b36349ff0d7e8fe560f944b77879e82bc0d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbuspirate (0.1.1)
+    rbuspirate (0.1.2)
       serialport (~> 1.3)
 
 GEM

data/lib/rbuspirate.rb

@@ -2,9 +2,9 @@ require 'expect'
 require 'serialport'
 
 require 'rbuspirate/commands'
-require 'rbuspirate/helpers'
 require 'rbuspirate/responses'
 require 'rbuspirate/timeouts'
+require 'rbuspirate/interfaces/abstract'
 require 'rbuspirate/interfaces/i2c'
 require 'rbuspirate/interfaces/uart'
 
@@ -20,6 +20,7 @@ module Rbuspirate
         raise 'Device argument must be device' if File.stat(dvc).rdev.zero?
 
         dvc = SerialPort.new(dvc, 115_200, 8, 1, SerialPort::NONE)
+        dvc.flow_control = SerialPort::NONE
       end
       @le_port = dvc
       @le_port.sync = true if sync

data/lib/rbuspirate/commands.rb

@@ -4,6 +4,16 @@
 module Rbuspirate
   module Commands
     RESET_BITBANG = 0b00000000
+    CONF_PER = 0b01000000
+
+    module Config
+      module Peripherals
+        POWER = 0b00001000
+        PULLUP = 0b00000100
+        AUX = 0b00000010
+        CS = 0b00000001
+      end
+    end
 
     module I2C
       ENTER = 0b00000010
@@ -12,18 +22,9 @@ module Rbuspirate
       WRITE_THEN_READ = 0x8
 
       module Config
-        CONF_PER = 0b01000000
-
-        module Peripherals
-          POWER = 0b00001000
-          PULLUP = 0b00000100
-          AUX = 0b00000010
-          CS = 0b00000001
-        end
-
         module Speed
           S5KHZ = 0b01100000
-          S50KZ = 0b01100001
+          S50KHZ = 0b01100001
           S100KHZ = 0b01100010
           S400KHZ = 0b01100011
         end
@@ -42,16 +43,8 @@ module Rbuspirate
       START_BRIDGE = 0b00001111
 
       module Config
-        CONF_PER = 0b01000000
         CONF_UART = 0b10000000
 
-        module Peripherals
-          POWER = 0b00001000
-          PULLUP = 0b00000100
-          AUX = 0b00000010
-          CS = 0b00000001
-        end
-
         module Speed
           S300 = 0b01100000
           S1200 = 0b01100001

data/lib/rbuspirate/interfaces/abstract.rb

@@ -0,0 +1,36 @@
+module Rbuspirate
+  module Interfaces
+    class Abstract
+      def configure_peripherals(
+        power: false, pullup: false, aux: false, cs: false
+      )
+        [power, pullup, aux, cs].map(&:class).each do |cls|
+          raise ArgumentError, 'All args must be true or false' unless [FalseClass, TrueClass].include?(cls)
+        end
+
+        bit_config = Commands::CONF_PER
+        bit_config |= Commands::Config::Peripherals::POWER if power
+        bit_config |= Commands::Config::Peripherals::PULLUP if pullup
+        bit_config |= Commands::Config::Peripherals::AUX if aux
+        bit_config |= Commands::Config::Peripherals::CS if cs
+
+        simplex_command(
+          bit_config,
+          Timeouts::SUCCESS,
+          'Unable to confgure peripherals'
+        )
+       @power, @pullup, @aux, @cs = power, pullup, aux, cs
+      end
+
+      protected
+
+      def simplex_command(command, tout, ex_message)
+        @le_port.write(command.chr)
+        resp = @le_port.expect(Responses::SUCCESS, tout)
+        return true if resp
+
+        raise ex_message
+      end
+    end
+  end
+end

data/lib/rbuspirate/interfaces/i2c.rb

@@ -5,52 +5,18 @@ require 'timeout'
 
 module Rbuspirate
   module Interfaces
-    class I2C
-      include Helpers
+    class I2C < Abstract
       attr_reader :speed, :power, :pullup, :aux, :cs
 
       def initialize(serial, bup)
         raise 'Bus pirate must be in i2c mode' unless bup.mode == :i2c
 
         @le_port = serial
-      end
-
-      def configure_peripherals(
-        power: false, pullup: false, aux: false, cs: false
-      )
-        [power, pullup, aux, cs].map(&:class).each do |cls|
-          raise ArgumentError, 'All args must be true or false' unless [FalseClass, TrueClass].include?(cls)
-        end
-
-        bit_config = Commands::I2C::Config::CONF_PER
-        bit_config |= Commands::I2C::Config::Peripherals::POWER if power
-        bit_config |= Commands::I2C::Config::Peripherals::PULLUP if pullup
-        bit_config |= Commands::I2C::Config::Peripherals::AUX if aux
-        bit_config |= Commands::I2C::Config::Peripherals::CS if cs
-
-        simplex_command(
-          bit_config,
-          Timeouts::SUCCESS,
-          'Unable to confgure peripherals'
-        )
-       @power, @pullup, @aux, @cs = power, pullup, aux, cs
+        set_speed(:'400khz')
       end
 
       def speed=(le_speed)
-        bit_speed = case le_speed.to_sym
-                    when :'5khz'
-                      Commands::I2C::Config::Speed::S5KHZ
-                    when :'50khz'
-                      Commands::I2C::Config::Speed::S50KHZ
-                    when :'100khz'
-                      Commands::I2C::Config::Speed::S100KHZ
-                    when :'400khz'
-                      Commands::I2C::Config::Speed::S400KHZ
-                    else
-                      raise ArgumentError, 'Bad speed argument'
-                    end
-
-        simplex_command(bit_speed, Timeouts::SUCCESS, 'Unable to set speed')
+        set_speed(le_speed)
       end
 
       def send_start
@@ -155,7 +121,6 @@ module Rbuspirate
         end
         return false if allow_zerobyte && result.ord.zero?
         raise 'Write failed' if result.ord.zero?
-
         if expected_bytes != 0
           Timeout.timeout(Timeouts::I2C::WRITE_THEN_READ_D) do
             result = @le_port.read(expected_bytes)
@@ -165,6 +130,24 @@ module Rbuspirate
           true
         end
       end
+      private
+      def set_speed(le_speed)
+        bit_speed = case le_speed.to_sym
+                    when :'5khz'
+                      Commands::I2C::Config::Speed::S5KHZ
+                    when :'50khz'
+                      Commands::I2C::Config::Speed::S50KHZ
+                    when :'100khz'
+                      Commands::I2C::Config::Speed::S100KHZ
+                    when :'400khz'
+                      Commands::I2C::Config::Speed::S400KHZ
+                    else
+                      raise ArgumentError, 'Bad speed argument'
+                    end
+
+        simplex_command(bit_speed, Timeouts::SUCCESS, 'Unable to set speed')
+        @speed = le_speed
+      end
     end
   end
 end

data/lib/rbuspirate/interfaces/uart.rb

@@ -5,8 +5,7 @@ require 'timeout'
 
 module Rbuspirate
   module Interfaces
-    class UART
-      include Helpers
+    class UART < Abstract
       attr_reader :bridge, :speed, :power, :pullup, :aux, :cs,
                   :pin_out_33, :parity_data, :stop_bits, :rx_idle,
                   :port
@@ -19,27 +18,10 @@ module Rbuspirate
         @le_port = serial
       end
 
-      def configure_peripherals(
-        power: false, pullup: false, aux: false, cs: false
-      )
+      def configure_peripherals(...)
         raise 'Device needs reset in order to reconfigure it' if @bridge
 
-        [power, pullup, aux, cs].map(&:class).each do |cls|
-          raise ArgumentError, 'All args must be true or false' unless [FalseClass, TrueClass].include?(cls)
-        end
-
-        bit_config = Commands::UART::Config::CONF_PER
-        bit_config |= Commands::UART::Config::Peripherals::POWER if power
-        bit_config |= Commands::UART::Config::Peripherals::PULLUP if pullup
-        bit_config |= Commands::UART::Config::Peripherals::AUX if aux
-        bit_config |= Commands::UART::Config::Peripherals::CS if cs
-
-        simplex_command(
-          bit_config,
-          Timeouts::SUCCESS,
-          'Unable to confgure peripherals'
-        )
-        @power, @pullup, @aux, @cs = power, pullup, aux, cs
+        super
       end
 
       def speed=(le_speed)

data/lib/rbuspirate/version.rb

@@ -1,3 +1,3 @@
 module Rbuspirate
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbuspirate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - sh7d
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - lib/rbuspirate.rb
 - lib/rbuspirate/commands.rb
 - lib/rbuspirate/helpers.rb
+- lib/rbuspirate/interfaces/abstract.rb
 - lib/rbuspirate/interfaces/i2c.rb
 - lib/rbuspirate/interfaces/uart.rb
 - lib/rbuspirate/responses.rb