ws_light 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbf069c0977c0d9f8df28c61681c404780820a38
-  data.tar.gz: 5119cbe7ce8d5014ff8b9b63c299a68ef266dcb9
+  metadata.gz: c759d2c4fc062deccebc4190aa531af5f388cdd1
+  data.tar.gz: 0d471ef1d1f9b3988187f26e3efa57283df1731b
 SHA512:
-  metadata.gz: 9792d608a3f9859c70ff2c5319d6abb4480f21a4b39bbb7385c735fdbbe16e274184e1d45e347c2880ea38be1e6557ca4c9128d56a672b88f6fb2b652c9f9e5e
-  data.tar.gz: 2adef99d7dee1b1f081d510189535ab4b813697252e19bf9f1cd48e9a97971a9ef1e3428e8e9fa0da5d68e94a3d38f26a9b15b5f23e0aff3d542f52e7f6e9d0f
+  metadata.gz: 5c643c0a4992cb7310469cc5c7070d791906836267b0b24d1f2b3b5e1269902f6e626d4c687ad0a5cf0d0f05241504df7a8ad7872cb1cce5283fcb30dba71062
+  data.tar.gz: 78f81988a236233f7e64ad735f61a6edba4d9ddf952b2e564f3904bc9103ae910db20788acd12bee5aa2d9c22a921f7d9b23b18ec31637769ba0abb0fd047deb

data/.gitignore

@@ -2,4 +2,7 @@
 *.log
 
 # Ignore built gems
-*.gem
+*.gem
+
+# Ignore the lock file
+Gemfile.lock

data/bin/ws_light

@@ -24,15 +24,25 @@ require 'bundler'
 require 'ws_light/strip'
 require 'ws_light/sd_logger'
 
+PIN_RIGHT = 23
+PIN_LEFT = 24
+
 logger = WSLight::SDLogger.new
 logger.debug = DEBUG
-logger.filename = 'motion.log'
+logger.filename = '/var/log/motion.log'
 logger.log 'Starting up'
 
+def unregister_pins
+  [PIN_RIGHT, PIN_LEFT].each do |pin|
+    File.open('/sys/class/gpio/unexport', 'w') { |f| f.write("#{pin}") }
+  end
+end
+
 # Trap ^C 
 Signal.trap('INT') {
   logger.log 'Shutting down'
   logger.write_log
+  unregister_pins
   exit
 }
  
@@ -40,31 +50,21 @@ Signal.trap('INT') {
 Signal.trap('TERM') {
   logger.log 'Shutting down'
   logger.write_log
+  unregister_pins
   exit
 }
 
 strip = WSLight::Strip.new
 strip.debug = DEBUG
 
-pin_right = PiPiper::Pin.new(:pin => 22, :direction => :in)
-pin_left = PiPiper::Pin.new(:pin => 23, :direction => :in)
-
-after :pin => 23, :goes => :high do
+after :pin => PIN_RIGHT, :goes => :high do
   logger.log('Motion detected: RIGHT')
-  strip.on(WSLight::Strip::DIRECTION_RIGHT)
-  while pin_right.on?
-  	strip.on(WSLight::Strip::DIRECTION_RIGHT)
-  	sleep 1
-  end
+  strip.on(:direction_right)
 end
 
-after :pin => 24, :goes => :high do
+after :pin => PIN_LEFT, :goes => :high do
   logger.log('Motion detected: LEFT')
-  strip.on(WSLight::Strip::DIRECTION_LEFT)
-  while pin_left.on?
-  	strip.on(WSLight::Strip::DIRECTION_LEFT)
-  	sleep 1
-  end
+  strip.on(:direction_left)
 end
 
 PiPiper.wait

data/lib/ws_light/sd_logger.rb

@@ -5,7 +5,7 @@ module WSLight
     attr_accessor :entries, :interval, :entries, :debug, :filename
 
     def initialize
-      @filename = 'log.txt'
+      @filename = '/var/log/motion.log'
       @interval = 1800 # log interval in seconds
       @entries = []
       @last_write = Time.now

data/lib/ws_light/set/strawberry_set.rb

@@ -26,6 +26,8 @@ module WSLight
 
         set = sprinkle_nuts(set)
 
+        set.reverse! if rand(2) == 0
+
         type == :double ? set + set.reverse : set
       end
 

data/lib/ws_light/set/watermelon_set.rb

@@ -18,7 +18,7 @@ module WSLight
           if i < length_red
             set << Color.new((rand(25) < 1 ? 0 : 255), 0, 0)
           elsif i < length_red + length_red_to_white
-            ratio = (i - length_red) / (length_red + length_red_to_white)
+            ratio = (i - length_red) / length_red_to_white.to_f
             set << red.mix(white, ratio)
           elsif i < length_red + length_red_to_white + length_white
             set << white
@@ -27,6 +27,8 @@ module WSLight
           end
         end
 
+        set.reverse! if rand(2) == 0
+
         type == :double ? set + set.reverse : set
       end
 

data/lib/ws_light/strip.rb

@@ -32,16 +32,8 @@ module WSLight
     LENGTH = 160
     TYPE = :double
 
-    DIRECTION_NONE = 0
-    DIRECTION_LEFT = 1
-    DIRECTION_RIGHT = 2
     TIMEOUT = 12
-
-    STATE_OFF = :state_off
-    STATE_ON = :state_on
-    STATE_STARTING_UP = :state_starting_up
-    STATE_SHUTTING_DOWN = :state_shutting_down
-
+    
     WEATHER_URL = 'http://api.openweathermap.org/data/2.5/weather?q=Hannover,de'
 
     FRAMES_PER_SECOND = 25
@@ -49,11 +41,10 @@ module WSLight
     def initialize
       WS2801.length(Strip::TYPE == :double ? Strip::LENGTH * 2 : Strip::LENGTH)
       WS2801.autowrite(true)
-      update_daylight
       self_test
       @listen_thread = Thread.new { while true do check_timer; sleep 0.5; end }
       @last_event = Time.now - 3600 # set last event to a longer time ago
-      @state = STATE_OFF
+      @state = :state_off
       @debug = false
       @current_set = Set::ColorSet.new
       @current_set.color = Color.new(0,0,0)
@@ -62,13 +53,13 @@ module WSLight
     def on(direction)
       @last_event = Time.now
       puts "triggered event 'on': #{last_event.to_f} from state #{@state}" if @debug
-      @state = STATE_STARTING_UP if @state == STATE_SHUTTING_DOWN
-      return if @state != STATE_OFF
+      @state = :state_starting_up if @state == :state_shutting_down
+      return if @state != :state_off
 
       puts 'Loading a new set...' if @debug
 
       @direction = direction
-      @state = STATE_STARTING_UP
+      @state = :state_starting_up
 
       case rand(100)
       when 0..3
@@ -96,7 +87,7 @@ module WSLight
       animate(animation)
       @current_set = set
 
-      @state = STATE_ON
+      @state = :state_on
 
       # Move show() into background, so we can accept new events on the main thread
       Thread.new { show(@current_set, animation.frames) }
@@ -104,9 +95,9 @@ module WSLight
 
     def off(direction = nil)
       puts "triggered event 'off': #{Time.now.to_f} during state #{@state}" if @debug
-      return if @state != STATE_ON
+      return if @state != :state_on
 
-      @state = STATE_SHUTTING_DOWN
+      @state = :state_shutting_down
       sleep 0.2
       @direction = direction if direction
 
@@ -116,10 +107,10 @@ module WSLight
       animation = animation_for(@direction).new(@current_set, set)
 
       if animate(animation)
-        @state = STATE_OFF
+        @state = :state_off
         @current_set = set
       else
-        @state = STATE_ON
+        @state = :state_on
         Thread.new { show(@current_set, animation.frames) }
       end
 
@@ -129,7 +120,7 @@ module WSLight
     def animation_for(direction)
       return Animation::FadeAnimation if night?
 
-      if direction == DIRECTION_LEFT
+      if direction == :direction_left
         Animation::SlideLeftAnimation
       else
         Animation::SlideRightAnimation
@@ -173,20 +164,7 @@ module WSLight
 
     def night?
       time = Time.now
-      time.to_i < (@daylight[:start] - 3600) || time.to_i > (@daylight[:end] + 3600)
-    end
-
-    # Gets the sunset/sunrise data
-    # this might get out of sync when the clock is not set correctly
-    # anyway, one day off is not a problem :)
-    def update_daylight
-      data = JSON.parse(open(WEATHER_URL).read)
-      @daylight = {
-        start: data['sys']['sunrise'].to_i,
-        end: data['sys']['sunset'].to_i,
-        day: Time.now.day
-      }
-      pp @daylight
+      time.hour > 22 || time.hour < 6
     end
 
     def shutdown
@@ -204,10 +182,7 @@ module WSLight
     end
 
     def check_timer
-      WS2801.set(r: 0, g: 0, b: 0) if @state == STATE_OFF
-      # Test after 2 a.m. to make sure we can the correct date even if our time is slightly off
-      time = Time.now
-      update_daylight if @daylight[:day] != time.day && time.hour > 1
+      WS2801.set(r: 0, g: 0, b: 0) if @state == :state_off
       off if timeout?
     end
 

data/lib/ws_light/version.rb

@@ -1,4 +1,4 @@
 # Provides a global version number
 module WSLight
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ws_light
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerrit Visscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A lighting gem for WS2801 led strips.