avburn 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/avburn

@@ -4,17 +4,13 @@ require 'avburn'
 include Avburn
 
 
-
-
-
-
 Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
   background gradient(rgb(245, 245, 245), rgb(190,190,190))
   #  background "#e0e0e0"
 
   flow do
     background "#881010"
-   # background_gradient(rgb(138, 10, 10), rgb(190,30,30))
+    # background_gradient(rgb(138, 10, 10), rgb(190,30,30))
     # image "gamefaqs-logo.gif"
     # title "AVRb", :margin_top => 30, :color => "#ffffff"
     stack :width => '90%' do
@@ -52,7 +48,6 @@ Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
           @prog_list = list_box :items => Prog.all, :width => 120, :choose => Conf[:prog] do |list|
             @prog = list.text
             changed(list)
-            check_enabled()
           end
           para "   Platform:     ", :weight => "bold"
           @platform_list = list_box :items => Part.all, :text => "Select..", :width => 120, :choose => @platform ||= Conf[:platform]  do |list|
@@ -60,13 +55,11 @@ Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
             @platform = list.text
             changed(list)
             print_fuses()
-            check_enabled()
           end
           para "   Memory:      ", :weight => "bold"
           @memory_list = list_box :items => Memory, :width => 120, :choose => Conf[:memory] do |list|
             @memory = list.text
             changed(list)
-            check_enabled()
           end
           para "     "
           button "Read" do
@@ -74,60 +67,60 @@ Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
           end
           para "     "
           button "Config" do
-            dialog "foo" do
+            @config_dlg = dialog "Config", :width => 300, :height => 280 do
               flow do
-                background "#252499"
+                background "#881010"
                 # image "gamefaqs-logo.gif"
                 # title "AVRb", :margin_top => 30, :color => "#ffffff"
                 stack :width => '100%' do
                   banner "Config", :margin_left => 15, :margin_top => 20, :variant => 'smallcaps', :size => 'large', :stroke => "#fff", :weight => "bold"
                 end
               end
-              stack do
-                flow { check; para "Disable auto erase for flash" }
+              stack :margin => 15 do
+                flow do
+                  ch = check :checked => @erase_flash
+                  ch.click do |c|
+                    @erase_flash = c.checked?
+                  end
+                  para "Disable auto erase for flash"
+                end
                 flow { check; para "Override invalid signature check" }
                 flow { check; para "Perform chip erase" }
                 flow { check; para "Do not verify" }
               end
-              flow do
-                button "Cancel"
-                button "Save"
+              stack :margin_left => 110 do
+                button "Close" do
+                  close
+                end
               end
-
             end
 
           end
         end
 
-      # end
-
-      # stack :width => '-50%' do
 
         flow do
           para "    Port:  ", :weight => "bold"
-          @game_field = edit_line do
-            check_enabled()
+          edit_line do |l|
+            @port = l.text
           end
 
           para "   CMD Opts:   ", :weight => "bold"
-          @game_field = edit_line do
-            check_enabled()
+          edit_line do |l|
+            @cmd_opts = l.text
           end
 
           para "    Format:      ", :weight => "bold"
           @format_list = list_box :items => Format.values, :width => 120, :choose => Conf[:format] do |list|
             @format = Format.keys[Format.values.index_of(list.text)]
             changed(list)
-            check_enabled()
           end
 
-
         end
 
       end
-    end
-
 
+    end
 
     @fuses = stack :margin_top => 15 do
       caption "Fuses"
@@ -148,18 +141,33 @@ Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
       flow do
         para "  Hexfile:   ", :weight => "bold"
         @hex_list = list_box :items => Hex.all, :width => 420, :choose => Conf[:hex] do |list|
-          @hex = list.text
-          changed(list)
-          check_enabled()
+          @hexfile = list.text
+          check_hex_enabled
         end
         para "    "
-        button "Dump"
+        @verify_btn = button("Verify", :state => "disabled") { run_hex_comm :v }
         para "    "
-        button "Verify"
+        @burn_btn = button("Burn!", :state => "disabled") { run_hex_comm :w }
+      end
+
+      flow do
+        para "  Name:   ", :weight => "bold"
+        edit_line :width => 220 do |le|
+          @proj_name = le.text
+        end
         para "    "
-        button "Burn!" do
-          run_comm "#{@memory}:w:#{ENV['HOME']}/#{AvbHex}/#{@hex}"
+        button "Dump" do |btn|
+          btn.state = "Disabled"
+          Thread.new do
+            ds = dump_stamp(@memory)
+            run_comm "#{@memory}:r:#{ds}:i"
+            data = File.read(ds)
+            filename = "/#{@proj_name}_#{@platform}.hex"
+            File.open(AvbHex + filename, "w") { |f| f << data }
+            @hex_list.items = Hex.all
+          end
         end
+
       end
 
     end
@@ -186,17 +194,10 @@ Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
   #
   # Methods
   #
-
-  def calc_fuses
-
+  def run_hex_comm(c)
+    run_comm "#{@memory}:#{c}:#{ENV['HOME']}/#{AvbHex}/#{@hexfile}"
   end
 
-  # stack :margin => 20 do
-  #   @average_score = para ""
-  #   @one_line = para ""
-  #   @full_review = para ""
-  # end
-
   def print_fuses
     @fuses_checks.clear
     return unless @platform && fuse_ary = FuseLabel[@platform.to_sym]
@@ -209,7 +210,7 @@ Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
             print_fuses if line.text.size > 1
           end
           instance_variable_set("@#{fuse}_txt".to_sym, ftxt)
-            all.each_with_index do |label, i|
+          all.each_with_index do |label, i|
 
             lbl = para  label
             ch = check :checked => avr_bool(@fuses_store[fuse][i])
@@ -218,7 +219,7 @@ Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
             end
             para "|", :stroke => "#aaa"
             # lbl.click { ch.checked = ch.checked? ? false : true } #TODO nice to click on labels... =/
-            end
+          end
           para " #{@fuses_store[fuse].join.scan(/\d{4}/).join(' ')} "
           button("w") { write_fuse(fuse) }
 
@@ -233,17 +234,15 @@ Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
   end
 
   def log(txt)
-    @footer.text = txt
+    @footer.text = txt.split("\n")[-1]
     @log.text += txt + "\n" #+ @log.text
   end
 
   def read_fuse(fuse)
     name =  (fuse =~ /\// ? fuse.split("/")[1] : fuse)
-    p name
     data = File.read(fuse)
     log "Data: #{data}"
     @fuses_store.set(name, Integer(data).to_s(16))
-    p @fuses_store
   end
 
   def write_fuse(fu)
@@ -276,16 +275,10 @@ Shoes.app :title => "AVbuRn", :width => 980, :height => 730 do
     print_fuses
   end
 
-
-
-  def check_enabled
-    [@one_line_review_button, @review_button, @average_score_button].each do |btn|
-      if @game_field.text.size > 0 and !@platform_list.text.nil?
-        btn.state = nil
-      else
-        btn.state = "disabled"
-      end
-    end
+  def check_hex_enabled
+    state = @hexfile ? nil : "disabled"
+    @verify_btn.state = state
+    @burn_btn.state = state
   end
 end
 

data/lib/avburn.rb

@@ -41,16 +41,29 @@ module Avburn
     bit.to_i.zero?
   end
 
+  def dump_stamp(n)
+    "/tmp/#{n}-#{Time.now.to_i}"
+  end
+
   def run_comm(c)
     @log.text = ""
     comm = "#{Avrdude} -c #{Conf[:prog]} -p #{Conf[:platform]} "
-    comm << "-P #{Conf[:port]} " if @port
-    comm << "-U #{c}"
+    comm << "-P #{@port} " if @port
+    comm << "#{@cmd_opts} -U #{c}"
     log  "> Running #{comm}"
-    Kernel.system "#{comm} &> output"
-    log File.read("output")
+    if block_given?
+      Thread.new do
+        Kernel.system "#{comm} &> output"
+        log File.read("output")
+        yield
+      end
+    else
+      Kernel.system "#{comm} &> output"
+      log File.read("output")
+    end
   end
 
+
   class << self
 
     def read_conf
@@ -117,3 +130,13 @@ end
 
 
 Avburn.read_conf
+
+
+# class AvrdudeWrapper
+#   attr_accessor :percent
+
+#  def bg_run_comm
+#     @percent = 0.0
+#  end
+
+# end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -83,14 +83,12 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE.txt
 - README.rdoc
 files: 
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
@@ -114,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1524349970638977619
+      hash: -2285582613984815413
       segments: 
       - 0
       version: "0"

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Marcos Piccinini
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.