rfbeam 0.5.0 → 0.5.8

data/lib/rfbeam/kld7/operation_params.rb

@@ -0,0 +1,162 @@
+# frozen_string_literal: true
+
+module RfBeam
+  module KLD7
+    # -----------------
+    # Base Frequency, 0 = low, 1 = middle (default), 2 = high
+    # -----------------
+    def base_frequency
+      query_parameter RADAR_PARAMETERS[:base_frequency].grps_index
+    end
+    alias rbfr base_frequency
+
+    def base_frequency=(frequency = 1)
+      value =
+        case frequency
+        when 0, :low, 'low'
+          0
+        when 1, :middle, 'middle'
+          1
+        when 2, :high, 'high'
+          2
+        else
+          raise ArgumentError, "Invalid arg: '#{frequency}'"
+        end
+      set_parameter(:rbfr, value, :uint32)
+    end
+
+    alias set_base_frequency base_frequency=
+    alias rbfr= base_frequency=
+
+    # -----------------
+    # Maximum Speed, 0 = 12.5km/h, 1 = 25km/h (default), 2 = 50km/h, 3 = 100km/h
+    # -----------------
+    def max_speed
+      query_parameter(RADAR_PARAMETERS[:max_speed].grps_index)
+    end
+
+    def max_speed=(speed = 1)
+      raise ArgumentError, "Invalid arg: '#{speed}'" unless (0..3).cover?(speed)
+      raise ArgumentError, 'Expected an Integer' unless speed.is_a?(Integer)
+
+      set_parameter :rspi, speed, :uint32
+    end
+
+    alias set_max_speed max_speed=
+    alias rspi max_speed=
+
+    # -----------------
+    # Maximum Range, 0 = 5m, 1 = 10m (default), 2 = 30m, 3 = 100m
+    # -----------------
+    def max_range
+      query_parameter(RADAR_PARAMETERS[:max_range].grps_index)
+    end
+
+    def max_range=(range = 1)
+      raise ArgumentError, "Invalid arg: '#{range}'" unless (0..3).cover?(range)
+      raise ArgumentError, 'Expected an Integer' unless range.is_a?(Integer)
+
+      set_parameter :rrai, range, :uint32
+    end
+
+    alias rrai= max_range=
+    alias set_max_range max_range=
+
+    # -----------------
+    # Threshold Offset, 10 - 60db, (default = 30)
+    # -----------------
+    def threshold_offset
+      query_parameter RADAR_PARAMETERS[:threshold_offset].grps_index
+    end
+
+    def threshold_offset=(offset = 30)
+      raise ArgumentError, "Invalid arg: '#{offset}'" unless (10..60).cover?(offset)
+      raise ArgumentError, 'Expected an Integer' unless offset.is_a?(Integer)
+
+      set_parameter :thof, offset, :uint32
+    end
+
+    alias thof= threshold_offset=
+    alias set_threshold_offset threshold_offset=
+
+    # -----------------
+    # Tracking filter type, 0 = Standard (Default), 1 = Fast Tracking, 2 = Long visibility
+    # -----------------
+    def tracking_filter
+      query_parameter RADAR_PARAMETERS[:tracking_filter].grps_index
+    end
+
+    def tracking_filter=(type = 0)
+      raise ArgumentError, "Invalid arg: '#{type}'" unless (0..2).cover?(type)
+      raise ArgumentError, 'Expected an Integer' unless type.is_a?(Integer)
+
+      set_parameter :trft, type, :uint32
+    end
+    alias trtf= tracking_filter=
+    alias set_tracking_filter tracking_filter=
+
+    # -----------------
+    # Vibration suppression, 0 - 16, 0 = No Suppression, 16 = High Suppression, default = 2
+    # -----------------
+    def vibration_suppression
+      query_parameter RADAR_PARAMETERS[:vibration_suppression].grps_index
+    end
+
+    def vibration_suppression=(value = 2)
+      raise ArgumentError, "Invalid arg: '#{value}'" unless (0..16).cover?(value)
+      raise ArgumentError, 'Expected an Integer' unless value.is_a?(Integer)
+
+      set_parameter :visu, value, :uint32
+    end
+    alias visu= vibration_suppression=
+    alias set_vibration_suppression vibration_suppression=
+  end
+
+  # -----------------
+  # Range Threshold, 0 - 100% of Range setting, default = 10
+  # -----------------
+  def range_threshold
+    query_parameter RADAR_PARAMETERS[:range_threshold].grps_index
+  end
+
+  def range_threshold=(value = 10)
+    raise ArgumentError, "Invalid arg: '#{value}'" unless (0..100).cover?(value)
+    raise ArgumentError, 'Expected an Integer' unless value.is_a?(Integer)
+
+    set_parameter :rath, value, :uint32
+  end
+  alias rath= range_threshold=
+  alias set_range_threshold range_threshold=
+
+  # -----------------
+  # Angle Threshold, -90° to 90°, default = 0
+  # -----------------
+  def angle_threshold
+    query_parameter RADAR_PARAMETERS[:angle_threshold].grps_index
+  end
+
+  def angle_threshold=(value = 0)
+    raise ArgumentError, "Invalid arg: '#{value}'" unless (-90..90).cover?(value)
+    raise ArgumentError, 'Expected an Integer' unless value.is_a?(Integer)
+
+    set_parameter :anth, value, :int32
+  end
+  alias anth= angle_threshold=
+  alias set_angle_threshold angle_threshold=
+
+  # -----------------
+  # Speed Threshold, 0 - 100% of speed setting, default = 50
+  # -----------------
+  def speed_threshold
+    query_parameter RADAR_PARAMETERS[:speed_threshold].grps_index
+  end
+
+  def speed_threshold=(value = 50)
+    raise ArgumentError, "Invalid arg: '#{value}'" unless (0..100).cover?(value)
+    raise ArgumentError, 'Expected an Integer' unless value.is_a?(Integer)
+
+    set_parameter :spth, value, :uint32
+  end
+  alias spth= angle_threshold=
+  alias set_speed_threshold angle_threshold=
+end

data/lib/rfbeam/kld7/radar_messages.rb

@@ -3,7 +3,7 @@
 require 'csv'
 
 module RfBeam
-  module Kld7
+  module KLD7
     def detection?
       data = ddat
       (data[2] == 1)
@@ -30,12 +30,10 @@ module RfBeam
     def pdat(formatted: false)
       request_frame_data(:pdat)
       resp = read(102).unpack('a4LSssSSssSSssSSssSSssSSssSSssSSssSSssSSssS')
-      raise Error, "PDAT response = #{resp[0]}" unless resp[0] == 'PDAT'
-
       return resp unless formatted
 
-      target_count = resp[1].to_i / 8
-      return [] unless target_count.positive?
+      target_count = Integer(resp[1], 10) / 8
+      return [] if target_count <= 0
 
       resp.shift 2
       resp.compact
@@ -46,22 +44,25 @@ module RfBeam
 
     def tdat
       request_frame_data(:tdat)
-      sleep MEASUREMENT_DELAY
 
+      sleep 0.1
       resp = read(16).unpack('a4LSssS')
-      raise Error, "TDAT response = #{resp[0]}" unless resp[0] == 'TDAT'
-
-      resp
+      return { dist: resp[2], speed: resp[3], angle: resp[4], mag: resp[5] } if resp[1].nonzero?
     end
 
     def ddat
       request_frame_data(:ddat)
-      sleep MEASUREMENT_DELAY
-
-      resp = read(14).unpack('a4LC6')
-      raise Error, "DDAT response = #{resp[0]}" unless resp[0] == 'DDAT'
-
-      resp
+      array = read(14).unpack('a4LC6')
+      {
+        label: array[0],
+        detection: array[2] == 1,
+        detection_str: DETECTION_FLAGS[:detection][array[2]],
+        micro_detection: DETECTION_FLAGS[:micro_detection][array[3]],
+        angle: DETECTION_FLAGS[:angle][array[4]],
+        direction: DETECTION_FLAGS[:direction][array[5]],
+        range: DETECTION_FLAGS[:range][array[6]],
+        speed: DETECTION_FLAGS[:speed][array[7]]
+      }
     end
 
     # Get the radar parameter structure
@@ -74,7 +75,7 @@ module RfBeam
 
     def config
       data = grps
-      output = []
+      output = "\n"
       RADAR_PARAMETERS.each_key { |key| output << formatted_parameter(key, data[RADAR_PARAMETERS[key].grps_index]) }
       output
     end
@@ -85,7 +86,7 @@ module RfBeam
         data = grps
         value = data[param.grps_index]
       end
-      param_str_value = param.str_values.empty? ? value.to_s : param.str_values[value]
+      param_str_value = param.values.empty? ? value.to_s : param.values[value]
       "#{param.name}: #{param_str_value}#{param.units}\n"
     end
 

data/lib/rfbeam/kld7/serial_connection.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RfBeam
-  module Kld7
+  module KLD7
     require 'rubyserial'
     require 'timeout'
 
@@ -16,7 +16,6 @@ module RfBeam
       parity = :even
       stop_bits = 1
       open_serial_port(path, baude_rate, data_bits, parity, stop_bits)
-      init_radar if connected?
 
       yield self if block_given?
     end
@@ -42,6 +41,12 @@ module RfBeam
       sleep 0.1
     end
 
+    def init_radar
+      command = ['INIT', 4, 0]
+      @serial_port.write command.pack('a4LL')
+      check_response
+    end
+
     private
 
     def open_serial_port(path, baude_rate, data_bits, parity, stop_bits)
@@ -49,7 +54,7 @@ module RfBeam
     end
 
     def connected?
-      raise Error, 'ConnectionError: No open Serial device connections.' if @serial_port.nil?
+      raise Error, 'ConnectionError: No open Serial device connections.' if @serial_port.closed?
 
       true
     end
@@ -70,22 +75,16 @@ module RfBeam
       end
     end
 
-    def init_radar
-      command = ['INIT', 4, 0]
-      @serial_port.write command.pack('a4LL') # 4 ASCII bytes, UINT32, UINT32
-      check_response
-    end
-
     def check_response
       sleep RESPONSE_DELAY
-      resp = @serial_port.read(9).unpack('a4LC') # 4 ASCII bytes, UINT32, UINT8
+      resp = @serial_port.read(9).unpack('a4LC')
       raise Error, 'No valid response from Serial Port' if resp[2].nil?
 
-      response_key = resp[2]
-      error_string = RESP_CODES[response_key].nil? ? 'Response unknown' : RESP_CODES[response_key]
-      raise Error, "Radar response Error: #{error_string}" unless response_key.zero?
+      resp_code = resp[2]
+      index_range = 1..RESP_CODES.size
 
-      response_key.zero? # Everything OK
+      raise Error, "Radar response Error: #{RESP_CODES[resp_code]}" if index_range.include?(resp_code)
+      true
     end
   end
 end

data/lib/rfbeam/kld7/streamer.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'io/console'
+require 'stringio'
+require 'tty-screen'
+require 'unicode_plot'
+
+module RfBeam
+  module KLD7
+    class Streamer
+      attr_accessor :radar
+
+      def initialize(radar)
+        @radar = radar
+      end
+
+      def monitor_keypress
+        loop do
+          key = $stdin.getch
+          if key.casecmp('q').zero?
+            @stop_streaming = true
+            break
+          end
+        end
+      end
+
+      def rfft
+        out = StringIO.new
+        def out.tty?
+          true
+        end
+
+        Thread.new { monitor_keypress }
+
+        loop do
+          out.truncate(0)
+
+          plot = rfft_plot(@radar)
+          plot.render(out)
+
+          lines = out.string.lines
+          lines.each { |line| $stdout.print "\r#{line}" }
+          $stdout.print "\e[0J"
+          $stdout.flush
+          break if @stop_streaming
+
+          n = lines.count
+          $stdout.print "\e[#{n}F"
+        end
+      end
+
+      private
+
+      def plot_data(data)
+        {
+          x: Array(-128...128),
+          series1: data.shift(256).map { |value| value / 100 },
+          series2: data.shift(256).map { |value| Integer(value, 10) / 100 }
+        }
+      end
+
+      def rfft_plot(radar)
+        width = TTY::Screen.width * 0.65
+        data = plot_data(radar.rfft)
+        plot =
+          UnicodePlot.lineplot(
+            data[:x],
+            data[:series1],
+            name: 'IF1/2 Averaged',
+            title: 'Raw FFT',
+            height: 25,
+            width:,
+            xlabel: 'Speed (km/h)',
+            ylabel: 'Signal (db)',
+            xlim: [-128, 128],
+            ylim: [0, 100]
+          )
+        UnicodePlot.lineplot!(plot, data[:x], data[:series2], name: 'Threshold')
+        plot
+      end
+    end
+  end
+end

data/lib/rfbeam/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RfBeam
-  VERSION = '0.5.0'
+  VERSION = '0.5.8'
 end

data/lib/rfbeam.rb

@@ -1,20 +1,21 @@
 # frozen_string_literal: true
 
-require 'rfbeam/kld7/radar_parameters'
+require 'rfbeam/cli'
+require 'rfbeam/kld7/constants'
+require 'rfbeam/kld7/detection_params'
+require 'rfbeam/kld7/module_params'
+require 'rfbeam/kld7/operation_params'
 require 'rfbeam/kld7/radar_messages'
 require 'rfbeam/kld7/serial_connection'
-require 'rfbeam/kld7/constants'
-require 'rfbeam/kld7/cli_output'
-require 'rfbeam/kld7/cli_formatter'
+require 'rfbeam/kld7/streamer'
 require 'rfbeam/version'
-require 'rfbeam/cli'
 
 module RfBeam
   class Error < StandardError
   end
 
-  class KLD7
-    include RfBeam::Kld7
+  class Kld7
+    include RfBeam::KLD7
   end
 
   def self.connected

data/output.csv

@@ -0,0 +1,257 @@
+0,2105,2105
+1,3070,2915
+2,2915,805
+3,2325,2830
+4,805,3420
+5,1000,1340
+6,2830,1555
+7,3810,2645
+8,3420,1270
+9,1645,1400
+10,1340,1130
+11,1285,1350
+12,1555,1085
+13,1500,910
+14,2645,1400
+15,2785,1435
+16,1270,1150
+17,500,1545
+18,1400,1270
+19,615,1285
+20,1130,1435
+21,1000,785
+22,1350,710
+23,1565,955
+24,1085,1165
+25,1420,1645
+26,910,1595
+27,1265,455
+28,1400,805
+29,1015,1050
+30,1435,560
+31,1060,1530
+32,1150,3275
+33,305,3510
+34,1545,650
+35,765,1415
+36,1270,1760
+37,785,650
+38,1285,830
+39,980,560
+40,1435,850
+41,1085,0
+42,785,480
+43,1340,1150
+44,710,910
+45,1210,1050
+46,955,500
+47,1000,1230
+48,1165,1040
+49,1060,955
+50,1645,910
+51,2200,150
+52,1595,455
+53,1085,150
+54,455,830
+55,1400,455
+56,805,500
+57,1490,850
+58,1050,0
+59,560,980
+60,560,1040
+61,800,500
+62,1530,800
+63,0,1410
+64,3275,305
+65,3990,1570
+66,3510,1255
+67,1105,955
+68,650,150
+69,700,655
+70,1415,1245
+71,1295,455
+72,1760,710
+73,1235,560
+74,650,650
+75,500,1000
+76,830,760
+77,650,760
+78,560,350
+79,1240,305
+80,850,150
+81,1400,910
+82,0,650
+83,805,500
+84,480,1180
+85,150,1435
+86,1150,850
+87,1360,800
+88,910,1305
+89,1190,910
+90,1050,1260
+91,1115,455
+92,500,1000
+93,800,615
+94,1230,1265
+95,980,3955
+96,1040,3675
+97,500,615
+98,955,300
+99,1285,1825
+100,910,760
+101,980,1315
+102,150,1435
+103,1200,1260
+104,455,850
+105,480,1260
+106,150,1970
+107,500,1015
+108,830,350
+109,700,735
+110,455,1680
+111,150,350
+112,500,1135
+113,605,865
+114,850,1735
+115,805,850
+116,0,1165
+117,710,1965
+118,980,810
+119,305,1005
+120,1040,1200
+121,150,2885
+122,500,1095
+123,710,1060
+124,800,2455
+125,1265,2145
+126,1410,1665
+127,1175,3230
+128,305,4328
+129,1255,4228
+130,1570,4069
+131,980,3995
+132,1255,3946
+133,1480,3910
+134,955,3881
+135,455,3857
+136,150,3836
+137,910,3818
+138,655,3802
+139,350,3788
+140,1245,3774
+141,1150,3762
+142,455,3751
+143,560,3741
+144,710,3731
+145,150,3722
+146,560,3714
+147,830,3706
+148,650,3698
+149,655,3691
+150,1000,3684
+151,350,3677
+152,760,3671
+153,455,3665
+154,760,3659
+155,560,3654
+156,350,3648
+157,655,3643
+158,305,3638
+159,150,3633
+160,150,3629
+161,910,3624
+162,910,3620
+163,1190,3616
+164,650,3612
+165,455,3608
+166,500,3604
+167,500,3600
+168,1180,3596
+169,1500,3592
+170,1435,3589
+171,1265,3586
+172,850,3582
+173,650,3579
+174,800,3576
+175,1350,3573
+176,1305,3569
+177,1260,3566
+178,910,3563
+179,805,3561
+180,1260,3558
+181,1175,3555
+182,455,3552
+183,965,3550
+184,1000,3547
+185,755,3544
+186,615,3542
+187,350,3539
+188,1265,3537
+189,935,3534
+190,3955,3532
+191,4445,3530
+192,3675,3528
+193,1365,3530
+194,615,3532
+195,605,3534
+196,300,3537
+197,1135,3539
+198,1825,3542
+199,895,3544
+200,760,3547
+201,500,3550
+202,1315,3552
+203,1330,3555
+204,1435,3558
+205,1385,3561
+206,1260,3563
+207,920,3566
+208,850,3569
+209,615,3573
+210,1260,3576
+211,1545,3579
+212,1970,3582
+213,1605,3586
+214,1015,3589
+215,955,3592
+216,350,3596
+217,1270,3600
+218,735,3604
+219,1330,3608
+220,1680,3612
+221,630,3616
+222,350,3620
+223,1200,3624
+224,1135,3629
+225,850,3633
+226,865,3638
+227,1540,3643
+228,1735,3648
+229,500,3654
+230,850,3659
+231,150,3665
+232,1165,3671
+233,1345,3677
+234,1965,3684
+235,1630,3691
+236,810,3698
+237,1175,3706
+238,1005,3714
+239,500,3722
+240,1200,3731
+241,2830,3741
+242,2885,3751
+243,1630,3762
+244,1095,3774
+245,980,3788
+246,1060,3802
+247,1190,3818
+248,2455,3836
+249,3045,3857
+250,2145,3881
+251,1500,3910
+252,1665,3946
+253,1975,3995
+254,3230,
+255,3470,
+256,4328,