tamashii-agent 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9d22e0f412ffe228a1d91b28c78da5108f60024
-  data.tar.gz: 686f0b637d4a6a941b06fff85df869b568fb4f0d
+  metadata.gz: 4f8a6bed3bf8f1f705b5c21447fdf9ac48d6cf03
+  data.tar.gz: 339afb9a39fdf6f5c478d124ca0e73997fd49c93
 SHA512:
-  metadata.gz: 59b573c6b0a744a33c19d1424d62abb05173df4e1fa546c48ec5bb8d253c65d4ba3c34fef3217c7113181968e396b9ca9ece0d40ffa576e04034684e36613638
-  data.tar.gz: 7cdd4e93f41cd4e66e640c8636917f2c4c93b03a50c5e591a73677c33c1911e23c7702411c0c80334ce1e311f8cfa43562b73fb9dc500f889dfe791bbefa93ab
+  metadata.gz: 7c2bbc212637f2120e34eee02ac695c8543ad6c260e4f1bf1d31df0fc432a2a00e2d5f5129d19a80f811928c3341d0c4f0e2aae9b0bf960557851e9b3ec2434e
+  data.tar.gz: 0ba0b3399a3a811e6f4a616a23438d5f042c3a6e6ff380c168fa1e0741cf5992b9b111353cc548cda8b129cc8ea3bb2f6738724525fe720a7513e2d62eb510f8

data/lib/tamashii/agent/device/buzzer/pwm_buzzer.rb

@@ -34,7 +34,7 @@ module Tamashii
           end
 
           def default_pin
-            19
+            18
           end
 
           private

data/lib/tamashii/agent/device/keyboard/base.rb

@@ -10,7 +10,7 @@ module Tamashii
           def initialize(*args)
             super(*args)
             initialize_hardware
-            @number_of_keys = fetch_option(:number_of_keys, default_number_of_keys)
+            @number_of_keys = number_of_keys
             @watcher_mode = fetch_option(:watch, default_watch)
             @watcher_stopping = Concurrent::AtomicBoolean.new(false)
             if @watcher_mode
@@ -19,6 +19,10 @@ module Tamashii
             end
           end
 
+          def number_of_keys
+            fetch_option(:number_of_keys, default_number_of_keys)
+          end
+
           def default_number_of_keys
             raise NotImplementedError
           end
@@ -75,7 +79,7 @@ module Tamashii
           end
 
           def watcher_loop
-            puts "watcher started"
+            logger.debug "Watcher started"
             loop do
               if watcher_stopping?
                 break

data/lib/tamashii/agent/device/keyboard/button_matrix4x4.rb

@@ -0,0 +1,64 @@
+require 'pi_piper'
+require 'tamashii/agent/device/keyboard/base'
+
+module Tamashii
+  module Agent
+    module Device
+      module Keyboard
+        class ButtonMatrix4x4 < Base
+
+          def initialize_hardware
+            @row_pins = fetch_option(:row_pins, default_row_pins).map do |pin_number|
+              PiPiper::Pin.new(pin: pin_number, direction: :out).tap {|pin| pin.on} 
+            end
+            @col_pins = fetch_option(:col_pins, default_col_pins).map do |pin_number|
+              PiPiper::Pin.new(pin: pin_number, direction: :in, pull: :up)
+            end
+          end
+
+          def number_of_keys
+            16
+          end
+
+          def polling_interval
+            0.01
+          end
+
+          def default_row_pins
+            [21, 20, 16, 12]
+          end
+
+          def default_col_pins
+            [26, 19, 13, 6]
+          end
+          
+          def finalize_hardware
+            (@row_pins + @col_pins).each do |pin|
+              unexport_pin(pin.pin)
+            end
+          end
+
+          def read_key
+            current_key = nil
+            @row_pins.each_with_index do |row_pin, row_index|
+              row_pin.off
+              @col_pins.each_with_index do |col_pin, col_index|
+                col_pin.read
+                key = row_index * 4 + col_index
+                if col_pin.off?
+                  current_key = key
+                  mark_key_down(key)
+                else
+                  mark_key_up(key)
+                end
+              end
+              row_pin.on
+              sleep 0.001
+            end
+            current_key
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tamashii/agent/device/keyboard/ttp229_serial.rb

@@ -33,8 +33,8 @@ module Tamashii
           end
           
           def finalize_hardware
-            unexport_pin(fetch_option(:scl_pin, default_scl_pin))
-            unexport_pin(fetch_option(:sdo_pin, default_sdo_pin))
+            unexport_pin(@scl_pin.pin)
+            unexport_pin(@sdo_pin.pin)
           end
 
           def read_key

data/lib/tamashii/agent/{keyboard.rb → keyboard_logger.rb}

@@ -3,7 +3,7 @@ require 'tamashii/agent/event'
 
 module Tamashii
   module Agent
-    class Keyboard < Component
+    class KeyboardLogger < Component
       def initialize(name, master, options = {})
         options[:watch] = true # Force enable watch mode
         super

data/lib/tamashii/agent/master.rb

@@ -3,7 +3,7 @@ require 'tamashii/agent/networking'
 require 'tamashii/agent/lcd'
 require 'tamashii/agent/buzzer'
 require 'tamashii/agent/card_reader'
-require 'tamashii/agent/keyboard'
+require 'tamashii/agent/keyboard_logger'
 require 'tamashii/agent/event'
 
 module Tamashii

data/lib/tamashii/agent/version.rb

@@ -1,5 +1,5 @@
 module Tamashii
   module Agent
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii-agent
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -302,6 +302,7 @@ files:
 - lib/tamashii/agent/device/card_reader/pn532_uart.rb
 - lib/tamashii/agent/device/device_base.rb
 - lib/tamashii/agent/device/keyboard/base.rb
+- lib/tamashii/agent/device/keyboard/button_matrix4x4.rb
 - lib/tamashii/agent/device/keyboard/dummy.rb
 - lib/tamashii/agent/device/keyboard/ttp229_serial.rb
 - lib/tamashii/agent/device/lcd/base.rb
@@ -314,7 +315,7 @@ files:
 - lib/tamashii/agent/handler/lcd.rb
 - lib/tamashii/agent/handler/remote_response.rb
 - lib/tamashii/agent/handler/system.rb
-- lib/tamashii/agent/keyboard.rb
+- lib/tamashii/agent/keyboard_logger.rb
 - lib/tamashii/agent/lcd.rb
 - lib/tamashii/agent/master.rb
 - lib/tamashii/agent/networking.rb