atduskgreg-rad 0.2.5 → 0.3.0.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.0 2008-09-22
+* Pushing to rubyforge.. 
+	- added rad install arduino
+	- added rad test arduino
+
 == 0.2.5 2008-07-21
 * 1ish large post Bastille Day update:
 	- added i2c capability

data/Manifest.txt

@@ -3,8 +3,6 @@ License.txt
 Manifest.txt
 README.rdoc
 Rakefile
-bin/hello_world_test/Makefile
-bin/hello_world_test/hello_world.cpp
 bin/rad
 lib/examples/add_hysteresis.rb
 lib/examples/basic_blink.rb
@@ -103,10 +101,12 @@ lib/rad.rb
 lib/rad/README.rdoc
 lib/rad/arduino_plugin.rb
 lib/rad/arduino_sketch.rb
+lib/rad/darwin_installer.rb
 lib/rad/generators/makefile/makefile.erb
 lib/rad/generators/makefile/makefile.rb
 lib/rad/hardware_library.rb
 lib/rad/init.rb
+lib/rad/linux_installer.rb
 lib/rad/progressbar.rb
 lib/rad/rad_processor.rb
 lib/rad/rad_rewriter.rb
@@ -127,6 +127,8 @@ spec/models/sketch_compiler_spec.rb
 spec/models/spec_helper.rb
 spec/sim/hello_world_spec.rb
 spec/spec.opts
+test/hello_world_test/Makefile
+test/hello_world_test/hello_world.cpp
 test/test_array_processing.rb
 test/test_plugin_loading.rb
 test/test_translation_post_processing.rb

data/bin/rad

@@ -14,6 +14,8 @@ require 'readline'
 
 require File.expand_path(File.dirname(__FILE__)) + "/../lib/rad/version.rb"
 require File.expand_path(File.dirname(__FILE__)) + "/../lib/rad/progressbar.rb"
+require File.expand_path(File.dirname(__FILE__)) + "/../lib/rad/linux_installer.rb"
+require File.expand_path(File.dirname(__FILE__)) + "/../lib/rad/darwin_installer.rb"
 
 class OptionParser #:nodoc:
     
@@ -94,28 +96,18 @@ end
 
 
 if ARGV[0] == "install"
-  raise "Sorry. Can only install Arduino on Mac OS X. See here for Linux instructions: http://www.arduino.cc/playground/Learning/Linux" unless RUBY_PLATFORM =~ /darwin/
-  puts "Downloading arduino-0012 for Mac from Arduino.cc"
-  File.open("/Applications/arduino-0012.zip", "w") do |file|
-    pbar = nil
-    file << open("http://www.arduino.cc/files/arduino-0012-mac.zip",
-    :content_length_proc => lambda {|t|
-      if t && 0 < t
-        pbar = ProgressBar.new(" Progress", t)
-        pbar.file_transfer_mode
-      end
-    },
-    :progress_proc => lambda {|s|
-      pbar.set s if pbar
-    }).read
-    pbar.finish
+  
+  case RUBY_PLATFORM
+  when /linux/
+    LinuxInstaller.install!
+  when /darwin/
+    DarwinInstaller.install!
+  else
+    raise "Sorry. Can only install Arduino on Mac OS X. See here for Linux instructions: http://www.arduino.cc/playground/Learning/Linux"
   end
-  puts "Unzipping..."
-  `cd /Applications; unzip arduino-0012.zip`
-  `rm /Applications/arduino-0012.zip`
-  puts "installed Arduino here: /Applications/arduino-0012"
+
 elsif ARGV[0] == "test"
-  test_dir = File.expand_path(File.dirname(__FILE__)) + "/../bin/hello_world_test"
+  test_dir = File.expand_path(File.dirname(__FILE__)) + "/../test/hello_world_test"
   puts "Compiling hello_world.cpp to test your Arduino."
   puts "cd #{test_dir}; make depend; make;"
   `cd #{test_dir}; make depend; make;`
@@ -176,6 +168,14 @@ else
   FileUtils.mkdir_p "#{sketch_name}/vendor/libraries"
   puts "Successfully created your libraries directory."
   
+  FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/AF_XPort/.", "#{sketch_name}/vendor/libraries/AF_XPort"
+  puts "Installed AF_XPort into #{sketch_name}/vendor/libraries"
+  puts
+
+  FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/AFSoftSerial/.", "#{sketch_name}/vendor/libraries/AFSoftSerial"
+  puts "Installed AFSoftSerial into #{sketch_name}/vendor/libraries"
+  puts
+  
   FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/DS1307/.", "#{sketch_name}/vendor/libraries/DS1307"
   puts "Installed DS1307 into #{sketch_name}/vendor/libraries"
   puts

data/lib/examples/hello_array2.rb

@@ -24,7 +24,12 @@ class HelloArray2 < ArduinoSketch
  array "int pizzas[] = {1,2,3,4}"
  array "byte buffer[20] = {'A', 'B', 'Z', 'C', 'Y', 'D', 'W', 'E', '%', 'H', '*', '!', ')', '=', 'P', '-', '+', 'R', 'I', 'K'}"
  
- output_pin 14, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
+ ## multidimensional arrays
+ array 'int @my_numbers[3][4] = {{1,2,3,4},{5,6,7,8},{9,10,11,12}}'
+ array 'char* @pizzas[2][4] = {{"margherita","funghi","napoletana","prosciutto cotto"},{"veggie","pepperoni","cheese","kitchen sink"}}'
+ 
+ 
+ output_pin 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
  
  
  def setup
@@ -56,6 +61,8 @@ class HelloArray2 < ArduinoSketch
    
    delay 3000
    
+
+   
    my_lcd.clearline 1, @names[2]
    my_lcd.print " [ "
    my_lcd.print pizzas[1]
@@ -63,6 +70,32 @@ class HelloArray2 < ArduinoSketch
    
    delay 2000
    
+   my_lcd.clearscr "Multidimensional ?n"
+   
+   0.upto(2) do |f|
+     0.upto(3) do |s|
+       my_lcd.print @my_numbers[f][s]
+       my_lcd.print ", "
+       delay 500
+     end
+   end
+   
+   delay 1000
+   
+   my_lcd.clearscr
+
+    0.upto(1) do |f|
+      0.upto(3) do |s|
+        my_lcd.print @pizzas[f][s]
+        my_lcd.print ", "
+        delay 500
+      end
+    end
+
+
+
+    delay 2000
+   
    my_lcd.clearscr "Array Load?n"
    1.upto(20) do |x|
 #     buffer[x] = 64 + x  # we cannot set array elements yet except to initialize in declaration

data/lib/rad/arduino_sketch.rb

@@ -204,6 +204,7 @@ class ArduinoSketch
   def array(arg)
     if arg
         arg = arg.chomp.rstrip.lstrip
+        arg.sub!("@","__")
         name = arg.scan(/\s*(\w*)\[\d*\]?/).first.first
         # help rad_processor do a better job with array types
         types = ["int", "long", "char*", "unsigned int", "unsigned long", "byte", "bool", "float" ]

data/lib/rad/linux_installer.rb

@@ -0,0 +1,132 @@
+class LinuxInstaller
+  
+  # this is the thing we actually run to make something happen
+  def self.install!
+    puts "Welcome to the RAD Linux Installer!"
+    puts "-----------------------------------"
+    puts "Let's begin."
+    puts
+    
+    check_or_warn_for_usb_driver
+    
+    # of course we need rubygems
+    # maybe just rely on the user installing rubygems, because the ubuntu one sux
+    #check_or_install_package("rubygems")
+    #%x{gem update --system}
+    
+    # we need java to make this ship float
+    check_or_nag_package("sun-java5-jre")
+    
+    # remove a package that interferes with the arduino usb/serial driver
+    check_or_remove_package("brltty")
+    
+    # install pre-requisites
+    check_or_install_package("binutils-avr")
+    check_or_install_package("gcc-avr")
+    check_or_install_package("avr-libc")
+    check_or_install_package("unzip")
+    check_or_install_package("wget")
+    
+    # remove a probably out of date avrdude
+    check_or_remove_package("avrdude")
+    
+    # install pre-requisites for avrdude if we wanted to build from source
+    # nah, it comes with the arduino binary
+    #check_or_install_package("gcc")
+    #check_or_install_package("bison")
+    #check_or_install_package("flex")
+    check_or_install_arduino
+  end
+  
+  def self.check_or_install_package(package_name)
+  	package = %x{dpkg --get-selections | grep #{package_name}}
+  	if package.include?("\tinstall")
+  		puts "#{package_name} installed!"
+  	else
+  		puts "installing #{package_name}..."
+  		%x{apt-get install -y #{package_name}}
+  	end
+  end
+  
+  def self.check_or_nag_package(package_name, custom_msg = nil)
+  	package = %x{dpkg --get-selections | grep #{package_name}}
+  	if package.include?("\tinstall")
+  		puts "#{package_name} installed!"
+  	else
+  		puts "you will need to manually install #{package_name}! use the command below."
+  		if custom_msg
+  			puts custom_msg
+  		else
+  			puts "sudo apt-get install #{package_name}"
+  		end		
+  		exit
+  	end
+  end
+  
+  def self.check_or_remove_package(package_name)
+  	package = %x{dpkg --get-selections | grep #{package_name}}
+  
+  	#an easier way to check for installed packages?
+  	if package.include?("\tinstall")
+  		puts "removing #{package_name}..."
+  		%x{apt-get remove -y #{package_name}}
+  	else
+  		puts "#{package_name} previously uninstalled!"
+  	end
+  end
+  
+  def self.check_or_warn_for_usb_driver
+  
+  	# check if usb device recognized by system
+  	puts "Please plug in your arduino to your usb port... [hit enter to continue]"
+  	STDIN.gets # we patiently wait
+  
+  	usb = %x{dmesg | tail | grep "FTDI USB Serial" | grep -c "now attached"}
+  
+  	if usb.to_i == 0
+  		# maybe we can be nice here and offer to download and install the driver package
+  		puts "the system is not recognizing your usb-serial driver, please re-install"
+  		exit
+  	end
+  end
+  
+  def self.check_or_install_arduino 
+  	if File.exist?("/usr/local/arduino-0012")
+  		puts "arduino software previously installed at /usr/local/arduino-0012 !"
+  	else
+  		puts "installing arduino software..."
+  		%x{cd /usr/local/; wget http://arduino.cc/files/arduino-0012-linux.tgz}
+  		%x{tar -C /usr/local -xzf /usr/local/arduino-0012-linux.tgz}
+  
+  		%x{ln -s /usr/local/arduino-0012/arduino ~/Desktop/arduino}
+  
+  		# gotta patch it so it can run from command line or anywhere
+  		arduino_file = File.open("/usr/local/arduino-0012/arduino") {|f| f.read}
+  		new_doc = arduino_file.split("\n")
+  		new_doc[1] = "cd /usr/local/arduino-0012"
+  		File.open("/usr/local/arduino-0012/arduino", "w") {|f| f.puts new_doc }
+  
+  		%x{mkdir -p /usr/local/arduino-0012/hardware/tools/avr/bin}
+  		# there is a difference from what the makefile expects to where it is
+  		%x{ln -s /usr/bin/avr-gcc /usr/local/arduino-0012/hardware/tools/avr/bin/avr-gcc}		
+  		%x{ln -s /usr/bin/avr-g++ /usr/local/arduino-0012/hardware/tools/avr/bin/avr-g++}
+  		%x{ln -s /usr/bin/avr-ar /usr/local/arduino-0012/hardware/tools/avr/bin/avr-ar}
+  		%x{ln -s /usr/bin/avr-objcopy /usr/local/arduino-0012/hardware/tools/avr/bin/avr-objcopy}
+  		%x{ln -s /usr/local/arduino-0012/hardware/tools/avrdude /usr/local/arduino-0012/hardware/tools/avr/bin/avrdude}
+  		%x{ln -s /usr/local/arduino-0012/hardware/tools/avrdude.conf /usr/local/arduino-0012/hardware/tools/avr/etc/avrdude.conf}
+  
+  
+  		puts
+  		puts "************************************************************************"
+  		puts "**  please add /usr/local/arduino-0012 to your path!                  **"
+  		puts "**  you will also need to run sudo update-alternatives --config java  **"
+  		puts "**  to choose java-1.50-sun as the default java                       **"
+  		puts "************************************************************************"
+  		puts
+  	end
+  	
+  end
+end
+
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: atduskgreg-rad
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0.1
 platform: ruby
 authors: 
 - Greg Borenstein
@@ -47,8 +47,8 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- bin/hello_world_test/Makefile
-- bin/hello_world_test/hello_world.cpp
+- test/hello_world_test/Makefile
+- test/hello_world_test/hello_world.cpp
 - bin/rad
 - lib/examples/add_hysteresis.rb
 - lib/examples/basic_blink.rb
@@ -153,7 +153,8 @@ files:
 - lib/rad/init.rb
 - lib/rad/progressbar.rb
 - lib/rad/rad_processor.rb
-- lib/rad/rad_rewriter.rb
+- lib/rad/linux_installer.rb
+- lib/rad/darwin_installer.rblib/rad/rad_rewriter.rb
 - lib/rad/rad_type_checker.rb
 - lib/rad/sim/arduino_sketch.rb
 - lib/rad/sketch_compiler.rb
@@ -184,8 +185,6 @@ files:
 - website/examples/gps_reader.rb.html
 - website/examples/hello_world.rb.html
 - website/examples/serial_motor.rb.html
-- bin/Makefile
-- bin/hello_world.cpp
 has_rdoc: true
 homepage: http://github.com/atduskreg/rad
 post_install_message: 
@@ -212,6 +211,6 @@ rubyforge_project: rad
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: "RAD: Ruby Arduino Development - 0.2.5.5"
+summary: "RAD: Ruby Arduino Development - 0.3.0.2"
 test_files: []
 

data/lib/rad/rad_rewriter.rb

@@ -1,94 +0,0 @@
-require 'ruby_to_ansi_c'
-
-class RADRewriter < Rewriter
-  
-  def process_iter(exp)
-    call = process exp.shift
-    var  = process exp.shift
-    body = process exp.shift
-
-    var = s(:dasgn_curr, Unique.next) if var.nil?
-
-    assert_type call, :call
-
-    if call[2] != :each then # TODO: fix call[n] (api)
-      call.shift # :call
-      lhs = call.shift
-      method_name = call.shift
-
-      case method_name
-      when :downto then
-        var.shift # 
-        start_value = lhs
-        finish_value = call.pop.pop # not sure about this
-        var_name = var.shift
-        body.find_and_replace_all(:dvar, :lvar)
-        result = s(:dummy,
-                   s(:lasgn, var_name, start_value),
-                   s(:while,
-                     s(:call, s(:lvar, var_name), :>=,
-                       s(:arglist, finish_value)),
-                     s(:block,
-                       body,
-                       s(:lasgn, var_name,
-                         s(:call, s(:lvar, var_name), :-,
-                           s(:arglist, s(:lit, 1))))), true))
-      when :upto then
-        # REFACTOR: completely duped from above and direction changed
-        var.shift # 
-        start_value = lhs
-        finish_value = call.pop.pop # not sure about this
-        var_name = var.shift
-        body.find_and_replace_all(:dvar, :lvar)
-        result = s(:dummy,
-                   s(:lasgn, var_name, start_value),
-                   s(:while,
-                     s(:call, s(:lvar, var_name), :<=,
-                       s(:arglist, finish_value)),
-                     s(:block,
-                       body,
-                       s(:lasgn, var_name,
-                         s(:call, s(:lvar, var_name), :+,
-                           s(:arglist, s(:lit, 1))))), true))
-       when :times then
-         # REFACTOR: mostly duped from above and gave default start value of 0
-         # and a finish value that was the start value above
-         var.shift 
-         start_value = s(:lit, 0)
-         finish_value = lhs
-         var_name = var.shift
-         body.find_and_replace_all(:dvar, :lvar)
-         result = s(:dummy,
-                    s(:lasgn, var_name, start_value),
-                    s(:while,
-                      s(:call, s(:lvar, var_name), :<,
-                        s(:arglist, finish_value)),
-                      s(:block,
-                        body,
-                        s(:lasgn, var_name,
-                          s(:call, s(:lvar, var_name), :+,
-                            s(:arglist, s(:lit, 1))))), true))
-      when :define_method then
-        # BEFORE: [:iter, [:call, nil, :define_method, [:array, [:lit, :bmethod_added]]], [:dasgn_curr, :x], [:call, [:dvar, :x], :+, [:array, [:lit, 1]]]]
-        # we want to get it rewritten for the scope/block context, so:
-        #   - throw call away
-        #   - rewrite to args
-        #   - plop body into a scope
-        # AFTER:  [:block, [:args, :x], [:call, [:lvar, :x], :+, [:arglist, [:lit, 1]]]]
-        var.find_and_replace_all(:dasgn_curr, :args)
-        body.find_and_replace_all(:dvar, :lvar)
-        result = s(:block, var, body)
-      else
-        # HACK we butchered call up top
-        result = s(:iter, s(:call, lhs, method_name, call.shift), var, body)
-      end
-    else
-      if var.nil? then
-        var = s(:lvar, Unique.next)
-      end
-
-      s(:iter, call, var, body)
-    end
-  end
-
-end