extface 0.4.3g → 0.4.4a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7760a0fa4a0798cc8e3f78340bdd652adcdf6dd
-  data.tar.gz: a1d528b4dcb8eeb79078e245c73935e28ded3ee9
+  metadata.gz: 43caaf09fdef3c71d0adcab6345f04686fbe9797
+  data.tar.gz: f2dec73772e0a27eba21492b16ff303d6e2dce3c
 SHA512:
-  metadata.gz: b58bad49defb4af1b80f4399dd02c40cf5f26663a55dd1c8d4ffce55cd7951610c5594cb5cb07a863175bb88b7c1efea202a0cf6751c94c1a4ec707ad4b868e7
-  data.tar.gz: 07906e3c2dd1cf839ee65ac97f5f19190eb1cec6e84def59e950ce4d6e63650dca93f9d6f0a10c046d20d9c6ae4ebe48cee9dc96dac0e9be5c61f7a22edbe9e9
+  metadata.gz: ba2a0b28a2d63bc5779663a6887719230ef3c68ad9f413e73f8f8a065640bc01369ec7b3b4ffb7bf96c3d98c5f6d9b2eecd3ef63ac5faa75f06f67a7374ac9c6
+  data.tar.gz: 20783a589d47e8823e2c32b3881b7c9c162deee756a1c58e8dec3c449f1d01c3bd4298089a01c6d778826c9d8726199e5f285505f7d5aede1c35f97d25f323dd

data/app/models/extface/driver/datecs/commands_v1.rb

@@ -24,7 +24,8 @@ module Extface
     end
     
     module Printer
-      PAPER_CUT                   = 0x00
+      PAPER_MOVE                  = 0x2C
+      PAPER_CUT                   = 0x2D
     end
   end
 end

data/app/models/extface/driver/datecs/fp550.rb

@@ -1,6 +1,11 @@
 module Extface
   class Driver::Datecs::Fp550 < Extface::Driver::Base::Fiscal
     NAME = 'Datecs FP550 (Serial)'.freeze
+    
+    RESPONSE_TIMEOUT = 3  #seconds
+    INVALID_FRAME_RETRIES = 6  #count (bad length, bad checksum)
+    ACKS_MAX_WAIT = 60 #count / nothing is forever
+    NAKS_MAX_COUNT = 3 #count
 
     include Extface::Driver::Datecs::CommandsV1
 
@@ -19,14 +24,49 @@ module Extface
     
     def fsend(cmd, data = "") #return data or nil
       packet_data = build_packet(cmd, data) #store packet to be able to re-transmit it with the same sequence number
+      p packet_data
       invalid_frames = 0 #counter for bad responses
       nak_messages = 0 #counter for rejected packets (should re-transmit the packet)
       push packet_data #send packet
-      begin
-        errors.clear #start with slate clean
+      ACKS_MAX_WAIT.times do |retries|
+        errors.clear
         if resp = frecv(RESPONSE_TIMEOUT)
-          
+          if resp.valid?
+            human_status_errors(resp.status)
+            if errors.empty?
+              result = resp.data
+              break
+            else
+              raise errors.full_messages.join(',')
+            end
+          else #ack, nak or bad
+            if resp.nak?
+              nak_messages += 1
+              if nak_messages > NAKS_MAX_COUNT
+                errors.add :base, "#{NAKS_MAX_COUNT} NAKs Received. Abort!"
+                break
+              end
+            elsif !resp.ack?
+              invalid_frames += 1
+              if nak_messages > INVALID_FRAME_RETRIES
+                errors.add :base, "#{INVALID_FRAME_RETRIES} Broken Packets Received. Abort!"
+                break
+              end
+            end
+            push packet_data unless resp.ack?
+          end
         end
+        errors.add :base, "#{ACKS_MAX_WAIT} ACKs Received. Abort!"
+      end
+      return result
+    end
+    
+    def frecv(timeout) # return RespFrame or nil
+      if frame_bytes = pull(timeout)
+        return Frame.new(frame_bytes.b)
+      else
+        errors.add :base, "No data received from device"
+        return nil
       end
     end
     

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.4.3g"
+  VERSION = "0.4.4a"
 end

data/test/dummy/log/extface/229906743/fp550.log

@@ -0,0 +1,12 @@
+# Logfile created on 2015-05-20 00:00:00 -0400 by logger.rb/44203
+D, [2015-05-20T00:00:00.879764 #12792] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-20T00:00:01.864476 #12792] DEBUG -- : <-- 01 2C 2F 2D 50 04 88 80 C0 80 80 B0 05 30 34 35 39 03
+D, [2015-05-20T00:00:10.882294 #12792] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-20T00:02:23.587163 #13078] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-20T00:02:33.590490 #13078] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-20T00:05:57.424966 #13165] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-20T00:06:07.427669 #13165] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-20T00:11:16.034082 #13292] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-20T00:11:26.037421 #13292] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-20T00:12:25.752623 #13380] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-20T00:12:35.754555 #13380] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03

data/test/dummy/log/extface/229906743/fp550.log.20150519

@@ -0,0 +1,35 @@
+# Logfile created on 2015-05-19 22:59:30 -0400 by logger.rb/44203
+D, [2015-05-19T22:59:30.658269 #10838] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T22:59:55.365866 #10885] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:00:20.737954 #10907] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:01:26.204288 #11164] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:02:17.076246 #11214] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:06:50.204981 #11281] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:07:00.208062 #11281] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:07:44.339216 #11342] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:07:54.339477 #11342] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:12:02.585579 #11504] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:12:12.588779 #11504] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:15:46.061884 #11666] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:15:56.065033 #11666] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:41:07.590433 #11886] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:41:17.593311 #11886] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:42:31.054832 #11946] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:42:41.057203 #11946] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:42:56.689245 #12020] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:43:06.693098 #12020] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:43:26.845881 #12084] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:43:36.849264 #12084] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:44:09.732492 #12252] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:44:19.737048 #12252] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:45:43.240522 #12319] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:45:53.244373 #12319] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:49:43.189449 #12417] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:49:53.191849 #12417] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:52:59.669476 #12496] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:53:09.672390 #12496] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:58:14.389146 #12604] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:58:58.939983 #12673] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:59:21.566720 #12709] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:59:41.826274 #12745] DEBUG -- : --> 01 25 20 4A 58 05 30 30 3E 3C 03
+D, [2015-05-19T23:59:42.807515 #12745] DEBUG -- : <-- 01 2C 2F 2D 50 04 88 80 C0 80 80 B0 05 30 34 35 39 03