rfbeam 0.3.4 → 0.4.0

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,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfbeam
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Rob Carruthers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -55,7 +55,8 @@ dependencies:
 description: Currently only tested with K-LD7 on MacOS & Raspian (bullseye)
 email:
 - robc@hey.com
-executables: []
+executables:
+- rfbeam
 extensions: []
 extra_rdoc_files: []
 files:
@@ -68,11 +69,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- exe/rfbeam
 - lib/rfbeam.rb
-- lib/rfbeam/kld7/app_commands.rb
-- lib/rfbeam/kld7/app_messages.rb
-- lib/rfbeam/kld7/connection.rb
+- lib/rfbeam/cli.rb
 - lib/rfbeam/kld7/constants.rb
+- lib/rfbeam/kld7/radar_messages.rb
+- lib/rfbeam/kld7/radar_parameters.rb
+- lib/rfbeam/kld7/serial_connection.rb
+- lib/rfbeam/kld7/streamer.rb
 - lib/rfbeam/version.rb
 - node_modules/.bin/prettier
 - node_modules/.yarn-integrity
@@ -159,6 +163,7 @@ files:
 - node_modules/prettier/parser-yaml.js
 - node_modules/prettier/standalone.js
 - node_modules/prettier/third-party.js
+- output.csv
 - package.json
 - rfbeam.gemspec
 - sig/rfbeam.rbs

data/lib/rfbeam/kld7/app_commands.rb

@@ -1,201 +0,0 @@
-module RfBeam
-  module KLD7
-
-    # Base Frequency, 0 = low, 1 = middle (default), 2 = high
-    def base_frequency
-      data = grps
-      data[3]
-    end
-    alias rbfr base_frequency
-    
-    
-    def set_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, :uint8)
-    end
-    alias set_rbfr set_base_frequency
-    
-    # Maximum Speed, 0 = 12.5km/h, 1 = 25km/h (default), 2 = 50km/h, 3 = 100km/h
-    def set_max_speed(speed = 1)
-      set_parameter :rspi, speed, :uint8
-    end
-    alias rspi set_max_speed
-    
-    # Maximum Range, 0 = 5m, 1 = 10m (default), 2 = 30m, 3 = 100m
-    def set_max_range(range = 1)
-      set_parameter :rrai, range, :uint8
-    end
-    alias rrai set_max_range
-    
-    # Threshold Offset, 10 - 60db, (default = 30)
-    def set_threshold_offset(offset = 30)
-      range = 10..60
-      return false unless range.include?(offset)
-      
-      set_parameter :thof, offset, :uint8
-    end
-    alias thof set_threshold_offset
-    
-    # Tracking filter type, 0 = Standard (Default), 1 = Fast Tracking, 2 = Long visibility
-    def set_tracking_filter(type = 0)
-        set_parameter :trft, type, :uint8
-    end
-    alias trtf set_tracking_filter
-    
-    # Vibration suppression, 0 - 16, 0 = No Suppression, 16 = High Suppression, default = 2
-    def set_vibration_suppression(value = 2)
-      set_parameter :visu, value, :uint8  
-    end
-    alias visu set_vibration_suppression
-    
-    # Minimum Detection distance, 0 - 100% of Range setting, default = 0
-    def set_min_detection_distance(value = 0)
-      set_parameter :mira, value, :uint8
-    end
-    alias mira set_min_detection_distance
-    
-    # Maximum Detection distance, 0 - 100% of Range setting, default = 50
-    def set_max_detection_distance(value = 50)
-      set_parameter :mara, value, :uint8
-    end
-    alias mara set_max_detection_distance
-    
-    # Minimum Detection Angle, -90° - 90°, default = -90
-    def set_min_detection_angle(angle = -90)
-      set_parameter :mian, angle, :int8
-    end
-    alias mian set_min_detection_distance
-    
-    # Maximum Detection Angle, -90° - 90°, default = 90
-    def set_max_detection_angle(angle = 90)
-      set_parameter :maan, angle, :int8
-    end
-    alias maan set_max_detection_angle
-    
-    # Minimum Detection Speed, 0 - 100% of Speed setting, default = 0
-    def set_min_detection_speed(speed = 0)
-      set_parameter :misp, speed, :uint8
-    end
-    alias misp set_min_detection_speed
-    
-    # Maximum Detection Speed, 0 - 100% of Speed setting, default = 100
-    def set_max_detection_speed(speed = 100)
-      set_parameter :masp, speed, :uint8
-    end
-    alias masp set_max_detection_speed
-    
-    # Detection Direction, 0 = Receding, 1 = Approaching, 2 = Both (default)
-    def set_detection_direction(direction = 2)
-      set_parameter :dedi, direction, :uint8
-    end
-    alias dedi set_detection_direction
-    
-    # Range Threshold, 0 - 100% of Range setting, default = 10
-    def set_range_threshold(value = 10)
-      range = 0..100
-      return false unless range.include?(value)
-      
-      set_parameter :rath, value, :uint8
-    end
-    alias rath set_range_threshold
-    
-    # Angle Threshold, -90° to 90°, default = 0
-    def set_range_threshold(value = 0)
-      range = -90..90
-      return false unless range.include?(value)
-      
-      set_parameter :anth, value, :int8
-    end
-    alias anth set_range_threshold
-    
-    # Speed Threshold, 0 - 100% of speed setting, default = 50
-    def set_angle_threshold(value = 50)
-      range = 0..100
-      return false unless range.include?(value)
-      
-      set_parameter :spth, value, :uint8
-    end
-    alias spth set_angle_threshold
-    
-    # Digital output 1, 0 = Direction, 1 = Angle, 2 = Range, 3 = Speed, 4 = Micro Detection, default = 0
-    def set_dio_1(value = 0)
-      range = 0..4
-      return false unless range.include?(value)
-      
-      set_parameter :dig1, value, :uint8
-    end
-    alias dig1 set_dio_1
-    
-    # Digital output 2, 0 = Direction, 1 = Angle, 2 = Range, 3 = Speed, 4 = Micro Detection, default = 1
-    def set_dio_2(value = 1)
-      range = 0..4
-      return false unless range.include?(value)
-      
-      set_parameter :dig2, value, :uint8
-    end
-    alias dig2 set_dio_2
-    
-    # Digital output 3, 0 = Direction, 1 = Angle, 2 = Range, 3 = Speed, 4 = Micro Detection, default = 2
-    def set_dio_3(value = 2)
-      range = 0..4
-      return false unless range.include?(value)
-      
-      set_parameter :dig3, value, :uint8
-    end
-    alias dig3 set_dio_3
-    
-    # Hold Time, 1 - 7200s, default = 1
-    def set_hold_time(time = 1)
-      range = 1..7200
-      return false unless range.include?(time)
-      
-      set_parameter :hold, time, :uint16
-    end
-    alias hold set_hold_time
-    
-    # Micro Detection retrigger, 0 = Off (default), 1 = Retrigger
-    def set_micro_detection_retrigger(value = 0)
-      return false unless [0, 1].include?(value)
-      
-      set_parameter :mide, value, :uint8
-    end
-    alias mide set_micro_detection_retrigger
-    
-    # Micro Detection sensitivity, 0 - 9, 0 = Min, 9 = Max, default = 4
-    def set_micro_detection_sensitivty(value = 4)
-      range = 0..9
-      return false unless range.include?(value)
-      
-      set_parameter :mids, value, :uint8
-    end
-    alias mids set_micro_detection_sensitivty
-
-    private
-    
-    def set_parameter(header, value, return_type = :uint8)
-      return_type =
-        case return_type
-          when :uint8
-          'L'
-          when :int8
-          'l'
-          when :uint16
-          'S'
-          else
-          'L'
-        end
-      command = [header.upcase.to_s, 4, value]
-      write command.pack("a4L#{return_type}")
-      check_response
-    end
-  end
-end

data/lib/rfbeam/kld7/app_messages.rb

@@ -1,100 +0,0 @@
-module RfBeam
-  module KLD7
-    def detection?
-      data = ddat
-      (data[2] == 1)
-    end
-    
-    def pdat(formatted: false)
-      request_frame_data(:pdat)      
-      resp = read(102).unpack('a4LSssSSssSSssSSssSSssSSssSSssSSssSSssSSssS')
-      return resp unless formatted
-
-      target_count = resp[1].to_i / 8
-      return [] unless target_count > 0
-
-      resp.shift 2
-      resp.compact
-      detected_raw_targets = []
-      target_count.times { detected_raw_targets << format_raw_target_data(resp.shift(4)) }
-      detected_raw_targets
-    end
-
-    def tdat
-      request_frame_data(:tdat)
-
-      sleep 0.1
-      resp = read(16).unpack('a4LSssS')
-      return { dist: resp[2], speed: resp[3], angle: resp[4], mag: resp[5] } unless resp[1].zero?
-    end
-
-    def ddat
-      request_frame_data(:ddat)
-
-      read(14).unpack('a4LC6')
-    end
-    
-    def config
-      puts formatted_grps(grps)
-    end
-    
-    def formatted_parameter(param)
-      return unless PARAMETERS.include? param
-      
-      param_data = PARAMETERS[param]
-      grps_data = grps
-      index = grps_data[param_data[:grps_index]]
-      param_data[:values][index]
-    end
-
-    # Get the radar parameter structure
-    def grps
-      command = ['GRPS', 0]
-      write command.pack('a4L')
-      check_response
-      read(50).unpack('a4LA19C8c2C4cCCCCSCC')
-    end
-    
-
-    private
-
-    def format_raw_target_data(array)
-        { dist: array.shift, speed: array.shift, angle: array.shift, mag: array.shift }
-    end
-
-    def request_frame_data(type)
-      command = ['GNFD', 4, FRAME_DATA_TYPES[type]]
-      write command.pack('a4LL')
-      check_response
-    end
-
-    def formatted_grps(data)
-      output = "\n"
-      output << "Software Version: #{data[2]}\n"
-      output << "Base Frequency: #{PARAMETER_STRUCTURE[:base_frequency][data[3]]}\n"
-      output << "Max Speed: #{PARAMETER_STRUCTURE[:max_speed][data[4]]}\n"
-      output << "Max Range: #{PARAMETER_STRUCTURE[:max_range][data[5]]}\n"
-      output << "Threshold offset: #{data[6]}db\n"
-      output << "Tracking Filter Type: #{PARAMETER_STRUCTURE[:tracking_filter_type][data[7]]}\n"
-      output << "Vibration Suppression: #{data[8]} , (#{PARAMETER_STRUCTURE[:vibration_suppression]})\n"
-      output << "Minimum Detection Distance: #{data[9]} , (#{PARAMETER_STRUCTURE[:min_detection_distance]})\n"
-      output << "Maximum Detection Distance: #{data[10]} , (#{PARAMETER_STRUCTURE[:max_detection_distance]})\n"
-      output << "Minimum Detection Angle: #{data[11]}° , (#{PARAMETER_STRUCTURE[:min_detection_angle]})\n"
-      output << "Maximum Detection Angle: #{data[12]}° , (#{PARAMETER_STRUCTURE[:max_detection_angle]})\n"
-      output << "Minimum Detection Speed: #{data[13]} , (#{PARAMETER_STRUCTURE[:min_detection_speed]})\n"
-      output << "Maximum Detection Speed: #{data[14]} , (#{PARAMETER_STRUCTURE[:max_detection_speed]})\n"
-      output << "Detection Direction: #{PARAMETER_STRUCTURE[:detection_direction][data[15]]}\n"
-      output << "Range Threshold: #{data[16]}%, (#{PARAMETER_STRUCTURE[:range_threshold]})\n"
-      output << "Angle Threshold: #{data[17]}°, (#{PARAMETER_STRUCTURE[:angle_threshold]})\n"
-      output << "Speed Threshold: #{data[18]}%, (#{PARAMETER_STRUCTURE[:speed_threshold]})\n"
-      output << "Digital output 1: #{PARAMETER_STRUCTURE[:digital_output_1][data[19]]}\n"
-      output << "Digital output 2: #{PARAMETER_STRUCTURE[:digital_output_2][data[20]]}\n"
-      output << "Digital output 3: #{PARAMETER_STRUCTURE[:digital_output_3][data[21]]}\n"
-      output << "Hold time: #{data[22]}sec\n"
-      output << "Micro Detection Retrigger: #{PARAMETER_STRUCTURE[:micro_detection_trigger][data[23]]}\n"
-      output << "Micro Detection Sensitivity: #{data[24]} (#{PARAMETER_STRUCTURE[:micro_detection_sensitivity]})"
-      
-      output
-    end
-  end
-end