tamashii-agent 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e19cd4d2b7129befe8660e8841e46281d7c3f2be
-  data.tar.gz: 25cd75e5189d50ed84bf53bd24b5fa01c65682ea
+  metadata.gz: 8472e90c77ca68d4a0d15db970fb273fb389062d
+  data.tar.gz: db69d53412c00a2b54a31a3e6a6ea890c60e1492
 SHA512:
-  metadata.gz: 83bdcd64c59293adbe9951aae411e5717162893981e51a0352fd01453354798732278c0db620cb4bc784d85889200480118c0ac8f7f9e9d706f2581ffb7a9c6c
-  data.tar.gz: 334b41844278c811c406386315a297da6b83e102c073a6dd4bbf5a409c736b553a28396424e943d40b4a878d0ac1e4a3556ee4ec6c254f332520c7385a10bf59
+  metadata.gz: b6a316a2e7a50933e92d8a98c2ef747f47d7c8b1b0d670f165367ee061f2fde511487adeffe5976b39e40f0b077e11262e2d4a0c697242e6c973024831e4675d
+  data.tar.gz: 5d41b33314386e86365764565e64c6031248b29e6313bac7d251ccad4051b3aa3a1a07a9ddf93fac9ae3af3d69d2c8c838821c5ff5ff5f1168889d27704366ea

data/lib/tamashii/agent/config.rb

@@ -12,8 +12,11 @@ module Tamashii
       register :manager_port, 3000
       register :connection_timeout, 3
 
+      register :localtime, "+08:00"
+
       register :lcd_path, '/dev/i2c-1'
       register :lcd_address, 0x27
+      register :lcd_animation_delay, 1
 
       def auth_type(type = nil)
         return @auth_type ||= :none if type.nil?

data/lib/tamashii/agent/device/fake_lcd.rb

@@ -3,7 +3,9 @@ module Tamashii
     module Device
       # :nodoc:
       class FakeLCD
+        include Common::Loggable
         WIDTH = 16
+        LINE_COUNT = 2
 
         attr_accessor :backlight
 
@@ -13,16 +15,15 @@ module Tamashii
 
         def print_message(message)
           lines = message.lines.map{|l| l.delete("\n")}
-          puts "LCD Display(BACKLIGHT: #{@backlight}):"
-          puts lines.take(2).map { |line| print_line(line) }.join("\n")
+          logger.info "LCD Display(BACKLIGHT: #{@backlight}):"
+          lines.take(LINE_COUNT).each_with_index { |line_text, line| print_line(line_text, line) }
         end
 
-        private
-
-        def print_line(message)
+        def print_line(message, line)
           message = '' unless message
           message = message.ljust(WIDTH, ' ')
           message.split('').take(WIDTH).join('')
+          logger.info "Line #{line}: #{message}"
         end
       end
     end

data/lib/tamashii/agent/device/lcd.rb

@@ -6,6 +6,7 @@ module Tamashii
       # :nodoc:
       class LCD
         WIDTH = 16
+        LINE_COUNT = 2
 
         OP_CHR = 1
         OP_CMD = 0
@@ -41,7 +42,11 @@ module Tamashii
 
         def print_message(message)
           lines = message.lines.map{|l| l.delete("\n")}
-          2.times.each { |line| print_line(lines[line], LINES[line]) }
+          LINE_COUNT.times.each { |line| print_line(lines[line], line) }
+        end
+
+        def print_line(message, line)
+          write_line(message, LINES[line])
         end
 
         private
@@ -51,7 +56,7 @@ module Tamashii
           BACKLIGHT_OFF
         end
 
-        def print_line(message, line)
+        def write_line(message, line)
           message = '' unless message
           message = message.ljust(WIDTH, ' ')
           byte(line, OP_CMD)

data/lib/tamashii/agent/lcd.rb

@@ -5,20 +5,90 @@ require 'tamashii/agent/event'
 require 'tamashii/agent/adapter/lcd'
 
 
-
 module Tamashii
   module Agent
     class LCD < Component
+
+      class LineAnimator
+        include Common::Loggable
+        attr_reader :text
+
+        def self.line_width=(value)
+          @@line_width = value
+        end
+
+        def self.handler_print_line=(value)
+          @@handler_print_line = value
+        end
+
+        def initialize(line)
+          @line = line
+          @text = ""
+          @pos = -1
+        end
+
+        def set_text(text)
+          return if text == @text
+          stop_animation
+          @text = text || ""
+          if @text.size > @@line_width
+            start_animation
+          else
+            print_text(@text)
+          end
+        end
+
+        def animation_show_text
+          text = @text[@pos, @@line_width]
+          @pos += 1
+          @pos = 0 if @pos > @max_pos
+          print_text(text)
+        end
+
+        def start_animation
+          @pos = 0
+          @max_pos = @text.size - @@line_width
+          logger.debug "Start animation for line #{@line}: #{@text}"
+          @animation_thread = Thread.new { animation_loop }
+        end
+
+        def animation_loop
+          loop do
+            sleep Config.lcd_animation_delay
+            animation_show_text
+            sleep 1 if @pos == 0 || @pos == @max_pos
+          end
+        end
+
+        def stop_animation
+          @animation_thread.exit if @animation_thread
+          @animation_thread = nil
+        end
+
+        def print_text(text)
+          @@handler_print_line&.call(text, @line)
+        end
+      end
+
       def initialize(master)
         super
         load_lcd_device
+        @device_line_count = @lcd.class::LINE_COUNT
         @device_lock = Mutex.new
-        @idle_message = "[Tamashii]\nIdle..."
+        create_line_animators
+        set_idle_text("[Tamashii]\nIdle...")
         logger.debug "Using LCD instance: #{@lcd.class}"
-        @lcd.print_message("Initializing\nPlease wait...")
+        print_message("Initializing\nPlease wait...")
         schedule_to_print_idle
       end
 
+      def create_line_animators
+        LineAnimator.line_width = @lcd.class::WIDTH
+        LineAnimator.handler_print_line = method(:print_line)
+        @line_animators = [] 
+        @device_line_count.times {|i| @line_animators << LineAnimator.new(i)}
+      end
+
       def load_lcd_device
         @lcd = Adapter::LCD.object
       rescue => e
@@ -27,14 +97,64 @@ module Tamashii
         @lcd = Adapter::LCD.fake_class.new
       end
 
+      def print_message(message)
+        lines = message.lines.map{|l| l.delete("\n")} 
+        @device_line_count.times do |line_count|
+          @line_animators[line_count].set_text(lines[line_count])
+        end
+      end
+
+      def print_line(*args)
+        @device_lock.synchronize do
+          @lcd.print_line(*args)
+        end
+      end
+
+      def set_idle_text(text)
+        @idle_text_raw = text
+        @auto_update_interval = 0
+        # Time hint
+        if @idle_text_raw.include?(Tamashii::AgentHint::TIME)
+          @has_time_hint = true
+          @auto_update_interval = [@auto_update_interval, 30].max
+        else
+          @has_time_hint = false
+        end
+        # clear auto update timer
+        @idle_text_timer_task.shutdown if @idle_text_timer_task
+        if @auto_update_interval > 0
+          setup_idle_text_auto_update
+        else
+          # one-time setup
+          compute_idle_text
+        end
+      end
+
+      def setup_idle_text_auto_update
+        @idle_text_timer_task = Concurrent::TimerTask.new(run_now: true) do 
+          compute_idle_text
+          print_idle
+        end
+        @idle_text_timer_task.execution_interval = @auto_update_interval
+        @idle_text_timer_task.timeout_interval = @auto_update_interval
+        @idle_text_timer_task.execute
+      end
+
+      def compute_idle_text
+        result = @idle_text_raw.clone
+        if @has_time_hint
+          result.gsub!(Tamashii::AgentHint::TIME, Time.now.localtime(Config.localtime).strftime("%m/%d(%a) %H:%M"))
+        end
+        @idle_text = result
+        logger.debug "Idle text updated to #{@idle_text}"
+      end
+
       def schedule_to_print_idle(delay = 5)
         @back_to_idle_task = Concurrent::ScheduledTask.execute(delay, &method(:print_idle))
       end
 
       def print_idle
-        @device_lock.synchronize do
-          @lcd.print_message(@idle_message)
-        end
+        print_message(@idle_text)
       end
 
       def process_event(event)
@@ -42,23 +162,19 @@ module Tamashii
         when Event::LCD_MESSAGE
           logger.debug "Show message: #{event.body}"
           @back_to_idle_task&.cancel
+          print_message(event.body)
           @device_lock.synchronize do
-            @lcd.print_message(event.body)
             schedule_to_print_idle
           end
         when Event::LCD_SET_IDLE_TEXT
           logger.debug "Idle text set to #{event.body}"
-          @idle_message = event.body
-          @device_lock.synchronize do
-            @lcd.print_message(event.body)
-          end
+          set_idle_text(event.body)
+          print_idle
         end
       end
 
       def clear_screen
-        @device_lock.synchronize do
-          @lcd.print_message("")
-        end
+        print_message("")
       end
 
       def clean_up
@@ -69,6 +185,3 @@ module Tamashii
   end
 end
 
-
-
-

data/lib/tamashii/agent/version.rb

@@ -1,5 +1,5 @@
 module Tamashii
   module Agent
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/tamashii-agent.gemspec

@@ -35,10 +35,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "timecop"
   spec.add_development_dependency "pry"
 
 
-  spec.add_runtime_dependency "tamashii-common", ">=0.1.5"
+  spec.add_runtime_dependency "tamashii-common", ">=0.1.6"
   spec.add_runtime_dependency "websocket-driver"
   spec.add_runtime_dependency "nio4r"
   spec.add_runtime_dependency "pi_piper"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii-agent
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +130,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement