mkduino 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de0f4ee565df942d0e8e9f2dccd172fdf20b3641
-  data.tar.gz: 2cc271faf1f3776cbcb7efab8667f68cbe39190f
+  metadata.gz: c5b152daf399b2dd6353a039f14877097a22e6dd
+  data.tar.gz: c21b7d3d1a43177e7b9e8caaa9f69418183e262c
 SHA512:
-  metadata.gz: 38d1996ef00ea152d12c75eba66caa81c1424776f86b24b1732f005bfd01a9788eff1ff2fdca114d45fe3d9c9694f376788ece36c60069c232192ea82f8a3363
-  data.tar.gz: 7aad23e98edaf57cee23f1c0c585dbe2f53d9dfdad09dca114bc04c4eb8d0faa69d202e0e6a558b97e3bab1b9cf53c9280aa614b3c4b1a23440a5152a19cce78
+  metadata.gz: 4deedcc41a23c012c4310c38ee55b1589dc130ea9aa24fa2e815dc1b865ceaab4647d7b1ebcc5376e20c3ec4de3e8390687a89bfa641b626af076ac220be5e2e
+  data.tar.gz: 12ab946a5607b571214ce95f0b4f4e9350a9d709559bddbeee31f023c99191c71c7170972bd0aaa827fe6d2c10561f9ae0885914682acf64a1daa98015415406

data/bin/mkduino

@@ -34,15 +34,29 @@ require "mkduino"
 require 'optparse'
 
 options = {}
+default_options = {}
+probed_options = {}
+probe = Mkduino::Probe.new
+
 OptionParser.new do |opts|
-  options[:verbose] = false
-  options[:git] = false
-  options[:update] = false
-  options[:overwrite] = false
-  options[:num_args] = ARGV.length
-  options[:autoconfigure] = false
-  options[:device] = "standard"
+  default_options[:verbose] = false
+  default_options[:git] = false
+  default_options[:update] = false
+  default_options[:overwrite] = false
+  default_options[:mcu] = "atmega328p"
+  default_options[:num_args] = ARGV.length
+  default_options[:autoconfigure] = false
+  default_options[:device] = "/dev/ttyUSB0"
+  default_options[:variant] = "standard"
+  default_options[:clock_speed] = "16000000"
+  default_options[:baud_rate] = "57600"
+  default_options[:programmer] = "arduino"
   opts.banner = "Usage: #{opts.program_name} [options]"
+  opts.on("-p","--[no-]probe","Probe for stuff") do |v|
+    probe.probe
+    probed_options.merge! probe.options
+  end
+
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
     options[:verbose] = v
   end
@@ -55,21 +69,47 @@ OptionParser.new do |opts|
   opts.on('-a',"--[no-]autoconfigure","automatically run autogen.sh and configure") do |v|
     options[:autoconfigure] = v
   end
+
+  opts.on("-b","--board BOARD",Mkduino::Probe::BOARDS.keys,"Arduino Board Type", "#{Mkduino::Probe::BOARDS.keys.join(',')}") do |v|
+    options.merge! Mkduino::Probe::BOARDS[v]
+  end
+
+  opts.on("--programmer PROGRAMMER",["arduino","stk500"],"AVRDUDE Programmer type", "arduino, stk500") do |v|
+    options[:programmer] = v
+  end
+
+
   opts.on("-o","--[no-]overwrite","Overwrite current project files") do |v|
     options[:overwrite] = v
   end
+
+  opts.on("-c","--clock SPEED",Integer,"Clock speed") do |v|
+    options[:clock_speed] = v
+  end
+
+  opts.on("-t","--type TYPE",["mega","standard"],"Arduino library type (aka variant)") do |v|
+    options[:variant] = v
+  end
+
+  opts.on("-d","--device DEVICE","Arduino programming device.","Example: /dev/ttyUSB0.") do |v|
+    options[:device] = v
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
   end
 
-  if options[:num_args] < 1
+  if( default_options[:num_args] < 1)
     puts opts
     exit
   end
-
 end.parse!
 
+
+default_options.merge!( probed_options.merge!( options ) )
+
+
 if !options[:overwrite] && Mkduino::GENERATED_FILES.collect do |gf|
     Pathname.new("Makefile.am").exist? ? true : nil
   end.compact.any?
@@ -79,7 +119,7 @@ end
 
 
 
-ma = Mkduino::MakefileAm.new
+ma = Mkduino::MakefileAm.new "Makefile.am", options
 ma.find_arduino_libraries '/usr/share/arduino/libraries'
 ma.find_arduino_libraries '/usr/share/arduino/hardware/arduino/cores'
 ma.find_source_files

data/lib/makefile_am.rb

@@ -24,15 +24,19 @@
 #
 
 module Mkduino
-  class MakefileAm
+  class MakefileAm < Mkduino::GeneratedFile
     attr_accessor :source_files, :header_files, :arduino_sources
     attr_accessor :project_name, :project_author, :project_dir
     attr_accessor :project_includes
+
+    attr_accessor :mcu, :clock_speed, :variant, :device, :baud_rate, :programmer
+
     # future stuff
     attr_accessor :git_project
-    attr_accessor :board, :common_includes
+    attr_accessor :common_includes
 
-    def initialize
+    def initialize output_filename, options
+      super output_filename, options
       @project_dir =  Dir.pwd
       @project_name = File.basename @project_dir
       @project_name.tr!('.-','__')
@@ -44,11 +48,20 @@ module Mkduino
       @arduino_libraries = []
       @project_author = {}
       @git_project = nil
+
+      @options = options
+      @mcu = @options[:mcu] || "atmega328p"
+      @clock_speed = @options[:clock_speed] || "16000000"
+      @variant = @options[:variant] || "standard"
+      @device = @options[:device] || "/dev/USB0"
+      @baud_rate = @options[:baud_rate] || "57600"
+      @programmer = @options[:programmer] || "arduino"
+
       @common_libraries = ['arduino', 'spi','wire']
       @libraries_to_skip = {
-        'standard' => ['Esplora','GSM','Robot_Control','Robot_Motor','TFT','robot']
+        'standard' => ['Esplora','GSM','Robot_Control','Robot_Motor','TFT','robot'],
+        'mega' => ['Esplora','GSM','Robot_Control','Robot_Motor','TFT','robot']
       }
-      @board='standard'
       @project_author[:username] = ENV['USERNAME']
       git_exists = `which git`.chomp
       if git_exists &&  git_exists.length > 0
@@ -163,7 +176,7 @@ module Mkduino
       Find.find(libraries_dir) do |path|
         if FileTest.directory?(path)
           if File.basename(path)[0] == ?. || File.basename(path) == 'examples' ||
-              (@libraries_to_skip[@board] && @libraries_to_skip[@board].include?(File.basename(path)) )
+              (@libraries_to_skip[@variant] && @libraries_to_skip[@variant].include?(File.basename(path)) )
             Find.prune       # Don't look any further into this directory.
           else
             if File.dirname(path) == libraries_dir
@@ -246,18 +259,18 @@ MAIN_CPP
 
 
     def write_makefile_am
-      puts "Writing Makefile.am"
-      File.open('Makefile.am',"w") do |f|
+      puts "Writing #{@output_file}"
+      write_file do |f|
         f.puts <<-MAKEFILE_AM
 ## Process this file with automake to produce Makefile.in
 bin_PROGRAMS=#{self.project_name}
-# MCU=atmega1280
-MCU=atmega328p
-F_CPU=-DF_CPU=16000000
+
+MCU=#{self.mcu}
+F_CPU=-DF_CPU=#{self.clock_speed}
 ARDUINO_VERSION=-DARDUINO=105
 ARDUINO_INSTALL=/usr/share/arduino/hardware/arduino
 ARDUINO_CORES=$(ARDUINO_INSTALL)/cores/arduino
-ARDUINO_VARIANTS=$(ARDUINO_INSTALL)/variants/#{self.board}
+ARDUINO_VARIANTS=$(ARDUINO_INSTALL)/variants/#{self.variant}
 ARDUINO_COMMON_INCLUDES=#{self.common_includes}
 ARDUINO_INCLUDE_PATH=-I$(ARDUINO_VARIANTS) $(LIBRARY_INCLUDES)
 nodist_#{self.project_name}_SOURCES=#{self.source_files.join(' ')}
@@ -277,11 +290,9 @@ AM_CXXFLAGS=-g0 -Os
 AM_CFLAGS=-g0 -Os
 VPATH=/usr/share/arduino/hardware/arduino/cores/arduino
 
-# AVRDUDE_PORT=/dev/ttyACM0
-AVRDUDE_PORT=/dev/ttyUSB0
-AVRDUDE_PROGRAMMER = arduino
-# UPLOAD_RATE = 115200
-UPLOAD_RATE = 57600
+AVRDUDE_PORT = #{self.device}
+AVRDUDE_PROGRAMMER = #{self.programmer}
+UPLOAD_RATE = #{self.baud_rate}
 FORMAT=ihex
 
 AVRDUDE_WRITE_FLASH = -U flash:w:$(bin_PROGRAMS).hex

data/lib/mkduino/version.rb

@@ -1,3 +1,3 @@
 module Mkduino
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/mkduino.rb

@@ -32,7 +32,7 @@ require_relative "file_generator"
 require_relative "makefile_am"
 require_relative "configure_ac"
 require_relative "autogen_sh"
-
+require_relative "probe"
 module Mkduino
   GENERATED_FILES = ["Makefile.am",
                      "configure.ac",

data/lib/probe.rb

@@ -0,0 +1,90 @@
+module Mkduino
+  class Probe
+    attr_accessor :options
+    attr_accessor :probe_options
+
+    DEVICES = ["/dev/ttyUSB0",
+               "/dev/ttyUSB1",
+               "/dev/ttyUSB2",
+               "/dev/ttyACM0",
+               "/dev/ttyACM1",
+               "/dev/ttyACM2",
+               "/dev/rfcomm0",
+               "/dev/rfcomm1",
+               "/dev/rfcomm2"]
+
+    BOARDS = {
+      "mega" => {
+        variant: "mega",
+        clock_speed: 16000000,
+        device: "/dev/ACM0",
+        baud_rate: "115200",
+        programmer: "stk500",
+        mcu: "atmega2560"
+      },
+      "mega1280" => {
+        variant: "mega",
+        clock_speed: 16000000,
+        device: "/dev/ACM0",
+        baud_rate: "115200",
+        programmer: "stk500",
+        mcu: "atmega1280"
+      },
+
+      "uno" => {
+        variant: "standard",
+        clock_speed: 16000000,
+        device: "/dev/USB0",
+        baud_rate: "57600",
+        programmer: "arduino",
+        mcu: "atmega328p"
+
+      },
+      "mini" => {
+        variant: "standard",
+        clock_speed: 16000000,
+        device: "/dev/USB0",
+        baud_rate: "57600",
+        programmer: "arduino",
+        mcu: "atmega328p"
+      },
+      "mini3v" => {
+        variant: "standard",
+        clock_speed: 8000000,
+        device: "/dev/USB0",
+        baud_rate: "57600",
+        programmer: "arduino",
+        mcu: "atmega328p"
+      }
+    }
+
+
+    def initialize probe_options = {}
+      @probe_options = probe_options
+      @options = {}
+    end
+
+    def probe
+      probe_device
+      probe_variant
+    end
+
+    def probe_variant
+      if @options[:device] && @options[:device] =~ /ACM[0-9]/
+        @options[:variant] = "mega"
+      else
+        @options[:variant] = "standard"
+      end
+    end
+
+    def probe_device
+      @options[:device] = DEVICES[0]
+      DEVICES.each do |d|
+        if File.exist?(d)
+          @options[:device] = d
+          break
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkduino
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - David H. Wilkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,7 @@ files:
 - lib/makefile_am.rb
 - lib/mkduino.rb
 - lib/mkduino/version.rb
+- lib/probe.rb
 - mkduino.gemspec
 homepage: https://rubygems.org/gems/mkduino
 licenses: