rad 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.1 2007-10-29
+* 2 major fixes:
+  * explicitly specify path to arduino avr tools (this was broken on systems that didn't have the avr toolchain installed, oops)
+  * add explicit path to avrdude.conf in the upload make target
+
 == 0.1.0 2007-10-28
 * 4ish major updates:
   * Arduino interop has been updated, and consequently now requires Arduino 0010:

data/lib/rad/generators/makefile/makefile.erb

@@ -72,6 +72,7 @@ MCU = <%= params['mcu'] %>
 F_CPU = 16000000
 FORMAT = ihex
 UPLOAD_RATE = 19200
+BIN_DIR = <%= params['arduino_root'] %>/hardware/tools/avr/bin
 
 # Name of this Makefile (used for "make depend").
 MAKEFILE = Makefile
@@ -113,17 +114,17 @@ AVRDUDE_PROGRAMMER = stk500
 AVRDUDE_PORT = $(PORT)
 AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
 AVRDUDE_FLAGS = -F -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
-  -b $(UPLOAD_RATE)
+  -b $(UPLOAD_RATE) -C <%= params['arduino_root'] %>/hardware/tools/avr/etc/avrdude.conf
 
 # Program settings
-CC = avr-gcc
-CXX = avr-g++
-OBJCOPY = avr-objcopy
-OBJDUMP = avr-objdump
-AR  = avr-ar
-SIZE = avr-size
-NM = avr-nm
-AVRDUDE = avrdude
+CC = $(BIN_DIR)/avr-gcc
+CXX = $(BIN_DIR)/avr-g++
+OBJCOPY = $(BIN_DIR)/avr-objcopy
+OBJDUMP = $(BIN_DIR)/avr-objdump
+AR  = $(BIN_DIR)/avr-ar
+SIZE = $(BIN_DIR)/avr-size
+NM = $(BIN_DIR)/avr-nm
+AVRDUDE = $(BIN_DIR)/avrdude
 REMOVE = rm -f
 MV = mv -f
 

data/lib/rad/tasks/build_and_make.rake

@@ -7,7 +7,7 @@ namespace :make do
   task :upload => :compile do
     puts "Reset the Arduino (unless yours has auto-reset!) and hit enter."
     STDIN.gets.chomp
-    sh %{#{Makefile.software_params['arduino_root']}/hardware/tools/avr/bin/avrdude -F -p #{Makefile.hardware_params['mcu']} -P #{Makefile.hardware_params['serial_port']} -c stk500v1 -b 19200 -U flash:w:#{[RAD_ROOT,@sketch_name,@sketch_name].join '/'}.hex}
+    sh %{#{Makefile.software_params['arduino_root']}/hardware/tools/avr/bin/avrdude -F -p #{Makefile.hardware_params['mcu']} -P #{Makefile.hardware_params['serial_port']} -c stk500v1 -b 19200 -C #{Makefile.software_params['arduino_root']}/hardware/tools/avr/etc/avrdude.conf -U flash:w:#{[RAD_ROOT,@sketch_name,@sketch_name].join '/'}.hex}
   end
   
   desc "generate a makefile and use it to compile the .cpp"

data/lib/rad/version.rb

@@ -2,7 +2,7 @@ module Rad #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rad
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-10-28 00:00:00 -07:00
+  version: 0.1.1
+date: 2007-10-29 00:00:00 -07:00
 summary: A framework for programming the Arduino physcial computing platform using Ruby. RAD converts Ruby scripts written using a set of Rails-like conventions and helpers into C source code which can be compiled and run on the Arduino microcontroller.
 require_paths: 
 - lib