lorraine 0.0.5 → 0.0.6

data/lib/lorraine/command.rb

@@ -15,7 +15,7 @@ module Lorraine
     end
     
     desc "server <command>", "install one of the available apps"
-    method_option :port, type: :numeric, aliases: "-p", desc: "Port this server will be at.", default: 1964
+    method_option :port, type: :numeric, aliases: "-p", desc: "Port this server will be at.", default: 3010
     def server(command)
       puts "command: #{command}, options: #{options}"
       if command.to_sym == :start
@@ -26,47 +26,39 @@ module Lorraine
     desc "set <pixel> <r> <g> <b>", "light up a pixel. rgb values from 0.0 - 1.0"
     method_option :remote, type: :boolean, aliases: "-r", desc: "Set the pixel over the network.", default: false
     method_option :hostname, type: :string, aliases: "-h", desc: "Network hostname.", default: "localhost"
-    method_option :port, type: :numeric, aliases: "-h", desc: "Network port.", default: 1964
+    method_option :port, type: :numeric, aliases: "-h", desc: "Network port.", default: 3010
     def set(pixel, r, g, b)
+      c = open_connection(options)
       m = message_from_console_array [pixel, r, g, b]
-      if options[:remote]
-        Lorraine::Client.send_message(m, options[:hostname], options[:port])
-      else
-        c = Lorraine::Connection.new
-        puts "Waiting 5 seconds..."
-        sleep 5
-        c.write_message(m)
-        c.write_message Lorraine::Message.new(:refresh)
-      end
+      c.write_message m
+      c.write_message Lorraine::Message.new(:refresh)
     end
     
     map "i" => :interactive
     desc "interactive", "Interact directly with the connection"
     method_option :remote, type: :boolean, aliases: "-r", desc: "Interact over the network.", default: false
     method_option :hostname, type: :string, aliases: "-h", desc: "Network hostname.", default: "localhost"
-    method_option :port, type: :numeric, aliases: "-h", desc: "Network port.", default: 1964
+    method_option :port, type: :numeric, aliases: "-h", desc: "Network port.", default: 3010
     def interactive
-      c = nil
-      if options[:remote]
-        say "Let's do this through the ether...", :blue
-      else
-        say "Opening a connection to the LED monstrosity...", :yellow
-        c = Lorraine::Connection.new
-        sleep 5
-        say "... opened.", :green
-      end
+      c = open_connection(options)
       while true
         response = ask(">> ")
         if response == "exit"
           break
-        else
-          m = message_from_console_array(response.split(" "))
-          if options[:remote]
-            Lorraine::Client.send_message(m, options[:hostname], options[:port])
+        elsif response.include?("effect")
+          if response.include?("off")
+            c.write_message Lorraine::Message.new(:effect, 0)
           else
-            c.write_message m
-            c.write_message Lorraine::Message.new(:refresh)
+            c.write_message Lorraine::Message.new(:effect, response.split(" ")[1].to_i)
           end
+        elsif response == "defcon"
+          defcon = Lorraine::Image.new(5, 1)
+          defcon.rgb_pixels = [[1, 0, 0], [1, 0.2, 0], [1, 1, 0], [0, 0, 1], [0, 1, 0]]
+          c.display_image defcon
+        else
+          m = message_from_console_array(response.split(" "))
+          c.write_message m
+          c.write_message Lorraine::Message.new(:refresh)
         end
       end
     end
@@ -81,6 +73,22 @@ module Lorraine
     end
     
     private
+    
+    def open_connection(options)
+      c = nil
+      if options[:remote]
+        say "Opening a connection through the matrix...", :green
+        c = Lorraine::NetworkConnection.new
+        c.port = options[:port]
+        c.hostname = options[:hostname]
+      else
+        say "Opening a connection to the LED monstrosity...", :yellow
+        c = Lorraine::SerialConnection.new
+        sleep 5
+        say "... and now it's open!", :green
+      end
+      c
+    end
   
     def message_from_console_array(arr)
       Lorraine::Message.new :set_pixel, arr[0].to_i, (arr[1].to_f * 4095).to_i, (arr[2].to_f * 4095).to_i, (arr[3].to_f * 4095).to_i

data/lib/lorraine/connection.rb

@@ -2,41 +2,11 @@ module Lorraine
   
   class Connection
     
-    require "serialport"
-    
-    attr_accessor :port
-    
-    def initialize(port = Lorraine::Connection.first_available_port)
-      
-      #simplest ruby program to read from arduino serial, 
-      #using the SerialPort gem
-      #(http://rubygems.org/gems/serialport)
-
-
-      #params for serial port
-      port_str = port  # may be different for you
-      baud_rate = 115200
-      # data_bits = 8
-      # stop_bits = 1
-      # parity = SerialPort::NONE
-
-      self.port = SerialPort.new port_str, baud_rate#, data_bits, stop_bits, parity
-      
-    end
-    
-    def self.first_available_port
-      p = Dir.glob("/dev/tty.usb*").first
-      raise "No available ports." unless p
-      p
+    def initialize
     end
-    
-    def write_binary_string(binary_string)
-      self.port.write binary_string
-    end
-    
+
     def write_message(msg)
-      puts "Writing message: #{msg}"
-      write_binary_string msg.to_binary
+      puts "Writing message unimplemented."
     end
     
     def display_pixels(pixel_array)
@@ -66,16 +36,10 @@ module Lorraine
       end
     end
     
-    def read_line
-      m = self.port.gets
-      puts "Lorraine::Connection Message: #{m}"
-      m
-    end
-    
     def sever!
-      self.port.close # see note 1
+      
     end
-    
+        
   end
   
 end

data/lib/lorraine/message.rb

@@ -34,7 +34,7 @@ module Lorraine
     attr_accessor :command
     attr_accessor :pixel
     
-    COMMAND_IDS = {set_pixel: 1, refresh: 2}
+    COMMAND_IDS = {set_pixel: 1, refresh: 2, effect: 3}
     
     def command_id
       COMMAND_IDS[self.command]

data/lib/lorraine/network_connection.rb

@@ -0,0 +1,22 @@
+module Lorraine
+  
+  class NetworkConnection < Lorraine::Connection
+    
+    attr_writer :hostname
+    def hostname
+      @hostname || "localhost"
+    end
+    
+    attr_writer :port
+    def port
+      @port || "3010"
+    end
+        
+    def write_message(msg)
+      Lorraine::Client.send_message(msg, self.hostname, self.port)
+      puts "Writing network message: #{msg}"
+    end
+
+  end
+  
+end

data/lib/lorraine/serial_connection.rb

@@ -0,0 +1,56 @@
+module Lorraine
+  
+  class SerialConnection < Lorraine::Connection
+    
+    require "serialport"
+    
+    attr_accessor :port
+    
+    def initialize
+      super
+      
+      #simplest ruby program to read from arduino serial, 
+      #using the SerialPort gem
+      #(http://rubygems.org/gems/serialport)
+
+
+      #params for serial port
+      # port_str = port  # may be different for you
+      baud_rate = 115200
+      # data_bits = 8
+      # stop_bits = 1
+      # parity = SerialPort::NONE
+
+      self.port = SerialPort.new Lorraine::SerialConnection.first_available_port, baud_rate#, data_bits, stop_bits, parity
+      
+    end
+    
+    def self.first_available_port
+      p = Dir.glob("/dev/tty.usb*").first
+      raise "No available ports." unless p
+      p
+    end
+    
+    def write_binary_string(binary_string)
+      self.port.write binary_string
+    end
+    
+    def write_message(msg)
+      puts "Writing serial message: #{msg}"
+      write_binary_string msg.to_binary
+    end
+    
+    def read_line
+      m = self.port.gets
+      puts "Lorraine::SerialConnection Message: #{m}"
+      m
+    end
+    
+    def sever!
+      super
+      self.port.close
+    end
+    
+  end
+  
+end

data/lib/lorraine/server.rb

@@ -6,17 +6,32 @@ module Lorraine
     require 'thin'
     
     def self.start(port)
-      serial_connection = Lorraine::Connection.new      
+      begin
+        serial_connection = Lorraine::SerialConnection.new      
+      rescue
+        "Failed to start serial connection."
+      end
       Thin::Server.start('0.0.0.0', port) do
+        
+        map "/admin" do
+          files = File.expand_path(File.join(__FILE__, "..", "..", "..", "web"))
+          puts "serving files from #{files}"
+          run Rack::File.new(files)
+        end
+        
         Faye::WebSocket.load_adapter('thin')
         faye_server = Faye::RackAdapter.new(:mount => '/faye', :timeout => 45)
         faye_server.bind(:publish) do |client_id, channel, data|
-          # Process incoming things
-          puts "Received message data: #{data}"
-          m = Lorraine::Message.from_packet(data)
-          puts "Interpereted as: #{m}"
-          serial_connection.write_message(m)
-          serial_connection.write_message Lorraine::Message.new(:refresh)
+          begin
+            # Process incoming things
+            puts "Received message data: #{data}"
+            m = Lorraine::Message.from_packet(data)
+            puts "Interpereted as: #{m}"
+            serial_connection.write_message(m)
+            # serial_connection.write_message Lorraine::Message.new(:refresh)
+          rescue
+            puts "Failed to read data."
+          end
         end
         run faye_server
       end
@@ -29,7 +44,7 @@ module Lorraine
     require 'json'
     require 'httpclient'
     
-    def self.send_message(message, address = "localhost", port = "1964")
+    def self.send_message(message, address = "localhost", port = "3010")
       
       faye_json = {channel: "/illuminate", data: message.packet}.to_json
       

data/lib/lorraine/version.rb

@@ -1,3 +1,3 @@
 module Lorraine
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/lorraine.rb

@@ -1,6 +1,8 @@
 require "lorraine/version"
 require "lorraine/message"
 require "lorraine/connection"
+require "lorraine/serial_connection"
+require "lorraine/network_connection"
 require "lorraine/image"
 require "lorraine/server"
 require_relative "../vendor/colorist/colorist"

data/web/index.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Lorraine - on the nets</title>
+  <link href="lorraine.css" media="screen" rel="stylesheet" type="text/css" />
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" type="text/javascript"></script>
+  <script src="/faye.js" type="text/javascript"></script>
+  <script src="lorraine.js" type="text/javascript"></script>
+  <script src="vendor/jscolor/jscolor.js" type="text/javascript"></script>
+</head>
+<body>
+  <h1>Hey Howdy Hey</h1>
+  Color: <input class="color {onImmediateChange:'colorChanged(this);'}" value="66ff00">
+</body>
+</html>

data/web/lorraine.js

@@ -0,0 +1,55 @@
+$(function(){
+  
+  // Find the host
+  //var pathArray = window.location.pathname.split( '/' );
+  var host = getBaseURL() //pathArray[0]; // + "/";
+  
+  // alert(host);
+    
+  window.faye_client = new Faye.Client(host + "faye");
+
+  window.faye_client.subscribe('/messages', function(message) {
+    alert('Got a message: ' + message.text);
+  });
+  
+});
+
+function illuminatePixel(pixel, r, g, b) {
+  window.faye_client.publish('/illuminate', [1, pixel, r * 4095, g * 4095, b * 4095]);
+}
+
+function illuminateAll(r, g, b) {
+  illuminatePixel(0, r, g, b);
+  illuminatePixel(1, r, g, b);
+  illuminatePixel(2, r, g, b);
+  illuminatePixel(3, r, g, b);
+  illuminatePixel(4, r, g, b);
+}
+
+
+function colorChanged(color) {
+  illuminateAll(color.rgb[0], color.rgb[1], color.rgb[2])
+}
+
+
+function getBaseURL() {
+    var url = location.href;  // entire url including querystring - also: window.location.href;
+    var baseURL = url.substring(0, url.indexOf('/', 14));
+
+
+    if (baseURL.indexOf('http://localhost') != -1) {
+        // Base Url for localhost
+        var url = location.href;  // window.location.href;
+        var pathname = location.pathname;  // window.location.pathname;
+        var index1 = url.indexOf(pathname);
+        var index2 = url.indexOf("/", index1 + 1);
+        var baseLocalUrl = url.substr(0, index2);
+
+        return baseLocalUrl + "/";
+    }
+    else {
+        // Root Url for domain name
+        return baseURL + "/";
+    }
+
+}

data/web/vendor/jscolor/demo.html

@@ -0,0 +1,12 @@
+<html>
+<head>
+	<title>jscolor demo</title>
+</head>
+<body>
+
+	<script type="text/javascript" src="jscolor.js"></script>
+
+	Click here: <input class="color" value="66ff00">
+
+</body>
+</html>