farmbot-serial 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4349eb566899227dc4a17f353070503c670f5ab
-  data.tar.gz: d71e9c5485c8161971cd631dc8f07f8d5f907546
+  metadata.gz: 06ce110c398cd6a9a9ffc89454d7de2127bd7627
+  data.tar.gz: 5be8458098c21f5b89255b876d10a3c349cde7bf
 SHA512:
-  metadata.gz: 467e87b8a6d8184054fc160545763e66359821127f26f8cbdd3332c1801f0c86dcccb61908a9640a46ea4c54cb4edf591acc60385e61d795160b3c530b5f7a27
-  data.tar.gz: 34ba8fca6d587b689058311303803503d6d1bac118fabe5b354d295e125fef3fff5966d2811e2a352716571262fce9ab9592d124a14d6775601228edcabc2e49
+  metadata.gz: 33ebc3d04479030e9bef35605e625bad436c8785ded69c77103ff2b627c542e00a20c46759393b40e85fe8322c4924eb85ff7a0094e69397665539c65f2aa0b2
+  data.tar.gz: 7aae26c6e3fa5fb346e0552c776c849248c0cdb014ed148700ff3fcf2407c2328bba12b6c5f877f88ca7f73d465974309cf24e9878a0061ba27c8a110be93f63

data/lib/arduino.rb

@@ -24,6 +24,8 @@ module FB
       @commands    = FB::OutgoingHandler.new(self)
       @inputs      = FB::IncomingHandler.new(self)
       @status      = FB::Status.new
+
+      start_event_listeners
     end
 
     # Log to screen/file/IO stream
@@ -64,6 +66,7 @@ module FB
     end
 
     def maybe_execute_command
+      sleep 0.05 # Throttle CPU
       gcode = @outbound_queue.pop
       return unless gcode
       if status.ready? && gcode.is_a?(FB::Gcode) # Flip flop order for performance?
@@ -77,6 +80,7 @@ module FB
     end
 
     def start_event_listeners
+      EM.tick_loop { maybe_execute_command }
       status.onchange { |diff| @onchange.call(diff) if @onchange }
       inbound_queue.subscribe do |gcodes|
         Array(gcodes).each do |gcode|
@@ -86,12 +90,6 @@ module FB
       end
     end
 
-    def start
-      # A noble experiment.
-      EventMachine::PeriodicTimer.new(0.1) { maybe_execute_command }
-      start_event_listeners
-    end
-
   private
 
     # Highest priority method for processing incoming Gcode. Use for system

data/spec/lib/arduino_spec.rb

@@ -67,9 +67,7 @@ describe FB::Arduino do
     bot.outbound_queue.push(command)
     expect(bot.outbound_queue.length).to eq(1)
     bot.status[:BUSY] = 0
-    within_event_loop {
-      bot.start
-      bot.maybe_execute_command }
+    within_event_loop { bot.maybe_execute_command }
     expect(bot.outbound_queue.length).to eq(0)
     expect(serial_port.message).to eq('A1 B2 C3')
     expect(bot.status.ready?).to be_falsey
@@ -90,7 +88,7 @@ describe FB::Arduino do
       called_onchange += 1
     end
 
-    within_event_loop { bot.start }
+    within_event_loop { nil }
 
     expect(called_onmessage).to eq(1)
     expect(called_onchange).to eq(1)

data/spec/spec_helper.rb

@@ -32,6 +32,6 @@ end
 def within_event_loop(ticks_remaining = 1)
   EM.run do
     yield
-    EventMachine::PeriodicTimer.new(0.25) { EM.stop }
+    EventMachine::PeriodicTimer.new(0.1) { EM.stop }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: farmbot-serial
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tim Evers
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler