monome_serial 1.0.0 → 1.1.0

data/.gitignore

@@ -2,5 +2,5 @@ tmp
 *.DS_Store
 \#*#
 *.#*
+*.rbc
 pkg
-

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/monome_serial.rb

@@ -1,5 +1,5 @@
 #require external libraries
-require 'activesupport'
+require 'active_support'
 require 'fcntl'
 
 require 'monome_serial/serial_communicator'

data/lib/monome_serial/monome_communicator.rb

@@ -9,10 +9,11 @@ module MonomeSerial
 
     attr_reader :communicator, :serial, :protocol
 
-    def initialize(tty_path, protocol="series")
-      raise ArgumentError, "Unexpected protocol type: #{protocol}. Expected 40h or series" unless protocol == "40h" || protocol == "series"
+    def initialize(tty_path, opts = {})
+      opts.reverse_merge! :brightness => 10, :ignore_intro => false, :protocol => 'series'
+      raise ArgumentError, "Unexpected protocol type: #{opts[:protocol]}. Expected 40h or series" unless ['40h', 'series'].include?(opts[:protocol])
 
-      @protocol = protocol
+      @protocol = opts[:protocol]
 
       #try to pull out serial for the monome represented by
       #this tty_path
@@ -29,6 +30,11 @@ module MonomeSerial
       else
         extend SerialCommunicator::BinaryPatterns::Series
       end
+
+      if is_real?
+        run_intromation unless opts[:ignore_intro]
+        self.brightness = opts[:brightness]
+      end
     end
 
     def illuminate_lamp(x,y)
@@ -86,5 +92,29 @@ module MonomeSerial
     def is_real?
       @communicator && @communicator.class != MonomeSerial::SerialCommunicator::DummyCommunicator
     end
+
+    private
+
+    def run_intromation
+      extinguish_all
+
+      brightness = 1
+      illuminate_all
+
+      sleep_times = [ 0, 0.072, 0.1030, 0.1159, 0.1236, 0.1287, 0.1324, 0.1352, 0.1373, 0.1390, 0.1404, 0.1416, 0.1426, 0.1435, 0.1442, 0.1448, 0.1278 ]
+
+      (1..16).each do |brightness|
+        self.brightness = brightness
+        sleep_time = (sleep_times[16 - brightness]) / 4.0
+        sleep sleep_time
+      end
+
+      (1..16).to_a.reverse.each do |brightness|
+        self.brightness = brightness
+        sleep_time = (sleep_times[brightness]) / 10.0
+        sleep sleep_time
+      end
+      extinguish_all
+    end
   end
 end

data/lib/monome_serial/serial_communicator/binary_patterns/series.rb

@@ -272,9 +272,10 @@ module MonomeSerial
 
 
         def brightness_pattern(brightness)
-          raise ArgumentError, "Expecting a brightness between 0 and 15 inclusively, got #{brightness}" unless brightness >= 0 && brightness <= 15
+          raise ArgumentError, "Expecting brightness to be a Fixnum. You gave me a #{brightness.class}." unless Fixnum === brightness
+          raise ArgumentError, "Expecting a brightness between 1 and 16 inclusively, got #{brightness}" unless brightness >= 1 && brightness <= 16
 
-          "1010" + INT_TO_BIN_STRING[brightness]
+          "1010" + INT_TO_BIN_STRING[brightness - 1]
         end
 
       end

data/monome_serial.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{monome_serial}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Aaron"]
-  s.date = %q{2009-12-02}
+  s.date = %q{2010-01-21}
   s.description = %q{Communicate directly with your monome with this handy Ruby library.}
   s.email = %q{samaaron@gmail.com}
   s.extra_rdoc_files = [
@@ -20,9 +20,12 @@ Gem::Specification.new do |s|
      "README",
      "Rakefile",
      "VERSION",
+     "assets/monome_serial_final.png",
+     "assets/monome_serial_logo.graffle",
      "docs/CONTRIBUTORS",
      "docs/LICENSE",
      "docs/TODO",
+     "examples/toggler.rb",
      "lib/monome_serial.rb",
      "lib/monome_serial/examples/toggle.rb",
      "lib/monome_serial/monome_communicator.rb",

data/spec/unit/monome_communicator_spec.rb

@@ -7,7 +7,7 @@ describe MonomeCommunicator do
   end
 
   it "should raise an error when not initializing with a correct protocol name" do
-    lambda{MonomeCommunicator.new('/blah', "phonycol" )}.should raise_error(ArgumentError)
+    lambda{MonomeCommunicator.new('/blah', :protocol => "phonycol" )}.should raise_error(ArgumentError)
   end
 
   describe "A default monome with an unusual tty_path" do
@@ -30,7 +30,7 @@ describe MonomeCommunicator do
 
   describe "A default monome with the 40h protocol" do
     before(:each) do
-      @monome = MonomeCommunicator.new('/foo/tty.usbserial-m256-203', '40h')
+      @monome = MonomeCommunicator.new('/foo/tty.usbserial-m256-203', :protocol => '40h')
     end
 
     it "should raise an exception when a communicating method is used" do
@@ -57,27 +57,27 @@ describe MonomeCommunicator do
         @monome.extinguish_all
       end
 
-      it "should send the correct binary string to set the brightness to 0" do
+      it "should send the correct binary string to set the brightness to 1" do
         @comm.should_receive(:write).with(["10100000"])
-        @monome.brightness = 0
+        @monome.brightness = 1
       end
 
-      it "should send the correct binary string to set the brightness to 5" do
+      it "should send the correct binary string to set the brightness to 6" do
         @comm.should_receive(:write).with(["10100101"])
-        @monome.brightness = 5
+        @monome.brightness = 6
       end
 
-      it "should send the correct binary string to set the brightness to 15" do
+      it "should send the correct binary string to set the brightness to 16" do
         @comm.should_receive(:write).with(["10101111"])
-        @monome.brightness = 15
+        @monome.brightness = 16
       end
 
       it "should raise an error if a negative brightness is set" do
-        lambda{@monome.brightness = -1}.should raise_error(ArgumentError)
+        lambda{@monome.brightness = 0}.should raise_error(ArgumentError)
       end
 
       it "should raise an error if a brightness is set to an integer greater than 15" do
-        lambda{@monome.brightness = 16}.should raise_error(ArgumentError)
+        lambda{@monome.brightness = 17}.should raise_error(ArgumentError)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: monome_serial
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Sam Aaron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +01:00
+date: 2010-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency