smartware 0.4.3 → 0.4.4

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

@@ -32,10 +32,9 @@ module Smartware
 
         def query
           begin
-            @sp.write QUERY
-            magic, paper_status, user_status, recoverable, unrecoverable = read_response(6).unpack("nC*")
+            paper_status, user_status, recoverable, unrecoverable = do_query
 
-            raise "invalid magic: #{magic.to_s 16}" if magic != 0x100F
+            raise "no response to query" if paper_status.nil?
 
             if unrecoverable != 0
               @status = :error
@@ -59,45 +58,71 @@ module Smartware
             end
 
             @sp.write MODEL_QUERY
-            printer_model, = read_response(1).unpack("C*")
+            printer_model = read_response(1)
+            raise "no response to model query" if printer_model.nil?
+
+            printer_model, = printer_model.unpack("C*")
 
             @sp.write VERSION_QUERY
             printer_version = read_response(4)
+            raise "no response to version querty" if printer_version.nil?
 
             @model = "ESC/POS Printer #{printer_model.to_s 16}"
-            @version = "ROM #{printer_version}"
+            @version = "ROM #{printer_version.inspect}"
 
           rescue => e
             Smartware::Logging.logger.warn "Printer communication error: #{e}"
             e.backtrace.each { |line| Smartware::Logging.logger.warn line }
 
-            @buf = ""
-
             @error = Interface::Printer::COMMUNICATION_ERROR
             @status = :error
           end
         end
 
         def print(data)
+          start = Time.now
+
+          data.force_encoding('BINARY')
+
           begin
-            @sp.write data
+            data.split(/(\n)/, -1).each do |line|
+              @sp.write line
+
+              loop do
+                now = Time.now
+                # timeout exceeded
+                return if now - start > 10
 
-            start = Time.now
+                status = do_query
+                next if status.nil?
+
+                paper_status, user_status, recoverable, unrecoverable = status
+
+                # Unrecoverable error or out of paper
+                return if unrecoverable != 0 || (paper_status & 1) != 0
+
+                # No error - continue printing
+                break if (recoverable == 0) && ((user_status & 3) == 0)
+              end
+            end
 
             loop do
               now = Time.now
-              break if now - start > 30
+              # timeout exceeded
+              return if now - start > 10
 
-              @sp.write QUERY
-              magic, paper_status, user_status, recoverable, unrecoverable = read_response(6).unpack("nC*")
+              status = do_query
+              next if status.nil?
 
-              raise "invalid magic: #{magic.to_s 16}" if magic != 0x100F
+              paper_status, user_status, recoverable, unrecoverable = status
 
               # paper not in motion
               break if (user_status & 8) == 0
             end
+
           rescue => e
-            Smartware::Logging.logger.warn "Printer communication error: #{e}"
+            Smartware::Logging.logger.error "Printer communication error: #{e}"
+            e.backtrace.each { |line| Smartware::Logging.logger.error line }
           end
         end
 
@@ -107,8 +132,25 @@ module Smartware
 
         private
 
-        def read_response(bytes)
+        def do_query
+          # flush driver buffer
+          read_response(65536, 0)
+          @buf.clear
+
+          @sp.write QUERY
+          response = read_response(6).unpack("nC*")
+          return nil if response.nil?
+
+          magic, *rest = response
+          raise "invalid magic: #{magic.to_s 16}. Response: #{response}, buffer: #{@buf}" if magic != 0x100F
+
+          rest
+        end
+
+        def read_response(bytes, timeout = 1.0)
           while @buf.length < bytes
+            return nil if IO.select([ @sp ], [], [], timeout).nil?
+
             @buf << @sp.sysread(128)
           end
 

data/lib/smartware/interfaces/cash_acceptor.rb

@@ -53,7 +53,7 @@ module Smartware
         Smartware::Logging.logger.info "Cash acceptor monitor started"
       end
 
-      def open_session(limit_min, limit_max)
+      def open(limit_min = nil, limit_max = nil)
         @banknotes.clear
 
         if limit_min.nil? || limit_max.nil?
@@ -80,7 +80,7 @@ module Smartware
         end
       end
 
-      def close_session
+      def close
         Smartware::Logging.logger.debug "Session closed"
 
         EventMachine.schedule do
@@ -94,7 +94,7 @@ module Smartware
         @banknotes
       end
 
-      def cashsum
+      def sum
         self.banknotes.inject(0) do |result, (key, value)|
           result + key.to_i * value.to_i
         end
@@ -115,7 +115,7 @@ module Smartware
       end
 
       def escrow(banknote)
-        limit_satisfied?(self.cashsum + banknote.value)
+        limit_satisfied?(self.sum + banknote.value)
       end
 
       def stacked(banknote)
@@ -139,7 +139,7 @@ module Smartware
         update_status :model, @device.model
         update_status :version, @device.version
         update_status :casette, error != DROP_CASETTE_OUT_OF_POSITION
-        update_status :cashsum, cashsum
+        update_status :cashsum, sum
       end
 
       def device_open

data/lib/smartware/interfaces/pin_pad.rb

@@ -0,0 +1,90 @@
+module Smartware
+  module Interface
+    class PinPad < Interface
+      class PinPadError < RuntimeError; end
+
+      # Error codes
+      DEVICE_NOT_READY = 1
+      DEVICE_ERROR     = 2
+
+      # Input modes
+      INPUT_PLAINTEXT  = 1
+      INPUT_PIN        = 2
+
+      # Pin block formats
+      ASCII            = 0
+      ISO9564_0        = 1
+      ISO9564_1        = 2
+      ISO9564_3        = 3
+      IBM3624          = 4
+
+      def self.safe_proxy(*methods)
+        methods.each do |method|
+          class_eval <<-END
+          def #{method}(*args)
+            result = @device.#{method}(*args)
+            update_status :error, nil
+            result
+          rescue PinPadError => e
+            Logging.logger.error "Pin pad command failed: #\{e}"
+            update_status :error, DEVICE_ERROR
+            nil
+          end
+          END
+        end
+      end
+
+      safe_proxy :wipe, :restart, :start_input, :stop_input
+      safe_proxy :load_working_keys, :get_pin
+
+      def initialize(config, service)
+        super
+
+        device_not_ready
+
+        @device.imk_source = method :imk_source
+        @device.post_configuration = method :post_configuration
+        @device.device_ready = method :device_ready
+        @device.device_not_ready = method :device_not_ready
+        @device.input_event = method :input_event
+
+      end
+
+      protected
+
+      def imk_source
+        imk = "000000000000000000000000000000000000000000000000"
+        tmk = "12345678" + "\x00" * 16
+
+        [ imk, tmk ]
+      end
+
+      def post_configuration
+        Logging.logger.debug "post configuration"
+      end
+
+      def device_not_ready
+        update_status :error, DEVICE_NOT_READY
+        update_status :in_input, false
+      end
+
+      def device_ready
+        update_status :error, nil
+        update_status :model, @device.model
+        update_status :version, @device.version
+      end
+
+      def input_event(event, data = nil)
+        publish_event :input, event, data
+
+        case event
+        when :start
+          update_status :in_input, true
+
+        when :accept, :cancel
+          update_status :in_input, false
+        end
+      end
+    end
+  end
+end

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/smartware.gemspec

@@ -6,11 +6,11 @@ require 'smartware/version'
 Gem::Specification.new do |gem|
   gem.name          = "smartware"
   gem.version       = Smartware::VERSION
-  gem.authors       = ["Evgeni Sudarchikov", "Boris Staal"]
-  gem.email         = ["e.sudarchikov@roundlake.ru", "boris@roundlake.ru"]
+  gem.authors       = ["Evgeni Sudarchikov", "Boris Staal", 'Sergey Gridasov']
+  gem.email         = ["e.sudarchikov@roundlake.ru", "boris@roundlake.ru", 'grindars@gmail.com']
   gem.description   = %q{Smartware is the Smartkiosk hardware control daemon}
   gem.summary       = gem.description
-  gem.homepage      = "https://github.com/roundlake/smartware"
+  gem.homepage      = "https://github.com/smartkiosk/smartware"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
 - Evgeni Sudarchikov
 - Boris Staal
+- Sergey Gridasov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-01 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
@@ -144,10 +145,12 @@ description: Smartware is the Smartkiosk hardware control daemon
 email:
 - e.sudarchikov@roundlake.ru
 - boris@roundlake.ru
+- grindars@gmail.com
 executables:
 - smartware
 - smartware-monitor
 - smartware-ppp-helper
+- smartware-readepp
 extensions: []
 extra_rdoc_files: []
 files:
@@ -159,13 +162,10 @@ files:
 - bin/smartware
 - bin/smartware-monitor
 - bin/smartware-ppp-helper
+- bin/smartware-readepp
 - config/smartware.yml.sample
 - lib/smartware.rb
-- lib/smartware/clients/card_reader.rb
-- lib/smartware/clients/cash_acceptor.rb
-- lib/smartware/clients/modem.rb
-- lib/smartware/clients/printer.rb
-- lib/smartware/clients/watchdog.rb
+- lib/smartware/client.rb
 - lib/smartware/connection_monitor.rb
 - lib/smartware/drivers/card_reader/dummy.rb
 - lib/smartware/drivers/card_reader/ict3_k5.rb
@@ -174,8 +174,10 @@ files:
 - lib/smartware/drivers/common/ccnet_connection.rb
 - lib/smartware/drivers/common/command_based_device.rb
 - lib/smartware/drivers/common/sankyo_connection.rb
+- lib/smartware/drivers/common/szzt_connection.rb
 - lib/smartware/drivers/modem/dummy.rb
 - lib/smartware/drivers/modem/standard.rb
+- lib/smartware/drivers/pin_pad/zt588.rb
 - lib/smartware/drivers/printer/dummy.rb
 - lib/smartware/drivers/printer/esc_pos.rb
 - lib/smartware/drivers/watchdog/dummy.rb
@@ -184,6 +186,7 @@ files:
 - lib/smartware/interfaces/cash_acceptor.rb
 - lib/smartware/interfaces/interface.rb
 - lib/smartware/interfaces/modem.rb
+- lib/smartware/interfaces/pin_pad.rb
 - lib/smartware/interfaces/printer.rb
 - lib/smartware/interfaces/watchdog.rb
 - lib/smartware/logging.rb
@@ -193,7 +196,7 @@ files:
 - lib/smartware/service.rb
 - lib/smartware/version.rb
 - smartware.gemspec
-homepage: https://github.com/roundlake/smartware
+homepage: https://github.com/smartkiosk/smartware
 licenses: []
 post_install_message: 
 rdoc_options: []

data/lib/smartware/clients/card_reader.rb

@@ -1,41 +0,0 @@
-require 'drb'
-
-module Smartware
-  module Client
-
-    module CardReader
-
-      DRb.start_service
-      @device = DRbObject.new_with_uri('druby://localhost:6004')
-
-
-      def self.status
-        @device.status
-      end
-
-      def self.error
-        @device.error
-      end
-
-      def self.model
-        @device.model
-      end
-
-      def self.version
-        @device.version
-      end
-
-      def self.open
-        @device.open
-      end
-
-      def self.close
-        @device.close
-      end
-
-      def self.card_inserted
-        @device.card_inserted
-      end
-    end
-  end
-end

data/lib/smartware/clients/cash_acceptor.rb

@@ -1,52 +0,0 @@
-require 'drb'
-
-module Smartware
-  module Client
-
-    module CashAcceptor
-
-      DRb.start_service
-      @device = DRbObject.new_with_uri('druby://localhost:6001')
-
-      def self.open(limit_min = nil, limit_max = nil)
-        @device.open_session(limit_min, limit_max)
-      end
-
-      def self.close
-        @device.close_session
-      end
-
-      def self.status
-        @device.status
-      end
-
-      def self.error
-        @device.error
-      end
-
-      def self.model
-        @device.model
-      end
-
-      def self.version
-        @device.version
-      end
-
-      def self.banknotes
-        @device.banknotes
-      end
-
-      def self.sum
-        @device.cashsum
-      end
-
-      def self.insert_casette
-        @device.insert_casette
-      end
-
-      def self.eject_casette
-        @device.eject_casette
-      end
-    end
-  end
-end