fldigi 0.0.13 → 0.0.14

data/lib/fldigi.rb

@@ -27,6 +27,10 @@
 #
 # Version History:
 #
+# 0.0.14 - 06/28/2014 - jfrancis - Be more consistent about to_f vs.
+# to_i.  Also, add a function to return actual radio freq (instead of
+# specified freq).
+# 
 # 0.0.13 - 06/11/2014 - jfrancis - A bunch of clean-up here.  I almost
 # certainly broke some code with this one.  I changed @freq to
 # @dial_freq to more accurately reflect what's going on, and added a
@@ -264,14 +268,14 @@ class Fldigi
     # all-purpose solution to this one, but at least it allows for
     # consistent and automated use of the library without having to do
     # the conversions in your own code.
-    @dial_freq=@dial_freq.to_f
+    @dial_freq=@dial_freq.to_i
     if (@dial_freq!=@dial_freq_old or @offset!=@offset_old) and @rigctl
       @dial_freq_old=@dial_freq
       @offset_old=@offset
-      if @dial_freq+@offset.to_f!=self.sendcmd("main.get_frequency")
-        self.sendcmd("main.set_frequency", @dial_freq+@offset.to_f)
+      if @dial_freq+@offset.to_i!=self.sendcmd("main.get_frequency").to_i
+        self.sendcmd("main.set_frequency", @dial_freq+@offset.to_i)
         sleep 0.5
-        if @dial_freq+@offset.to_f!=self.sendcmd("main.get_frequency")
+        if @dial_freq+@offset.to_i!=self.sendcmd("main.get_frequency").to_i
           return false
         end
       end
@@ -311,14 +315,22 @@ class Fldigi
     end
   end
   
-  # Get/set the actual transmit frequency (dial frequency plus
-  # carrier).  If you don't supply a parameter, this method returns
-  # the *actual* current transmit frequency (ie, it immediately reads
-  # the actual carrier).  If you do supply a parameter, it sets the
-  # transmit frequency by subtracting the currently requested carrier
-  # (ie, not the actual current carrier, but what you set @carrier to)
-  # from the supplied frequency, then setting @dial_freq to that
-  # value.  For example, if @carrier was set to 1000 and you called
+  # Get/set the transmit frequency (dial frequency plus carrier).  If
+  # you don't supply a parameter, this method returns the transmit
+  # frequency you most recently specified.  IMPORTANT: The returned
+  # value may not be where the radio is currently tuned.  This
+  # function returns what you *told* the radio to be, which could be
+  # different than what it's currently set to.  It's entirely possible
+  # that the user turned the knob after you set the frequency.  If you
+  # want to see what the radio is *actually* tuned to, use the
+  # radio_freq() method (below).  This method does, however, go out
+  # and read the actual current carrier, as that tends to float around
+  # due to both the user clicking on the waterfall, and naturally due
+  # to AFC.  If you do supply a parameter, it sets the transmit
+  # frequency by subtracting the currently requested carrier (ie, not
+  # the actual current carrier, but what you set @carrier to) from the
+  # supplied frequency, then setting @dial_freq to that value.  For
+  # example, if @carrier was set to 1000 and you called
   # self.freq(14071000), @dial_freq would be set to 14070000.  Note
   # that this only sets up all the values in the object, you still
   # have to "push" them to the radio with the self.config() method.
@@ -330,6 +342,12 @@ class Fldigi
     end
   end
 
+  # Read the real freq plus real carrier from the radio (contrast with
+  # freq() above).
+  def radio_freq
+    return (self.sendcmd("main.get_frequency").to_i+self.get_carrier()).to_i
+  end
+
   # Send the currently buffered data using the carrier, mode,
   # frequency, etc. currently configured.  The current code will wait
   # up to @start_wait (10) seconds for the first character to be

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fldigi
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors: