ws_light 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c759d2c4fc062deccebc4190aa531af5f388cdd1
-  data.tar.gz: 0d471ef1d1f9b3988187f26e3efa57283df1731b
+SHA256:
+  metadata.gz: 7c88abb859296341e8d84b4f1bb31bbf5932abf0daed9439e2d22640de25fab0
+  data.tar.gz: ba45253224b6b2e523e774255a8f56ab6aaf1d892ed4d805859e22a295961e05
 SHA512:
-  metadata.gz: 5c643c0a4992cb7310469cc5c7070d791906836267b0b24d1f2b3b5e1269902f6e626d4c687ad0a5cf0d0f05241504df7a8ad7872cb1cce5283fcb30dba71062
-  data.tar.gz: 78f81988a236233f7e64ad735f61a6edba4d9ddf952b2e564f3904bc9103ae910db20788acd12bee5aa2d9c22a921f7d9b23b18ec31637769ba0abb0fd047deb
+  metadata.gz: bccde7663cde60bcc102898e005e077e93b8507fe3b6b9ab247b055273dfa8c81c102a8a9f1b15aa1838326a6d7183417f4f7af487e2907d662fef18a4252001
+  data.tar.gz: 3efedea3cffa086835d1cbe30a01ced9505c94549fe107dc77abdcd9b8d3148218b2be0cf8228a184b32f169bd1cc63716a0b88905ca77ddb723c37c1f68981d

data/bin/ws_light

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 
-DEBUG = true
-
-if ARGV[0] && ARGV[0]=='-b'
+if ARGV[0] && ARGV[0] == '-b'
   case ARGV[1]
   when 'set'
     require 'ws_light/benchmark/set_benchmark'
@@ -20,52 +18,65 @@ require 'pi_piper'
 
 include PiPiper
 
+require 'socket'
 require 'bundler'
 require 'ws_light/strip'
 require 'ws_light/sd_logger'
+require 'ws_light/hass'
+
+require 'ws_light/config'
 
-PIN_RIGHT = 23
-PIN_LEFT = 24
+TELEGRAF_IP = '127.0.0.1'.freeze
+TELEGRAF_PORT = 8094
+
+# Load config to overwrite default values
+config = WSLight::Config.new.parse
 
 logger = WSLight::SDLogger.new
-logger.debug = DEBUG
-logger.filename = '/var/log/motion.log'
+logger.debug = false
+logger.filename = config['log_file']
 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}") }
+def unregister_pins(pins)
+  pins.each do |pin|
+    File.open('/sys/class/gpio/unexport', 'w') { |f| f.write(pin.to_s) }
   end
 end
 
-# Trap ^C 
-Signal.trap('INT') {
+# Trap ^C
+Signal.trap('INT') do
   logger.log 'Shutting down'
   logger.write_log
-  unregister_pins
+  unregister_pins([config['pin_right'], config['pin_left']])
   exit
-}
- 
+end
+
 # Trap `kill `
-Signal.trap('TERM') {
+Signal.trap('TERM') do
   logger.log 'Shutting down'
   logger.write_log
-  unregister_pins
+  unregister_pins([config['pin_right'], config['pin_left']])
   exit
-}
+end
 
 strip = WSLight::Strip.new
-strip.debug = DEBUG
+strip.debug = config['debug']
+hass = Hass.new(config['hass_url'], config['hass_api_password'], logger)
+
+socket = UDPSocket.new
 
-after :pin => PIN_RIGHT, :goes => :high do
-  logger.log('Motion detected: RIGHT')
+after pin: config['pin_right'], goes: :high do
+  logger.log('Motion detected: RIGHT') if config['track_motion_in_log']
+  socket.send 'motion,room=hallway,sensor=right value=1', 0, TELEGRAF_IP, TELEGRAF_PORT
   strip.on(:direction_right)
+  hass.notify(true, config['sensor_right_name'], config['sensor_right_description']) if config['hass_integration']
 end
 
-after :pin => PIN_LEFT, :goes => :high do
-  logger.log('Motion detected: LEFT')
+after pin: config['pin_left'], goes: :high do
+  logger.log('Motion detected: LEFT') if config['track_motion_in_log']
+  socket.send 'motion,room=hallway,sensor=left value=1', 0, TELEGRAF_IP, TELEGRAF_PORT
   strip.on(:direction_left)
+  hass.notify(true, config['sensor_left_name'], config['sensor_left_description']) if config['hass_integration']
 end
 
 PiPiper.wait
-	

data/lib/ws_light/animation/base_animation.rb

@@ -10,7 +10,7 @@ module WSLight
       end
 
       def frame_data(count)
-        frame(count).collect{|color| color.to_a}.flatten
+        frame(count).collect(&:to_a).flatten
       end
 
       def frames_per_second
@@ -18,4 +18,4 @@ module WSLight
       end
     end
   end
-end
+end

data/lib/ws_light/animation/fade_animation.rb

@@ -17,7 +17,7 @@ module WSLight
         @set_to.next_frame
 
         @set_from.full_length.times do |i|
-          set << @set_from.pixel(i).mix(@set_to.pixel(i), count.to_f/FADE_DURATION.to_f)
+          set << @set_from.pixel(i).mix(@set_to.pixel(i), count.to_f / FADE_DURATION.to_f)
         end
 
         set

data/lib/ws_light/animation/slide_right_animation.rb

@@ -4,7 +4,6 @@ module WSLight
   module Animation
     # Slides from one set to another from right to left (obviously depending on the hardware setup)
     class SlideRightAnimation < BaseAnimation
-
       def frames
         @set_from.length + 1 # one for each led plus one for all zero
       end

data/lib/ws_light/benchmark/set_benchmark.rb

@@ -4,7 +4,7 @@ require 'ws_light/set/semolina_set'
 require 'ws_light/set/random_set'
 require 'ws_light/set/strawberry_set'
 require 'ws_light/set/watermelon_set'
-
+require 'ws_light/set/star_set'
 
 require 'benchmark'
 include Benchmark
@@ -15,6 +15,7 @@ include Benchmark
 @random_set = WSLight::Set::RandomSet.new
 @strawberry_set = WSLight::Set::StrawberrySet.new
 @watermelon_set = WSLight::Set::WatermelonSet.new
+@star_set = WSLight::Set::StarSet.new
 
 @gradient_set.color_from = WSLight::Color.random_from_set
 @gradient_set.color_to = WSLight::Color.random_from_set
@@ -30,6 +31,7 @@ Benchmark.bm(15) do |x|
   x.report('RandomSet:') { n.times do @random_set.frame end }
   x.report('StrawberrySet:') { n.times do @strawberry_set.frame end }
   x.report('WatermelonSet:') { n.times do @watermelon_set.frame end }
+  x.report('StarSet:') { n.times do @star_set.frame end }
 end
 
 puts "To run smoothly, the benchmarks should all be lower than #{n/50.0} seconds."

data/lib/ws_light/color.rb

@@ -1,17 +1,18 @@
 module WSLight
+  # Handles the red/green/blue value of a color
   class Color
     attr_accessor :r, :g, :b
 
     COLORS = {
-      pink: { r: 255, g: 16, b:32 },
-      red: { r: 255, g: 0, b: 0},
-      blue: { r: 0, g: 0, b: 255},
-      green: { r: 0, g: 255, b: 0},
-      cyan: { r: 0, g: 127, b: 127},
-      orange: {r: 255, g:70, b: 0},
-      yellow: {r: 255, g:220, b: 0},
-      purple: {r: 80, g:0, b: 180}
-    }
+      pink: { r: 255, g: 16, b: 32 },
+      red: { r: 255, g: 0, b: 0 },
+      blue: { r: 0, g: 0, b: 255 },
+      green: { r: 0, g: 255, b: 0 },
+      cyan: { r: 0, g: 127, b: 127 },
+      orange: { r: 255, g: 70, b: 0 },
+      yellow: { r: 255, g: 220, b: 0 },
+      purple: { r: 80, g: 0, b: 180 }
+    }.freeze
 
     def initialize(r=0, g=0, b=0)
       @r = r > 255 ? 255 : r.to_i
@@ -28,16 +29,16 @@ module WSLight
 
     def mix(other, ratio)
       Color.new(
-          (@r * (1-ratio) + other.r * ratio).to_i,
-          (@g * (1-ratio) + other.g * ratio).to_i,
-          (@b * (1-ratio) + other.b * ratio).to_i
+        (@r * (1 - ratio) + other.r * ratio).to_i,
+        (@g * (1 - ratio) + other.g * ratio).to_i,
+        (@b * (1 - ratio) + other.b * ratio).to_i
       )
     end
 
     def mix!(other, ratio)
-      @r = (@r * (1-ratio) + other.r * ratio).to_i
-      @g = (@g * (1-ratio) + other.g * ratio).to_i
-      @b = (@b * (1-ratio) + other.b * ratio).to_i
+      @r = (@r * (1 - ratio) + other.r * ratio).to_i
+      @g = (@g * (1 - ratio) + other.g * ratio).to_i
+      @b = (@b * (1 - ratio) + other.b * ratio).to_i
       self
     end
 
@@ -52,7 +53,7 @@ module WSLight
       elsif name == :black
         Color.new(0, 0, 0)
       else
-        fail "Cannot find color #{name}"
+        raise "Cannot find color #{name}"
       end
     end
 

data/lib/ws_light/config.rb

@@ -0,0 +1,79 @@
+require 'optparse'
+require 'yaml'
+
+module WSLight
+  # Reads config file and parses command parameters
+  class Config
+    CONFIG_FILE = '/etc/ws_light.conf'.freeze
+
+    DEFAULT_OPTIONS = {
+      'pin_right' => 23,
+      'pin_left' => 24,
+      'log_file' => '/var/log/motion.log',
+      'track_motion_in_log' => true,
+      'debug' => false,
+      'sensor_right_name' => 'motion_right',
+      'sensor_left_name' => 'motion_left',
+      'sensor_right_description' => 'Motion sensor right',
+      'sensor_left_description' => 'Motion sensor left',
+      'hass_integration' => false,
+      'hass_url' => '',
+      'hass_api_password' => ''
+    }.freeze
+
+    def initialize
+      @config = DEFAULT_OPTIONS.merge(yaml_options).merge(command_line_options)
+      store_options
+    end
+
+    def store_options
+      File.open(CONFIG_FILE, 'w') do |file|
+        file.puts @config.to_yaml
+      end
+    end
+
+    def parse
+      @config
+    end
+
+    def yaml_options
+      if File.exist? CONFIG_FILE
+        ::YAML.safe_load(File.read(CONFIG_FILE))
+      else
+        {}
+      end
+    end
+
+    def command_line_options
+      options = {}
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: ws_light [options]'
+
+        opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
+          options['verbose'] = v
+        end
+
+        opts.on('-l NUMBER', '--left-pin NUMBER', 'Pin to which the left motion detector is connected') do |number|
+          options['pin_left'] = number
+        end
+
+        opts.on('-r NUMBER', '--right-pin NUMBER', 'Pin to which the right motion detector is connected') do |number|
+          options['pin_right'] = number
+        end
+
+        opts.on('-o PATH', '--log PATH', 'path to the log file') do |log_file|
+          options['log_file'] = log_file
+        end
+
+        opts.on('--quiet-log', 'do not log detected motions') do
+          options['track_motion_in_log'] = false
+        end
+
+        opts.on('--debug', 'output all log messages to stdout, too') do
+          options['debug'] = true
+        end
+      end.parse!
+      options
+    end
+  end
+end

data/lib/ws_light/hass.rb

@@ -0,0 +1,30 @@
+require 'net/http'
+require 'json'
+
+# Home Assistant notifier
+class Hass
+  def initialize(url, password, logger)
+    @url = url
+    @password = password
+    @logger = logger
+  end
+
+  def notify(state = true, sensor_name = 'motion', friendly_name = 'Motion Sensor')
+    url = "#{@url}/api/states/sensor.#{sensor_name}"
+    data = { 'state' => (state ? 'on' : 'off'), 'attributes' => { 'friendly_name' => friendly_name } }.to_json
+    Thread.new { send_data(url, data) }
+  end
+
+  def send_data(url, data)
+    uri = URI(url)
+    puts "Starting request to #{url} with data #{data}"
+    https = Net::HTTP.new(uri.host, uri.port)
+    request = Net::HTTP::Post.new(uri.path)
+    request['Authorization'] = "Bearer #{@password}"
+    request['Accept-Encoding'] = 'deflate'
+    request.body = data
+    https.use_ssl = true if uri.scheme == 'https'
+    response = https.request request
+    @logger.log("Request to Home Assistant failed (#{response.code}): #{response.body}") #  if response.code > 299
+  end
+end

data/lib/ws_light/sd_logger.rb

@@ -2,7 +2,7 @@ module WSLight
   # Provides a logger which writes only in long intervals, thus reducing write access to the cd card
   # (out data is not that crucial)
   class SDLogger
-    attr_accessor :entries, :interval, :entries, :debug, :filename
+    attr_accessor :entries, :interval, :debug, :filename
 
     def initialize
       @filename = '/var/log/motion.log'
@@ -23,7 +23,8 @@ module WSLight
 
     def write_log
       return if @entries.empty?
-      file = File.open(@filename, File.exists?(@filename) ? 'a' : 'w')
+
+      file = File.open(@filename, File.exist?(@filename) ? 'a' : 'w')
       @entries.each do |entry|
         file.puts(entry[:time].to_s + ', ' + entry[:text])
       end
@@ -35,6 +36,5 @@ module WSLight
     def timeout?
       (Time.now - @last_write) > @interval
     end
-
   end
 end

data/lib/ws_light/set/color_set.rb

@@ -19,7 +19,7 @@ module WSLight
       end
 
       def frame_data
-        frame.collect{|color| color.to_a}.flatten
+        frame.collect(&:to_a).flatten
       end
 
       def frame

data/lib/ws_light/set/flowerbed_set.rb

@@ -0,0 +1,28 @@
+require 'ws_light/set/color_set'
+
+module WSLight
+  module Set
+    # Creates a green set with some random colors
+    class FlowerbedSet < ColorSet
+      def frame
+        @set ||= generate_set
+      end
+
+      def pixel(number, _frame = 0)
+        frame[number]
+      end
+
+      def generate_set
+        set = []
+        @full_length.times do
+          set << if rand(8).zero?
+                   Color.random_from_set
+                 else
+                   Color.by_name(:green)
+                 end
+        end
+        set
+      end
+    end
+  end
+end

data/lib/ws_light/set/gradient_set.rb

@@ -7,8 +7,8 @@ module WSLight
       attr_accessor :color_from, :color_to
 
       def init
-        @color_from = Color.new(0,0,0)
-        @color_to = Color.new(255,255,255)
+        @color_from = Color.new(0, 0, 0)
+        @color_to = Color.new(255, 255, 255)
       end
 
       def frame
@@ -28,7 +28,7 @@ module WSLight
 
       def pixel(number)
         number = @full_length - 1 - number if number >= @length
-        @color_from.mix(@color_to, number.to_f/(@length-1))
+        @color_from.mix(@color_to, number.to_f / (@length - 1))
       end
     end
   end

data/lib/ws_light/set/rainbow_set.rb

@@ -27,14 +27,13 @@ module WSLight
 
       def pixel(number)
         number = @full_length - 1 - number if number >= @length
-        x = @frequency*(number+@frame_count)
+        x = @frequency * (number + @frame_count)
         Color.new(
-            (Math.sin(x)**2 * 127),
-            (Math.sin(x + 2.0*Math::PI/3.0)**2 * 127),
-            (Math.sin(x + 4.0*Math::PI/3.0)**2 * 127)
+          (Math.sin(x)**2 * 127),
+          (Math.sin(x + 2.0 * Math::PI / 3.0)**2 * 127),
+          (Math.sin(x + 4.0 * Math::PI / 3.0)**2 * 127)
         )
       end
-
     end
   end
 end

data/lib/ws_light/set/semolina_set.rb

@@ -12,15 +12,14 @@ module WSLight
       def init
         @raspberries = []
 
-        while @raspberries.size < RASPBERRY_COUNT do
+        while @raspberries.size < RASPBERRY_COUNT
           position = rand(@full_length)
-          @raspberries << position unless (at_end?(position) || between_strips?(position) || is_raspberry?(position))
+          @raspberries << position unless at_end?(position) || between_strips?(position) || raspberry?(position)
         end
       end
 
       def between_strips?(position)
-
-        @type == :double && ((@full_length/2 - 1 - RASPBERRY_SIZE)..(@full_length/2)).include?(position)
+        @type == :double && ((@full_length / 2 - 1 - RASPBERRY_SIZE)..(@full_length / 2)).cover?(position)
       end
 
       def at_end?(position)
@@ -35,13 +34,13 @@ module WSLight
         set = []
 
         @full_length.times do |i|
-          set << (is_raspberry?(i) ? COLOR_RASPBERRY : COLOR_SEMOLINA)
+          set << (raspberry?(i) ? COLOR_RASPBERRY : COLOR_SEMOLINA)
         end
 
         set
       end
 
-      def is_raspberry?(pixel)
+      def raspberry?(pixel)
         @raspberries.each do |raspberry|
           return true if pixel > raspberry && pixel < (raspberry + RASPBERRY_SIZE)
         end

data/lib/ws_light/set/star_set.rb

@@ -6,10 +6,10 @@ module WSLight
     class StarSet < ColorSet
       FRAMES_PER_STAR = 75
       VISIBLE_STARS = 7
-      BLACK = Color.new(0,0,0)
+      BLACK = Color.new(0, 0, 0)
 
       def init
-        @stars = (0..(@full_length-4)).to_a.shuffle
+        @stars = (0..(@full_length - 4)).to_a.shuffle
         @max = @stars.size
         @stars += @stars[@stars.size - VISIBLE_STARS, VISIBLE_STARS]
         generate_frame
@@ -28,21 +28,16 @@ module WSLight
 
       def generate_frame
         @set = []
-        @full_length.times{ @set << BLACK }
+        @full_length.times { @set << BLACK }
         start = (@frame_count * VISIBLE_STARS / FRAMES_PER_STAR) % @max
         VISIBLE_STARS.times do |i|
-            draw_star(@stars[start + i], @frame_count - ((start - VISIBLE_STARS + 1 + i) * (FRAMES_PER_STAR.to_f / VISIBLE_STARS.to_f)).to_i)
+          star_ratio = FRAMES_PER_STAR.to_f / VISIBLE_STARS.to_f
+          draw_star(@stars[start + i], @frame_count - ((start - VISIBLE_STARS + 1 + i) * star_ratio).to_i)
         end
       end
 
       def draw_star(position, star_frame)
-        #(-3..3).each do |i|
-        #  white = brightness(i.abs, (star_frame - (FRAMES_PER_STAR/2)).abs)
-        #  @set[position + i] = Color.new(white, white, white)
-        #end
-        #return if star_frame < 0
-        white = brightness(0, (star_frame.to_f - (FRAMES_PER_STAR.to_f/2.0)).abs)
-        #puts "#{position}, #{star_frame}, #{(star_frame.to_f - (FRAMES_PER_STAR.to_f/2.0)).abs}, #{white}"
+        white = brightness((star_frame.to_f - (FRAMES_PER_STAR.to_f / 2.0)).abs)
         @set[position] = Color.new(white, white, white)
       end
 
@@ -50,10 +45,8 @@ module WSLight
         @set[number]
       end
 
-      def brightness(led_distance, frame_distance)
-        #return 0 if led_distance > 3
-        #(2 ** ((3 - led_distance) * 3 - 1) - 1) * (1 - (frame_distance/(FRAMES_PER_STAR/2)))
-        (255 * (1.0 - (frame_distance.to_f/(FRAMES_PER_STAR.to_f/2.0)))).to_i
+      def brightness(frame_distance)
+        (255 * (1.0 - (frame_distance.to_f / (FRAMES_PER_STAR.to_f / 2.0)))).to_i
       end
     end
   end

data/lib/ws_light/set/strawberry_set.rb

@@ -16,7 +16,6 @@ module WSLight
 
         length_red = (LENGTH_RED * @length).to_i
 
-
         color_strawberry = Color.new(255, 7, 15)
         color_leaves = Color.new(15, 191, 15)
 
@@ -26,7 +25,7 @@ module WSLight
 
         set = sprinkle_nuts(set)
 
-        set.reverse! if rand(2) == 0
+        set.reverse! if rand(2).zero?
 
         type == :double ? set + set.reverse : set
       end
@@ -35,7 +34,7 @@ module WSLight
         length_red = (LENGTH_RED * @length).to_i
         distance = 0
         while distance < length_red - 21
-          distance += 15 + rand(5)
+          distance += rand(5..20)
           set[distance] = COLOR_NUT
         end
 

data/lib/ws_light/set/watermelon_set.rb

@@ -27,7 +27,7 @@ module WSLight
           end
         end
 
-        set.reverse! if rand(2) == 0
+        set.reverse! if rand(2).zero?
 
         type == :double ? set + set.reverse : set
       end

data/lib/ws_light/set/weather/cloudy_set.rb

@@ -0,0 +1,24 @@
+require 'ws_light/set/color_set'
+
+module WSLight
+  module Set
+    # Creates a set with all random colors
+    class CloudySet < ColorSet
+      def frame
+        @set ||= generate_set
+      end
+
+      def pixel(number, _frame = 0)
+        frame[number]
+      end
+
+      def generate_set
+        set = []
+        @full_length.times do
+          set << Color.new(8, 8, 8)
+        end
+        set
+      end
+    end
+  end
+end

data/lib/ws_light/set/weather/fair_set.rb

@@ -0,0 +1,24 @@
+require 'ws_light/set/color_set'
+
+module WSLight
+  module Set
+    # Creates a set with all random colors
+    class FairSet < ColorSet
+      def frame
+        @set ||= generate_set
+      end
+
+      def pixel(number, _frame = 0)
+        frame[number]
+      end
+
+      def generate_set
+        set = []
+        @full_length.times do
+          set << Color.new(8, 8, 8)
+        end
+        set
+      end
+    end
+  end
+end

data/lib/ws_light/set/weather/rain_set.rb

@@ -0,0 +1,53 @@
+require 'ws_light/set/color_set'
+
+module WSLight
+  module Set
+    # Creates a set with all random colors
+    class RainSet < ColorSet
+      FRAMES_PER_DROP = 20
+      VISIBLE_DROPS = 35
+      CLOUD = Color.new(4, 4, 4)
+
+      def init
+        @drops = (0..(@full_length - 1)).to_a.shuffle
+        @max = @drops.size
+        # append the start at the end to ensure same result window when near the % @max
+        @drops += @drops[0, VISIBLE_DROPS]
+        generate_frame
+      end
+
+      def next_frame
+        @frame_count += 1
+        @frame_count = @frame_count % (@max * FRAMES_PER_DROP)
+        generate_frame
+      end
+
+      def frame
+        next_frame
+        @set
+      end
+
+      def generate_frame
+        @set = [CLOUD] * @full_length
+        start = (@frame_count * VISIBLE_DROPS / FRAMES_PER_DROP) % @max
+        VISIBLE_DROPS.times do |i|
+          drop_ratio = (FRAMES_PER_DROP.to_f / VISIBLE_DROPS.to_f)
+          draw_drop(@drops[start + i], @frame_count - ((start - VISIBLE_DROPS + 1 + i) * drop_ratio).to_i)
+        end
+      end
+
+      def draw_drop(position, drop_frame)
+        blue = brightness(drop_frame.to_f) % 250
+        @set[position] = Color.new(4, 4, 4 + blue)
+      end
+
+      def pixel(number)
+        @set[number]
+      end
+
+      def brightness(frame_distance)
+        (250 * (1.0 - (frame_distance.to_f / FRAMES_PER_DROP.to_f))).to_i
+      end
+    end
+  end
+end

data/lib/ws_light/set/weather/sunny_set.rb

@@ -0,0 +1,42 @@
+require 'ws_light/set/color_set'
+
+module WSLight
+  module Set
+    # Creates a set with all random colors
+    class SunnySet < ColorSet
+      def frame
+        @set ||= generate_set
+      end
+
+      def pixel(number, _frame = 0)
+        frame[number]
+      end
+
+      def generate_set
+        set = []
+        position = sun_position
+        @full_length.times do |i|
+          set << if position.include?(i)
+                   Color.by_name(:yellow)
+                 else
+                   Color.by_name(:blue)
+                 end
+        end
+        set
+      end
+
+      def sun_position
+        case rand(4)
+        when 0
+          10..40
+        when 1
+          140..170
+        when 2
+          190..220
+        else
+          300..330
+        end
+      end
+    end
+  end
+end

data/lib/ws_light/strip.rb

@@ -1,4 +1,4 @@
-require 'ws2801'
+require 'spi'
 require 'ws_light/color'
 require 'pp'
 require 'date'
@@ -11,6 +11,7 @@ require 'ws_light/animation/fade_animation'
 
 require 'ws_light/set/color_set'
 require 'ws_light/set/gradient_set'
+require 'ws_light/set/flowerbed_set'
 require 'ws_light/set/random_set'
 require 'ws_light/set/rainbow_set'
 require 'ws_light/set/strawberry_set'
@@ -18,7 +19,10 @@ require 'ws_light/set/watermelon_set'
 require 'ws_light/set/semolina_set'
 require 'ws_light/set/star_set'
 
-
+require 'ws_light/set/weather/cloudy_set'
+require 'ws_light/set/weather/fair_set'
+require 'ws_light/set/weather/rain_set'
+require 'ws_light/set/weather/sunny_set'
 
 # Ideas
 # - Fire?
@@ -31,23 +35,40 @@ module WSLight
 
     LENGTH = 160
     TYPE = :double
+    FULL_LENGTH = 320
+
+    SPECIAL_SETS = [
+      Set::RainbowSet,
+      Set::RandomSet,
+      Set::StrawberrySet,
+      Set::WatermelonSet,
+      Set::SemolinaSet,
+      Set::FlowerbedSet
+    ].freeze
+
+    # SPECIAL_SETS = [
+    #   Set::RainSet,
+    #   Set::FairSet,
+    #   Set::SunnySet,
+    #   Set::CloudySet
+    # ].freeze
 
     TIMEOUT = 12
-    
-    WEATHER_URL = 'http://api.openweathermap.org/data/2.5/weather?q=Hannover,de'
+
+    WEATHER_URL = 'http://api.openweathermap.org/data/2.5/weather?q=Hannover,de'.freeze
 
     FRAMES_PER_SECOND = 25
 
     def initialize
-      WS2801.length(Strip::TYPE == :double ? Strip::LENGTH * 2 : Strip::LENGTH)
-      WS2801.autowrite(true)
+      @spi = SPI.new(device: '/dev/spidev0.0')
+      @spi.speed = 500_000
       self_test
-      @listen_thread = Thread.new { while true do check_timer; sleep 0.5; end }
+      @listen_thread = Thread.new { loop { check_timer; sleep 0.5; } }
       @last_event = Time.now - 3600 # set last event to a longer time ago
       @state = :state_off
       @debug = false
       @current_set = Set::ColorSet.new
-      @current_set.color = Color.new(0,0,0)
+      @current_set.color = Color.new(0, 0, 0)
     end
 
     def on(direction)
@@ -61,24 +82,7 @@ module WSLight
       @direction = direction
       @state = :state_starting_up
 
-      case rand(100)
-      when 0..3
-        set = Set::RainbowSet.new
-      when 4..6
-        set = Set::RandomSet.new
-      when 7..9
-        set = Set::StrawberrySet.new
-      when 10..12
-        set = Set::WatermelonSet.new
-      when 13..15
-        set = Set::SemolinaSet.new
-      else
-        set = Set::GradientSet.new
-        set.color_from = Color.random_from_set
-        set.color_to = Color.random_from_set
-      end
-
-      set = Set::StarSet.new if night?
+      set = choose_set
 
       puts "Set #{set.class}" if @debug
 
@@ -117,6 +121,17 @@ module WSLight
       puts "finished shutting off: #{Time.now.to_f}" if @debug
     end
 
+    def choose_set
+      return Set::StarSet.new if night?
+
+      return SPECIAL_SETS.sample.new if rand(8).zero?
+
+      set = Set::GradientSet.new
+      set.color_from = Color.random_from_set
+      set.color_to = Color.random_from_set
+      set
+    end
+
     def animation_for(direction)
       return Animation::FadeAnimation if night?
 
@@ -132,18 +147,16 @@ module WSLight
       beginning_state = @state
 
       animation.frames.times do |i|
-        WS2801.strip(animation.frame_data(current_frame = i))
-        WS2801.write
-        sleep (1.0/animation.frames_per_second) if animation.frames_per_second
+        write(animation.frame_data(current_frame = i))
+        sleep(1.0 / animation.frames_per_second) if animation.frames_per_second
         break if @state != beginning_state # Reverse shutting off when a new event is triggered
       end
 
       # This is run when the animation is reversed
       if (current_frame + 1) < animation.frames
         current_frame.times do |i|
-          WS2801.strip(animation.frame_data(current_frame - i - 1))
-          WS2801.write
-          sleep (1.0/animation.frames_per_second) if animation.frames_per_second
+          write(animation.frame_data(current_frame - i - 1))
+          sleep(1.0 / animation.frames_per_second) if animation.frames_per_second
         end
         false
       else
@@ -155,9 +168,8 @@ module WSLight
       current_state = @state
       i = start_frame
       while @state == current_state
-        WS2801.strip(set.frame_data)
-        WS2801.write
-        sleep 1.0/FRAMES_PER_SECOND.to_f
+        write(set.frame_data)
+        sleep 1.0 / FRAMES_PER_SECOND.to_f
         i += 1
       end
     end
@@ -168,26 +180,30 @@ module WSLight
     end
 
     def shutdown
-      WS2801.set(r: 0, g: 0, b: 0)
+      write([0, 0, 0] * FULL_LENGTH)
     end
 
     def self_test
-      WS2801.set(r: 0, g: 0, b: 255)
+      write([0, 0, 255] * FULL_LENGTH)
       sleep 1
-      WS2801.set(r: 0, g: 255, b: 0)
+      write([0, 255, 0] * FULL_LENGTH)
       sleep 1
-      WS2801.set(r: 255, g: 0, b: 0)
+      write([255, 0, 0] * FULL_LENGTH)
       sleep 1
-      WS2801.set(r: 0, g: 0, b: 0)
+      write([0, 0, 0] * FULL_LENGTH)
     end
 
     def check_timer
-      WS2801.set(r: 0, g: 0, b: 0) if @state == :state_off
+      write([0, 0, 0] * FULL_LENGTH) if @state == :state_off
       off if timeout?
     end
 
     def timeout?
       @last_event < (Time.now - TIMEOUT)
     end
+
+    def write(data)
+      @spi.xfer(txdata: data)
+    end
   end
 end

data/lib/ws_light/version.rb

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

data/ws_light.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ws_light/version'
@@ -21,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
 
   spec.add_runtime_dependency 'pi_piper', '~>1'
-  spec.add_runtime_dependency 'ws2801', '~>1'
+  spec.add_runtime_dependency 'spi', '~>0.1'
 end

data/ws_light.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=WS Light
+
+[Service]
+Type=simple
+ExecStart=/usr/local/bin/ws_light
+
+[Install]
+WantedBy=multi-user.target

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ws_light
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Gerrit Visscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: ws2801
+  name: spi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.1'
 description: Controls one or two WS2801 led strips with a Raspberry Pi or another
   computer with an SPI interface.
 email:
@@ -75,8 +75,11 @@ files:
 - lib/ws_light/benchmark/set_benchmark.rb
 - lib/ws_light/benchmark/ws2801_benchmark.rb
 - lib/ws_light/color.rb
+- lib/ws_light/config.rb
+- lib/ws_light/hass.rb
 - lib/ws_light/sd_logger.rb
 - lib/ws_light/set/color_set.rb
+- lib/ws_light/set/flowerbed_set.rb
 - lib/ws_light/set/gradient_set.rb
 - lib/ws_light/set/rainbow_set.rb
 - lib/ws_light/set/random_set.rb
@@ -84,9 +87,14 @@ files:
 - lib/ws_light/set/star_set.rb
 - lib/ws_light/set/strawberry_set.rb
 - lib/ws_light/set/watermelon_set.rb
+- lib/ws_light/set/weather/cloudy_set.rb
+- lib/ws_light/set/weather/fair_set.rb
+- lib/ws_light/set/weather/rain_set.rb
+- lib/ws_light/set/weather/sunny_set.rb
 - lib/ws_light/strip.rb
 - lib/ws_light/version.rb
 - ws_light.gemspec
+- ws_light.service
 homepage: https://github.com/kayssun/ws_light
 licenses:
 - MIT
@@ -106,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A lighting gem for WS2801 led strips.