gpsd_baud_rate 0.1.13 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e343e2224ce211deb5e835a96e60abcded7bd846276c36be6f730f4f470b7f4
-  data.tar.gz: ca105287fae0f58ede0960ef08587a2d96e68e0013476d09f94d3a0c2af5aa6f
+  metadata.gz: 339dbb83c3612644e284155a7cef27c814f7329a03d51402a706c670a94b180c
+  data.tar.gz: b0414f4bdb5e71fc2147ad4060cfc383f9df02731dcaf6be1986ca07f402194e
 SHA512:
-  metadata.gz: 5654eb49d988301e76677651b85ed07e0e8d8a81d894806c98e7fd5cc965afc1ab1031dbaeabf1b611f490b4dd312ea02ae846e0705d771d576af03b9224e26f
-  data.tar.gz: 005abe1437fd84d1facdbeda0c9cc32a9c57ef08839218b181c063f29b41e78212bf881780e7ecb5078e0d27036b3b2ee28e2f82f38a9e6f1e05bfc1181d4b98
+  metadata.gz: 91ad2d0ef9cfd74bf0282add9396cd7c5b828ab5201c65409a625361f880a641e6e7b96acb842dce47e50e27a53e45134927b094e92aecf5cb50a9937fdb4430
+  data.tar.gz: 43280a9fd19949638d48d42c9cbc31419a7b50d54ba4ef33dce66bb289958f5293f63e9938ef6b748cf5d6d019e6251c674ce22954adfecb52e834ea6cfe0695

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gpsd_baud_rate (0.1.5)
-      serialport (~> 1.3)
+    gpsd_baud_rate (0.1.17)
+      serialport (>= 1.3.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/gpsd_baud_rate.rb

@@ -29,37 +29,37 @@ class GpsdBaudRate
     end
 #    pid= %x|pgrep -f "ruby /home/deploy/bin/set_baud.rb"|
 #    @logger.debug "Pid:  #{pid}, $$: #{$$}, $BASHPID: #{$BASHPID}"
-=begin
+
     @goal_rate = goal_rate.to_i
     @logger.debug  "Goal_rate: #{@goal_rate}"
+  end #initiallize
 
-
-    gpsd_start unless gpsd_active?   #make sure it's running
-
-    @logger.debug "Service Status: #{gpsd_active?}"
-    @logger.debug "Baud Rate: #{@active_rate = baud_rate}"
-    gpsd_stop
-    @logger.debug "Service Status: #{gpsd_active?}"
-    @logger.debug "Baud Rate: #{@inactive_rate = baud_rate}"
-
-    @logger.debug "\n~~~~~~~~~~~~ Read at #{@active_rate} baud ~~~~~~~~~~~~~~"
-    if (read_from_device @active_rate) && (@active_rate != @goal_rate)
-      @logger.debug "Setting Goal Rate (#{goal_rate})"
-      set_PMTK_baud_rate @goal_rate
-      if read_from_device @goal_rate
-        @logger.debug "Goal Baud Rate (#{@goal_rate}) has been set"
+  def set_baud_rate b_rate = @goal_rate
+    @logger.debug "In set_baud_rate"
+    gpsd_start unless GpsdBaudRate::gpsd_active?   #make sure it's running
+
+    @logger.debug "Service Status: #{GpsdBaudRate::gpsd_active?}"
+    @logger.debug "Baud Rate: #{active_rate = GpsdBaudRate::baud_rate}"
+    GpsdBaudRate::gpsd_stop
+    @logger.debug "Service Status: #{GpsdBaudRate::gpsd_active?}"
+    @logger.debug "Baud Rate: #{inactive_rate = GpsdBaudRate::baud_rate}"
+
+    @logger.debug "\n~~~~~~~~~~~~ Read at #{active_rate} baud ~~~~~~~~~~~~~~"
+    if (read_from_device active_rate) && (active_rate != b_rate)
+      @logger.debug "Setting Goal Rate (#{b_rate})"
+      set_PMTK_baud_rate b_rate
+      if read_from_device b_rate
+        @logger.debug "Goal Baud Rate (#{b_rate}) has been set"
       end
     else
       @logger.debug "Already at Goal Baud Rate"
     end
-
-
 #
 #   Cleanup
-    gpsd_start
-    @logger.debug "Service Status: #{gpsd_active?}"
-=end
-  end #initiallize
+    GpsdBaudRate::gpsd_start
+    @logger.debug "Service Status: #{GpsdBaudRate::gpsd_active?}"
+
+  end
 
 #~~~~~~~~~~~~~~~~~~~~~ gpsd_status ~~~~~~~~~~~~~~~~~
 
@@ -67,7 +67,7 @@ class GpsdBaudRate
   def self.check_device?
     # Does the @@device exist and is it a character device
     # [[ ]] returns true (0) if 'file' exists
-    "0/n" == %x| [ -c "#{@@device}" ] ; echo $?|
+    "0\n" == %x| [ -c "#{@@device}" ] ; echo $?|
 
   end
 
@@ -113,14 +113,14 @@ class GpsdBaudRate
     read_from_device b_rate
   end
 
-
+private
 # Attempts to read from serial port using the baud rate specified
 # Will try to receive five 'lines' of text
 # Expects to receive NMEA sentences
 # Returns true if at least two of the received lines start with the NMEA
 # '$GPxxx' sentence codes in @@NMEA_sentences
   def read_from_device( baud)
-    gpsd_stop
+    GpsdBaudRate::gpsd_stop
     begin
       results = []
       count = 0
@@ -140,7 +140,7 @@ class GpsdBaudRate
       @logger.debug "Error: #{e.inspect}"
     end
     @logger.debug "SerialPort Closed"
-    gpsd_start
+    GpsdBaudRate::gpsd_start
     count >= 2
   end
 
@@ -178,9 +178,9 @@ class GpsdBaudRate
 
   def find_baud_rate
     @logger.debug %x| sudo stty -F "#{@@device}"|
-    gpsd_stop
+    GpsdBaudRate::gpsd_stop
     @logger.debug %x|sudo stty -F "#{@@device}"|
-    gpsd_start
+    GpsdBaudRate::gpsd_start
   end
 
   def set_PMTK_baud_rate rate

data/lib/gpsd_baud_rate/version.rb

@@ -1,3 +1,3 @@
 class GpsdBaudRate
-  VERSION = "0.1.13"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpsd_baud_rate
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.18
 platform: ruby
 authors:
 - Steven Finnegan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler