rfbeam 0.4.7 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43572c13d87b8bd222b7cde57fb7dc7a0177b3b5259fc618a99d3de0024b7a5
-  data.tar.gz: '061808ba887fb6d85b32f18b731c5c71d02baec97ecfa1fa648266cc1064085e'
+  metadata.gz: a3ca645044245d21d0248633dc68c5ac8608102c0fe4d8a93d825b7735bc225f
+  data.tar.gz: 5a443dad972d3c26d5e462597f166c7fa333bc2294ecd3b0529ad036fbe23375
 SHA512:
-  metadata.gz: 72d8235c55222039286acabb5d30a9a7004d5c8922ecc3d78743e3ad3e5cfb71b1c136a7628407cc99be8e2d00bd1c47511e2062f4c6811b9bab8b001a8d9410
-  data.tar.gz: 30099662c342218648172db87b552823fe40b095585fd169b0179a72adc0abb002e844fcca0c2fe7289190ad2d51fdb2ff5d8d04328361ae2c3a34940256011f
+  metadata.gz: 46e7f4cadd95cfabce4025d34e3cca666c655510b18e74edd451f3194ff70dfbd25bb116c88380873b34416c69f25274a2ee924ec45ac6913eb7cd76392d2c9d
+  data.tar.gz: f22887f60570dfa98d0430de0a6a487a3da566f1a9776058466015baa09b259026b4d064be99804669fddb9e1703ef8afc5892d5f42e22e6ecca8394278fdc28

data/Gemfile

@@ -9,9 +9,12 @@ 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 "syntax_tree", "~> 6.1", :groups => [:development, :test]
-gem "rubocop", "~> 1.39", :groups => [:development, :test]
+git 'https://github.com/piotrmurach/tty-spinner.git', branch: 'master' do
+  gem 'tty-spinner', '~> 0.9.3'
+end
+
+gem 'rubocop', '~> 1.39', groups: %i[development test]
+gem 'syntax_tree', '~> 6.1', groups: %i[development test]

data/Gemfile.lock

@@ -1,7 +1,15 @@
+GIT
+  remote: https://github.com/piotrmurach/tty-spinner.git
+  revision: a57d37a2617d4d58e33dca912061fe7e6754bea0
+  branch: master
+  specs:
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+
 PATH
   remote: .
   specs:
-    rfbeam (0.4.7)
+    rfbeam (0.4.9)
       activesupport (~> 6.1.0)
       rubyserial (~> 0.6.0)
       thor (~> 1.2.1)
@@ -66,8 +74,6 @@ GEM
     tty-logger (0.6.0)
       pastel (~> 0.8)
     tty-screen (0.8.1)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
     tty-table (0.12.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
@@ -92,7 +98,7 @@ DEPENDENCIES
   syntax_tree (~> 6.1)
   tty-logger (~> 0.6.0)
   tty-screen (~> 0.8.1)
-  tty-spinner (~> 0.9.3)
+  tty-spinner (~> 0.9.3)!
   tty-table (~> 0.12.0)
   unicode_plot (~> 0.0.5)
 

data/README.md

@@ -1,11 +1,14 @@
 # Rfbeam
 
-![Gem](https://img.shields.io/gem/v/rfbeam?color=green&label=version)
 ![Ruby](https://img.shields.io/static/v1?message=Ruby&color=red&logo=Ruby&logoColor=FFFFFF&label=v3.1.2)
 ![Ruby](https://img.shields.io/gitlab/license/robcarruthers/rfbeam?color=orange)
 
-RfBeam is a simple, high-level interface for the RFBeam radar modules.
-The user can query process and raw detection data and set the radar parameters for the sensor.
+![Gem](https://img.shields.io/gem/v/rfbeam?color=green&label=version)
+![Build](https://img.shields.io/gitlab/pipeline-status/robcarruthers/rfbeam?branch=master)
+![Build](https://img.shields.io/gitlab/last-commit/robcarruthers/rfbeam)
+
+RfBeam is a simple, high-level interface and CLI for the RFBeam radar modules.
+The user can query/set radar parameters, raw detection data and stream data from the sensor.
 
 At this stage it only works on Linux and Mac with the K-LD7 module.
 

data/lib/rfbeam/kld7/cli_formatter.rb

@@ -5,39 +5,46 @@ require 'tty-table'
 module RfBeam
   module Kld7
     class CliFormatter
-      def tdat(data)
-        { dist: data[2], speed: data[3], angle: data[4], mag: data[5] }
-      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
+      def format(type, data)
+        case type
+        when :tdat
+          tdat(data)
+        when :pdat
+          pdat_table(data)
+        when :ddat
+          ddat(data)
         end
-        table
       end
+    end
 
-      def ddat(data)
-        if data[2] == 1
-          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")
-        else
-          'DDAT: No Detection'
-        end
+    def tdat(data)
+      { dist: data[2], speed: data[3], angle: data[4], mag: data[5] }
+    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
+    private
 
-      def to_symbol(string)
-        modified_string = string.gsub(' ', '_').downcase
-        modified_string.to_sym
-      end
+    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 to_symbol(string)
+      modified_string = string.gsub(' ', '_').downcase
+      modified_string.to_sym
     end
   end
 end

data/lib/rfbeam/kld7/cli_output.rb

@@ -21,7 +21,7 @@ module RfBeam
       end
 
       def display(type, stream: false)
-        send("display_#{type}", stream)
+        stream ? send("stream_#{type}") : send("display_#{type}")
       end
 
       def plot(type, stream: false)
@@ -79,30 +79,30 @@ module RfBeam
         }
       end
 
-      def display_ddat(stream)
-        data = @radar.ddat
-        if stream
-          @streaming = true
-          Thread.new { monitor_keypress }
-          spinner = TTY::Spinner.new('[:spinner] :title ', format: :bouncing_ball)
-          logger = TTY::Logger.new
+      def display_ddat
+        puts RfBeam::Kld7::CliFormatter.new.format(:ddat, @radar.ddat)
+      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
 
-            spinner.spin
-            spinner.update title: "Detection: #{DETECTION_FLAGS[data[2]]}"
-            logger.success @radar.tdat.to_s unless data[2].zero?
+            data = @radar.ddat
+            sp.update title: "Detection: #{DETECTION_FLAGS[:detection][data[2]]}"
           end
-        else
-          puts RfBeam::Kld7::CliFormatter.new.ddat(data)
+          spinner.update title: ''
         end
       end
 
-      def display_tdat(stream)
+      def display_tdat
         puts RfBeam::Kld7::CliFormatter.new.tdat(@radar.tdat)
       end
 
-      def display_pdat(stream)
+      def display_pdat
         table = RfBeam::Kld7::CliFormatter.new.pdat_table(@radar.pdat)
         puts "\n   Detected Raw Targets"
         puts table.render(:unicode, alignment: :center)

data/lib/rfbeam/kld7/constants.rb

@@ -28,7 +28,7 @@ module RfBeam
       detection: %w[No Yes],
       micro_detection: %w[No Yes],
       angle: %w[Left Right],
-      direction: %w[Receding Approaching],
+      direction: ['Going away', 'Approaching'],
       range: %w[Far Near],
       speed: %w[Low High]
     }.freeze

data/lib/rfbeam/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfbeam
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.9
 platform: ruby
 authors:
 - Rob Carruthers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-09 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport