subduino 0.1.0

data/lib/subduino/scaffold/Makefile2

@@ -0,0 +1,247 @@
+#
+# Copyright 2010 Alan Burlison. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#  1. Redistributions of source code must retain the above copyright notice,
+#     this list of conditions and the following disclaimer.
+#
+#  2. Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions and the following disclaimer in the documentation
+#     and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY ALAN BURLISON "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL ALAN BURLISON OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Makefile for building Arduino projects outside of the Arduino environment
+#
+# This makefile should be included into a per-project Makefile of the following
+# form:
+#
+# ----------
+# BOARD = mega
+# PORT = /dev/term/0
+# INC_DIRS = ../common
+# LIB_DIRS = ../libraries/Task ../../libraries/VirtualWire
+# include ../../Makefile.master
+# ----------
+#
+# Where:
+#   BOARD    : Arduino board type, from $(ARD_HOME)/hardware/boards.txt
+#   PORT     : USB port
+#   INC_DIRS : List pf directories containing header files
+#   LIB_DIRS : List of directories containing library source
+#
+# Before using this Makefile you should adjust the following macros to suit
+# your environment, either by editing this file directly or by defining them in
+# the Makefile that includes this one:
+#   ARD_REV   : Arduino software revision, e.g. 0017, 0018
+#   ARD_HOME  : Installation directory of the Arduino software.
+#   MON_TERM  : terminal command for serial monitor
+#   MON_CMD   : serial monitor command
+#   MON_SPEED : serial monitor speed
+#
+
+# Global configuration.
+ARD_REV ?= 0018
+ARD_HOME ?= /usr/share/arduino
+MON_TERM ?= gnome-terminal
+MON_SPEED ?= 9600
+MON_CMD ?= tip
+
+### Nothing below here should require editing. ###
+
+# Check for the required definitions.
+
+ifndef BOARD
+    $(error $$(BOARD) not defined)
+endif
+ifndef PORT
+    $(error $$(PORT) not defined)
+endif
+
+# Version-specific settings
+ifeq ($(ARD_REV),0018)
+    ARD_BOARDS = $(ARD_HOME)/hardware/arduino/boards.txt
+    ARD_SRC_DIR = $(ARD_HOME)/hardware/arduino/cores/arduino
+    ARD_MAIN = $(ARD_SRC_DIR)/main.cpp
+else
+    ARD_BOARDS = $(ARD_HOME)/hardware/boards.txt
+    ARD_SRC_DIR = $(ARD_HOME)/hardware/cores/arduino
+    ARD_MAIN = $(ARD_SRC_DIR)/main.cxx
+endif
+
+# Standard macros.
+PROGRAMMER ?= arduino
+SKETCH = $(notdir $(CURDIR))
+ARD_BIN = $(ARD_HOME)/hardware/tools/gcc-avr/bin
+BUILD_DIR = build
+VPATH = $(LIB_DIRS)
+
+# Macros derived from boards.txt
+MCU := $(shell sed -n 's/$(BOARD)\.build\.mcu=\(.*\)/\1/p' < $(ARD_BOARDS))
+F_CPU := $(shell sed -n 's/$(BOARD)\.build\.f_cpu=\(.*\)/\1/p' < $(ARD_BOARDS))
+UPLOAD_SPEED := \
+    $(shell sed -n 's/$(BOARD)\.upload\.speed=\(.*\)/\1/p' < $(ARD_BOARDS))
+
+# Build tools.
+CC = $(ARD_BIN)/avr-gcc
+CXX = $(ARD_BIN)/avr-g++
+CXXFILT = $(ARD_BIN)/avr-c++filt
+OBJCOPY = $(ARD_BIN)/avr-objcopy
+OBJDUMP = $(ARD_BIN)/avr-objdump
+AR = $(ARD_BIN)/avr-ar
+SIZE = $(ARD_BIN)/avr-size
+NM = $(ARD_BIN)/avr-nm
+AVRDUDE = $(ARD_HOME)/hardware/tools/avrdude
+AVRDUDE_CONF = $(ARD_HOME)/hardware/tools/avrdude.conf
+MKDIR = mkdir -p
+RM = rm -rf
+MV = mv -f
+
+# Compiler flags.
+INC_FLAGS = \
+    $(addprefix -I,$(INC_DIRS)) $(addprefix -I,$(LIB_DIRS)) -I$(ARD_SRC_DIR)
+ARD_FLAGS = -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARD_REV)
+C_CXX_FLAGS = \
+    -Wall -Wextra -Wundef -Werror -Wno-unused-parameter \
+    -Wno-attributes -fdiagnostics-show-option -g -Wa,-adhlns=$(BUILD_DIR)/$*.lst
+C_FLAGS = \
+    $(C_CXX_FLAGS) -std=gnu99 -Wstrict-prototypes -Wno-old-style-declaration
+CXX_FLAGS = $(C_CXX_FLAGS)
+
+# Optimiser flags.
+#     optimise for size, unsigned by default, pack data.
+#     separate sections, drop unused ones, shorten branches, jumps.
+#     don't inline, vectorise loops. no exceptions.
+#     no os preamble, use function calls in prologues.
+# http://gcc.gnu.org/onlinedocs/gcc-2.95.3/gcc.html
+# http://www.tty1.net/blog/2008-04-29-avr-gcc-optimisations_en.html
+# XXX does it really cause it to fail?
+# NB would like to add -fno-split-wide-types but that makes upload verify fail
+OPT_FLAGS = \
+     -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums \
+    -ffunction-sections -fdata-sections -Wl,--gc-sections,--relax \
+    -fno-inline-small-functions -fno-tree-scev-cprop -fno-exceptions \
+    -ffreestanding -mcall-prologues -fno-split-wide-types
+
+# Build parameters.
+IMAGE = $(BUILD_DIR)/$(SKETCH)
+ARD_C_SRC = $(wildcard $(ARD_SRC_DIR)/*.c)
+ARD_CXX_SRC = $(filter-out %/main.cpp,$(wildcard $(ARD_SRC_DIR)/*.cpp))
+ARD_C_OBJ = $(patsubst %.c,%.o,$(notdir $(ARD_C_SRC)))
+ARD_CXX_OBJ = $(patsubst %.cpp,%.o,$(notdir $(ARD_CXX_SRC)))
+ARD_LIB = arduino
+ARD_AR = $(BUILD_DIR)/lib$(ARD_LIB).a
+ARD_AR_OBJ = $(ARD_AR)($(ARD_C_OBJ) $(ARD_CXX_OBJ))
+ARD_LD_FLAG = -l$(ARD_LIB)
+
+# Workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34734
+$(ARD_AR)(Tone.o) : CXX_FLAGS += -w
+
+# Sketch libraries.
+LIB_C_SRC = $(foreach ld,$(LIB_DIRS),$(wildcard $(ld)/*.c))
+LIB_CXX_SRC = $(foreach ld,$(LIB_DIRS),$(wildcard $(ld)/*.cpp))
+LIB_SRC = $(LIB_C_SRC) $(LIB_CXX_SRC)
+ifneq "$(strip $(LIB_C_SRC) $(LIB_CXX_SRC))" ""
+  LIB_C_OBJ = $(patsubst %.c,%.o,$(notdir $(LIB_C_SRC)))
+  LIB_CXX_OBJ = $(patsubst %.cpp,%.o,$(notdir $(LIB_CXX_SRC)))
+  LIB_LIB = library
+  LIB_AR = $(BUILD_DIR)/lib$(LIB_LIB).a
+  LIB_AR_OBJ = $(LIB_AR)($(LIB_C_OBJ) $(LIB_CXX_OBJ))
+  LIB_LD_FLAG = -l$(LIB_LIB)
+endif
+
+# Sketch PDE, C and C++ source.
+SKT_PDE_SRC = $(wildcard *.pde)
+SKT_C_SRC = $(wildcard *.c)
+SKT_CXX_SRC = $(wildcard *.cpp)
+ifneq "$(strip $(SKT_C_SRC) $(SKT_CXX_SRC))" ""
+  ifneq "$(strip $(SKT_PDE_SRC))" ""
+    SKT_PDE_OBJ = $(BUILD_DIR)/$(SKETCH)_pde.o
+  endif
+  SKT_C_OBJ = $(patsubst %.c,%.o,$(SKT_C_SRC))
+  SKT_CXX_OBJ = $(patsubst %.cpp,%.o,$(SKT_CXX_SRC))
+  SKT_LIB = sketch
+  SKT_AR = $(BUILD_DIR)/lib$(SKT_LIB).a
+  SKT_AR_OBJ = $(SKT_AR)/($(SKT_C_OBJ) $(SKT_CXX_OBJ))
+  SKT_LD_FLAG = -l$(SKT_LIB)
+endif
+
+# Definitions.
+define run-cc
+  $(CC) -c $(C_FLAGS) $(OPT_FLAGS) $(ARD_FLAGS) $(INC_FLAGS) \
+      $< -o $(BUILD_DIR)/$*.o
+  @ $(AR) rc $@ $(BUILD_DIR)/$*.o
+  @ $(RM) $(BUILD_DIR)/$*.o
+  @ $(CXXFILT) < $(BUILD_DIR)/$*.lst > $(BUILD_DIR)/$*.lst.tmp
+  @ $(MV) $(BUILD_DIR)/$*.lst.tmp $(BUILD_DIR)/$*.lst
+endef
+
+define run-cxx
+  $(CXX) -c $(CXX_FLAGS) $(OPT_FLAGS) $(ARD_FLAGS) $(INC_FLAGS) \
+      $< -o $(BUILD_DIR)/$*.o
+  @ $(AR) rc $@ $(BUILD_DIR)/$*.o
+  @ $(RM) $(BUILD_DIR)/$*.o
+  @ $(CXXFILT) < $(BUILD_DIR)/$*.lst > $(BUILD_DIR)/$*.lst.tmp
+  @ $(MV) $(BUILD_DIR)/$*.lst.tmp $(BUILD_DIR)/$*.lst
+endef
+
+# Rules.
+.PHONY : all clean upload monitor upload_monitor
+
+all : $(BUILD_DIR) $(IMAGE).hex
+
+clean :  $(RM) $(BUILD_DIR)
+
+$(BUILD_DIR) :  $(MKDIR) $@
+
+$(SKT_PDE_OBJ) : $(SKT_PDE_SRC)
+  echo '#include <WProgram.h>' > $(BUILD_DIR)/$(SKETCH)_pde.cpp
+  cat $^ $(ARD_MAIN) >> $(BUILD_DIR)/$(SKETCH)_pde.cpp
+  cd $(BUILD_DIR) && $(CXX) -c $(subst build/,,$(CXX_FLAGS)) \
+      $(OPT_FLAGS) $(ARD_FLAGS) -I.. \
+      $(subst -I../,-I../../,$(INC_FLAGS)) $(SKETCH)_pde.cpp -o $(@F)
+
+(%.o) : $(ARD_SRC_DIR)/%.c
+  $(run-cc)
+
+(%.o) : $(ARD_SRC_DIR)/%.cpp
+  $(run-cxx)
+
+(%.o) : %.c
+  $(run-cc)
+
+(%.o) : %.cpp
+  $(run-cxx)
+
+$(IMAGE).hex : $(ARD_AR_OBJ) $(LIB_AR_OBJ) $(SKT_AR_OBJ) $(SKT_PDE_OBJ)
+  $(CXX) $(CXX_FLAGS) $(OPT_FLAGS) $(ARD_FLAGS) -L$(BUILD_DIR) \
+      $(SKT_PDE_OBJ) $(SKT_LD_FLAG) $(LIB_LD_FLAG) $(ARD_LD_FLAG) \
+      -o $(IMAGE).elf
+  $(OBJCOPY) -O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load \
+      --no-change-warnings --change-section-lma .eeprom=0 $(IMAGE).elf \
+      $(IMAGE).eep
+  $(OBJCOPY) -O ihex -R .eeprom $(IMAGE).elf $(IMAGE).hex
+  $(SIZE) $(IMAGE).hex
+
+upload : all
+  - pkill -f $(MON_CMD).*$(PORT)
+  - $(AVRDUDE) -C$(AVRDUDE_CONF) -p$(MCU) -c$(PROGRAMMER) -P$(PORT) \
+      -b$(UPLOAD_SPEED) -D -Uflash:w:$(IMAGE).hex:i -q
+
+monitor :
+  LD_LIBRARY_PATH= LD_PRELOAD= \
+      $(MON_TERM) -t '$(BOARD) $(PORT)' \
+      -e '$(MON_CMD) -$(MON_SPEED) $(PORT)' &
+
+upload_monitor : upload monitor

data/lib/subduino/scaffold/generator.rb

@@ -0,0 +1,29 @@
+
+module Subduino
+  class Generator
+
+    Files = %w{ Makefile scaffold.rb scaffold.pde}
+    class << self
+
+      def copy_files(dir)
+        name = dir.split("/").last
+        Files.each do |file|
+          puts "Working on #{file}"
+          dump = File.open(File.dirname(__FILE__) + "/#{file}").readlines
+          file.gsub!(/scaffold/, name)
+          File.open(dir + "/#{file}", 'w') do |f|
+            f.write(dump.join.gsub(/!!SCAFFOLD!!/, name))
+          end
+        end
+      end
+
+      def os_detect
+        case RUBY_PLATFORM
+        when /linux/ then ""
+        when /darwin/ then ""
+          else raise "Dunno how to play with #{RUBY_PLATFORM}"
+        end
+      end
+    end
+  end
+end

data/lib/subduino/scaffold/scaffold.pde

@@ -0,0 +1,17 @@
+/*
+ *
+ *     SCAFFOLD
+ *
+ *
+ *     #{Time.now}
+*/
+
+#include <Messenger.h>
+
+void setup() {
+
+}
+
+void loop() {
+
+}

data/lib/subduino/scaffold/scaffold.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+#  SCAFFOLD
+#
+#
+
+require "rubygems"
+require "subduino"
+
+
+Subduino.start do |r|
+  puts "Received #{r}"
+end
+
+# Subduino.write("Hi")
+

data/lib/subduino/store.rb

@@ -0,0 +1,65 @@
+#
+#  Subduino Persistent Store
+#
+#
+#  Uses redis to store.
+#  Maybe Tokyo/PG support in the future...
+#
+module Subduino
+  class Store
+    class << self
+
+      def redis
+        @redis ||= Redis.new(:timeout => 0) rescue false
+      end
+
+
+      def read(key)
+        redis.get key
+      end
+
+      def write(key, val=nil)
+        if val
+          add_to_store key, val
+        else
+          key.each do |k,v|
+            add_to_store k, v
+          end
+        end
+      end
+
+      def add_to_store(k, v)
+        return unless redis.connected?
+        redis.set k, v
+        redis.rpush "#{k}_log", v
+      end
+
+      def add_csv_to_store(csv)
+        Log.info "[STORE] CSV #{Time.now.to_i}"
+        csv.split(",").each do |d|
+          comm, value = d.split(":")
+          write(comm, value)
+        end
+      end
+
+      def count
+        redis.dbsize
+      end
+
+      def flush
+        redis.flushdb
+        #redis.flushall
+      end
+
+      def all
+        redis.keys
+      end
+
+
+      # def method_missing(*args)
+      #   read(args[0])
+      # end
+
+    end
+  end
+end

data/lib/subduino.rb

@@ -0,0 +1,48 @@
+#
+#
+#  Arduino PubSub Hub
+#
+#
+#
+require 'serialport'
+require 'eventmachine'
+require 'stringio'
+require 'readline'
+require 'logger'
+require 'redis'
+
+require 'subduino/ard_io'
+require 'subduino/ard_ps'
+require 'subduino/parse'
+require 'subduino/store'
+require 'subduino/arduino'
+
+Thread.current.abort_on_exception = false
+
+module Subduino
+  Log = Logger.new("out.log")
+  BAUDS = 115200   #BAUDS = 9600
+ # BAUDS = [300, 1200, 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 115200]
+  Sensors = [:temp, :lux]
+  # DATA_BITS = 8
+  # DATA_STOP = 1
+
+
+  def self.start(&proc)
+    trap(:TERM) { stop! }
+    trap(:INT)  { stop! }
+    # Start some threads...
+    ArdIO.read &proc
+    ArdPS.read
+
+    # Be a daemon. Should be a better way..
+    # EM.run do; end
+  end
+
+  def self.stop!
+    ArdIO.stop!
+    ArdPS.stop!
+    exit 0
+  end
+
+end

data/node/arduinode.js

@@ -0,0 +1,68 @@
+// Arduino Node.js
+
+
+var sys  = require('sys'),
+fs  = require('fs'),
+faye  = require('./vendor/faye');
+
+var dpath = "/dev/ttyUSB1";
+
+var client = new faye.Client('http://localhost:8000/faye');
+
+var subscription = client.subscribe('/foo', function(message) {
+  sys.puts("SUB!!!");  // handle message
+});
+
+var log = function(txt) {
+  sys.puts(txt)
+}
+
+var find_arduino = function(err, stats) {
+  if(err)
+    return log("Arduino not found...");
+
+  log("DUIN!");
+  log(sys.inspect(stats));
+}
+
+fs.stat("/dev/ttyUSB1", find_arduino);
+
+
+var spawn = require('child_process').spawn,
+    stty  = spawn('stty -F /dev/ttyUSB1 cs8 115200 ignbrk -brkint -icrnl -imaxbel -opost -onlcr -isig -icanon -iexten -echo -echoe -echok -echoctl -echoke noflsh -ixon -crtscts'); //, ['-lh', '/usr']);
+
+stty.stdout.on('data', function (data) {
+  sys.print('stdout: ' + data);
+});
+
+stty.stderr.on('data', function (data) {
+  log("Could not stty " + dpath);
+  log('stderr: ' + data);
+});
+
+stty.on('exit', function (code) {
+  if (code == 0)
+    console.log('Done modding stty ' + dpath);
+});
+
+
+// stty -F /dev/ttyUSB1 cs8 115200 ignbrk -brkint -icrnl -imaxbel -opost -onlcr -isig -icanon -iexten -echo -echoe -echok -echoctl -echoke noflsh -ixon -crtscts
+var rr = fs.createReadStream(dpath, {
+  'flags': 'r',
+  'encoding': 'ascii', // binary, utf8
+  // 'mode': 0666,
+  // 'bufferSize': 4 * 1024
+});
+
+
+rr.addListener('data', function (chunk) {
+  log('data: ' + chunk);
+  log(sys.inspect(chunk));
+});
+
+rr.on('end', function () {
+  log('end, closed fs');
+});
+
+
+

data/node/server.js

@@ -0,0 +1,45 @@
+// Arduino <> Subduino/Node <> WWW
+
+var sys  = require('sys'),
+    http = require('http'),
+    faye = require('./vendor/faye');
+
+var bayeux = new faye.NodeAdapter({
+  mount:    '/faye',
+  timeout:  45
+});
+
+sys.puts("Starting server...");
+
+// process.on('SIGHUP', function () {
+//   sys.puts('Got SIGHUP signal.');
+// });
+// process.on('SIGKILL', function () {
+//   sys.puts('Got SIGHUP signal.');
+// });
+
+// Handle non-Bayeux requests
+var server = http.createServer(function(request, response) {
+  response.writeHead(200, {'Content-Type': 'text/plain'});
+  response.write('Nothing to see here...');
+  response.end();
+});
+
+server.on('stream', function(stream) {
+  sys.puts("Stream!");
+  sys.puts(stream);
+})
+
+var listen_callback = function() {
+  sys.log("Server started...");
+}
+
+bayeux.attach(server);
+server.listen(8000, listen_callback);
+
+
+// var client = new faye.Client('http://localhost:8000/faye');
+// bayeux.getClient().publish('/email/new', {
+//   text:       'New email has arrived!',
+//   inboxSize:  34
+// });