build/bin/arduino-ide @@ -3,3 +3,5 @@ conf.yml *.swp log/*.yml *.bak +firmware/arduino/arduino-0017/* +firmware/arduino/arduino-0017 .gitignore @@ -32,8 +32,10 @@ end task :build => :check_version_provided do here = Dir.pwd + abort("You need to provide the arduino ide in firmware/arduino/arduino-0017") unless File.exists?("firmware/arduino/arduino-0017") `rm -rf /tmp/build` if File.exists?('/tmp/build') - `cp -L -R build /tmp/build` + `cp -R build /tmp/build` + `cp -R ../opensprints /tmp/build/` Dir.chdir('/tmp/build') `debuild --no-tgz-check` Dir.chdir(here) Rakefile @@ -8,5 +8,5 @@ Homepage: http://www.opensprints.org Package: opensprints Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, build-essential, libssl-dev, libreadline5-dev, zlib1g-dev, gcc-avr, avr-libc, make, gtkterm, avrdude, binutils-avr +Depends: ${shlibs:Depends}, ${misc:Depends}, build-essential, libssl-dev, libreadline5-dev, zlib1g-dev, gcc-avr, avr-libc, make, gtkterm, avrdude, binutils-avr, sun-java6-jre Description: A program for running goldsprints build/debian/control @@ -1,4 +1,5 @@ opensprints/* /opt/opensprints bin/shoes2.run /opt/opensprints bin/opensprints /usr/bin +bin/arduino-ide /usr/bin shortcuts/opensprints.desktop /usr/share/applications build/debian/install @@ -113,6 +113,9 @@ void checkSerial(){ charBuffLen = 0; isReceivingRaceLength = true; } + if(val == 'v') { + Serial.print("basic-1"); + } if(val == 'g') { for(int i=0; i<=3; i++) { firmware/arduino/basic_msg/basic_msg.pde @@ -362,10 +362,14 @@ class ConfigController < Shoes::Main stack do version = `dpkg-query -W -f='${Version}' opensprints` version = File.readlines('build/debian/changelog').first.gsub(/.*\((.*)\).*/,'\1').strip if version.empty? - para "You're using version: #{version}" - button("Update!", :width => 200) do + para "You're using software version: #{version}" + button("Update the software!", :width => 200) do `update-manager` end + para "You're using firmware version: #{SENSOR.version}" + button("Update the firmware", :width => 200) do + `arduino-ide` + end end end end lib/controllers/config_controller.rb @@ -1,16 +1,49 @@ #Arduino: a sensor written for the arduino open source hardware. class Sensor attr_accessor :queue + attr_accessor :version def initialize(filename=nil) raise MissingArduinoError unless File.writable?(filename) #HACK oogity boogity magic happens here: `stty -F #{filename} cs8 115200 ignbrk -brkint -icrnl -imaxbel -opost -onlcr -isig -icanon -iexten -echo -echoe -echok -echoctl -echoke -noflsh -ixon -crtscts` @f = File.open(filename, 'w+') ticks = ($RACE_DISTANCE / $ROLLER_CIRCUMFERENCE).floor + get_version + send_length(ticks) + end + + def get_version + @f.flush + @f.putc ?v + @f.putc ?\r + @f.flush + begin + Timeout.timeout(1){ + @version = @f.readline + } + rescue Timeout::Error + puts "Timeout getting version" + end + puts @version + end + + def send_length(ticks) + @f.flush @f.putc ?l @f.putc(ticks % 256) @f.putc(ticks / 256) @f.putc ?\r + begin + Timeout.timeout(1){ + @length_status = @f.readline + } + rescue Timeout::Error + puts "Timeout setting length" + else + #TODO raise an ErrorReceivingTickLength and catch it in the app. + #raise @length_status unless @length_status=~/OK/ + end + puts @length_status end def start lib/sensors/basic_message_arduino_sensor.rb @@ -1,9 +1,13 @@ -#Arduino: a sensor written for the arduino open source hardware. +#Mock: a sensor intended to mock the behavior of the basic_message arduino firmware. The behavior will always repeat: the first racer will go fast, the second slow, the third will go as fast as the first and the fourth will give up after 2 seconds. class Sensor attr_accessor :r def initialize(filename=nil) end + def version + "mock-1" + end + def start @fast,@slow,@random = [[]]*3 lib/sensors/mock_sensor.rb build/opensprints 9458b15615653518c7a4ba394b4e430436bb0b22 Evan Farrar evanfarrar@gmail.com http://github.com/evanfarrar/opensprints/commit/dee6ae6a0e92a3c7197fb65bd07ae661df08fca4 dee6ae6a0e92a3c7197fb65bd07ae661df08fca4 2009-10-25T20:16:37-07:00 2009-10-25T20:16:37-07:00 Adds a button to start the arduino ide to the config->upgrade screen to upgrade your firmware. b045edae8b29cc60721f7fa812edc2884e2b6678 Evan Farrar evanfarrar@gmail.com