arduino 0.3.3 → 0.4

data/README.md

@@ -4,7 +4,7 @@ This gem is a prototyping API for Arduino in Ruby. Helps prototype Arduino progr
 
 #### Setup:
 1. Install the gem: `gem install arduino`
-2. Load [arduino.pde](https://github.com/SingAlong/arduino/raw/master/arduino.pde) onto your Arduino dev board (just once and for all).
+2. Load [arduino.pde](https://github.com/HashNuke/arduino/raw/master/arduino.pde) onto your Arduino dev board (just once and for all).
 3. Import the arduino gem: `require "arduino"`
 
 ## Methods
@@ -65,3 +65,9 @@ The output pins must be set explicitly.
 > &copy; 2010 Akash Manohar <akash@akash.im>
 > under the MIT License
 
+# Credits
+
+Thanks to the following people:
+
+* [@unsymbol](http://github.com/unsymbol) - for fixing the Ubuntu reset problem
+

data/arduino.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "arduino"
-  s.version     = "0.3.3"
+  s.version     = "0.4"
   s.date 				= %q{2011-01-01}
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Akash Manohar"]
@@ -18,10 +18,10 @@ Thank you for installing the arduino gem
 	
 Load the arduino.pde program from http://ln.akash.im/arduino.pde to your board before using this library
 	
-Source: https://github.com/SingAlong/arduino/
+Source: https://github.com/HashNuke/arduino/
 
 --
-SingAlong
+@HashNuke
 (http://akash.im)
 ==============================================
 	}

data/arduino.pde

@@ -1,131 +1,151 @@
-// variable to store the data from the serial port
-int cmd = 0;
-
-// command arguments
-int cmd_arg[2];
-
-
-void setup() {
-  // connect to the serial port
-  Serial.begin(115200);
-  // confirm ready state
-
-  while(Serial.available()<1)
-  {
-    // get number of output pins and convert to int
-    cmd = int(readData()) - 48;
-    for(int i=0; i<cmd; i++)
-    {
-      cmd_arg[0] = int(readData()) - 48;
-      pinMode(cmd_arg[0], OUTPUT);
-    }
-    break;
-  }
-}
-
-void loop()
-{
-
-  askCmd();
-
-  if(Serial.available()>0)
-  {
-    cmd = int(Serial.read()) - 48;
-
-    if(cmd==0) //set digital low
-    {
-      cmd_arg[0] = int(readData()) - 48;
-      digitalWrite(cmd_arg[0],LOW);
-    }
-
-    if(cmd==1) //set digital high
-    {
-      cmd_arg[0] = int(readData()) - 48;
-      digitalWrite(cmd_arg[0],HIGH);
-    }
-
-    if(cmd==2) //get digital value
-    {
-      cmd_arg[0] = int(readData()) - 48;
-      cmd_arg[0] = digitalRead(cmd_arg[0]);
-      Serial.println(cmd_arg[0]);
-    }
-
-    if(cmd==3) // set analog value
-    {
-      Serial.println("I'm in the right place");
-      cmd_arg[0] = int(readData()) - 48;
-      cmd_arg[1] = readHexValue();
-      analogWrite(cmd_arg[0],cmd_arg[1]);
-    }
-
-    if(cmd==4) //read analog value
-    {
-      cmd_arg[0] = int(readData()) - 48;
-      cmd_arg[0] = analogRead(cmd_arg[0]);
-      Serial.println(cmd_arg[0]);
-    }
-  }
-}
-
-char readData()
-{
-  askData();
-
-  while(1)
-  {
-    if(Serial.available()>0)
-    {
-      return Serial.read();
-    }
-  }
-}
-
-
-//read hex value from serial and convert to integer
-int readHexValue()
-{
-  int strval[2];
-  int converted_str;
-
-  while(1)
-  {
-    if(Serial.available()>0)
-    {
-      strval[0] = convert_hex_to_int(Serial.read());
-      break;
-    }
-  }
-
-  askData();
-
-  while(1)
-  {
-    if(Serial.available()>0)
-    {
-      strval[1] = convert_hex_to_int(Serial.read());
-      break;
-    }
-  }
-
-  converted_str = (strval[0]*16) + strval[1];
-  return converted_str;
-}
-
-int convert_hex_to_int(char c)
-{
-  return (c <= '9') ? c-'0' : c-'a'+10;
-}
-
-void askData()
-{
-  Serial.println("?");
-}
-
-void askCmd()
-{
-  askData();
-  while(Serial.available()<=0)
-  {}
-}
-
+// variable to store the data from the serial port
+int cmd = 0;
+
+// command arguments
+int cmd_arg[2];
+
+int serialStatus = 0;
+
+void setup() {
+  // connect to the serial port
+  Serial.begin(115200);
+  setupPins();
+  serialStatus = 1;
+}
+
+void loop()
+{
+
+  if(serialStatus==0)
+  {
+    Serial.flush();
+    setupPins();
+  }
+  askCmd();
+
+  {
+    if(Serial.available()>0)
+    {
+      cmd = int(Serial.read()) - 48;
+  
+      if(cmd==0) //set digital low
+      {
+        cmd_arg[0] = int(readData()) - 48;
+        digitalWrite(cmd_arg[0],LOW);
+      }
+  
+      if(cmd==1) //set digital high
+      {
+        cmd_arg[0] = int(readData()) - 48;
+        digitalWrite(cmd_arg[0],HIGH);
+      }
+  
+      if(cmd==2) //get digital value
+      {
+        cmd_arg[0] = int(readData()) - 48;
+        cmd_arg[0] = digitalRead(cmd_arg[0]);
+        Serial.println(cmd_arg[0]);
+      }
+  
+      if(cmd==3) // set analog value
+      {
+        Serial.println("I'm in the right place");
+        cmd_arg[0] = int(readData()) - 48;
+        cmd_arg[1] = readHexValue();
+        analogWrite(cmd_arg[0],cmd_arg[1]);
+      }
+  
+      if(cmd==4) //read analog value
+      {
+        cmd_arg[0] = int(readData()) - 48;
+        cmd_arg[0] = analogRead(cmd_arg[0]);
+        Serial.println(cmd_arg[0]);
+      }
+  
+      if(cmd==5)
+      {
+        serialStatus = 0;
+      }
+    }
+  }
+}
+
+char readData()
+{
+  askData();
+
+  while(1)
+  {
+    if(Serial.available()>0)
+    {
+      return Serial.read();
+    }
+  }
+}
+
+
+//read hex value from serial and convert to integer
+int readHexValue()
+{
+  int strval[2];
+  int converted_str;
+
+  while(1)
+  {
+    if(Serial.available()>0)
+    {
+      strval[0] = convert_hex_to_int(Serial.read());
+      break;
+    }
+  }
+
+  askData();
+
+  while(1)
+  {
+    if(Serial.available()>0)
+    {
+      strval[1] = convert_hex_to_int(Serial.read());
+      break;
+    }
+  }
+
+  converted_str = (strval[0]*16) + strval[1];
+  return converted_str;
+}
+
+
+int convert_hex_to_int(char c)
+{
+  return (c <= '9') ? c-'0' : c-'a'+10;
+}
+
+
+void askData()
+{
+  Serial.println("?");
+}
+
+
+void askCmd()
+{
+  askData();
+  while(Serial.available()<=0)
+  {}
+}
+
+
+void setupPins()
+{
+  while(Serial.available()<1)
+  {
+    // get number of output pins and convert to int
+    cmd = int(readData()) - 48;
+    for(int i=0; i<cmd; i++)
+    {
+      cmd_arg[0] = int(readData()) - 48;
+      pinMode(cmd_arg[0], OUTPUT);
+    }
+    break;
+  }
+}

data/example_blink.rb

@@ -1,13 +1,15 @@
 require "./lib/arduino"
 
+port = '/dev/ttyUSB0'
+
 #specify the port as an argument
-board = Arduino.new('/dev/ttyUSB0')
+board = Arduino.new(port)
 
 #declare output pins
 board.output(13)
 
 #perform operations
-10.times do
+5.times do
   board.setHigh(13)
   puts "High" if board.getState(13)
   sleep(1)
@@ -15,3 +17,5 @@ board.output(13)
   puts "Low" if !board.getState(13)
   sleep(1)
 end
+
+board.close

data/lib/arduino.rb

@@ -12,126 +12,139 @@ require "serialport"
 
 class Arduino
 
-	# initialize port and baudrate
-	def initialize(port, baudrate=115200)
-	  @serial = SerialPort.new port, baudrate
-	  @serial.sync
-	  @port = port
-	  @outputPins = []
-	  @pinStates = {}
-	end
+    # initialize port and baudrate
+    def initialize(port, baudrate=115200)
+        puts "initialized"
+        data_bits = 8
+        stop_bits = 1
+        parity = SerialPort::NONE
 
-	# Print information about connected board
-	def to_s
-	  "Arduino is on port #{@port} at #{@serial.baud} baudrate"
-	end
-	
-	# Set output pins. This is a must.
-	def output(*pinList)
-	  sendData(pinList.length)
-	
-	  if pinList.class==Array
-	    @outputPins = pinList
-	    pinList.each do |pin|
-	    	sendPin(pin)
-	    end
-	  else
-		 	raise ArgumentError, "Arguments must be a list of pin numbers"
-	  end
-	  return pinList
-	end
+        @serial = SerialPort.new port, baudrate
+        @serial.read_timeout = 2
+        @serial.sync
+        
+        @port = port
+        @outputPins = []
+        @pinStates = {}
+    end
+    
+    # Print information about connected board
+    def to_s
+        "Arduino is on port #{@port} at #{@serial.baud} baudrate"
+    end
+    
+    # Set output pins. This is a must.
+    def output(*pinList)
+        sendData(pinList.length)
+        if pinList.class==Array
+            @outputPins = pinList
+            pinList.each do |pin|
+                sendPin(pin)
+            end
+        else
+            raise ArgumentError, "Arguments must be a list of pin numbers"
+        end
+        puts "return pinlist"
+        return pinList
+    end
+    
+    # Set a pin state to low
+    def setLow(pin)
+        saveState(pin, false)
+        sendData('0')
+        sendPin(pin)
+    end
+    
+    def isLow?(pin)
+        if !getState(pin)
+            return true
+        else
+            return false
+        end
+    end
+    
+    # Set a pin state to high
+    def setHigh(pin)
+        saveState(pin, true)
+        sendData('1')
+        sendPin(pin)
+    end
+    
+    def isHigh?(pin)
+      if getState(pin)
+          return true
+      else
+          return false
+      end
+    end
+    
+    def saveState(pin, state)
+        @pinStates[pin.to_s] = state
+    end
+    
+    # Get state of a digital pin. Returns true if high and false if low.
+    def getState(pin)
+        if @pinStates.key?(pin.to_s)
+            return @pinStates[pin.to_s]
+        end
+        return false
+    end
+    
+    # Write to an analog pin
+    def analogWrite(pin, value)
+        sendData('3')
+        fullHexValue = value.to_s(base=16)
+        hexValue = hexValue[2..fullHexValue.length]
+        if(hexValue.length==1)
+            sendData('0')
+        else
+            sendData(hexValue[0])
+        end
+        sendData(hexValue[1])
+    end
+    
+    # Read from an analog pin
+    def analogRead(pin)
+        sendData('4')
+        sendPin(pin)
+        getData()
+    end
+    
+    # set all pins to low
+    def turnOff
+        @outputPins.each do |pin|
+            setLow(pin)
+        end
+    end
+    
+    # close serial connection to connected board
+    def close
+        # stops executing arduino code
+        @serial.write '5'.chr  
+        # resets the arduino board (not on windows)   
+        @serial.dtr=(0) 
+        # close serial connection
+        @serial.close
+        p "closed"
+    end
+    
+    private
+    
+    def sendPin(pin)
+        pinInChar = (pin+48)
+        sendData(pinInChar)
+    end
 
-	# Set a pin state to low
-	def setLow(pin)
-		saveState(pin, false)
-	  sendData('0')
-	  sendPin(pin)
-	end
-	
-	def isLow?(pin)
-		if !getState(pin)
-			return true
-		else
-			return false
-		end
-	end
-	
-	# Set a pin state to high
-	def setHigh(pin)
-		saveState(pin, true)
-	  sendData('1')
-	  sendPin(pin)
-	end
-	
-	def isHigh?(pin)
-		if getState(pin)
-			return true
-		else
-			return false
-		end
-	end
-	
-	def saveState(pin, state)
-		@pinStates[pin.to_s] = state
-	end
-
-		# Get state of a digital pin. Returns true if high and false if low.
-	def getState(pin)
-		if @pinStates.key?(pin.to_s)
-			return @pinStates[pin.to_s]
-		end
-	  return false
-	end
-	
-	# Write to an analog pin
-	def analogWrite(pin, value)
-		sendData('3')
-	  fullHexValue = value.to_s(base=16)
-	  hexValue = hexValue[2..fullHexValue.length]
-	  if(hexValue.length==1)
-	  	sendData('0')
-	  else
-	    sendData(hexValue[0])
-	  end
-	  sendData(hexValue[1])
-	end
-
-	# Read from an analog pin
-	def analogRead(pin)
-	  sendData('4')
-	  sendPin(pin)
-	  getData()
-	end
-
-	# set all pins to low
-	def turnOff
-	  @outputPins.each do |pin|
-	    setLow(pin)
-	  end
-	end
-
-	# close serial connection to connected board
-	def close
-		@serial.close
-	end
-
-	private
-
-	def sendPin(pin)
-	  pinInChar = (pin+48)
-	  sendData(pinInChar)
-	end
-
-	def sendData(serialData)
-	  while true
-			break	if getData()=="?"
-	  end
-	  s = String(serialData.chr)
-	  x = @serial.write (s)
-	end
-
-	def getData
-	  cleanData = @serial.readlines()
-	  cleanData = cleanData.join("").gsub("\n","").gsub("\r","")
-	end
+    def sendData(serialData)
+        while true
+            break if getData()=="?"
+        end
+        s = String(serialData.chr)
+        x = @serial.write s
+    end
+    
+    def getData
+        cleanData = @serial.readlines()
+        cleanData = cleanData.join("").gsub("\n","").gsub("\r","")
+    end
 end

metadata

@@ -1,47 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: arduino
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+version: !ruby/object:Gem::Version
+  version: '0.4'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Akash Manohar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-01 00:00:00 +05:30
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-01-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: serialport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70182320491400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
-  version_requirements: *id001
-description: A ruby library to talk to Arduino without having to burn programs repeatedly to the board
-email: 
+  prerelease: false
+  version_requirements: *70182320491400
+description: A ruby library to talk to Arduino without having to burn programs repeatedly
+  to the board
+email:
 - akash@akash.im
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -52,49 +40,31 @@ files:
 - arduino.pde
 - example_blink.rb
 - lib/arduino.rb
-has_rdoc: true
 homepage: http://akash.im/arduino-ruby
 licenses: []
-
-post_install_message: "\n\
-  ==============================================\n\
-  Thank you for installing the arduino gem\n\
-  ----------------------------------------------\n\
-  \t\n\
-  Load the arduino.pde program from http://ln.akash.im/arduino.pde to your board before using this library\n\
-  \t\n\
-  Source: https://github.com/SingAlong/arduino/\n\n\
-  --\n\
-  SingAlong\n\
-  (http://akash.im)\n\
-  ==============================================\n\
-  \t"
+post_install_message: ! "\n==============================================\nThank you
+  for installing the arduino gem\n----------------------------------------------\n\t\nLoad
+  the arduino.pde program from http://ln.akash.im/arduino.pde to your board before
+  using this library\n\t\nSource: https://github.com/HashNuke/arduino/\n\n--\n@HashNuke\n(http://akash.im)\n==============================================\n\t"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: arduino
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Arduino Prototyping API for Ruby
 test_files: []
-