relayrace 1.0.1 → 1.0.2

data/lib/relayrace.rb

@@ -1,4 +1,3 @@
-require 'monitor'
 require 'serialport'
 require 'system_timer'
 
@@ -6,12 +5,6 @@ class RelayrAce
   def initialize(port, logger = nil)
     @port = port
     @logger = logger
-    open_serial_port
-  end
-  
-  def close 
-    @serial.close
-    @serial = @port = nil
   end
   
   def get_relay(relay)
@@ -43,25 +36,16 @@ class RelayrAce
   end
   
   def send_cmd(cmd)
-    @serial.synchronize do
-      begin
-        SystemTimer.timeout_after(10) do
-          @serial.write("\r\n")
-          2.times { @serial.getc == ':' }
-          @serial.write("#{cmd}\r\n")
+    begin
+      SystemTimer.timeout_after(10) do
+        SerialPort.open(@port, 115200, 8, 1, SerialPort::NONE) do |tty|
+          tty.write("\r\n")
+          2.times { tty.getc == ':' }
+          tty.write("#{cmd}\r\n")
         end
-      rescue Timeout::Error
-        @logger.warn "Reopening serial port due to timeout" if @logger
-        open_serial_port
       end
+    rescue Timeout::Error
+      @logger.warn "Failed to execute operation #{cmd}" if @logger    
     end
   end  
-  
-  private
-  def open_serial_port
-    @serial.close if @serial
-    sleep 1 # Give the OS a chance to catch up
-    @serial = SerialPort.new(@port, 115200, 8, 1, SerialPort::NONE)
-    @serial.extend(MonitorMixin)
-  end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: relayrace
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Mat Trudel