rintcore 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f672b74c95d07cfb62eb006d5209065f57c51bd2
-  data.tar.gz: 64b07a334627117937c29c59d863b0371df74160
+  metadata.gz: a20bcac1c2747c6d8933b54fa95ee260d9f73320
+  data.tar.gz: 71914f9bc5e24cfad1d202efa716fb73b91313aa
 SHA512:
-  metadata.gz: 874f9595f51204151351828eedcb403d679d608a8b04b611283a476a75872fe8711da16c4b25031628278425ce85d96080a69afadf0acff08622da80cb58d269
-  data.tar.gz: 84da65e8d7d6ed60c02c06e4b3dcba01d9ce3cd9479961105d0690769d19d2006c477f471069b9362c9958a8cd6f0dcafcb74d7b2a38ad18b4a7f2c7e540145e
+  metadata.gz: d55c42be03827ff1a1372906335a7285149b59ce34dee145c525cc183c3f7343b4796ea0826719674116ffb9fb5bfe6b0526575e5c5dc42588cdf28197355f5a
+  data.tar.gz: 191454c20c3e97d2c47615736d647e5e76f5996ce92fcd8ebaf3a3e01b33151bdbfdd0168b80047f9b995ee703e3b0764e6548f935952fa18d2588515cf3cfe3

data/lib/rint_core/cli.rb

@@ -41,7 +41,8 @@ module RintCore
       @object.filament_used.each_with_index do |filament,extruder|
         puts "\tExtruder #{extruder+1}: #{filament.round(decimals)}mm"
       end
-      puts "Number of layers: #{@object.layers}\n"\
+      puts "\nNumber of layers: #{@object.layers}\n\n"\
+            "Estimated duration: #{@object.durration_in_words}\n\n"\
             "#{@object.raw_data.length} lines / #{@object.lines.length} commands"
     end
     

data/lib/rint_core/g_code/line.rb

@@ -60,8 +60,17 @@ module RintCore
       #   @!attribute [r] $12
       #     @return [nil] if there's no E parameter of the command.
       #     @return [Float] E parameter of the command.
+      #   @!attribute [r] $12
+      #     @return [nil] if there's no S parameter of the command.
+      #     @return [Fixnum] S parameter of the command.
+      #   @!attribute [r] $13
+      #     @return [nil] if there's no P parameter of the command.
+      #     @return [Fixnum] P parameter of the command.
+      #   @!attribute [r] $14
+      #     @return [nil] if there's no string dta for the command.
+      #     @return [Fixnum] extra string data for the command (ex. "filename.gco" in "M23 filename.gco").
       attr_reader :raw, :matches, :line, :command, :command_letter, :command_number,
-                  :s_data, :p_data, :x, :y, :z, :e
+                  :s_data, :p_data, :x, :y, :z, :e, :s, :p, :string_data
 
       # Creates a {Line}
       # @param line [String] a line of GCode.

data/lib/rint_core/g_code/object.rb

@@ -1,11 +1,13 @@
 require 'rint_core/g_code/codes'
 require 'rint_core/g_code/line'
+require 'rint_core/pretty_output'
 
 module RintCore
   module GCode
     # A class that represents a processed GCode file.
     class Object
       include RintCore::GCode::Codes
+      include RintCore::PrettyOutput
 
       # An array of the raw Gcode with each line as an element.
       # @return [Array] of raw GCode without the comments stripped out.
@@ -43,25 +45,29 @@ module RintCore
       #   @!attribute [r] $15
       #     @return [Float] the height of the print.
       #   @!attribute [r] $16
-      #   @return [Fixnum] the number of layers in the print.
+      #     @return [Fixnum] the number of layers in the print.
+      #   @!attribute [r] $17
+      #   @return [Float] the estimated durration of the print in seconds.
       attr_reader :lines, :x_min, :x_max, :y_min, :y_max, :z_min, :z_max,
                   :filament_used, :x_travel, :y_travel, :z_travel, :e_travel,
-                  :width, :depth, :height, :layers
+                  :width, :depth, :height, :layers, :total_duration
 
       # Creates a GCode {Object}.
       # @param data [String] path to a GCode file on the system.
       # @param data [Array] with each element being a line of GCode.
-      # @param default_speed [Float] the default speed (in mm/minute) for moves that don't have one declared.
       # @param auto_process [Boolean] enable/disable auto processing.
+      # @param default_speed [Float] the default speed (in mm/minute) for moves that don't have one declared.
+      # @param acceleration [Float] the acceleration rate set in the printer' firmware.
       # @return [Object] if data is valid, returns a GCode {Object}.
       # @return [false] if data is not an array, path, didn't contain GCode or default_speed wasn't a number grater than 0.
-      def initialize(data = nil, default_speed = 2400, auto_process = true)
-        return false if default_speed.nil? && (default_speed.class == Fixnum || default_speed.class == Float) && default_speed <= 0
+      def initialize(data = nil, default_speed = 2400, auto_process = true, acceleration = 1500)
+        return false if positive_number?(default_speed)
+        return false if positive_number?(acceleration)
         if data.class == String && self.class.is_file?(data)
           data = self.class.get_file(data)
         end
         return false if data.nil? || data.class != Array
-        set_variables(data, default_speed)
+        set_variables(data, default_speed, acceleration)
         data.each do |line|
           line = RintCore::GCode::Line.new(line)
           @lines << set_line_properties(line) if line && !line.command.nil?
@@ -112,6 +118,12 @@ module RintCore
         @filament_used.length > 1
       end
 
+      # Returns estimated durration of the print in a human readable format.
+      # @return [String] human readable estimated durration of the print.
+      def durration_in_words
+        seconds_to_words(@total_duration)
+      end
+
 private
 
       def process
@@ -136,6 +148,9 @@ private
           when CONTROLLED_MOVE
             count_layers(line)
             movement_line(line)
+            calculate_time(line)
+          when DWELL
+            @total_duration += line.p/1000 unless line.p.nil?
           end
         end
 
@@ -148,14 +163,33 @@ private
         @height = @z_max - @z_min
       end
 
+      def calculate_time(line)
+        @speed_per_second = line.f / 60
+        current_travel = hypot3d(@current_x, @current_y, @current_z, @last_x, @last_y, @last_z)
+        distance = (2*((@last_speed_per_second+@speed_per_second)*(@speed_per_second-@last_speed_per_second)*0.5)/@acceleration).abs
+        if distance <= current_travel && !(@last_speed_per_second+@speed_per_second).zero? && !@speed_per_second.zero?
+          move_duration = 2*distance/(@last_speed_per_second+@speed_per_second)
+          current_travel -= distance
+          move_duration += current_travel/@speed_per_second
+        else
+          move_duration = Math.sqrt(2*distance/@acceleration)
+        end
+        @total_duration += move_duration
+      end
+
       def count_layers(line)
         if !line.z.nil? && line.z > @current_z
           @layers += 1
         end
       end
 
+      def hypot3d(x1, y1, z1, x2 = 0.0, y2 = 0.0, z2 = 0.0)
+        return Math.hypot(x2-x1, Math.hypot(y2-y1, z2-z1))
+      end
+
       def movement_line(line)
         measure_travel(line)
+        set_last_values
         set_current_position(line)
         set_limits(line)
       end
@@ -187,6 +221,17 @@ private
         end
       end
 
+      def positive_number?(number, grater_than = 0)
+        number.nil? && (number.is_a?(Fixnum) || number.is_a?(Float)) && number >= grater_than
+      end
+
+      def set_last_values
+        @last_x = @current_x
+        @last_y = @current_y
+        @last_z = @current_z
+        @last_speed_per_second = @speed_per_second
+      end
+
       def set_positions(line)
         @current_x = to_mm(line.x) unless line.x.nil?
         @current_y = to_mm(line.y) unless line.y.nil?
@@ -245,6 +290,10 @@ private
         @current_y = 0
         @current_z = 0
         @current_e = 0
+        @last_x = 0
+        @last_y = 0
+        @last_z = 0
+        @last_e = 0
         @x_min = 999999999
         @y_min = 999999999
         @z_min = 0
@@ -253,14 +302,21 @@ private
         @z_max = -999999999
         @filament_used = []
         @layers = 0
+        # Time
+        @speed_per_second = 0.0
+        @last_speed_per_second = 0.0
+        @move_duration = 0.0
+        @total_duration = 0.0
+        @acceleration = 1500.0 #mm/s/s  ASSUMING THE DEFAULT FROM SPRINTER !!!!
       end
 
-      def set_variables(data, default_speed)
+      def set_variables(data, default_speed, acceleration)
         @raw_data = data
         @imperial = false
         @relative = false
         @tool_number = 0
         @speed = default_speed.to_f
+        @acceleration = acceleration
         @lines = []
       end
 

data/lib/rint_core/pretty_output.rb

@@ -0,0 +1,17 @@
+module RintCore
+  # provides methods to make human readable output.
+  module PrettyOutput
+
+private
+
+    def seconds_to_words(seconds)
+      [[60, :seconds], [60, :minutes], [24, :hours], [1000, :days]].map{ |count, name|
+        if seconds > 0
+          seconds, n = seconds.divmod(count)
+          "#{n.to_i} #{name}"
+        end
+      }.compact.reverse.join(' ')
+    end
+
+  end
+end

data/lib/rint_core/printer.rb

@@ -1,10 +1,12 @@
 require 'rint_core/driver'
 require 'active_support/configurable'
+require 'rint_core/pretty_output'
 
 module RintCore
   # Interface for directly intereacting with the printer.
   class Printer
     include RintCore::Driver
+    include RintCore::PrettyOutput
     include ActiveSupport::Configurable
 
     # @!macro config_accessor
@@ -94,13 +96,7 @@ module RintCore
     # @return [String] human readable time since print started, or "0 seconds" if not printing.
     def time_from_start
       @start_time = Time.now unless printing?
-      secs = Time.now - @start_time
-      [[60, :seconds], [60, :minutes], [24, :hours], [1000, :days]].map{ |count, name|
-        if secs > 0
-          secs, n = secs.divmod(count)
-          "#{n.to_i} #{name}"
-        end
-      }.compact.reverse.join(' ')
+      seconds_to_words(Time.now-@start_time)
     end
 
     class << self

data/lib/rint_core/version.rb

@@ -1,4 +1,4 @@
 module RintCore
   # Current release version of the gem.
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rintcore
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kaz Walker
@@ -107,6 +107,7 @@ files:
 - lib/rint_core/g_code/codes.rb
 - lib/rint_core/g_code/line.rb
 - lib/rint_core/g_code/object.rb
+- lib/rint_core/pretty_output.rb
 - lib/rint_core/printer.rb
 - lib/rint_core/version.rb
 - rintcore.gemspec