subduino 0.2.1 → 0.2.2

data/lib/subduino/scaffold/Makefile

@@ -1,25 +1,25 @@
 #
 #
 # !!SCAFFOLD!! Arduino command line tools Makefile
-# 
+#
 #
 # Copyright (C) 2010 Martin Oldfield <m@mjo.tc>, based on work that is
 # Copyright Nicholas Zambetti, David A. Mellis & Hernando Barragan
 #
 # See footer for copyright/changelog....
-# 
+#
 
 #
 # CONFIGURATION [EDIT ME]
 #
 TARGET       = !!SCAFFOLD!!
 ARDUINO_DIR  = /usr/share/arduino
-ARDUINO_LIBS = Messenger
+#ARDUINO_LIBS = ExtraLib
 
 # Board
 MCU          = atmega328p
 F_CPU        = 16000000
-ARDUINO_PORT = /dev/ttyUSB* 
+ARDUINO_PORT = /dev/ttyUSB*
 
 # Linux
 AVR_TOOLS_PATH = /usr/bin
@@ -29,7 +29,6 @@ AVRDUDE_CONF   = /usr/share/arduino/hardware/tools/avrdude.conf
 AVRDUDE_ARD_PROGRAMMER = stk500v1
 AVRDUDE_ARD_BAUDRATE   = 57600
 
-# INC_DIRS  =  ./vendor/Messenger
 #
 # Hopefully these will be self-explanatory but in case they're not:
 #
@@ -44,8 +43,8 @@ AVRDUDE_ARD_BAUDRATE   = 57600
 #                   when uploading
 #
 # ARDUINO WITH OTHER TOOLS
-# 
-# If the tools aren't in the Arduino distribution, then you need to 
+#
+# If the tools aren't in the Arduino distribution, then you need to
 # specify their location:
 #
 #    AVR_TOOLS_PATH = /usr/bin
@@ -76,9 +75,9 @@ AVRDUDE_ARD_BAUDRATE   = 57600
 # You need to specify some details of your ISP programmer and might
 # also need to specify the fuse values:
 #
-#     ISP_PROG	   = -c stk500v2
+#     ISP_PROG     = -c stk500v2
 #     ISP_PORT     = /dev/ttyACM0
-#     
+#
 #     ISP_LOCK_FUSE_PRE  = 0x3f
 #     ISP_LOCK_FUSE_POST = 0xcf
 #     ISP_HIGH_FUSE      = 0xdf
@@ -87,7 +86,7 @@ AVRDUDE_ARD_BAUDRATE   = 57600
 #
 # I think the fuses here are fine for uploading to the ATmega168
 # without bootloader.
-# 
+#
 # To actually do this upload use the ispload target:
 #
 #    make ispload
@@ -117,7 +116,7 @@ ARDUINO_CORE_PATH = $(ARDUINO_DIR)/hardware/arduino/cores/arduino
 endif
 
 # Everything gets built in here
-OBJDIR  	  = build-cli
+OBJDIR      = build-cli
 
 ########################################################################
 # Local sources
@@ -128,8 +127,8 @@ LOCAL_CC_SRCS   = $(wildcard *.cc)
 LOCAL_PDE_SRCS  = $(wildcard *.pde)
 LOCAL_AS_SRCS   = $(wildcard *.S)
 LOCAL_OBJ_FILES = $(LOCAL_C_SRCS:.c=.o) $(LOCAL_CPP_SRCS:.cpp=.o) \
-		$(LOCAL_CC_SRCS:.cc=.o) $(LOCAL_PDE_SRCS:.pde=.o) \
-		$(LOCAL_AS_SRCS:.S=.o)
+    $(LOCAL_CC_SRCS:.cc=.o) $(LOCAL_PDE_SRCS:.pde=.o) \
+    $(LOCAL_AS_SRCS:.S=.o)
 LOCAL_OBJS      = $(patsubst %,$(OBJDIR)/%,$(LOCAL_OBJ_FILES))
 
 # Dependency files
@@ -140,8 +139,8 @@ 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)
-CORE_OBJ_FILES  = $(CORE_C_SRCS:.c=.o) $(CORE_CPP_SRCS:.cpp=.o) $(EXTRA_CPP_SRCS:.cpp=.o) 
+# 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
 endif
@@ -180,9 +179,9 @@ SYS_INCLUDES  = $(patsubst %,-I%,$(SYS_LIBS))
 SYS_OBJS      = $(wildcard $(patsubst %,%/*.o,$(SYS_LIBS)))
 
 CPPFLAGS      = -mmcu=$(MCU) -DF_CPU=$(F_CPU) \
-			-I. -I$(ARDUINO_CORE_PATH) \
-			$(SYS_INCLUDES) -g -Os -w -Wall \
-			-ffunction-sections -fdata-sections
+      -I. -I$(ARDUINO_CORE_PATH) \
+      $(SYS_INCLUDES) -g -Os -w -Wall \
+      -ffunction-sections -fdata-sections
 CFLAGS        = -std=gnu99
 CXXFLAGS      = -fno-exceptions
 ASFLAGS       = -mmcu=$(MCU) -I. -x assembler-with-cpp
@@ -206,66 +205,66 @@ ARD_PORT      = $(firstword $(wildcard $(ARDUINO_PORT)))
 # .o rules are for objects, .d for dependency tracking
 # there seems to be an awful lot of duplication here!!!
 $(OBJDIR)/%.o: %.c
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
+  $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
 
 $(OBJDIR)/%.o: %.cc
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+  $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
 $(OBJDIR)/%.o: %.cpp
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+  $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
 $(OBJDIR)/%.o: %.S
-	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
+  $(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
 
 $(OBJDIR)/%.o: %.s
-	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
+  $(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
 
 $(OBJDIR)/%.d: %.c
-	$(CC) -MM $(CPPFLAGS) $(CFLAGS) $< -MF $@ -MT $(@:.d=.o)
+  $(CC) -MM $(CPPFLAGS) $(CFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
 $(OBJDIR)/%.d: %.cc
-	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
+  $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
 $(OBJDIR)/%.d: %.cpp
-	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
+  $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
 $(OBJDIR)/%.d: %.S
-	$(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
+  $(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
 $(OBJDIR)/%.d: %.s
-	$(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
+  $(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
 # the pde -> cpp -> o file
 $(OBJDIR)/%.cpp: %.pde
-	$(ECHO) $(PDEHEADER) > $@
-	$(CAT)  $< >> $@
+  $(ECHO) $(PDEHEADER) > $@
+  $(CAT)  $< >> $@
 
 $(OBJDIR)/%.o: $(OBJDIR)/%.cpp
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+  $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
 $(OBJDIR)/%.d: $(OBJDIR)/%.cpp
-	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
+  $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
 # core files
 $(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
+  $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
 
 $(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+  $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
 # various object conversions
 $(OBJDIR)/%.hex: $(OBJDIR)/%.elf
-	$(OBJCOPY) -O ihex -R .eeprom $< $@
+  $(OBJCOPY) -O ihex -R .eeprom $< $@
 
 $(OBJDIR)/%.eep: $(OBJDIR)/%.elf
-	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-		--change-section-lma .eeprom=0 -O ihex $< $@
+  -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+    --change-section-lma .eeprom=0 -O ihex $< $@
 
 $(OBJDIR)/%.lss: $(OBJDIR)/%.elf
-	$(OBJDUMP) -h -S $< > $@
+  $(OBJDUMP) -h -S $< > $@
 
 $(OBJDIR)/%.sym: $(OBJDIR)/%.elf
-	$(NM) -n $< > $@
+  $(NM) -n $< > $@
 
 ########################################################################
 #
@@ -311,7 +310,7 @@ ISP_EXT_FUSE       = 0x01
 endif
 
 ifndef ISP_PROG
-ISP_PROG	   = -c stk500v2
+ISP_PROG     = -c stk500v2
 endif
 
 AVRDUDE_ISP_OPTS = -P $(ISP_PORT) $(ISP_PROG)
@@ -322,52 +321,52 @@ AVRDUDE_ISP_OPTS = -P $(ISP_PORT) $(ISP_PROG)
 # Explicit targets start here
 #
 
-all: 		$(OBJDIR) $(TARGET_HEX)
+all:    $(OBJDIR) $(TARGET_HEX)
 
 $(OBJDIR):
-		mkdir $(OBJDIR)
+    mkdir $(OBJDIR)
 
-$(TARGET_ELF): 	$(OBJS)
-		$(CC) $(LDFLAGS) -o $@ $(OBJS) $(SYS_OBJS)
+$(TARGET_ELF):  $(OBJS)
+    $(CC) $(LDFLAGS) -o $@ $(OBJS) $(SYS_OBJS)
 
-$(DEP_FILE):	$(OBJDIR) $(DEPS)
-		cat $(DEPS) > $(DEP_FILE)
+$(DEP_FILE):  $(OBJDIR) $(DEPS)
+    cat $(DEPS) > $(DEP_FILE)
 
-upload:		reset raw_upload
+upload:   reset raw_upload
 
-raw_upload:	$(TARGET_HEX)
-		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
-			-U flash:w:$(TARGET_HEX):i
+raw_upload: $(TARGET_HEX)
+    $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
+      -U flash:w:$(TARGET_HEX):i
 
 # stty on MacOS likes -F, but on Debian it likes -f redirecting
 # stdin/out appears to work but generates a spurious error on MacOS at
 # least. Perhaps it would be better to just do it in perl ?
-reset:		
-		for STTYF in 'stty --file' 'stty -f' 'stty <' ; \
-		  do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \
-		done ;\
-		$$STTYF $(ARD_PORT)  hupcl ;\
-		(sleep 0.1 || sleep 1)     ;\
-		$$STTYF $(ARD_PORT) -hupcl 
-
-ispload:	$(TARGET_HEX)
-		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \
-			-U lock:w:$(ISP_LOCK_FUSE_PRE):m \
-			-U hfuse:w:$(ISP_HIGH_FUSE):m \
-			-U lfuse:w:$(ISP_LOW_FUSE):m \
-			-U efuse:w:$(ISP_EXT_FUSE):m
-		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -D \
-			-U flash:w:$(TARGET_HEX):i
-		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) \
-			-U lock:w:$(ISP_LOCK_FUSE_POST):m
+reset:
+    for STTYF in 'stty --file' 'stty -f' 'stty <' ; \
+      do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \
+    done ;\
+    $$STTYF $(ARD_PORT)  hupcl ;\
+    (sleep 0.1 || sleep 1)     ;\
+    $$STTYF $(ARD_PORT) -hupcl
+
+ispload:  $(TARGET_HEX)
+    $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \
+      -U lock:w:$(ISP_LOCK_FUSE_PRE):m \
+      -U hfuse:w:$(ISP_HIGH_FUSE):m \
+      -U lfuse:w:$(ISP_LOW_FUSE):m \
+      -U efuse:w:$(ISP_EXT_FUSE):m
+    $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -D \
+      -U flash:w:$(TARGET_HEX):i
+    $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) \
+      -U lock:w:$(ISP_LOCK_FUSE_POST):m
 
 clean:
-		$(REMOVE) $(OBJS) $(TARGETS) $(DEP_FILE) $(DEPS)
+    $(REMOVE) $(OBJS) $(TARGETS) $(DEP_FILE) $(DEPS)
 
-depends:	$(DEPS)
-		cat $(DEPS) > $(DEP_FILE)
+depends:  $(DEPS)
+    cat $(DEPS) > $(DEP_FILE)
 
-.PHONY:	all clean depends upload raw_upload reset
+.PHONY: all clean depends upload raw_upload reset
 
 include $(DEP_FILE)
 
@@ -375,7 +374,7 @@ 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

data/lib/subduino/scaffold/scaffold.pde

@@ -8,10 +8,87 @@
 
 #include <Messenger.h>
 
+#define sec  1000
+#define min  60000
+#define hour 3600000
+#define day  86400000
+
+// Output
+const int rxPin = 0;
+const int txPin = 1;
+const int d2 = 2;
+const int d3 = 3;
+const int d4 = 4;
+const int d5 = 5;
+const int d6 = 6;
+const int d7 = 7;
+const int d8 = 8;
+const int d9 = 9;
+//const int d10 = 10;
+//const int d11 = 11;
+//const int d12 = 12;
+const int infoPin = 13;
+
+// Input
+const int i0 = A0;
+const int i1 = A1;
+const int i2 = A2;
+const int i3 = A3;
+const int i4 = A4;
+const int i5 = A5;
+// Digital
+const int d10 = 10;
+const int d11 = 11;
+const int d12 = 12;
+
+Messenger message = Messenger();
+
+// Create the callback function
+
+unsigned long mintomilli(unsigned long m) {
+  return(m * 60000);
+}
+
+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 setup() {
+  // Atmega defaults INPUT
+  pinMode(infoPin, OUTPUT);
 
+  Serial.begin(115200);
+  message.attach(messageReady);
 }
 
 void loop() {
 
+  time_now = millis();
+
+  // 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);
+  }
+
+  while ( Serial.available() )  message.process(Serial.read());
+
 }

data/lib/subduino/store.rb

@@ -23,7 +23,7 @@ module Subduino
 
       def write(k, v, stamp = false)
         return unless redis #.connected?
-        stamp ?  redis.rpush("#{k}_log", "#{timestamp}:#{v}") : redis.set(k, v)
+        stamp ?  redis.rpush("log:inputs:#{k}", "#{timestamp}:#{v}") : redis.set("now:inputs:"+k, v)
       end
 
 

data/spec/subduino/parse_spec.rb

@@ -4,7 +4,7 @@ describe Parse do
   include Parse
 
   it "should parse digital" do
-    d = DigParser.new(8)
+    d = Digital.new(8)
     d.should be_digital
   end