gpsd_baud_rate 0.1.21 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 697ffd2de6dd6bc7fac5dbe256ab84dd8420db64965664428f07bb82a7f19432
-  data.tar.gz: 9bd0de90edff488cd6d4935a98375e25f30ce936d89d3ecff8653be8d6a490aa
+  metadata.gz: 75181cca77379dac1e13489449b6e5044df60975b425c7d8e04ec2c9060009f8
+  data.tar.gz: 19baba5ad478b3aef6048bd7f159e720118bb3c5d947eaec5d1ff6be92fed467
 SHA512:
-  metadata.gz: 47611d2009ff43745721faf9d4f2b6cfb03a939c6f787b71f07553b08ab3a4189eff81f1f830ef2d886493c83e21fbfd4aa888aa1e381b0995a29fc93c237a23
-  data.tar.gz: 7aec7fa85e6da637fa2f6b00a515393dafd4f679c70f84adfa6a6c8795d9658148340ac9b6e22e943f80e23e2db14a87adf2cfa22aec76f8d9533d6723b1a65e
+  metadata.gz: a3b80cce3ed695f62ec4f995736a2596451c2503a7ebc265f939f6d823a1c43d51018b70075c4b3fc721e34b23b44a7d6dcf79563dee3d1327f012c1ea3950f3
+  data.tar.gz: 83f70272821f1933b5eb7099ef20f88382f839c1a265ed741eef7281883d5988e51b6e8751c8fe42de7f3b8c2d330885f58c8f2afbdd0f8f18451cdd5a0c2d6e

data/lib/gpsd_baud_rate.rb

@@ -47,12 +47,12 @@ class GpsdBaudRate
     if active_rate == b_rate
       @logger.debug "Already at Goal Baud Rate"
     else
-      @logger.debug "\n~~~~~~~~~~~~ Read at #{active_rate} baud ~~~~~~~~~~~~~~"
+      @logger.debug "~~~~~~~~~~~~ Read at #{active_rate} baud ~~~~~~~~~~~~~~"
       unless (read_from_device active_rate)
         @logger.debug "Read at #{active_rate} baud Failed"
       else
         @logger.debug "Setting Goal Rate (#{b_rate})"
-        set_PMTK_baud_rate b_rate
+        set_PMTK_baud_rate active_rate, b_rate
         @logger.debug "Attempting Read at #{b_rate}"
         if read_from_device b_rate
           @logger.debug "Baud Rate Modification Successful"
@@ -60,6 +60,7 @@ class GpsdBaudRate
         else
           @logger.debug "Setting Baud Rate Failed"
         end
+      end
     end
 #
 #   Cleanup
@@ -135,7 +136,7 @@ private
         ser.read_timeout = 900
         @logger.debug "ReadTimeout: #{ser.read_timeout} ms"
         5.times { results << ser.readline(100)}
-        results.each { |s| @logger.debug s}
+        results.each { |s| @logger.debug s.strip!}
         results.each do |r|
           count += 1 if @@NMEA_sentences.any? { |s| s == r[0,6]}
         end
@@ -151,13 +152,17 @@ private
     count >= 2
   end
 
-  def write_to_device cmmd, baud
+  def write_to_device cmmd, active_rate
     count=0
     results=[]
+    GpsdBaudRate::gpsd_stop
 
     begin
-      @logger.debug "Send to device"
-      ser = SerialPort.open( @@device, baud, 8, 1, SerialPort::NONE) { |ser|
+      @logger.debug "In write_to_device"
+      @logger.debug "cmmd: #{cmmd}, class: #{cmmd.class}"
+      @logger.debug "baud: #{active_rate}, class: #{active_rate.class}"
+      @logger.debug "Send to device @ #{active_rate}"
+      ser = SerialPort.open( @@device, active_rate, 8, 1, SerialPort::NONE) { |ser|
         count = ser.write cmmd+"\r\n"
       }
     rescue IOError => e
@@ -168,7 +173,7 @@ private
     @logger.debug "Bytes Written: #{count}"
 
     begin
-      @logger.debug "Receive response"
+      @logger.debug "Receive response @ #{@goal_rate}"
       ser = SerialPort.open( @@device, @goal_rate, 8, 1, SerialPort::NONE) { |ser|
         ser.read_timeout = 900
         10.times {results << ser.readline(100)}
@@ -179,6 +184,7 @@ private
       @logger.debug "Error: #{e.inspect}"
     end
     results.each { |r| @logger.debug "Results: #{r}"}
+    GpsdBaudRate::gpsd_start
 
   end
 
@@ -190,11 +196,11 @@ private
     GpsdBaudRate::gpsd_start
   end
 
-  def set_PMTK_baud_rate rate
+  def set_PMTK_baud_rate active_rate, goal_rate
     @logger.debug "In set_PMTK_baud_rate"
     type = 251
-    cmmd = nmea_checksum("PMTK#{type},#{rate}")
-    write_to_device cmmd, @active_rate
+    cmmd = nmea_checksum("PMTK#{type},#{goal_rate}")
+    write_to_device cmmd, active_rate
   end
 
   def nmea_checksum cmmd

data/lib/gpsd_baud_rate/version.rb

@@ -1,3 +1,3 @@
 class GpsdBaudRate
-  VERSION = "0.1.21"
+  VERSION = "0.1.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpsd_baud_rate
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.26
 platform: ruby
 authors:
 - Steven Finnegan