subduino 0.1.0 → 0.2.0

data/lib/subduino.rb

@@ -22,7 +22,7 @@ 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]
+  # BAUDS = [300, 1200, 2400, 4800, 9600, 14400, 19200, 28800, 38400, 57600, 115200]
   Sensors = [:temp, :lux]
   # DATA_BITS = 8
   # DATA_STOP = 1

data/lib/subduino/parse.rb

@@ -2,15 +2,33 @@
 module Subduino
   module Parse
 
-    def self.work(klass, v)
-      const_get(klass).new(v)
+    def self.work(klass, v, name=nil, id=nil)
+      const_get(klass).new(v, name, id)
     end
 
     class DigParser
-      def initialize(v); @v = v.to_i;  end
+      def initialize(v,n=nil,id=nil)
+        @v = v.to_i
+        @id = id
+        @name = n
+      end
       def digital?; true;   end
       def to_s; @v.to_s; end
+      def name; @name; end
+      def type
+        self.class.to_s.split("::")[-1].downcase # ugly
+      end
       def raw; @v; end
+
+      def sparkline(range = [-50, -1])
+        Store.redis.lrange "#{@id}_log", *range
+      end
+
+      def graph(period)
+        Store.redis
+      end
+
+
     end
 
     class AnaParser < DigParser
@@ -22,40 +40,11 @@ module Subduino
       end
     end
 
-    class Bool < DigParser
-      def parse
-        @v.zero? ? false : true
-      end
-
-      def to_s
-        parse ? "ON" : "OFF"
-      end
-    end
-
     class Knob < AnaParser
     end
 
-    class Temp < AnaParser
-      def parse
-        @v * 0.035
-      end
-
-      def to_s
-        "%0.2f°C" % parse
-      end
-    end
-
-    class Lux < AnaParser
-      def parse
-        (@v * 0.5).to_i
-      end
-
-      def to_s
-        "#{parse} L"
-      end
-    end
-
-
 
   end
 end
+
+Dir[File.dirname(__FILE__) + "/parse/*.rb"].each { |f| require f}

data/lib/subduino/parse/bool.rb

@@ -0,0 +1,13 @@
+module Subduino
+  module Parse
+    class Bool < DigParser
+      def parse
+        @v.zero? ? false : true
+      end
+
+      def to_s
+        parse ? "ON" : "OFF"
+      end
+    end
+  end
+end

data/lib/subduino/parse/lux.rb

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

data/lib/subduino/parse/temp.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+module Subduino
+  module Parse
+
+    class Temp < AnaParser
+      def parse
+        @v * 0.035
+      end
+
+      def to_s
+        "%0.2f°C" % parse
+      end
+    end
+
+
+  end
+end

data/lib/subduino/scaffold/Makefile

@@ -1,62 +1,35 @@
-########################################################################
 #
-# Arduino command line tools Makefile
-# System part (i.e. project independent)
 #
-# Copyright (C) 2010 Martin Oldfield <m@mjo.tc>, based on work that is
-# Copyright Nicholas Zambetti, David A. Mellis & Hernando Barragan
+# !!SCAFFOLD!! Arduino command line tools Makefile
 # 
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# Adapted from Arduino 0011 Makefile by M J Oldfield
-#
-# Original Arduino adaptation by mellis, eighthave, oli.keller
-#
-# Version 0.1  17.ii.2009  M J Oldfield
-#
-#         0.2  22.ii.2009  M J Oldfield
-#                          - fixes so that the Makefile actually works!
-#                          - support for uploading via ISP
-#                          - orthogonal choices of using the Arduino for
-#                            tools, libraries and uploading
-#
-#         0.3  21.v.2010   M J Oldfield
-#                          - added proper license statement
-#                          - added code from Philip Hands to reset
-#                            Arduino prior to upload
-#
-#         0.4  25.v.2010   M J Oldfield
-#                          - tweaked reset target on Philip Hands' advice
 #
-########################################################################
-#
-# STANDARD ARDUINO WORKFLOW
+# Copyright (C) 2010 Martin Oldfield <m@mjo.tc>, based on work that is
+# Copyright Nicholas Zambetti, David A. Mellis & Hernando Barragan
 #
-# Given a normal sketch directory, all you need to do is to create
-# a small Makefile which defines a few things, and then includes this one.
+# See footer for copyright/changelog....
+# 
+
 #
-# For example:
+# CONFIGURATION [EDIT ME]
 #
+TARGET       = !!SCAFFOLD!!
 ARDUINO_DIR  = /usr/share/arduino
-#
-TARGET       = DUINO
 ARDUINO_LIBS = Messenger
 
+# Board
 MCU          = atmega328p
 F_CPU        = 16000000
-ARDUINO_PORT = /dev/ttyUSB* #cu.usb*
+ARDUINO_PORT = /dev/ttyUSB* 
 
 # Linux
 AVR_TOOLS_PATH = /usr/bin
 AVRDUDE_CONF   = /usr/share/arduino/hardware/tools/avrdude.conf
 
-# INC_DIRS  =  ./vendor/Messenger
+# AVRDUDE
+AVRDUDE_ARD_PROGRAMMER = stk500v1
+AVRDUDE_ARD_BAUDRATE   = 57600
 
-#
-#       include /usr/local/share/Arduino.mk
+# INC_DIRS  =  ./vendor/Messenger
 #
 # Hopefully these will be self-explanatory but in case they're not:
 #
@@ -70,6 +43,14 @@ AVRDUDE_CONF   = /usr/share/arduino/hardware/tools/avrdude.conf
 #    ARDUINO_PORT - The port where the Arduino can be found (only needed
 #                   when uploading
 #
+# ARDUINO WITH OTHER TOOLS
+# 
+# If the tools aren't in the Arduino distribution, then you need to 
+# specify their location:
+#
+#    AVR_TOOLS_PATH = /usr/bin
+#    AVRDUDE_CONF   = /etc/avrdude/avrdude.conf
+
 # Once this file has been created the typical workflow is just
 #
 #   $ make upload
@@ -90,16 +71,6 @@ AVRDUDE_CONF   = /usr/share/arduino/hardware/tools/avrdude.conf
 #
 ########################################################################
 #
-# ARDUINO WITH OTHER TOOLS
-# 
-# If the tools aren't in the Arduino distribution, then you need to 
-# specify their location:
-#
-#    AVR_TOOLS_PATH = /usr/bin
-#    AVRDUDE_CONF   = /etc/avrdude/avrdude.conf
-#
-########################################################################
-#
 # ARDUINO WITH ISP
 #
 # You need to specify some details of your ISP programmer and might
@@ -399,3 +370,40 @@ depends:	$(DEPS)
 .PHONY:	all clean depends upload raw_upload reset
 
 include $(DEP_FILE)
+
+########################################################################
+#
+# This makefile is from:
+# http://mjo.tc/atelier/2009/02/arduino-cli.html
+# 
+# With some help:
+#
+# http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1265576847
+# http://johanneshoff.com/arduino-command-line/Makefile
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# Adapted from Arduino 0011 Makefile by M J Oldfield
+#
+# Original Arduino adaptation by mellis, eighthave, oli.keller
+#
+# Version 0.1  17.ii.2009  M J Oldfield
+#
+#         0.2  22.ii.2009  M J Oldfield
+#                          - fixes so that the Makefile actually works!
+#                          - support for uploading via ISP
+#                          - orthogonal choices of using the Arduino for
+#                            tools, libraries and uploading
+#
+#         0.3  21.v.2010   M J Oldfield
+#                          - added proper license statement
+#                          - added code from Philip Hands to reset
+#                            Arduino prior to upload
+#
+#         0.4  25.v.2010   M J Oldfield
+#                          - tweaked reset target on Philip Hands' advice
+#
+########################################################################

data/lib/subduino/store.rb

@@ -13,35 +13,44 @@ module Subduino
         @redis ||= Redis.new(:timeout => 0) rescue false
       end
 
-
       def read(key)
         redis.get key
       end
 
-      def write(key, val=nil)
+      def timestamp
+        Time.now.to_i.to_s
+      end
+
+      def write(k, v, stamp = false)
+        return unless redis #.connected?
+        stamp ?  redis.rpush("#{k}_log", "#{timestamp}:#{v}") : redis.set(k, v)
+      end
+
+
+      def add_to_store(key, val=nil)
         if val
-          add_to_store key, val
+          write key, val
         else
           key.each do |k,v|
-            add_to_store k, v
+            write 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)
+      def add_csv_to_store(csv, stamp = false)
         Log.info "[STORE] CSV #{Time.now.to_i}"
         csv.split(",").each do |d|
           comm, value = d.split(":")
-          write(comm, value)
+          write(comm, value, stamp)
         end
       end
 
+      # SORT key [BY pattern] [LIMIT start count] [GET pattern]
+      # [ASC|DESC] [ALPHA] [STORE dstkey]
+      def read_hist(key, period, offset = 0, max = 100)
+        redis.sort key, { :order => 'desc', :limit => [offset, max] }
+      end
+
       def count
         redis.dbsize
       end

data/subduino.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{subduino}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-09-11}
+  s.date = %q{2010-09-18}
   s.description = %q{Interface, compile, upload, play with arduino/ruby}
   s.email = %q{x@nofxx.com}
   s.executables = ["subduino-cli", "subduino"]
@@ -31,6 +31,9 @@ Gem::Specification.new do |s|
      "lib/subduino/ard_ps.rb",
      "lib/subduino/arduino.rb",
      "lib/subduino/parse.rb",
+     "lib/subduino/parse/bool.rb",
+     "lib/subduino/parse/lux.rb",
+     "lib/subduino/parse/temp.rb",
      "lib/subduino/scaffold/Makefile",
      "lib/subduino/scaffold/Makefile2",
      "lib/subduino/scaffold/generator.rb",
@@ -51,12 +54,18 @@ Gem::Specification.new do |s|
      "webapp/Rakefile",
      "webapp/Readme.textile",
      "webapp/VERSION",
+     "webapp/config.yml",
      "webapp/lib/app.rb",
      "webapp/lib/duino.rb",
      "webapp/lib/environment.rb",
      "webapp/lib/messenger.rb",
      "webapp/public/app.css",
      "webapp/public/app.js",
+     "webapp/public/custom.js",
+     "webapp/public/date_input.css",
+     "webapp/public/facebox.css",
+     "webapp/public/facebox.js",
+     "webapp/public/favicon.ico",
      "webapp/public/faye.js",
      "webapp/public/icons/alarm-clock-blue.png",
      "webapp/public/icons/alarm-clock.png",
@@ -87,9 +96,12 @@ Gem::Specification.new do |s|
      "webapp/public/icons/cpus.png",
      "webapp/public/icons/credit-card.png",
      "webapp/public/icons/cross-small.png",
+     "webapp/public/icons/current.png",
      "webapp/public/icons/dashboard.png",
      "webapp/public/icons/database.png",
      "webapp/public/icons/databases.png",
+     "webapp/public/icons/day.png",
+     "webapp/public/icons/door-big.png",
      "webapp/public/icons/door-open-in.png",
      "webapp/public/icons/door-open-out.png",
      "webapp/public/icons/door-open.png",
@@ -101,13 +113,16 @@ Gem::Specification.new do |s|
      "webapp/public/icons/eye-disable.png",
      "webapp/public/icons/eye.png",
      "webapp/public/icons/false.png",
+     "webapp/public/icons/favicon.png",
      "webapp/public/icons/gear-small.png",
      "webapp/public/icons/gear.png",
      "webapp/public/icons/groups.png",
      "webapp/public/icons/heart.png",
      "webapp/public/icons/heart_empty.png",
      "webapp/public/icons/info.png",
+     "webapp/public/icons/irrigation.png",
      "webapp/public/icons/key.png",
+     "webapp/public/icons/lamp-big.png",
      "webapp/public/icons/lightbulb.png",
      "webapp/public/icons/lightbulb_off.png",
      "webapp/public/icons/lightning-disable.png",
@@ -115,6 +130,8 @@ Gem::Specification.new do |s|
      "webapp/public/icons/lightning.png",
      "webapp/public/icons/lock-unlock.png",
      "webapp/public/icons/lock.png",
+     "webapp/public/icons/locked.png",
+     "webapp/public/icons/lux.png",
      "webapp/public/icons/marker.png",
      "webapp/public/icons/media-player-phone.png",
      "webapp/public/icons/megaphone.png",
@@ -122,12 +139,17 @@ Gem::Specification.new do |s|
      "webapp/public/icons/microphone.png",
      "webapp/public/icons/monitor.png",
      "webapp/public/icons/navigation.png",
+     "webapp/public/icons/night.png",
+     "webapp/public/icons/noise.png",
      "webapp/public/icons/off.png",
      "webapp/public/icons/on.png",
+     "webapp/public/icons/onoff.png",
      "webapp/public/icons/pin.png",
      "webapp/public/icons/plug--exclamation.png",
      "webapp/public/icons/plug-disable.png",
      "webapp/public/icons/plug.png",
+     "webapp/public/icons/rain.png",
+     "webapp/public/icons/refrigeration.png",
      "webapp/public/icons/restart.png",
      "webapp/public/icons/ruby.png",
      "webapp/public/icons/server.png",
@@ -145,6 +167,7 @@ Gem::Specification.new do |s|
      "webapp/public/icons/target.png",
      "webapp/public/icons/television-off.png",
      "webapp/public/icons/television.png",
+     "webapp/public/icons/temp.png",
      "webapp/public/icons/terminal.png",
      "webapp/public/icons/tick-small.png",
      "webapp/public/icons/traffic-light-off.png",
@@ -152,6 +175,7 @@ Gem::Specification.new do |s|
      "webapp/public/icons/traffic.png",
      "webapp/public/icons/true.png",
      "webapp/public/icons/umbrella.png",
+     "webapp/public/icons/unlocked.png",
      "webapp/public/icons/unmonitor.png",
      "webapp/public/icons/unmonitored.png",
      "webapp/public/icons/users.png",
@@ -170,6 +194,60 @@ Gem::Specification.new do |s|
      "webapp/public/icons/weather_sun.png",
      "webapp/public/icons/wrench-screwdriver.png",
      "webapp/public/icons/wrench.png",
+     "webapp/public/images/ajax-loader.gif",
+     "webapp/public/images/b.png",
+     "webapp/public/images/bendl.gif",
+     "webapp/public/images/bendr.gif",
+     "webapp/public/images/bendsb.gif",
+     "webapp/public/images/bg.jpg",
+     "webapp/public/images/bhead.gif",
+     "webapp/public/images/bheadl.gif",
+     "webapp/public/images/bheadr.gif",
+     "webapp/public/images/bl.png",
+     "webapp/public/images/bnd.gif",
+     "webapp/public/images/br.png",
+     "webapp/public/images/bread.gif",
+     "webapp/public/images/btnb.gif",
+     "webapp/public/images/btnb_.gif",
+     "webapp/public/images/btnm.gif",
+     "webapp/public/images/btnm_.gif",
+     "webapp/public/images/btns.gif",
+     "webapp/public/images/btns_.gif",
+     "webapp/public/images/cal.jpg",
+     "webapp/public/images/close.png",
+     "webapp/public/images/closelabel.gif",
+     "webapp/public/images/error.gif",
+     "webapp/public/images/ft.gif",
+     "webapp/public/images/hdr.gif",
+     "webapp/public/images/hdrl.gif",
+     "webapp/public/images/hdrr.gif",
+     "webapp/public/images/hld.jpg",
+     "webapp/public/images/imgb.gif",
+     "webapp/public/images/imgo.gif",
+     "webapp/public/images/imgt.gif",
+     "webapp/public/images/info.gif",
+     "webapp/public/images/jquery.wysiwyg.gif",
+     "webapp/public/images/li.gif",
+     "webapp/public/images/mbg.png",
+     "webapp/public/images/nsp.gif",
+     "webapp/public/images/phs.gif",
+     "webapp/public/images/sdd.jpg",
+     "webapp/public/images/sdd_.jpg",
+     "webapp/public/images/sidebar.gif",
+     "webapp/public/images/sorta.gif",
+     "webapp/public/images/sortd.gif",
+     "webapp/public/images/srch.gif",
+     "webapp/public/images/srch_.gif",
+     "webapp/public/images/success.gif",
+     "webapp/public/images/thumb1.jpg",
+     "webapp/public/images/thumb2.jpg",
+     "webapp/public/images/thumb3.jpg",
+     "webapp/public/images/tiny.gif",
+     "webapp/public/images/tiny_.gif",
+     "webapp/public/images/tl.png",
+     "webapp/public/images/tr.png",
+     "webapp/public/images/upload.gif",
+     "webapp/public/images/warning.gif",
      "webapp/public/iui/backButton.png",
      "webapp/public/iui/blueButton.png",
      "webapp/public/iui/cancel.png",
@@ -194,11 +272,18 @@ Gem::Specification.new do |s|
      "webapp/public/iui/toolbar.png",
      "webapp/public/iui/whiteButton.png",
      "webapp/public/iui/yellowButton.png",
+     "webapp/public/jquery.img.preload.js",
      "webapp/public/jquery.js",
+     "webapp/public/jquery.sparkline.js",
+     "webapp/public/jquery.tablesorter.min.js",
+     "webapp/public/jquery.visualize.js",
+     "webapp/public/jquery.wysiwyg.css",
      "webapp/public/layout.css",
      "webapp/public/right.js",
      "webapp/public/rt.js",
      "webapp/public/sparkline.js",
+     "webapp/public/style.css",
+     "webapp/public/visualize.css",
      "webapp/spec/duino_spec.rb",
      "webapp/spec/spec_helper.rb",
      "webapp/views/command.haml",
@@ -207,6 +292,7 @@ Gem::Specification.new do |s|
      "webapp/views/layout.haml",
      "webapp/views/mobile.haml",
      "webapp/views/switch.haml",
+     "webapp/views/template.haml",
      "webapp/views/top.haml",
      "webapp/views/watch.haml"
   ]