subduino 0.1.0 → 0.2.0

data/Readme.textile

@@ -1,9 +1,10 @@
 h1. Subduino
 
-Talks to arduino using cool stuff.
+Arduino Tools on Ruby
 
 http://github.com/nofxx/subduino
 
+
 h2. Install
 
     gem install subduino
@@ -12,11 +13,51 @@ h2. Install
 h3. Requirements
 
 * "Arduino":http://arduino.cc
+
+PubSub (gems):
+
 * "serialport":http://github.com/hparra/ruby-serialport
 * "redis":http://github.com/ezmobius/redis-rb
 
+Compile/Upload to arduino (archlinux pkgs):
+
+* "arduino" or "arduino64"
+* "gcc-avr"
+* "avrdude"
+
+WebApp (gems):
+
+* sinatra
+* haml
 
-h2. Use
+
+h2. Create a project
+
+<pre><code>
+    subduino some/dir/bot
+    ...creates folder and some sketch files...
+
+</pre></code>
+
+h3. bot.rb
+
+Simple example that monitors arduinos on the USB.
+
+h3. bot.pde
+
+Common arduino source, can be compiled/uploaded via the IDE or:
+
+h3. Makefile
+
+Nice makefile so you don't need the IDE ;)
+Use 'make' or 'make upload'.
+
+It's being tested (works) on archlinux with arduino 0019.
+It's just a matter of setting the first lines of the Makefile correct for your OS.
+Please let me know so I can detect the OS and write a correct makefile for other distros.
+
+
+h2. PubSub
 
 <pre><code>
 
@@ -31,6 +72,11 @@ h2. Use
 </pre></code>
 
 
+h2. Webapp
+
+Need some heavy work...
+
+
 h2. Contributing
 
 Fork/work/push.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/subduino

@@ -12,23 +12,39 @@ OptionParser.new { |op|
 }.parse!(ARGV.dup)
 
 # set :run, true
-if ARGV.empty?
+
+
+if ARGV.empty? || ARGV.join =~ /yml/
+  LastRun = {:all => 0}
+  if File.exists?(f = ARGV.join)
+    puts "Using config file #{f}"
+    AppConfig = YAML.load(File.read(f))["opts"]
+  else
+    AppConfig = { "log_interval" => 30, "bauds" => 57600 }
+  end
 
   client = Faye::Client.new('http://localhost:8000/faye')
 
   EM.run do
 
     Subduino.start do |read|
-      client.publish('/stats', 'data' => read)
       puts "[IO] #{read}"
+      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)
+      else
+        Subduino::Store.add_csv_to_store(read)
+      end
     end
 
   end
-end
-
+else
   require "subduino/scaffold/generator"
   dir = ARGV[0]
   puts "Subduing dir #{dir}"
   `mkdir #{dir}` unless File.exists?(dir)
+  Subduino::Generator.copy_files(dir)
+end
 
-Subduino::Generator.copy_files(dir)

data/duino/Makefile

@@ -1,53 +1,25 @@
-########################################################################
 #
-# 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
+# duino 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
 #
-########################################################################
+# Copyright (C) 2010 Martin Oldfield <m@mjo.tc>, based on work that is
+# Copyright Nicholas Zambetti, David A. Mellis & Hernando Barragan
 #
-# STANDARD ARDUINO WORKFLOW
 #
-# 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
 #
+TARGET       = duino
 ARDUINO_DIR  = /usr/share/arduino
-#
-TARGET       = DUINO
 ARDUINO_LIBS = Messenger
 
 MCU          = atmega328p
 F_CPU        = 16000000
-ARDUINO_PORT = /dev/ttyUSB* #cu.usb*
+ARDUINO_PORT = /dev/ttyUSB* 
 
 # Linux
 AVR_TOOLS_PATH = /usr/bin
@@ -55,9 +27,6 @@ AVRDUDE_CONF   = /usr/share/arduino/hardware/tools/avrdude.conf
 
 # INC_DIRS  =  ./vendor/Messenger
 
-#
-#       include /usr/local/share/Arduino.mk
-#
 # Hopefully these will be self-explanatory but in case they're not:
 #
 #    ARDUINO_DIR  - Where the Arduino software has been unpacked
@@ -70,6 +39,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 +67,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 +366,39 @@ 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/duino/duino.pde

@@ -1,17 +1,283 @@
 /*
+ * Arduin
  *
- *     SCAFFOLD
  *
+ *  /home/nofxx/projects/ardo/control
  *
- *     #{Time.now}
-*/
+ *
+ */
 
 #include <Messenger.h>
 
-void setup() {
+#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;
+
+// Intervals (s)
+unsigned long shoot = 1;
+unsigned long sync  = 5 * sec;
+unsigned long time_now, last_shoot, last_sync;
+
+int btnState = 0;
+int touchState = 0;
+int motorState = 0;
+
+char buffer [50];
+
+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);
+  }
+
+}
+
+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);
+  pinMode(d2, OUTPUT);
+  pinMode(d3, OUTPUT);
+  pinMode(d6, OUTPUT);
+  pinMode(d10, OUTPUT);
+
+  // testFalse();
+  shoot = mintomilli(shoot);
+
+  attachInterrupt(0, btnLed, CHANGE);
+  Serial.begin(115200);
+  //Serial.begin(9600);
+  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);
+  }
+
+
+  // if (motorState != 0) {
+  //   analogWrite(d10, (analogRead(i1)/5));
+  // } else {
+  //   analogWrite(d10, 0);
+  // }
+
+  // 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);
+
+    //Serial.println(touchState);
+    //Serial.print(byte(50));
+    // * Serial.print(78, BYTE) gives "N"
+    // * Serial.print(78, BIN) gives "1001110"
+    // * Serial.print(78, OCT) gives "116"
+    // * Serial.print(78, DEC) gives "78"
+    // * Serial.print(78, HEX) gives "4E"
+    // * Serial.println(1.23456, 0) gives "1"
+    // * Serial.println(1.23456, 2) gives "1.23"
+    // * Serial.println(1.23456, 4) gives "1.2346"
+    // lightVal = buffer;
+
+    // if (analogRead(i2) > 200) {
+    //   analogWrite(d3, 0);
+    // } else {
+    //   analogWrite(d3, 250);
+    // }
+
+
+  while ( Serial.available() )  message.process(Serial.read());
 
 }
 
-void loop() {
+// void pulseJob(pin) {
+//   analogWrite(pin, 250);
+//   delay(2000);
+//   analogWrite(pin, LOW);
+// }
+
+// From Doorduino
+// http://github.com/martymcguire/Doorduino/blob/master/Doorduino.pde
+// Log a system message to console
+// void log(char* message)
+// {
+//   static char timeString[20];
+//   getTime(timeString);
+
+//   Serial.print("[");
+//   Serial.print(timeString);
+//   Serial.print("] DOOR: ");
+//   Serial.println(message);
+
+// }
+
+// void readRTC(time& currentTime)
+// {
+//   Wire.beginTransmission(DS1307);
+//   Wire.send(R_SECS);
+//   Wire.endTransmission();
+
+//   Wire.requestFrom(DS1307, 7);
+//   currentTime.second = bcd2Dec(Wire.receive());
+//   currentTime.minute = bcd2Dec(Wire.receive());
+//   currentTime.hour = bcd2Dec(Wire.receive());
+//   currentTime.wkDay = bcd2Dec(Wire.receive());
+//   currentTime.day = bcd2Dec(Wire.receive());
+//   currentTime.month = bcd2Dec(Wire.receive());
+//   currentTime.year = bcd2Dec(Wire.receive());
+// }
+
+
+// void setRTC(time& newTime)
+// {
+//   Wire.beginTransmission(DS1307);
+//   Wire.send(dec2Bcd(R_SECS));
+//   Wire.send(dec2Bcd(newTime.second));
+//   Wire.send(dec2Bcd(newTime.minute));
+//   Wire.send(dec2Bcd(newTime.hour));
+//   Wire.send(dec2Bcd(newTime.wkDay));
+//   Wire.send(dec2Bcd(newTime.day));
+//   Wire.send(dec2Bcd(newTime.month));
+//   Wire.send(dec2Bcd(newTime.year));
+//   Wire.endTransmission();
+// }
+
+
+// Build a human-readable representation of the current time
+// @string character array to put the time in, must be 20 bytes long
+// void getTime(char* string)
+// {
+//   // Grab the latest time from the RTC
+//   time currentTime;
+//   readRTC(currentTime);
+
+//   // And build a formatted string to represent it
+//   sprintf(string, "20%02d-%02d-%02dT%02d:%02d:%02dZ",
+//                   currentTime.year, currentTime.month, currentTime.day,
+//                   currentTime.hour, currentTime.minute, currentTime.second);
+// }
+
+
+// void setTimeFromSerial()
+// {
+//   time newTime;
+
+//   char temp = 0;
+
+//   // Wait for full time to be received
+//   for (int i = 0; i < 7; i++)
+//   {
+//     while (Serial.available() == 0) {}
+
+//     temp = Serial.read();
+
+//     switch (i) {
+//       case 0: newTime.year = temp; break;
+//       case 1: newTime.month = temp; break;
+//       case 2: newTime.day = temp; break;
+//       case 3: newTime.wkDay = temp; break;
+//       case 4: newTime.hour = temp; break;
+//       case 5: newTime.minute = temp; break;
+//       case 6: newTime.second = temp; break;
+//     }
+//   }
+
+//   setRTC(newTime);
+// }
+
+
+byte bcd2Dec(byte bcdVal)
+{
+  return bcdVal / 16 * 10 + bcdVal % 16;
+}
 
+byte dec2Bcd(byte decVal)
+{
+  return decVal / 10 * 16 + decVal % 10;
 }