subduino 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bin/subduino

@@ -3,16 +3,23 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
 require 'optparse'
 require 'subduino'
+require 'subduino/os'
 require 'faye'
 
+Debug = false
+
 OptionParser.new { |op|
+  op.on('-d', '--debug')  { |d| Debug = true }
   op.on('-e env')    { |val| set :environment, val.to_sym }
   op.on('-s server') { |val| set :server, val }
   op.on('-p port')   { |val| set :port, val.to_i }
-}.parse!(ARGV.dup)
+}.parse!(ARGV)
 
 # set :run, true
 
+if Debug
+  puts "Starting on #{OS}"
+end
 
 if ARGV.empty? || ARGV.join =~ /yml/
   LastRun = {:all => 0}
@@ -20,7 +27,7 @@ if ARGV.empty? || ARGV.join =~ /yml/
     puts "Using config file #{f}"
     AppConfig = YAML.load(File.read(f))["opts"]
   else
-    AppConfig = { "log_interval" => 30, "bauds" => 57600 }
+    AppConfig = { "log_interval" => 30, "bauds" => 115200 }
   end
 
   client = Faye::Client.new('http://localhost:8000/faye')
@@ -28,9 +35,12 @@ if ARGV.empty? || ARGV.join =~ /yml/
   EM.run do
 
     Subduino.start do |read|
-      puts "[IO] #{read}"
+      #   Subduino::ArdIO.write("hi")
+      if Debug
+        # puts "--------------------- #{Time.now}"
+        p read
+      end
       if LastRun[:all] < (Time.now.to_i - AppConfig["log_interval"])
-        p "Syncing...."
         LastRun[:all] = Time.now.to_i
         client.publish('/stats', 'data' => read)
         Subduino::Store.add_csv_to_store(read, true)
@@ -40,6 +50,10 @@ if ARGV.empty? || ARGV.join =~ /yml/
     end
 
   end
+elsif ARGV.join =~ /send/
+  txt = ARGV[1..-1].join
+  puts "Writing #{txt}"
+  Subduino::ArdPS.write(txt)
 else
   require "subduino/scaffold/generator"
   dir = ARGV[0]
@@ -47,4 +61,3 @@ else
   `mkdir #{dir}` unless File.exists?(dir)
   Subduino::Generator.copy_files(dir)
 end
-

data/duino/Makefile

@@ -15,7 +15,7 @@
 #
 TARGET       = duino
 ARDUINO_DIR  = /usr/share/arduino
-ARDUINO_LIBS = Messenger
+# ARDUINO_LIBS = ExtraLib
 
 MCU          = atmega328p
 F_CPU        = 16000000
@@ -25,7 +25,6 @@ ARDUINO_PORT = /dev/ttyUSB*
 AVR_TOOLS_PATH = /usr/bin
 AVRDUDE_CONF   = /usr/share/arduino/hardware/tools/avrdude.conf
 
-# INC_DIRS  =  ./vendor/Messenger
 
 # Hopefully these will be self-explanatory but in case they're not:
 #
@@ -136,7 +135,7 @@ ifeq ($(strip $(NO_CORE)),)
 ifdef ARDUINO_CORE_PATH
 CORE_C_SRCS     = $(wildcard $(ARDUINO_CORE_PATH)/*.c)
 CORE_CPP_SRCS   = $(wildcard $(ARDUINO_CORE_PATH)/*.cpp)
-EXTRA_CPP_SRCS  = $(wildcard $(ARDUINO_LIB_PATH)/Messenger/*.cpp)
+# EXTRA_CPP_SRCS  = $(wildcard $(ARDUINO_LIB_PATH)/ExtraLib/*.cpp)
 CORE_OBJ_FILES  = $(CORE_C_SRCS:.c=.o) $(CORE_CPP_SRCS:.cpp=.o) $(EXTRA_CPP_SRCS:.cpp=.o) 
 CORE_OBJS       = $(patsubst $(ARDUINO_CORE_PATH)/%, $(OBJDIR)/%,$(CORE_OBJ_FILES))
 endif

data/duino/duino.pde

@@ -1,5 +1,5 @@
 /*
- * Arduin
+ * Arduin v2
  *
  *
  *  /home/nofxx/projects/ardo/control
@@ -7,12 +7,11 @@
  *
  */
 
-#include <Messenger.h>
-
-#define sec  1000
-#define min  60000
-#define hour 3600000
-#define day  86400000
+#define SEC  1000
+#define MIN  60000
+#define HOUR 3600000
+#define DAY  86400000
+#define MAX  50
 
 // Output
 const int rxPin = 0;
@@ -43,55 +42,87 @@ const int d11 = 11;
 const int d12 = 12;
 
 // Intervals (s)
-unsigned long shoot = 1;
-unsigned long sync  = 5 * sec;
-unsigned long time_now, last_shoot, last_sync;
+unsigned long sync  = 5 * SEC;
+unsigned long time_now, last_sync;
 
+int i = 0;
 int btnState = 0;
 int touchState = 0;
 int motorState = 0;
 
-char buffer [50];
+char outbuf[MAX];
+char cmdbuf[MAX];
 
 volatile int rx_state = LOW;
 volatile int tx_state = LOW;
 
-Messenger message = Messenger();
-
-// Create the callback function
 
 unsigned long mintomilli(unsigned long m) {
   return(m * 60000);
 }
 
-void btnLed() {
-  if(digitalRead(d2) == 1) {
-    Serial.println("BUTTON");
-    digitalWrite(infoPin, HIGH);
-    analogWrite(d3, 250);
-    if (motorState != 0) {
-      motorState = 0;
-    } else {
-      motorState = 1;
-    }
-  } else {
-    digitalWrite(infoPin, LOW);
-    analogWrite(d3, LOW);
-  }
+int ctoi( int c )
+{
+  return c - '0';
+}
+
+/*
 
+  Read Sensors Data
+
+*/
+void read_sensors() {
+  sprintf(outbuf, "i0:%d,i1:%d,i2:%d,i3:%d,i4:%d,i5:%d,d11:%d,d12:%d",
+          analogRead(i0),
+          analogRead(i1),
+          analogRead(i2),
+          analogRead(i3),
+          analogRead(i4),
+          analogRead(i5),
+          digitalRead(d11),
+          digitalRead(d12));
+
+  Serial.println(outbuf);
 }
 
-void messageReady() {
-  int pin = 2;
-  int val = 0;
-   // Loop through all the available elements of the message
-  while ( message.available() && pin <= infoPin ) {
-    val = message.readInt();
-    // Set the pin as determined by the message
-    analogWrite(pin, val);
-    pin = pin + 1;
-  }
+void switch_pin(int pin) {
+  analogWrite(pin, digitalRead(pin) == 0 ? 999 : 0);
+}
+
+void pulse_pin(int pin) {
+  analogWrite(pin, HIGH);
+  delay(500);
+  analogWrite(pin, LOW);
+}
 
+/*
+
+  Command Protocol -> NNvvv
+  2 bytes pin number NN
+  3 bytes value vvv
+  Split commands with ','
+
+  13500,130,13999
+
+  Pin 13 -> 500 -> 000 -> 999
+
+*/
+void read_commands() {
+  char c;
+  while( Serial.available() && c != '\n' ) {  // buffer up a line
+    c = Serial.read();
+    if (c == '\n' || c == ',') {
+      int pin; int val;
+      pin = (ctoi(cmdbuf[0])*10) + ctoi(cmdbuf[1]);
+      val = (ctoi(cmdbuf[2])*100) + (ctoi(cmdbuf[3])*10) + ctoi(cmdbuf[4]);
+      analogWrite(pin, val);
+      i = 0;
+    } else if (c == 'x') {
+      read_sensors();
+    } else {
+      cmdbuf[i++] = c;
+    }
+  }
 }
 
 void setup()  {
@@ -99,39 +130,50 @@ void setup()  {
   pinMode(infoPin, OUTPUT);
   pinMode(d2, OUTPUT);
   pinMode(d3, OUTPUT);
+  pinMode(d4, OUTPUT);
+  pinMode(d5, OUTPUT);
   pinMode(d6, OUTPUT);
+  pinMode(d7, OUTPUT);
   pinMode(d10, OUTPUT);
 
-  // testFalse();
-  shoot = mintomilli(shoot);
-
-  attachInterrupt(0, btnLed, CHANGE);
+  //  attachInterrupt(0, btnLed, CHANGE);
   Serial.begin(115200);
-  //Serial.begin(9600);
-  message.attach(messageReady);
 }
 
 
 void loop()  {
-
   time_now = millis();
 
+  read_commands();
+
   // Sync over wire
   if ( abs(time_now - last_sync) >= sync) {
     last_sync = time_now;
-    sprintf(buffer, "i0:%d,i1:%d,i2:%d,i3:%d,i4:%d,i5:%d,d11:%d,d12:%d",
-            analogRead(i0),
-            analogRead(i1),
-            analogRead(i2),
-            analogRead(i3),
-            analogRead(i4),
-            analogRead(i5),
-            digitalRead(d11),
-            digitalRead(d12));
-    Serial.println(buffer);
+    read_sensors();
   }
 
 
+}
+
+
+// void btnLed() {
+//   if(digitalRead(d2) == 1) {
+//     Serial.println("BUTTON");
+//     digitalWrite(infoPin, HIGH);
+//     analogWrite(d3, 250);
+//     if (motorState != 0) {
+//       motorState = 0;
+//     } else {
+//       motorState = 1;
+//     }
+//   } else {
+//     digitalWrite(infoPin, LOW);
+//     analogWrite(d3, LOW);
+//   }
+
+// }
+
+
   // if (motorState != 0) {
   //   analogWrite(d10, (analogRead(i1)/5));
   // } else {
@@ -141,14 +183,6 @@ void loop()  {
   // noInterrupts();
   //  interrupts();
 
-  // if ( abs(time_now - last_shoot) >= shoot) {
-  //   last_shoot = time_now;
-  //   //  Serial.println("SHOOTING");
-  //   digitalWrite(d6, HIGH);  // turn the d6 on
-  //   delay(400);                  // stop the program for some time
-  //   digitalWrite(d6, LOW);   // turn the d6 off
-  // }
-
     // Terminate message with a linefeed and a carriage return
     // Serial.print(13,BYTE);
     // Serial.print(10,BYTE);
@@ -172,9 +206,6 @@ void loop()  {
     // }
 
 
-  while ( Serial.available() )  message.process(Serial.read());
-
-}
 
 // void pulseJob(pin) {
 //   analogWrite(pin, 250);

data/lib/subduino/ard_io.rb

@@ -3,39 +3,46 @@ module Subduino
   class ArdIO
     class << self
 
+      #
+      # Serial Port
+      #
+      # Direct access to the SerialPort instance.
+      #
       def sp
         @sp ||= SerialPort.new(Arduino.find_usb, BAUDS) #, DATA_BITS, DATA_STOP, parity)
         # @sp.read_timeout = 10;# @sp.write_timeout = 10
       end
 
+      #
+      # Read I/O
+      #
+      # Starts a thread that loops fetching serial bytes.
+      # It'll buffer it up until a \n or \r char are found.
+      # Feed it with a block to read the text.
+      #
       def read(&proc)
         Log.info "[USB] Starting USB Connect..." + sp.get_modem_params.map { |k,v| "#{k}: #{v}" }.join(" ")
         Log.info "[USB] Read Timeout #{sp.read_timeout}" # {sp.write_timeout}"
 
-        #
-        # Read I/O
-        #
         @iothread ||= Thread.new do
           Thread.current.abort_on_exception = false
           icache = []
-
           loop do
             begin
               while char = sp.getc
-                if char !~ /\n|\r/
+                if !char.valid_encoding?
+                  puts "Bad char #{char}"
+                elsif char !~ /\n|\r/
                   icache << char
                 else
                   data = icache.join(""); icache = []
-                  if data =~ /:/
+                  unless data.empty?
+                    Log.info "[IO  RX] #{data}"
                     proc.call(data)
-                    Log.info "[SENSOR] #{data}"
-                  else
-                    proc.call(data) unless data.empty?
-                    # Log.info "[INPUT] Done."
                   end
                 end
+                # sleep 1
               end
-              sleep 1
             rescue => e
               Log.error "[USB] Error #{e}"
               Log.error e.backtrace.join("\n")
@@ -44,13 +51,25 @@ module Subduino
         end
       end
 
+      #
+      # Write I/O
+      #
+      # Prints bytes to the serial port.
+      # It'll use subduino convention of \n to end the message.
+      # Use #sp to write directly to the port. `ArdIO.sp.puts ('hi')`
+      #
       def write(msg)
         Log.info "[IO  TX] #{msg}"
-        txt = msg.gsub("\n", "\r")
-        txt += "\r" unless txt =~ /^\\r/
-        sp.write(txt)
+        txt = msg.gsub("\r", "\n")
+        txt += "\n" unless txt =~ /^\\n/
+        puts "=> Sending #{txt.inspect}" if Debug
+        sp.puts(msg)
       end
 
+
+      #
+      # Finish Him!
+      #
       def stop!
         sp.close
       end

data/lib/subduino/ard_ps.rb

@@ -1,38 +1,61 @@
 module Subduino
+
   class ArdPS
+    class << self
 
-    def self.redis
-      @redis ||= Redis.new(:timeout => 0) rescue false
-    end
+      #
+      # Redis PubSub
+      #
+      # Direct access to the Redis instance.
+      #
+      def redis
+        @redis ||= Redis.new(:timeout => 0) rescue false
+      end
 
-    def self.read
-      return Log.warn "[PubSub] Not started..." unless @redis
-      Thread.new do
-        begin
-          redis.subscribe('subduin') do |on|
-            on.subscribe {|klass, num_subs| Log.info "[PubSub] Subscribed to #{klass} (#{num_subs} subscriptions)" }
-            on.message do |klass, msg|
-              Log.info "[PubSub] #{klass} - #{msg}"
-              ArdIO.write msg
-              # @redis.unsubscribe if msg == 'exit'
+      #
+      # Read PubSub
+      #
+      # Join 'subduino' channel and send messages to I/O
+      #
+      def read
+        return Log.warn "[PubSub] Not started..." unless redis
+        Thread.new do
+          begin
+            redis.subscribe('subduino') do |on|
+              on.subscribe {|klass, num_subs| Log.info "[PubSub] Subscribed to #{klass} (#{num_subs} subscriptions)" }
+              on.message do |klass, msg|
+                Log.info "[PubSub] #{klass} - #{msg}"
+                ArdIO.write msg
+                # @redis.unsubscribe if msg == 'exit'
+              end
+              on.unsubscribe {|klass, num_subs| Log.info "[PubSub] Unsubscribed to #{klass} (#{num_subs} subscriptions)" }
             end
-            on.unsubscribe {|klass, num_subs| Log.info "[PubSub] Unsubscribed to #{klass} (#{num_subs} subscriptions)" }
+          rescue => e
+            Log.error "[PubSub] Error #{e}"
+            Log.error e.backtrace.join("\n")
           end
-        rescue => e
-          Log.error "[PubSub] Error #{e}"
-          Log.error e.backtrace.join("\n")
+
         end
+      end
 
+      #
+      # Write PubSub
+      #
+      # Write a message to the 'subduino' PubSub channel.
+      #
+      def write(msg)
+        redis.publish('subduino', msg)
       end
-    end
 
-    def self.write(msg)
-      redis.publish('subdout', msg)
-    end
 
-    def self.stop!
-      redis.disconnect if @redis
-    end
+      #
+      # Fatality
+      #
+      def stop!
+        redis.disconnect if redis
+      end
 
+    end
   end
+
 end

data/lib/subduino/os.rb

@@ -0,0 +1,49 @@
+# From
+# http://rbjl.net/
+# Ruby Zucker
+require 'rbconfig'; RbConfig::CONFIG['host_os']
+
+module OS
+  class << self
+    def is?(what)
+      what === RbConfig::CONFIG['host_os']
+    end
+    alias is is?
+
+    def to_s
+      RbConfig::CONFIG['host_os']
+    end
+  end
+
+  module_function
+
+  def linux?
+    OS.is? /linux|cygwin/
+  end
+
+  def mac?
+    OS.is? /mac|darwin/
+  end
+
+  def bsd?
+    OS.is? /bsd/
+  end
+
+  def windows?
+    OS.is? /mswin|win|mingw/
+  end
+
+  def solaris?
+    OS.is? /solaris|sunos/
+  end
+
+  def posix?
+    linux? or mac? or bsd? or solaris? or Process.respond_to?(:fork)
+  end
+
+  #def symbian?
+    #TODO who knows what symbian returns?
+  #end
+
+  # ...
+end

data/lib/subduino/parse/bool.rb

@@ -1,6 +1,6 @@
 module Subduino
   module Parse
-    class Bool < DigParser
+    class Bool < Digital
       def parse
         @v.zero? ? false : true
       end

data/lib/subduino/parse/energy.rb

@@ -0,0 +1,18 @@
+module Subduino
+  module Parse
+    class Energy < Analogic
+      AC = 220
+      def parse
+        (@v / 10).to_i
+      end
+
+      def kwh
+        AC * parse
+      end
+
+      def to_s
+        "#{parse} A"
+      end
+    end
+  end
+end

data/lib/subduino/parse/flow.rb

@@ -0,0 +1,13 @@
+module Subduino
+  module Parse
+    class Flow < Analogic
+      def parse
+        (@v * 0.5).to_i
+      end
+
+      def to_s
+        "#{parse} cm3/h"
+      end
+    end
+  end
+end

data/lib/subduino/parse/lux.rb

@@ -1,6 +1,6 @@
 module Subduino
   module Parse
-    class Lux < AnaParser
+    class Lux < Analogic
       def parse
         (@v * 0.5).to_i
       end

data/lib/subduino/parse/presence.rb

@@ -0,0 +1,9 @@
+
+module Subduino
+  module Parse
+    class Presence < Digital
+
+
+    end
+  end
+end

data/lib/subduino/parse/pressure.rb

@@ -0,0 +1,13 @@
+module Subduino
+  module Parse
+    class Pressure < Analogic
+      def parse
+        (@v * 0.5).to_i
+      end
+
+      def to_s
+        "#{parse} psi"
+      end
+    end
+  end
+end

data/lib/subduino/parse/temp.rb

@@ -2,7 +2,7 @@
 module Subduino
   module Parse
 
-    class Temp < AnaParser
+    class Temp < Analogic
       def parse
         @v * 0.035
       end

data/lib/subduino/parse.rb

@@ -6,7 +6,7 @@ module Subduino
       const_get(klass).new(v, name, id)
     end
 
-    class DigParser
+    class Digital
       def initialize(v,n=nil,id=nil)
         @v = v.to_i
         @id = id
@@ -31,7 +31,7 @@ module Subduino
 
     end
 
-    class AnaParser < DigParser
+    class Analogic < Digital
       def digital?; false;   end
       def parse; @v;    end
       def ratio
@@ -40,7 +40,7 @@ module Subduino
       end
     end
 
-    class Knob < AnaParser
+    class Knob < Analogic
     end