rfbeam 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0b3dc099fbf26e535ffa58dad9e643a2556168528d206d8f0fb7d73507cba3e
-  data.tar.gz: f75cfd53fe0bc32e982dd75e53af8a9e7c976f64abc3eca43ea1a31549ba6bd8
+  metadata.gz: a3ca645044245d21d0248633dc68c5ac8608102c0fe4d8a93d825b7735bc225f
+  data.tar.gz: 5a443dad972d3c26d5e462597f166c7fa333bc2294ecd3b0529ad036fbe23375
 SHA512:
-  metadata.gz: 6f00551148744f9d8f214ebef729fa5f26e84c8403f88ce1cd6534c407a577fc439f284c20899d08d861252f269c007126a06501a4175d0c802c0581c0030861
-  data.tar.gz: cf59d75f0b12ea6bfa7b6d0dd519da5f8ef5c700c5cdf66d177e8e6bcea59911550aa7c7215049deebc7e13c0c9430ae8b6d6c5ba44c57ad9db6a1155e2c7f86
+  metadata.gz: 46e7f4cadd95cfabce4025d34e3cca666c655510b18e74edd451f3194ff70dfbd25bb116c88380873b34416c69f25274a2ee924ec45ac6913eb7cd76392d2c9d
+  data.tar.gz: f22887f60570dfa98d0430de0a6a487a3da566f1a9776058466015baa09b259026b4d064be99804669fddb9e1703ef8afc5892d5f42e22e6ecca8394278fdc28

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    rfbeam (0.4.8)
+    rfbeam (0.4.9)
       activesupport (~> 6.1.0)
       rubyserial (~> 0.6.0)
       thor (~> 1.2.1)

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

@@ -80,7 +80,7 @@ module RfBeam
       end
 
       def display_ddat
-        puts RfBeam::Kld7::CliFormatter.new.ddat(@radar.ddat)
+        puts RfBeam::Kld7::CliFormatter.new.format(:ddat, @radar.ddat)
       end
 
       def stream_ddat

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.8'
+  VERSION = '0.4.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfbeam
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  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