fldigi 0.1.6 → 0.1.10

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmZlZTZmNTkyOWU3N2EwMDQ5ZDVjNTFhY2NjZTJhZTMyZTFkYWY2Mg==
+  data.tar.gz: !binary |-
+    MzRhZGUzOWVmODYzNTdjMDg0ZDRhZGU2YTFmOGQ4NTRkYmIxOTdhOQ==
+SHA512:
+  metadata.gz: !binary |-
+    NzlhOWZjZWE3NzliYzNhMjQ2NWQyMDg5YmJiZWRjOWFhNTkxZDgxMTU5MTcz
+    YzQ4Yzg2MDAxYzQyMTIyYzQ2ZjBjOTZlNTVmYWEyYzYwOTI1NzVjOWY5NDEw
+    MGExYTQxZmY2M2IzMzllOTVkOTFhNGY3ZjRkZGIzZmM0YThjZTg=
+  data.tar.gz: !binary |-
+    NjRiYzhjNTQ2YjUxYTU3M2JiNjkxZjg0ZmVlMjdhYzlmNGJhN2NhYzZlMzdj
+    M2I4MWYwNDgwOWNlZDliODAxN2NiZGJjZWQ0ZTI0MGY2YjQ0MWJmODU4MTQ1
+    NTY3ODdlM2FiMTY4ODhhNDdmYWQzOTJkMGI1MGM3M2UyYTE5MTY=

data/lib/fldigi.rb

@@ -23,6 +23,7 @@
 require 'time'
 require 'xmlrpc/client'
 require 'thread'
+require 'digest/crc16_ccitt'
 
 # Turn 1/0 into false/true (some XMLRPC libraries seem to return 1/0,
 # others true/false).  This cleans up the code a bit.
@@ -49,7 +50,7 @@ class Error
 end
 
 class Fldigi
-  attr_accessor :rigctl, :dial_freq, :carrier, :call, :modem, :afc, :rsid, :sideband, :squelch, :slevel, :spot, :delay, :grid, :phg, :band, :offset, :start_wait, :char_wait, :debug, :errors
+  attr_accessor :rigctl, :dial_freq, :carrier, :call, :modem, :afc, :rsid, :sideband, :squelch, :slevel, :spot, :delay, :grid, :phg, :band, :offset, :start_wait, :char_wait, :debug, :errors, :fexpire
 
   # Do the initial setup.  All arguments are optional, default is
   # rigctl, localhost, standard port.  If you have no rig control,
@@ -91,6 +92,8 @@ class Fldigi
     @start_wait=10
     @char_wait=2
     @debug=false
+    @fexpire=3
+    @ftime=0
 
     # Propnet stuff.
     @band=nil
@@ -369,24 +372,33 @@ class Fldigi
   # 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.
+  # different than what it's currently set to.  It updates itself
+  # every @fexpire seconds (3 by default), but it's entirely possible
+  # that the user turned the knob in the three seconds since the last
+  # time you set/checked the frequency.  If you want to see what the
+  # radio is *actually* tuned to in real time, 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.
   def freq(f=false)
     if f
       @dial_freq=f-@carrier
     else
+      # If the last time we checked the dial frequency is more than
+      # @fexpire seconds ago, re-read the frequency and update the
+      # timestamp.
+      if Time.now().to_i-@ftime>@fexpire
+        @dial_freq=(self.radio_freq()+self.get_carrier()).to_i
+        @ftime=Time.now().to_i
+      end
       return (@dial_freq+self.get_carrier()).to_i
     end
   end
@@ -586,10 +598,18 @@ class Fldigi
         @delay=3600/(@phg[7,1].to_i)
       end
 
-      # Construct the actual string to be sent.
-      tmp="#{@call.downcase}>#{@fsym}:[#{@grid}]#{@phg}/^"
-      tmp=tmp+((self.crc16(tmp)).to_s(16)).upcase
-      @phgtext="FOR INFO: http://www.PropNET.org\n"+tmp
+      # Construct the actual string to be sent. Do some farting around
+      # with case to be consistent with what I actually see on the
+      # air.
+      tmpmsg="#{@call.upcase}>#{@fsym}:[#{@grid.downcase}]#{@phg.upcase}/"
+      tmpcrc=(Digest::CRC16CCITT.hexdigest(tmpmsg)).upcase
+      # Make sure the CRC is actually four characters long. Doesn't
+      # happen often, but it does happen (and I'm guessing won't be
+      # accepted by PropNet).
+      while tmpcrc.length<4
+        tmpcrc="0"+tmpcrc
+      end
+      @phgtext="FOR INFO: http://www.PropNET.org\n"+tmpmsg+"^"+tmpcrc+"\n"
     end
   end
 
@@ -612,44 +632,4 @@ class Fldigi
     end
   end
 
-  # CRC16 function for use with propnet.  "Borrowed" from:
-  # http://www.hadermann.be/blog/32/ruby-crc16-implementation/
-  def crc16(buf, crc=0)
-    ccitt_16 = [0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
-                0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
-                0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
-                0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
-                0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
-                0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
-                0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
-                0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
-                0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
-                0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
-                0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
-                0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
-                0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
-                0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
-                0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
-                0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
-                0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
-                0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
-                0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
-                0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
-                0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
-                0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
-                0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
-                0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
-                0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
-                0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
-                0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
-                0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
-                0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
-                0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
-                0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
-                0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0]
-
-    buf.each_byte{|x| crc = ((crc<<8) ^ ccitt_16[(crc>>8) ^ x])&0xffff} #>>
-    return crc
-  end
-
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fldigi
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.10
 platform: ruby
 authors:
 - Jeff Francis, N0GQ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies: []
 description: A library for talking to FLDigi.
 email: jeff@gritch.org
@@ -21,26 +20,25 @@ files:
 homepage: http://fldigi.gritch.org/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library for talking to FLDigi.
 test_files: []