raspberry_pi_iot 0.0.8 → 0.0.9

data/doc/top-level-namespace.html

@@ -82,7 +82,7 @@
 <p class="children">
   
     
-      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Bus.html" title="Bus (module)">Bus</a></span>, <span class='object_link'><a href="IoT.html" title="IoT (module)">IoT</a></span>, <span class='object_link'><a href="RaspberryPi.html" title="RaspberryPi (module)">RaspberryPi</a></span>
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Bus.html" title="Bus (module)">Bus</a></span>, <span class='object_link'><a href="IoT.html" title="IoT (module)">IoT</a></span>, <span class='object_link'><a href="RaspberryPi.html" title="RaspberryPi (module)">RaspberryPi</a></span>, <span class='object_link'><a href="RaspberryPiIoT.html" title="RaspberryPiIoT (module)">RaspberryPiIoT</a></span>
     
   
     
@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Dec 18 16:03:38 2018 by
+  Generated on Thu Dec 20 18:09:38 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.16 (ruby-2.3.3).
 </div>

data/lib/button.rb

@@ -10,31 +10,43 @@ class Button < BinaryReceptor
     @measure_pause = 0.01
     @long_click = 1.0
     @short_interval = 0.2
+    @timeout = 30
     @intervals = []
+    # samples:        wait time    press time     wait time    press time
+    # double press: [[1.486804292, 0.090814152], [0.131284967, 0.13125429]]
+    # long press:   [[0.910878286, 1.109352219]]
   end
 
-  # Is button pressed?
+  # Is button being pressed?
   def pressed?
     low?
   end
 
-  # Is button not pressed?
+  # Is button not being pressed?
   def not_pressed?
     high?
   end
 
+  def was_pressed?
+    @intervals.size > 0
+  end
+
+  def was_not_pressed?
+    !was_pressed?
+  end
+
   # Wait for the 1st pressing of button
   def wait_for_press
     wait_for_presses(1)
   end
 
   # Wait for several sequential presses
-  def wait_for_presses(attempts=2)
+  def wait_for_presses(attempts=2, timeout=@timeout)
     @intervals = []
     attempts.times do
       interval = []
       timer = Time.now
-      while not_pressed? do
+      while not_pressed? && (Time.now-timer) < timeout do
         sleep @measure_pause
       end
       interval << Time.now-timer
@@ -67,4 +79,16 @@ class Button < BinaryReceptor
   def long_press?(intervals=@intervals)
     intervals.size == 1 && intervals[0][1] >= @long_click
   end
+
+  def set_timeout(timeout)
+    @timeout = timeout
+  end
+
+  def timeout?
+    min_wait_time = 0.0
+    @intervals.each do |interval|
+      min_wait_time = [min_wait_time, interval[0]].min
+    end
+    min_wait_time > @timeout
+  end
 end

data/lib/digital_effector.rb

@@ -9,13 +9,13 @@ class DigitalEffector < Effector
   @pins = {} # GPIO pins
 
   def initialize(pins, state=:low)
-    @states = {}
-    @pins = pins
+    @states = {} # ON / Off states for pin numbers
+    @pins = pins # DigitalEffector.new {red: 17, green: 28, blue: 22}
     @pins.each_value do |pin|
       RPi::GPIO.setup pin, :as => :output, :initialize => state
       @states[pin] = (state == :high)
     end
-    @pin = pins.values[0]
+    @pin = pins.values[0] # default pin
   end
 
   def self.on(pin=@pin)
@@ -27,23 +27,17 @@ class DigitalEffector < Effector
   end
 
   def on(pin=@pin)
-    BinaryEffector.on @pin
-    @states[pin] = true
+    DigitalEffector.on pin
+    @states[pin_number(pin)] = true
   end
 
   def off(pin=@pin)
-    BinaryEffector.off @pin
-    @states[pin] = false
+    DigitalEffector.off pin
+    @states[pin_number(pin)] = false
   end
 
   def on?(pin=@pin)
-    state = nil
-    if pin.class.name == 'Fixnum' # by number
-      state = @states[pin]
-    elsif @pins[pin]              # by name
-      state = @states[@pins[pin]]
-    end
-    state
+    @states[pin_number(pin)]
   end
 
   def off?(pin=@pin)

data/lib/led.rb

@@ -7,10 +7,12 @@ class LED < BinaryEffector
     self.name = 'LED'
   end
 
+  # Turn on the LED.
   def on(pin=@pin)
     super(pin)
   end
 
+  # Turn off the LED.
   def off(pin=@pin)
     super(pin)
   end
@@ -25,12 +27,14 @@ class LED < BinaryEffector
     end
   end
 
+  # Turn the LED on for N seconds.
   def on_for(seconds=1)
     on
     sleep seconds
     off
   end
 
+  # Turn the LED off for N seconds.
   def off_for(seconds=1)
     off
     sleep seconds

data/lib/led_rgb.rb

@@ -14,45 +14,25 @@ class LED
     self.name = 'RGB LED'
   end
 
-  def red_on
-    DigitalEffector.on @red
-  end
-
-  def red_off
-    DigitalEffector.off @red
-  end
-
-  def green_on
-    DigitalEffector.on @green
-  end
-
-  def green_off
-    DigitalEffector.off @green
-  end
-
-  def blue_on
-    DigitalEffector.on @blue
-  end
-
-  def blue_off
-    DigitalEffector.off @blue
-  end
-
-  def on(color)
+  def on(color=:all)
     color = :aoi if color == :aqua
     case color
     when :red
-      red_on
+      super @red
     when :green
-      green_on
+      super @green
     when :blue
-      blue_on
+      super @blue
     when :yellow
-      red_on
-      green_on
+      super @red
+      super @green
     when :aoi
-      blue_on
-      green_on
+      super @blue
+      super @green
+    when :all
+      super @red
+      super @green
+      super @blue
     else
     end
   end
@@ -61,30 +41,33 @@ class LED
     color = :aoi if color == :aqua
     case color
     when :red
-      red_off
+      super @red
     when :green
-      green_off
+      super @green
     when :blue
-      blue_off
+      super @blue
     when :yellow
-      red_off
-      green_off
+      super @red
+      super @green
     when :aoi
-      blue_off
-      green_off
+      super @blue
+      super @green
     when :all
-      all_off
+      super @red
+      super @green
+      super @blue
     else
       all_off
     end
   end
 
-  def all_off
-    red_off
-    green_off
-    blue_off
+  def all_on
+    on :all
   end
 
+  def all_off
+    off :all
+  end
 
   def blink(list = :all, repeat=3, switched_on=0.25, switched_off=0.5)
     colors = (list == :all) ? [:red, :green, :blue] : (list.class == Array ? list : [list])

data/lib/raspberry_pi_iot.rb

@@ -1,3 +1,10 @@
 require 'raspberry_pi'
 require 'receptor'
 require 'effector'
+require_relative 'raspberry_pi_iot/version'
+
+module RaspberryPiIoT
+  class Error < StandardError
+  end
+  # Your code goes here...
+end

data/test/test_Raspberry_Pi_IoT.rb

@@ -0,0 +1,11 @@
+require "test_helper"
+
+class RaspberryPiIoTTest < Minitest::Test
+  def test_that_it_has_a_version_number
+    refute_nil ::RaspberryPiIoT::VERSION
+  end
+
+#  def test_it_does_something_useful
+#    assert false
+#  end
+end

data/test/test_button.rb

@@ -10,12 +10,16 @@ class RaspberryPiIoT_ButtonTest < MiniTest::Test
   def setup
     @pin = 21
     @button = Button.new(@pin)
+    @button.set_timeout 10
   end
 
   def test_wait_for_press
+    assert @button.not_pressed?
+    assert @button.was_not_pressed?
     printf "Waiting for press...\n"
     @button.wait_for_press
-    assert @button.not_pressed?
+    assert @button.was_pressed? if !@button.timeout?
+
   end
 
 
@@ -27,9 +31,10 @@ class RaspberryPiIoT_ButtonTest < MiniTest::Test
   end
 
   def test_wait_for_long_press
-    printf "Waiting for 1 long press...\n"
+    printf "Waiting for 1 long press (> 1 second)...\n"
     @button.wait_for_press
-    assert !@button.single_press?
+    assert @button.single_press?
+    assert !@button.double_press?
     assert @button.long_press?
   end
 
@@ -37,5 +42,6 @@ class RaspberryPiIoT_ButtonTest < MiniTest::Test
     printf "Waiting for double press...\n", p
     @button.wait_for_presses 2
     assert @button.double_press?
+    assert !@button.single_press?
   end
 end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "raspberry_pi_iot"
+
+require "minitest/autorun"

data/test/test_led.rb

@@ -35,11 +35,11 @@ class RaspberryPiIoT_LedTest < Minitest::Test
   end
 
   def test_sos
+    3.times { @led.on_for(0.25); @led.off_for(0.25) }
+    sleep 1
     3.times { @led.on_for(0.5); @led.off_for(0.25) }
-    sleep 0.5
-    3.times { @led.on_for(0.15); @led.off_for(0.25) }
-    sleep 0.5
-    3.times { @led.on_for(0.5); @led.off_for(0.25) }
+    sleep 1
+    3.times { @led.on_for(0.25); @led.off_for(0.25) }
     sleep 1.5
     @led.off
   end

data/test/test_led_rgb.rb

@@ -17,20 +17,41 @@ class RaspberryPiIoT_LedRgbTest < Minitest::Test
 
   def test_red
     @rgb.on :red
+    assert @rgb.on? :red
     sleep @time_on
     @rgb.off
+    assert @rgb.off? :red
   end
 
   def test_green
     @rgb.on :green
+    assert @rgb.on? :green
     sleep @time_on
     @rgb.off
+    assert @rgb.off? :green
   end
 
   def test_blue
     @rgb.on :blue
+    assert @rgb.on? :blue
     sleep @time_on
     @rgb.off
+    assert @rgb.off? :blue
+  end
+
+  def test_all_on
+    @rgb.on :all
+    assert @rgb.on? :red
+    assert @rgb.on? :green
+    assert @rgb.on? :blue
+    sleep @time_on
+  end
+
+  def test_all_off
+    @rgb.off :all
+    assert @rgb.off? :red
+    assert @rgb.off? :green
+    assert @rgb.off? :blue
   end
 
   def test_colors
@@ -53,10 +74,12 @@ class RaspberryPiIoT_LedRgbTest < Minitest::Test
   end
 
   def test_sos
-    @rgb.blink :red, 3, 0.25, 0.5
+    @rgb.blink :red, 3, 0.25, 0.25
     sleep 1
     @rgb.blink :red, 3, 0.5, 0.5
     sleep 1
-    @rgb.blink :red, 3, 0.25, 0.5
+    @rgb.blink :red, 3, 0.25, 0.25
+    assert @rgb.off?
+    sleep 1
   end
 end

data/test/test_thermal.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/ruby
+
+require 'minitest/autorun'
+
+$LOAD_PATH << "../lib"
+require "thermal_sensor"
+
+class RaspberryPiIoT_ThermalSensorTest < MiniTest::Test
+
+  def setup
+    @sensor = RaspberryPi::ThermalSensor.new
+  end
+
+  def test_sensor_value
+    c = @sensor.celsius
+    assert c > 15.0
+
+    r = @sensor.reaumur
+    assert r < c
+
+    f = @sensor.fahrenheit
+    assert f > c
+
+    k = @sensor.kelvin
+    assert k > f
+  end
+end

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: raspberry_pi_iot
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mike Shock (Mikhail V. Shokhirev)
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.16
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.16
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rpi_gpio
   requirement: !ruby/object:Gem::Requirement
@@ -143,11 +199,13 @@ files:
 - doc/LED.html
 - doc/MAX44009.html
 - doc/RaspberryPi.html
+- doc/RaspberryPiIoT.html
 - doc/Receptor.html
 - doc/Sensor.html
 - doc/TemperatureSensor.html
 - doc/_index.html
 - doc/class_list.html
+- doc/file.LICENSE.html
 - doc/file.README.html
 - doc/file_list.html
 - doc/frames.html
@@ -182,18 +240,25 @@ files:
 - lib/temperature_sensor.rb
 - lib/thermal_sensor.rb
 - test/standalone_test_bmp280.rb
+- test/test_Raspberry_Pi_IoT.rb
 - test/test_bh1750.rb
 - test/test_button.rb
 - test/test_dht11.rb
 - test/test_ds18b20.rb
+- test/test_helper.rb
 - test/test_info.rb
 - test/test_led.rb
 - test/test_led_rgb.rb
 - test/test_max44009_gy49.rb
+- test/test_thermal.rb
 homepage: https://github.com/mike-shock/Ruby-Raspberry_Pi_IoT/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/mike-shock/Ruby-Raspberry_Pi_IoT/
+  source_code_uri: 'TODO: Put your gem''s public repo URL here.'
+  changelog_uri: 'TODO: Put your gem''s CHANGELOG.md URL here.'
 post_install_message: 
 rdoc_options: []
 require_paths: