radio 0.0.1 → 0.0.2

data/lib/radio/psk31/bit_detect.rb

@@ -1,3 +1,18 @@
+# Copyright 2012 The ham21/radio Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 class Radio
   
   class PSK31
@@ -8,7 +23,7 @@ class Radio
       CHANGE_DELAY = 5
       
       def initialize
-        @averages = Array.new 21
+        @averages = Array.new 16
         reset
       end
       
@@ -20,10 +35,10 @@ class Radio
         @change_at = 0
       end
       
-      def call sample_x, sample_y
-        yield if @phase == @peak
+      def call iq
+        yield iq if @phase == @peak
         @peak = @next_peak if @phase == @change_at
-        energy = sample_x**2 + sample_y**2
+        energy = iq.real**2 + iq.imag**2
         @averages[@phase] = (1.0-1.0/AVG_SAMPLES)*@averages[@phase] + (1.0/AVG_SAMPLES)*energy
         @phase += 1
         if @phase > 15

data/lib/radio/psk31/decoder.rb

@@ -1,3 +1,18 @@
+# Copyright 2012 The ham21/radio Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 class Radio
   class PSK31
     
@@ -19,11 +34,11 @@ class Radio
         @prev_bit = false
       end
       
-      def call new_i, new_q
+      def call iq
         @prev_i = @this_i
         @prev_q = @this_q
-        @this_i = new_i
-        @this_q = new_q
+        @this_i = iq.real
+        @this_q = iq.imag
         vect_y = @prev_i*@this_i + @prev_q*@this_q
         if @mode == :bpsk
           bit = vect_y >= 0.0 ? 1 : 0

data/lib/radio/psk31/fir_coef.rb

@@ -1,6 +1,11 @@
+# These are from LGPL licensed programs if they are even copyrightable.
+# They will be removed after I implement remez in Ruby.
+
+
 class Radio
   class PSK31
 
+    # 48000 to 8000 decimation
     FIR_DEC6 = [
        -0.001026086585,
        -0.002131424398,
@@ -165,7 +170,7 @@ class Radio
     #            edge        edge
     #   1         0.0       .0125         1.0         1
     #   2         .125      .5          .000001       10  
-    FIR_DEC4 = [
+    FIR_DEC = [
      -0.00021203644,
      -0.00070252426,
       -0.0016680526,

data/lib/radio/psk31/rx.rb

@@ -1,49 +1,44 @@
+# Copyright 2012 The ham21/radio Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 class Radio
   
   class PSK31
     
     class Rx
 
-      def initialize sample_rate, format, frequency
-        @filter = Filters.new sample_rate, format, frequency, 
-          :dec6 => FIR_DEC6,
-          :dec16 => FIR_DEC16,
-          :dec4 => FIR_DEC4,
-          :bit => FIR_BIT
+      def initialize frequency
+        phase_inc = PI2 * frequency / 8000
+        @dec_filter = Filter.new mix:phase_inc, decimate:16, fir:FIR_DEC16
+        @bit_filter = Filter.new fir:FIR_BIT
         @bit_detect = BitDetect.new
         @decoder = Decoder.new
       end
       
-      def call sample_data
+      def call data
         decoded = ''
-        @filter.call sample_data do |i, q|
-          @bit_detect.call i, q do
-            @decoder.call i, q do |symbol|
-              decoded += symbol
+        @dec_filter.call data do |iq|
+          @bit_filter.call iq do |iq|
+            @bit_detect.call iq do |iq|
+              @decoder.call iq do |symbol|
+                decoded += symbol
+              end
             end
           end
         end
-        decoded
-      end
-      
-      def frequency= frequency
-        if frequency != @filter.frequency
-          @filter.frequency = frequency
-          @filter.recalc_phase_inc
-          reset
-        end
-      end
-      
-      # To compensate for bad clock in A-D conversion
-      def adjust_sample_clock ppm
-        @filter.clock = 8000.0 * ppm / 1000000 + 8000
-        @filter.recalc_phase_inc
-      end
-      
-      def reset
-        @filter.reset
-        @bit_detect.reset
-        @decoder.reset
+        yield decoded
       end
       
     end

data/lib/radio/psk31/varicode.rb

@@ -1,3 +1,18 @@
+# Copyright 2012 The ham21/radio Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 class Radio
   
   class PSK31

data/lib/radio/rig.rb

@@ -0,0 +1,46 @@
+# Copyright 2012 The ham21/radio Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+class Radio
+
+  class Rig
+    
+    include Spectrum
+    include Rx
+    include LO
+  
+    def initialize
+      @semaphore = Mutex.new
+      super
+    end
+    
+    def rate
+      @semaphore.synchronize do
+        return @rx.rate if @rx
+        return @tx.rate if @tx
+        return 0
+      end
+    end
+    
+    def iq?
+      @semaphore.synchronize do
+        return @rx.channels == 2 if @rx
+        return @tx.channels == 2 if @tx
+        return false
+      end
+    end
+
+  end
+end

data/lib/radio/rig/lo.rb

@@ -0,0 +1,57 @@
+# Copyright 2012 The ham21/radio Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+class Radio
+  class Rig
+    module LO
+  
+      def initialize
+        @lo = Controls::Null.new
+        super
+      end
+      
+      # Accepts an instance of any LO control to use.
+      # Float for the frequency in MHz (sub-Hz ok).
+      # Integer for the frequency in Hz.
+      def lo= freq_or_control
+        @semaphore.synchronize do
+          if Numeric === freq_or_control
+            @lo.lo = if freq_or_control.integer?
+              freq_or_control.to_f / 1000000
+            else
+              freq_or_control
+            end
+          else
+            @lo.stop if @lo
+            @lo = freq_or_control
+          end
+        end
+      end
+
+      # Returns a float of the LO frequency in MHz.
+      # This will read from the actual device for the case of an
+      # operator adjusting outside this application, such as with
+      # the main dial of a stand-alone radio.
+      def lo
+        @semaphore.synchronize do
+          @lo.lo
+        end
+      end
+    
+    end
+  end
+end
+
+

data/lib/radio/rig/rx.rb

@@ -0,0 +1,61 @@
+# Copyright 2012 The ham21/radio Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+class Radio
+
+  class Rig
+    
+    module Rx
+  
+      def initialize
+        @rx = @rx_thread = nil
+        super
+      end
+      
+      def rx= input
+        old_rx_thread = new_thread = false
+        @semaphore.synchronize do
+          if @rx
+            @rx.stop
+            old_rx_thread = @rx_thread
+            old_rx_thread.kill
+          end
+          if @rx = input
+            @rx_thread = Thread.new &method(:rx_thread)
+          end
+        end
+        old_rx_thread.join if old_rx_thread
+      end
+  
+      private
+    
+      # DSP under an OS requires chunked and streaming processing
+      # as opposed to handling every sample as it arrives.
+      # We want to work with powers of two but sample rates
+      # are multiples of 8000. Let's use a lag of 32ms or 31.25 baud.
+      def rx_thread
+        qty_samples = @rx.rate / 125 * 4
+        loop do
+          samples = @rx.call qty_samples
+          spectrum_collect samples
+        end
+      end
+    
+    end
+  
+  end
+end
+
+

data/lib/radio/rig/spectrum.rb

@@ -0,0 +1,96 @@
+# Copyright 2012 The ham21/radio Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+class Radio
+  class Rig
+    module Spectrum
+  
+      def initialize
+        @spectrum_buf = {}
+        @spectrum_pending = Hash.new {|h,k|h[k]=[]}
+        super
+      end
+
+      # Block until the next collection of data is ready (size*frequency samples).
+      # Result is NArray of floats suitable for display purposes.
+      # size must be a power of 2 for good performance (use GPU for visual scaling)
+      # frequency may be greater or less than 1.0
+      # keep_alive in secs set high enough so intervals between results are accurate
+      # Results are not queued; missed processing is skipped.
+      # This is meant to be an ideal interface for Web UI work, not signal analysis.
+      def spectrum size, frequency=1.0, keep_alive=2.0
+        @semaphore.synchronize do
+          @spectrum_pending[[size, frequency, keep_alive]] << Thread.current
+        end
+        sleep
+        @spectrum_buf[[size, frequency, keep_alive]][2]
+      end
+  
+      private
+    
+      def spectrum_collect samples
+        time_now = Time.now
+        @semaphore.synchronize do
+          # Ensure buffers for all requested setups are in place
+          @spectrum_pending.keys.each do |size, frequency, keep_alive|
+            @spectrum_buf[[size, frequency, keep_alive]] ||= [nil,[],nil]
+            @spectrum_buf[[size, frequency, keep_alive]][0] = time_now
+          end
+          # Stop running anything that's not being used anymore
+          @spectrum_buf.delete_if { |k,v| v[0] < time_now - k[2] }
+          # Handle the data for each active buffer
+          @spectrum_buf.each do |k,v|
+            time, data, result = v
+            size, frequency, keep_alive = k
+            collect_size = size * ((Float === samples[0]) ? 2 : 1)
+            data.push samples
+            buf_size = data.reduce(0){|a,b|a+b.size}
+            size_freq = collect_size*frequency
+            # Wait until we have enough data and the time is right
+            if buf_size > collect_size and buf_size > size_freq
+              # Discard any extra data we won't use (frequency>1)
+              while buf_size - data.first.size > collect_size
+                buf_size -= data.shift.size
+              end
+              pending_key = [size, frequency, keep_alive]
+              if @spectrum_pending.has_key? pending_key
+                spectrum_data = NArray.to_na data
+                spectrum_data.reshape! spectrum_data.total
+                spectrum_out = FFTW3.fft(spectrum_data[-collect_size..-1]) 
+                if spectrum_out.size == size
+                  result = NArray.sfloat size
+                  result[0...size/2] = spectrum_out[size/2..-1].div!(size)
+                  result[size/2..-1] = spectrum_out[0...size/2].div!(size)
+                  v[2] = result.abs
+                else
+                  v[2] = spectrum_out[0...size].div!(size).abs
+                end
+                @spectrum_pending[pending_key].each(&:wakeup)
+                @spectrum_pending.delete pending_key
+              end
+              # Discard enough old buffers to accommodate the frequency
+              trim_size = [0, collect_size - size*frequency].max
+              while buf_size > trim_size
+                buf_size -= data.shift.size
+              end
+            end
+          end
+        end
+      end
+    
+    end
+  end
+end
+