rfbeam 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd82af6ee6d040de78fe19f179f643b0617c37b09a0f0f79ad952d05514b934
-  data.tar.gz: 4efe06f17ac00595fa1407212cc77f909bf3fcdcaacf190587daa73424132f41
+  metadata.gz: e21d45a85534f9324053e8874f3c8f75b52a41eaaa9cf3efc37d1e8116a63b46
+  data.tar.gz: 0cdd3969ca1be5db0fb11a685b45afb61c7d24080ca8b4526a27fa91c2138ac4
 SHA512:
-  metadata.gz: 07fac5306643bdac200b16c6aec4515602e6dcd42f96dc7198706d863fece4fc1b648accb1da80a48959826a50e9fcaaa6a4d7dbbc9f8775416c17faf3b49b35
-  data.tar.gz: 64e52d170ad21a8a6fb98006310b3e874f62300162c25bd3a3de5d6f158a55652add50c1646be4c3f8d597f580ebc4c7b3f7a848212f190cf6836508e1dcf494
+  metadata.gz: bc9d798e398e5d134a75f1c80bb0c09fbecddb968f3438d58c8803497cb00f31e8a2994a3f5075c6ecd99e233d2045c98b6b7c0c3d6c34d574dd7efcd9834340
+  data.tar.gz: a8e378dc22187394d953bd134933574b524630b7edee5a1d4a2749ca280a72b7eb48a212f8a8bf02f0bb2a17cdd727dfa5714a3149dd04db36e62af34c38288f

data/.rubocop.yml

@@ -1,10 +1,17 @@
+inherit_gem:
+  syntax_tree: config/rubocop.yml
+
 AllCops:
   TargetRubyVersion: 3.1
+  NewCops: enable
 
 Layout/LineLength:
   Max: 120
   AutoCorrect: true
 
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
 Metrics/ModuleLength:
   Enabled: false
 

data/Gemfile

@@ -1,26 +1,17 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rfbeam.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem 'minitest', '~> 5.0'
+gem 'rake', '~> 13.0'
+gem 'tty-logger', '~> 0.6.0'
+gem 'tty-screen', '~> 0.8.1'
+gem 'tty-spinner', '~> 0.9.3'
+gem 'tty-table', '~> 0.12.0'
+gem 'unicode_plot', '~> 0.0.5'
 
-gem "minitest", "~> 5.0"
-
-gem "rubocop", "~> 1.21"
-
-gem "tty-table", "~> 0.12.0"
-
-gem "tty-spinner", "~> 0.9.3"
-
-gem "unicode_plot", "~> 0.0.5"
-
-gem "tty-logger", "~> 0.6.0"
-
-gem "tty-screen", "~> 0.8.1"
-
-gem "tty-option", "~> 0.2.0"
-
-gem "tty-command", "~> 0.10.1"
+gem "syntax_tree", "~> 6.1", :groups => [:development, :test]
+gem "rubocop", "~> 1.39", :groups => [:development, :test]

data/Gemfile.lock

@@ -1,10 +1,15 @@
 PATH
   remote: .
   specs:
-    rfbeam (0.4.3)
+    rfbeam (0.4.5)
       activesupport (~> 6.1.0)
       rubyserial (~> 0.6.0)
       thor (~> 1.2.1)
+      tty-logger (~> 0.6.0)
+      tty-screen (~> 0.8.1)
+      tty-spinner (~> 0.9.3)
+      tty-table (~> 0.12.0)
+      unicode_plot (~> 0.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -28,6 +33,7 @@ GEM
       ast (~> 2.4.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
+    prettier_print (1.2.1)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.6.1)
@@ -52,14 +58,13 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
+    syntax_tree (6.1.1)
+      prettier_print (>= 1.2.0)
     thor (1.2.1)
     tty-color (0.6.0)
-    tty-command (0.10.1)
-      pastel (~> 0.8)
     tty-cursor (0.7.1)
     tty-logger (0.6.0)
       pastel (~> 0.8)
-    tty-option (0.2.0)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
@@ -83,10 +88,9 @@ DEPENDENCIES
   minitest (~> 5.0)
   rake (~> 13.0)
   rfbeam!
-  rubocop (~> 1.21)
-  tty-command (~> 0.10.1)
+  rubocop (~> 1.39)
+  syntax_tree (~> 6.1)
   tty-logger (~> 0.6.0)
-  tty-option (~> 0.2.0)
   tty-screen (~> 0.8.1)
   tty-spinner (~> 0.9.3)
   tty-table (~> 0.12.0)

data/README.md

@@ -27,7 +27,7 @@ The RfBeam class will return the path of any connected modules
 
 Simple pass the path and baude rate to initialise a new radar object
 
-    RfBeam::K_ld7.new("/dev/ttyUSB0", 115200) do |radar|
+    RfBeam::KLD7.new("/dev/ttyUSB0", 115200) do |radar|
         puts radar.config
     end
 
@@ -285,7 +285,7 @@ radar.micro_detection_sensitivty = 4
 
 ## CLI
 
-``` fish
+```fish
 ❯ bundle exec rfbeam list
 
 +--+------------+------------------+

data/Rakefile

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/test_*.rb']
 end
 
-require "rubocop/rake_task"
+require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
 

data/exe/rfbeam

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rfbeam'
 

data/lib/rfbeam/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'rfbeam'
 require 'tty-table'
@@ -8,7 +10,7 @@ require 'unicode_plot'
 
 module RfBeam
   class CLI < Thor
-    attr_accessor :radar, :logger
+    attr_accessor :logger
 
     desc 'list', 'List available radar modules'
     def list
@@ -18,7 +20,7 @@ module RfBeam
 
       table = TTY::Table.new(header: %w[id Path Version])
 
-      devices.each.with_index { |path, index| table << ["#{index}", path, radar(index).sw_version] }
+      devices.each.with_index { |path, index| table << [index.to_s, path, radar(index).sw_version] }
       puts table.render(:ascii)
     end
 
@@ -44,13 +46,13 @@ module RfBeam
     desc 'ddat <radar_id>', 'stream any valid detections, stop stream with q and enter'
     option :stream, type: :boolean, aliases: '-s', desc: 'Stream the data from the device'
     def ddat(radar_id)
-      cli = RfBeam::KLD7::CliOutput.new(radar_id)
+      cli = RfBeam::Kld7::CliOutput.new(radar_id)
       cli.display(:ddat, stream: options[:stream])
     end
 
     desc 'pdat <radar_id>', 'Display Tracked Targets'
     def pdat(radar_id)
-      cli = RfBeam::KLD7::CliOutput.new(radar_id)
+      cli = RfBeam::Kld7::CliOutput.new(radar_id)
       cli.display(:pdat, stream: options[:stream])
     end
 
@@ -58,7 +60,7 @@ module RfBeam
     option :stream, type: :boolean, aliases: '-s', desc: 'Stream the data from the device'
     option :raw, type: :boolean, aliases: '-r', desc: 'Display raw data'
     def rfft(radar_id)
-      plotter = RfBeam::KLD7::CliOutput.new(radar_id)
+      plotter = RfBeam::Kld7::CliOutput.new(radar_id)
       if options[:raw]
         print radar(radar_id).rfft
       else
@@ -68,7 +70,7 @@ module RfBeam
 
     desc 'tdat <radar_id>', 'Display tracked target data'
     def tdat(radar_id)
-      cli = RfBeam::KLD7::CliOutput.new(radar_id)
+      cli = RfBeam::Kld7::CliOutput.new(radar_id)
       cli.display(:tdat, stream: options[:stream])
     end
 
@@ -79,7 +81,7 @@ module RfBeam
       @logger = TTY::Logger.new
       return @logger.warning 'No Radar modules found.' unless devices.count.positive?
 
-      RfBeam::K_ld7.new(devices[id.to_i])
+      RfBeam::KLD7.new(devices[id.to_i])
     end
   end
 end

data/lib/rfbeam/kld7/cli_formatter.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'tty-table'
 
 module RfBeam
-  module KLD7
+  module Kld7
     class CliFormatter
       def tdat(data)
         { dist: data[2], speed: data[3], angle: data[4], mag: data[5] }
@@ -11,7 +13,7 @@ module RfBeam
         table = TTY::Table.new header: ['index', 'dist (M)', 'speed (Km/h)', 'angle (°)', 'mag (db)']
         count = data[1] / 8
         data.shift(2)
-        count.times.with_index do |index|
+        count.times do |index|
           values = data.shift(4).map { |value| value.to_f / 100.0 }
           table << [index, values].flatten
         end

data/lib/rfbeam/kld7/cli_output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'unicode_plot'
 require 'io/console'
 require 'stringio'
@@ -5,15 +7,17 @@ require 'tty-screen'
 require 'tty-logger'
 
 module RfBeam
-  module KLD7
+  module Kld7
     class CliOutput
       attr_reader :radar
 
       def initialize(radar_id)
         devices = RfBeam.connected
-        return TTY::Logger.new.warning 'No Radar modules found.' unless devices.count.positive?
-
-        @radar = RfBeam::K_ld7.new(devices[radar_id.to_i])
+        if devices.empty?
+          TTY::Logger.new.warn 'No Radar modules found.'
+        else
+          @radar = RfBeam::KLD7.new(devices[radar_id.to_i])
+        end
       end
 
       def display(type, stream: false)
@@ -39,10 +43,10 @@ module RfBeam
         $stdout.print "\e[0J"
         $stdout.flush
 
-        if @streaming
-          n = lines.count
-          $stdout.print "\e[#{n}F"
-        end
+        return unless @streaming
+
+        n = lines.count
+        $stdout.print "\e[#{n}F"
       end
 
       def stream_plot(type)
@@ -59,7 +63,7 @@ module RfBeam
 
       def monitor_keypress
         loop do
-          key = STDIN.getch
+          key = $stdin.getch
           if key.downcase == 'q'
             @streaming = false
             break
@@ -76,6 +80,7 @@ module RfBeam
       end
 
       def display_ddat(stream)
+        data = @radar.ddat
         if stream
           @streaming = true
           Thread.new { monitor_keypress }
@@ -83,28 +88,28 @@ module RfBeam
           logger = TTY::Logger.new
           loop do
             break unless @streaming
+
             spinner.spin
-            data = @radar.ddat
-            spinner.update title: "Searching... #{data[:detection_str]}"
-            logger.success "#{@radar.tdat}" if data[:detection]
+            spinner.update title: "Detection: #{DETECTION_FLAGS[data[2]]}"
+            logger.success @radar.tdat.to_s unless data[2].zero?
           end
         else
-          puts RfBeam::KLD7::CliFormatter.new.ddat(@radar.ddat)
+          puts RfBeam::Kld7::CliFormatter.new.ddat(data)
         end
       end
 
       def display_tdat(stream)
-        puts RfBeam::KLD7::CliFormatter.new.tdat(@radar.tdat)
+        puts RfBeam::Kld7::CliFormatter.new.tdat(@radar.tdat)
       end
 
       def display_pdat(stream)
-        table = RfBeam::KLD7::CliFormatter.new.pdat_table(@radar.pdat)
+        table = RfBeam::Kld7::CliFormatter.new.pdat_table(@radar.pdat)
         puts "\n   Detected Raw Targets"
         puts table.render(:unicode, alignment: :center)
       end
 
       def rfft_plot
-        width = TTY::Screen.width * 0.65
+        screen_width = TTY::Screen.width * 0.65
         data = rfft_plot_data(@radar.rfft)
         plot =
           UnicodePlot.lineplot(
@@ -113,7 +118,7 @@ module RfBeam
             name: 'IF1/2 Averaged',
             title: 'Raw FFT',
             height: 25,
-            width: width,
+            width: screen_width,
             xlabel: 'Speed (km/h)',
             ylabel: 'Signal (db)',
             xlim: [-128, 128],

data/lib/rfbeam/kld7/constants.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module RfBeam
-  module KLD7
+  module Kld7
     # All supported Serial port baude rates
     BAUDE_RATES = { 0 => 115_200, 1 => 460_800, 2 => 921_600, 3 => 2_000_000, 4 => 3_000_000 }.freeze
 
@@ -31,158 +33,231 @@ module RfBeam
       speed: %w[Low High]
     }.freeze
 
-    Param =
-      Struct.new(:name, :grps_index, :description, :default, :units, :values) do
-        def initialize(name:, grps_index:, description: nil, default: nil, units: nil, values: [])
-          super(name, grps_index, description, default, units, values)
-        end
+    class Param
+      attr_accessor :name, :grps_index, :description, :default, :units, :str_values
+
+      def initialize(name:, grps_index:, options: {})
+        @name = name
+        @grps_index = grps_index
+        @description = options.fetch(:description, nil)
+        @default = options.fetch(:default, nil)
+        @units = options.fetch(:units, nil)
+        @str_values = options.fetch(:str_values, [])
       end
+    end
 
     RADAR_PARAMETERS = {
-      sw_version: Param.new(name: 'Software Version', grps_index: 2, default: 'K-LD7_APP-RFB-XXXX'),
+      sw_version: Param.new(name: 'Software Version', grps_index: 2, options: { default: 'K-LD7_APP-RFB-XXXX' }),
       base_frequency:
         Param.new(
           name: 'Base Frequency',
           grps_index: 3,
-          description: '0 = Low, 1 = Middle, 2 = High',
-          default: 1,
-          values: %w[Low Middle High]
+          options: {
+            description: '0 = Low, 1 = Middle, 2 = High',
+            default: 1,
+            str_values: %w[Low Middle High]
+          }
         ),
       max_speed:
         Param.new(
           name: 'Maximum Speed',
           grps_index: 4,
-          description: '0 = 12km/h, 1 = 25km/h, 2 = 50km/h, 3 = 100km/h',
-          default: 1,
-          units: 'km/h',
-          values: %w[12.5 25 50 100]
+          options: {
+            description: '0 = 12km/h, 1 = 25km/h, 2 = 50km/h, 3 = 100km/h',
+            default: 1,
+            units: 'km/h',
+            str_values: %w[12.5 25 50 100]
+          }
         ),
       max_range:
         Param.new(
           name: 'Maximum Range',
           grps_index: 5,
-          description: '0 = 5m, 1 = 10m, 2 = 30m, 3 = 100m',
-          default: 1,
-          values: %w[5m 10m 30m 100m]
+          options: {
+            description: '0 = 5m, 1 = 10m, 2 = 30m, 3 = 100m',
+            default: 1,
+            str_values: %w[5m 10m 30m 100m]
+          }
         ),
       threshold_offset:
-        Param.new(name: 'Threshold Offset', grps_index: 6, description: '10db - 60db', default: 30, units: 'db'),
+        Param.new(
+          name: 'Threshold Offset',
+          grps_index: 6,
+          options: {
+            description: '10db - 60db',
+            default: 30,
+            units: 'db'
+          }
+        ),
       tracking_filter:
         Param.new(
           name: 'Tracking Filter Type',
           grps_index: 7,
-          description: '0 = Standard, 2 = Fast Detection, 3 = Long Visibility',
-          default: 0,
-          values: ['standard', 'Fast Detection', 'Long Visibility']
+          options: {
+            description: '0 = Standard, 2 = Fast Detection, 3 = Long Visibility',
+            default: 0,
+            str_values: ['standard', 'Fast Detection', 'Long Visibility']
+          }
         ),
       vibration_suppression:
         Param.new(
           name: 'Vibration Suppression',
           grps_index: 8,
-          description: '0-16, 0 = No Suppression, 16 = High Suppression',
-          default: 2
+          options: {
+            description: '0-16, 0 = No Suppression, 16 = High Suppression',
+            default: 2
+          }
         ),
       min_detection_distance:
         Param.new(
           name: 'Minimum Detection Distance',
           grps_index: 9,
-          description: '0 - 100% of range setting',
-          default: 0,
-          units: '%'
+          options: {
+            description: '0 - 100% of range setting',
+            default: 0,
+            units: '%'
+          }
         ),
       max_detection_distance:
         Param.new(
           name: 'Maximum Detection Distance',
           grps_index: 10,
-          description: '0 - 100% of range setting',
-          default: 50,
-          units: '%'
+          options: {
+            description: '0 - 100% of range setting',
+            default: 50,
+            units: '%'
+          }
         ),
       min_detection_angle:
-        Param.new(name: 'Minimum Detection Angle', grps_index: 11, description: '-90° - 90°', default: -90, units: '°'),
+        Param.new(
+          name: 'Minimum Detection Angle',
+          grps_index: 11,
+          options: {
+            description: '-90° - 90°',
+            default: -90,
+            units: '°'
+          }
+        ),
       max_detection_angle:
-        Param.new(name: 'Maximum Detection Angle', grps_index: 12, description: '-90° - 90°', default: 90, units: '°'),
+        Param.new(
+          name: 'Maximum Detection Angle',
+          grps_index: 12,
+          options: {
+            description: '-90° - 90°',
+            default: 90,
+            units: '°'
+          }
+        ),
       min_detection_speed:
         Param.new(
           name: 'Minimum Detection Speed',
           grps_index: 13,
-          description: '0 - 100% of speed setting',
-          default: 0,
-          units: '%'
+          options: {
+            description: '0 - 100% of speed setting',
+            default: 0,
+            units: '%'
+          }
         ),
       max_detection_speed:
         Param.new(
           name: 'Maximum Detection Speed',
           grps_index: 14,
-          description: '0 - 100% of speed setting',
-          default: 100,
-          units: '%'
+          options: {
+            description: '0 - 100% of speed setting',
+            default: 100,
+            units: '%'
+          }
         ),
       detection_direction:
         Param.new(
           name: 'Detection Direction',
           grps_index: 15,
-          description: '0 = Receding, 1 = Approaching, 2 = Both',
-          default: 2,
-          values: %w[Receding Approaching Both]
+          options: {
+            description: '0 = Receding, 1 = Approaching, 2 = Both',
+            default: 2,
+            str_values: %w[Receding Approaching Both]
+          }
         ),
       range_threshold:
         Param.new(
           name: 'Range Threshold',
           grps_index: 16,
-          description: '0 - 100% of range setting',
-          default: 10,
-          units: '%'
+          options: {
+            description: '0 - 100% of range setting',
+            default: 10,
+            units: '%'
+          }
         ),
       angle_threshold:
-        Param.new(name: 'Angle Threshold', grps_index: 17, description: '-90° - 90°', default: 0, units: '°'),
+        Param.new(
+          name: 'Angle Threshold',
+          grps_index: 17,
+          options: {
+            description: '-90° - 90°',
+            default: 0,
+            units: '°'
+          }
+        ),
       speed_threshold:
         Param.new(
           name: 'Speed Threshold',
           grps_index: 18,
-          description: '0 - 100% of speed setting',
-          default: 50,
-          units: '%'
+          options: {
+            description: '0 - 100% of speed setting',
+            default: 50,
+            units: '%'
+          }
         ),
       digital_output1:
         Param.new(
           name: 'Digital Output 1',
           grps_index: 19,
-          description: '0 = Direction, 1 = Angle, 2 = Range, 3 = Speed, 4 = Micro Detection',
-          default: 0,
-          values: %w[Direction Angle Range Speed Micro]
+          options: {
+            description: '0 = Direction, 1 = Angle, 2 = Range, 3 = Speed, 4 = Micro Detection',
+            default: 0,
+            str_values: %w[Direction Angle Range Speed Micro]
+          }
         ),
       digital_output2:
         Param.new(
           name: 'Digital Output 2',
           grps_index: 20,
-          description: '0 = Direction, 1 = Angle, 2 = Range, 3 = Speed, 4 = Micro Detection',
-          default: 1,
-          values: %w[Direction Angle Range Speed Micro]
+          options: {
+            description: '0 = Direction, 1 = Angle, 2 = Range, 3 = Speed, 4 = Micro Detection',
+            default: 1,
+            str_values: %w[Direction Angle Range Speed Micro]
+          }
         ),
       digital_output3:
         Param.new(
           name: 'Digital Output 3',
           grps_index: 21,
-          description: '0 = Direction, 1 = Angle, 2 = Range, 3 = Speed, 4 = Micro Detection',
-          default: 2,
-          values: %w[Direction Angle Range Speed Micro]
+          options: {
+            description: '0 = Direction, 1 = Angle, 2 = Range, 3 = Speed, 4 = Micro Detection',
+            default: 2,
+            str_values: %w[Direction Angle Range Speed Micro]
+          }
         ),
-      hold_time: Param.new(name: 'Hold Time', grps_index: 22, description: '1 - 7200s', default: 1, units: 's'),
+      hold_time:
+        Param.new(name: 'Hold Time', grps_index: 22, options: { description: '1 - 7200s', default: 1, units: 's' }),
       micro_detection_retrigger:
         Param.new(
           name: 'Micro Detection Trigger',
           grps_index: 23,
-          description: '0 = Off, 1 = Retrigger',
-          default: 0,
-          values: %w[Off Retrigger]
+          options: {
+            description: '0 = Off, 1 = Retrigger',
+            default: 0,
+            str_values: %w[Off Retrigger]
+          }
         ),
       micro_detection_sensativity:
         Param.new(
           name: 'Micro Detection Sensativity',
           grps_index: 24,
-          description: '0 - 9, 0 = Min, 9 = Max',
-          default: 4
+          options: {
+            description: '0 - 9, 0 = Min, 9 = Max',
+            default: 4
+          }
         )
     }.freeze
   end

data/lib/rfbeam/kld7/radar_messages.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 module RfBeam
-  module KLD7
+  module Kld7
     def detection?
       data = ddat
       (data[2] == 1)
@@ -33,7 +35,7 @@ module RfBeam
       return resp unless formatted
 
       target_count = resp[1].to_i / 8
-      return [] unless target_count > 0
+      return [] unless target_count.positive?
 
       resp.shift 2
       resp.compact
@@ -58,6 +60,7 @@ module RfBeam
 
       resp = read(14).unpack('a4LC6')
       raise Error, "DDAT response = #{resp[0]}" unless resp[0] == 'DDAT'
+
       resp
     end
 
@@ -71,8 +74,8 @@ module RfBeam
 
     def config
       data = grps
-      output = "\n"
-      RADAR_PARAMETERS.keys.each { |key| output << formatted_parameter(key, data[RADAR_PARAMETERS[key].grps_index]) }
+      output = []
+      RADAR_PARAMETERS.each_key { |key| output << formatted_parameter(key, data[RADAR_PARAMETERS[key].grps_index]) }
       output
     end
 
@@ -82,7 +85,7 @@ module RfBeam
         data = grps
         value = data[param.grps_index]
       end
-      param_str_value = param.values.empty? ? value.to_s : param.values[value]
+      param_str_value = param.str_values.empty? ? value.to_s : param.str_values[value]
       "#{param.name}: #{param_str_value}#{param.units}\n"
     end
 

data/lib/rfbeam/kld7/radar_parameters.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module RfBeam
-  module KLD7
+  module Kld7
     # -----------------
     # Software Version, 'K-LD7_APP-RFB-XXXX'
     # -----------------
@@ -382,12 +384,8 @@ module RfBeam
     def set_parameter(header, value, return_type = :uint32)
       return_type =
         case return_type
-        when :uint32
-          'L'
         when :int32
           'l'
-        when :uint32
-          'S'
         else
           'L'
         end

data/lib/rfbeam/kld7/serial_connection.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module RfBeam
-  module KLD7
+  module Kld7
     require 'rubyserial'
     require 'timeout'
-    
+
     class Error < StandardError
     end
 
@@ -80,10 +82,10 @@ module RfBeam
       raise Error, 'No valid response from Serial Port' if resp[2].nil?
 
       response_key = resp[2]
-      return response_key.zero? # Everything OK
-
       error_string = RESP_CODES[response_key].nil? ? 'Response unknown' : RESP_CODES[response_key]
-      raise Error, "Radar response Error: #{error_string}"
+      raise Error, "Radar response Error: #{error_string}" unless response_key.zero?
+
+      response_key.zero? # Everything OK
     end
   end
 end

data/lib/rfbeam/version.rb

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

data/lib/rfbeam.rb

@@ -13,8 +13,8 @@ module RfBeam
   class Error < StandardError
   end
 
-  class K_ld7
-    include RfBeam::KLD7
+  class KLD7
+    include RfBeam::Kld7
   end
 
   def self.connected

data/rfbeam.gemspec

@@ -36,11 +36,15 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
   spec.add_dependency 'activesupport', '~> 6.1.0'
-  # spec.add_dependency 'bindata', '~> 2.4.10'
   spec.add_dependency 'rubyserial', '~> 0.6.0'
-  # spec.add_dependency 'terminal-table', '~> 3.0.2'
   spec.add_dependency 'thor', '~> 1.2.1'
+  spec.add_dependency 'tty-logger', '~> 0.6.0'
+  spec.add_dependency 'tty-screen', '~> 0.8.1'
+  spec.add_dependency 'tty-spinner', '~> 0.9.3'
+  spec.add_dependency 'tty-table', '~> 0.12.0'
+  spec.add_dependency 'unicode_plot', '~> 0.0.5'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfbeam
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Rob Carruthers
@@ -52,6 +52,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: tty-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: unicode_plot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 description: Currently only tested with K-LD7 on MacOS & Raspian (bullseye)
 email:
 - robc@hey.com
@@ -165,7 +235,6 @@ 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
@@ -177,6 +246,7 @@ metadata:
   homepage_uri: https://gitlab.com/robcarruthers/rfbeam
   source_code_uri: https://gitlab.com/robcarruthers/rfbeam
   changelog_uri: https://gitlab.com/robcarruthers/rfbeam/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:

data/output.csv

@@ -1,257 +0,0 @@
-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,