lorraine 0.0.4 → 0.0.5

data/lib/lorraine/command.rb

@@ -28,7 +28,7 @@ module Lorraine
     method_option :hostname, type: :string, aliases: "-h", desc: "Network hostname.", default: "localhost"
     method_option :port, type: :numeric, aliases: "-h", desc: "Network port.", default: 1964
     def set(pixel, r, g, b)
-      m = Lorraine::Message.new :set_pixel, pixel, (r * 4095).to_i, (g * 4095).to_i, (b * 4095).to_i
+      m = message_from_console_array [pixel, r, g, b]
       if options[:remote]
         Lorraine::Client.send_message(m, options[:hostname], options[:port])
       else
@@ -36,26 +36,37 @@ module Lorraine
         puts "Waiting 5 seconds..."
         sleep 5
         c.write_message(m)
+        c.write_message Lorraine::Message.new(:refresh)
       end
     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
     def interactive
-      say "Opening a connection to the LED monstrosity...", :yellow
-      c = Lorraine::Connection.new
-      sleep 5
-      say "... opened.", :green
+      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
       while true
         response = ask(">> ")
         if response == "exit"
           break
         else
-          pixel, r, g, b = response.split(" ")
-          puts response
-          m = Lorraine::Message.new :set_pixel, pixel, (r * 4095).to_i, (g * 4095).to_i, (b * 4095).to_i
-          c.write_message(m)
+          m = message_from_console_array(response.split(" "))
+          if options[:remote]
+            Lorraine::Client.send_message(m, options[:hostname], options[:port])
+          else
+            c.write_message m
+            c.write_message Lorraine::Message.new(:refresh)
+          end
         end
       end
     end
@@ -69,6 +80,12 @@ module Lorraine
       puts Lorraine::Message.from_json j
     end
     
+    private
+  
+    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
+    end
+    
         # 
         # def self.testpattern
         #   # puts "command: #{command}"

data/lib/lorraine/message.rb

@@ -45,7 +45,7 @@ module Lorraine
     end
     
     def packet
-      [self.command_id, self.pixel, self.red.to_i, self.green.to_i, self.blue.to_i]
+      [self.command_id, self.pixel.to_i, self.red.to_i, self.green.to_i, self.blue.to_i]
     end
     
     def packet=(new_packet)

data/lib/lorraine/server.rb

@@ -12,9 +12,11 @@ module Lorraine
         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 "Received message: #{m}"
+          puts "Interpereted as: #{m}"
           serial_connection.write_message(m)
+          serial_connection.write_message Lorraine::Message.new(:refresh)
         end
         run faye_server
       end
@@ -30,6 +32,8 @@ module Lorraine
     def self.send_message(message, address = "localhost", port = "1964")
       
       faye_json = {channel: "/illuminate", data: message.packet}.to_json
+      
+      puts "sending json: #{faye_json}"
      
       client = HTTPClient.new
       puts client.post("http://#{address}:#{port}/faye", {message: faye_json})

data/lib/lorraine/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: lorraine
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Wil Gieseler