rfbeam 0.5.1 → 0.5.8

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfbeam
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.8
 platform: ruby
 authors:
 - Rob Carruthers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,84 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !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
+        version: 1.2.0
 description: Currently only tested with K-LD7 on MacOS & Raspian (bullseye)
 email:
 - robc@hey.com
@@ -131,9 +61,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".DS_Store"
-- ".rubocop.yml"
+- ".pre-commit-config.yaml"
 - ".streerc"
-- ".streerc~1f4cd14e3c0a9afdf972aa5f3982d36a89869b72"
 - ".tool-versions"
 - CHANGELOG.md
 - Gemfile
@@ -141,104 +70,20 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- cliff.toml
 - cog.toml
 - exe/rfbeam
 - lib/rfbeam.rb
 - lib/rfbeam/cli.rb
-- lib/rfbeam/kld7/cli_formatter.rb
-- lib/rfbeam/kld7/cli_output.rb
 - lib/rfbeam/kld7/constants.rb
+- lib/rfbeam/kld7/detection_params.rb
+- lib/rfbeam/kld7/module_params.rb
+- lib/rfbeam/kld7/operation_params.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
-- node_modules/@prettier/plugin-ruby/CHANGELOG.md
-- node_modules/@prettier/plugin-ruby/CODE_OF_CONDUCT.md
-- node_modules/@prettier/plugin-ruby/CONTRIBUTING.md
-- node_modules/@prettier/plugin-ruby/LICENSE
-- node_modules/@prettier/plugin-ruby/README.md
-- node_modules/@prettier/plugin-ruby/docs/logo.png
-- node_modules/@prettier/plugin-ruby/node_modules/.bin/prettier
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/LICENSE
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/README.md
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/bin-prettier.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/cli.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/doc.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-angular.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-babel.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-espree.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-flow.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-glimmer.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-graphql.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-html.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-markdown.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-meriyah.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-postcss.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-typescript.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/parser-yaml.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/esm/standalone.mjs
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/index.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/package.json
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-angular.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-babel.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-espree.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-flow.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-glimmer.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-graphql.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-html.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-markdown.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-meriyah.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-postcss.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-typescript.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/parser-yaml.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/standalone.js
-- node_modules/@prettier/plugin-ruby/node_modules/prettier/third-party.js
-- node_modules/@prettier/plugin-ruby/package.json
-- node_modules/@prettier/plugin-ruby/prettier.gemspec
-- node_modules/@prettier/plugin-ruby/rubocop.yml
-- node_modules/@prettier/plugin-ruby/src/getInfo.js
-- node_modules/@prettier/plugin-ruby/src/netcat.js
-- node_modules/@prettier/plugin-ruby/src/parseSync.js
-- node_modules/@prettier/plugin-ruby/src/plugin.js
-- node_modules/@prettier/plugin-ruby/src/server.rb
-- node_modules/prettier/LICENSE
-- node_modules/prettier/README.md
-- node_modules/prettier/bin-prettier.js
-- node_modules/prettier/cli.js
-- node_modules/prettier/doc.js
-- node_modules/prettier/esm/parser-angular.mjs
-- node_modules/prettier/esm/parser-babel.mjs
-- node_modules/prettier/esm/parser-espree.mjs
-- node_modules/prettier/esm/parser-flow.mjs
-- node_modules/prettier/esm/parser-glimmer.mjs
-- node_modules/prettier/esm/parser-graphql.mjs
-- node_modules/prettier/esm/parser-html.mjs
-- node_modules/prettier/esm/parser-markdown.mjs
-- node_modules/prettier/esm/parser-meriyah.mjs
-- node_modules/prettier/esm/parser-postcss.mjs
-- node_modules/prettier/esm/parser-typescript.mjs
-- node_modules/prettier/esm/parser-yaml.mjs
-- node_modules/prettier/esm/standalone.mjs
-- node_modules/prettier/index.js
-- node_modules/prettier/package.json
-- node_modules/prettier/parser-angular.js
-- node_modules/prettier/parser-babel.js
-- node_modules/prettier/parser-espree.js
-- node_modules/prettier/parser-flow.js
-- node_modules/prettier/parser-glimmer.js
-- node_modules/prettier/parser-graphql.js
-- node_modules/prettier/parser-html.js
-- node_modules/prettier/parser-markdown.js
-- node_modules/prettier/parser-meriyah.js
-- node_modules/prettier/parser-postcss.js
-- node_modules/prettier/parser-typescript.js
-- node_modules/prettier/parser-yaml.js
-- node_modules/prettier/standalone.js
-- node_modules/prettier/third-party.js
-- package.json
+- output.csv
 - rfbeam.gemspec
 - sig/rfbeam.rbs
 - streamer2.rb
@@ -260,14 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.2
+      version: 3.2.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Ruby API and CLI for RFBeam doplar radar modules

data/.rubocop.yml

@@ -1,25 +0,0 @@
-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
-
-Metrics/MethodLength:
-  Max: 20
-
-Metrics/ClassLength:
-  Enabled: false
-
-Documentation:
-  Enabled: false

data/.streerc~1f4cd14e3c0a9afdf972aa5f3982d36a89869b72

@@ -1,2 +0,0 @@
---print-width=120
---plugins=plugin/single_quotes

data/lib/rfbeam/kld7/cli_formatter.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'tty-table'
-
-module RfBeam
-  module Kld7
-    class CliFormatter
-      def self.format(type, data)
-        new.format(type, data)
-      end
-
-      def format(type, data)
-        case type
-        when :tdat
-          tdat(data)
-        when :pdat
-          pdat(data)
-        when :ddat
-          ddat(data)
-        end
-      end
-
-      def pdat_table(data)
-        table = TTY::Table.new header: ['index', 'dist (M)', 'speed (Km/h)', 'angle (°)', 'mag (db)']
-        count = data[1] / 8
-        data.shift(2)
-        count.times do |index|
-          values = data.shift(4).map { |value| value.to_f / 100.0 }
-          table << [index, values].flatten
-        end
-        table
-      end
-
-      private
-
-      def ddat(data)
-        labels = ['Detection', 'Micro Detection', 'Angle', 'Direction', 'Range', 'Speed']
-        labels
-          .map
-          .with_index { |label, index| "#{label}: #{DETECTION_FLAGS[to_symbol(label)][data[index + 2]]}" }
-          .join("\n")
-      end
-
-      def tdat(data)
-        return 'No target detected' unless data[1].positive?
-
-        [
-          "Distance: #{data[2].to_f / 100.0} m",
-          "Speed: #{data[3].to_f / 100.0} km/h",
-          "Angle: #{data[4].to_f / 100.0}°",
-          "Mag: #{data[5].to_f / 100.0} db"
-        ].join("\n")
-      end
-
-      def to_symbol(string)
-        modified_string = string.gsub(' ', '_').downcase
-        modified_string.to_sym
-      end
-    end
-  end
-end

data/lib/rfbeam/kld7/cli_output.rb

@@ -1,141 +0,0 @@
-# frozen_string_literal: true
-
-require 'unicode_plot'
-require 'io/console'
-require 'stringio'
-require 'tty-screen'
-require 'tty-logger'
-
-module RfBeam
-  module Kld7
-    class CliOutput
-      attr_reader :radar
-
-      def initialize(radar_id)
-        devices = RfBeam.connected
-        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, options)
-        display_method = options[:stream].nil? ? 'display' : 'stream'
-        send("#{display_method}_#{type}", options)
-      end
-
-      def plot(type, stream: false)
-        stream ? stream_plot(type) : display_plot(type)
-      end
-
-      def display_plot(type)
-        out = StringIO.new
-        def out.tty?
-          true
-        end
-        out.truncate(0)
-
-        plot = send("#{type}_plot")
-        plot.render(out)
-
-        lines = out.string.lines
-        lines.each { |line| $stdout.print "\r#{line}" }
-        $stdout.print "\e[0J"
-        $stdout.flush
-
-        return unless @streaming
-
-        n = lines.count
-        $stdout.print "\e[#{n}F"
-      end
-
-      def stream_plot(type)
-        @streaming = true
-        Thread.new { monitor_keypress }
-
-        loop do
-          display_plot(type)
-          break unless @streaming
-        end
-      end
-
-      private
-
-      def monitor_keypress
-        loop do
-          key = $stdin.getch
-          if key.downcase == 'q'
-            @streaming = false
-            break
-          end
-        end
-      end
-
-      def rfft_plot_data(data)
-        {
-          x: Array(-128...128),
-          series1: data.shift(256).map { |value| value / 100 },
-          series2: data.shift(256).map { |value| value.to_i / 100 }
-        }
-      end
-
-      def display_ddat(options)
-        if options[:raw].nil?
-          puts RfBeam::Kld7::CliFormatter.format(:ddat, @radar.ddat)
-        else
-          puts @radar.ddat.inspect
-        end
-      end
-
-      def stream_ddat
-        @streaming = true
-        Thread.new { monitor_keypress }
-        spinner = TTY::Spinner.new('[:spinner] :title ', format: :bouncing_ball)
-        spinner.run('Done!') do |sp|
-          loop do
-            break unless @streaming
-
-            data = @radar.ddat
-            sp.update title: "Detection: #{DETECTION_FLAGS[:detection][data[2]]}"
-          end
-          spinner.update title: ''
-        end
-      end
-
-      def display_tdat(options)
-        if options[:raw].nil?
-          puts RfBeam::Kld7::CliFormatter.format(:tdat, @radar.tdat)
-        else
-          puts @radar.tdat.inspect
-        end
-      end
-
-      def display_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
-        screen_width = TTY::Screen.width * 0.65
-        data = rfft_plot_data(@radar.rfft)
-        plot =
-          UnicodePlot.lineplot(
-            data[:x],
-            data[:series1],
-            name: 'IF1/2 Averaged',
-            title: 'Raw FFT',
-            height: 25,
-            width: screen_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