pbosetti-rubitlash 0.1 → 0.2

data/README.markdown

@@ -19,15 +19,44 @@ I'm still writing few docs, but the library itself is quite short. Look at it to
 EXAMPLE
 =======
 
-    require "rubitlash"
-
+    require "../lib/rubitlash"
+    
+    # Instantiate the connection. Verbose mode is false
     bl = Bitlash.new("/dev/tty.usbserial-A6004aLr", 57600, false)
+    
+    # talk() writes its argument to Arduino and reports the reply:
     r = bl.talk "print free()"
     puts "Bytes free: #{r}"
-    bl[:a] = 2
-    puts "a =  #{bl[:a]}"
-    bl.talk "d13=1"
+    
+    # variables are accessed as keys of the Bitlash instance:
+    bl[:a] = 2              # writing
+    puts "a =  #{bl[:a]}"   # reading
+    bl.talk "d12=1"         # low-level
     sleep 2
-    bl[:f] = bl.free
+    
+    # Assigning Bitlash variables:
+    bl[:f] = bl.free        # commands and functions are mapped as methods
     puts "f = #{bl[:f]}"
-    bl.close
+    
+    # Macro example
+    bl.macro "toggle13", "d13=!d13" # define a new macro
+    puts "\nMacros:"
+    bl.ls.each_with_index {|m,i| puts "#{i}:\t#{m}"}
+    bl.toggle13                     # calls the new macro
+    sleep 1
+    # but also:
+    # bl.run :toggle13        # this runs in background on Arduino
+    # sleep 1
+    
+    # Some play
+    puts "\nStarting cyclic fade"
+    bl.pinmode(11,1)
+    t = t0 = Time.now.to_f
+    while (t - t0) < 5 do
+      t = Time.now.to_f
+      bl[:a11] = ((1.0 - Math::cos((t - t0)*Math::PI))*100).to_i # 2 Hz cycle
+      sleep 0.01
+    end
+    
+    bl.close
+    

data/example/simple.rb

@@ -5,13 +5,41 @@
 # reserved.
 require "../lib/rubitlash"
 
+# Instantiate the connection. Verbose mode is false
 bl = Bitlash.new("/dev/tty.usbserial-A6004aLr", 57600, false)
+
+# talk() writes its argument to Arduino and reports the reply:
 r = bl.talk "print free()"
 puts "Bytes free: #{r}"
-bl[:a] = 2
-puts "a =  #{bl[:a]}"
-bl.talk "d13=1"
+
+# variables are accessed as keys of the Bitlash instance:
+bl[:a] = 2              # writing
+puts "a =  #{bl[:a]}"   # reading
+bl.talk "d12=1"         # low-level
 sleep 2
-bl[:f] = bl.free
+
+# Assigning Bitlash variables:
+bl[:f] = bl.free        # commands and functions are mapped as methods
 puts "f = #{bl[:f]}"
+
+# Macro example
+bl.macro "toggle13", "d13=!d13" # define a new macro
+puts "\nMacros:"
+bl.ls.each_with_index {|m,i| puts "#{i}:\t#{m}"}
+bl.toggle13                     # calls the new macro
+sleep 1
+# but also:
+# bl.run :toggle13        # this runs in background on Arduino
+# sleep 1
+
+# Some play
+puts "\nStarting cyclic fade"
+bl.pinmode(11,1)
+t = t0 = Time.now.to_f
+while (t - t0) < 5 do
+  t = Time.now.to_f
+  bl[:a11] = ((1.0 - Math::cos((t - t0)*Math::PI))*100).to_i # 2 Hz cycle
+  sleep 0.01
+end
+
 bl.close

data/lib/rubitlash.rb

@@ -22,6 +22,7 @@ require 'expect'
 
 class Bitlash
   PROMPT = ">\s"
+  COMMANDS = %w[boot help if ls peep print ps rm run stop while]
   attr_accessor :port_addr
   attr_reader :port, :baud
   def initialize(port_addr, baud=57600, verbose=false, name="Bitflash##{(rand*1000).to_i}")
@@ -43,9 +44,8 @@ class Bitlash
   
   def talk(string)
     @port.puts string
-    reply = @port.expect(/#{PROMPT}/)[0]
-    reply =~ /(.*)\n\r(.*)\n\r/
-    return $2
+    reply = @port.expect(/#{PROMPT}/)[0].split("\n\r")[1...-1]
+    return reply.size == 1 ? reply[0] : reply
   end
   
   def [](var)
@@ -60,8 +60,15 @@ class Bitlash
     self.talk "#{name}:=\"#{cmd}\""
   end
   
+  # def run(macro); self.talk macro.to_s; end
+  # def background(macro); self.talk "run #{macro}"; end
+  
   def method_missing(m, *args)
-    cmd = args.size > 0 ? "print #{m.to_s}(#{args * ','})" : "print #{m.to_s}"
+    if COMMANDS.include? m.to_s
+      cmd = args.size > 0 ? "#{m.to_s} #{args * ','}" : "#{m.to_s}"
+    else
+      cmd = args.size > 0 ? "print #{m.to_s}(#{args * ','})" : "print #{m.to_s}"
+    end
     self.talk(cmd)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pbosetti-rubitlash
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Paolo Bosetti