smartware 0.1.25 → 0.1.26

data/lib/smartware/drivers/printer/tg24xx.rb

@@ -28,7 +28,6 @@ module Smartware
 
         def model
           model_code  = send "\x1DI1"
-          rom_version = send "\x1DI3", false
           model_name  = case model_code
                           when "a7" then 'Custom TG2460H'
                           when "a8" then 'Custom TG2480H'
@@ -36,11 +35,15 @@ module Smartware
                           when "ad" then 'Custom TL60'
                           else 'Unknown printer'
                         end
-          "#{model_name}, ROM v#{rom_version}"
+          model_name
         rescue
           -1
         end
 
+        def version
+          send "\x1DI3", false
+        end
+
         private
           def send(message, parse_answer = true)
             @sp.write message

data/lib/smartware/interfaces/printer.rb

@@ -19,6 +19,7 @@ module Smartware
         @configured = true
       rescue => e
         @configured = false
+        Smartware::Logging.logger.error "Printer initialization failed: #{e.to_s}"
       end
 
       def self.configured?
@@ -49,20 +50,20 @@ module Smartware
         def self.start_monitor!
           t = Thread.new do
             loop do
-              if @queue.empty?
-                @status[:error] = @device.error || ''
-                @status[:model] = @device.model
-                @status[:version] = @device.version
-              else
-                begin
-                  `lpr #{@queue[0]}`
-                  Smartware::Logging.logger.info "Printed #{@queue[0]}"
-                  @queue.shift
-                  sleep 5
-                rescue => e
-                  Smartware::Logging.logger.error e.message
-                  Smartware::Logging.logger.error e.backtrace.join("\n")
+              begin
+                if @queue.empty?
+                  @status[:error] = @device.error || ''
+                  @status[:model] = @device.model
+                  @status[:version] = @device.version
+                else
+                    `lpr #{@queue[0]}`
+                    Smartware::Logging.logger.info "Printed #{@queue[0]}"
+                    @queue.shift
+                    sleep 5
                 end
+              rescue => e
+                Smartware::Logging.logger.error e.message
+                Smartware::Logging.logger.error e.backtrace.join("\n")
               end
               sleep 0.2
             end

data/lib/smartware/service.rb

@@ -68,8 +68,7 @@ module Smartware
       begin
         loop do
           pid = Process.wait(-1, Process::WNOHANG)
-
-          break if pid == 0
+          break if pid.nil?
 
           pids << pid
         end

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
   prerelease: 
 platform: ruby
 authors: