Merge pull request #19 from wirelane/feature/support-for-requesting-an-explicit-diagnosis-type

Support for requesting an explicit diagnosis type + Support for (common) card type ids + application label/id

Author: b3n3d1k7

ecrterm/__init__.py

@@ -1 +1 @@
-__version__ = '1.0.8'
+__version__ = '1.0.9'

ecrterm/ecr.py

@@ -19,8 +19,9 @@
     Authorisation, CloseCardSession, Completion, DisplayText, EndOfDay, Initialisation, Packet,
     PrintLine, ReadCard, Registration, ReservationBookTotal, ReservationPartialReversal,
     ReservationRequest, ResetTerminal, SetTerminalID, StatusEnquiry, StatusInformation, WriteFiles,
-    OpenReservationsEnquiry)
-from ecrterm.packets.types import (ConfigByte, CurrencyCode, ServiceByte)
+    OpenReservationsEnquiry, Diagnosis)
+from ecrterm.packets.tlv import TLVDictionary
+from ecrterm.packets.types import (ConfigByte, CurrencyCode, ServiceByte, DiagnosisType)
 from ecrterm.transmission._transmission import Transmission
 from ecrterm.transmission.signals import ACK, DLE, ETX, NAK, STX, TRANSMIT_OK
 from ecrterm.transmission.transport_serial import SerialTransport
@@ -422,6 +423,19 @@ def initialize(self, listener=None):
 
         return self._send_packet(packet, listener)
 
+    def request_diagnosis(self,
+                          diagnosis_type=DiagnosisType.EXTENDED_DIAGNOSIS,
+                          listener=None):
+        """
+        """
+        packet = Diagnosis(
+            tlv={
+                0x1b: TLVDictionary['zvt'][0x1b].to_bytes(diagnosis_type),
+            }
+        )
+
+        return self._send_packet(packet, listener)
+
     def _send_packet(self, packet, listener=None):
         """
         Generic method to send packets and check for completion status.

ecrterm/packets/base_packets.py

@@ -368,6 +368,10 @@ class Diagnosis(Packet):
     CMD_INSTR = 0x70
     wait_for_completion = True
 
+    ALLOWED_BITMAPS = [
+        'tlv'
+    ]
+
     def _handle_response(self, response, tm):
         if isinstance(response, PrintLine):
             print(response._data)

ecrterm/packets/fields.py

@@ -1,4 +1,5 @@
 import string
+import typing
 from enum import Enum
 from typing import Any, Union, List, Optional, Tuple
 
@@ -177,7 +178,7 @@ def from_bytes(self, v: Union[bytes, List[int]]) -> str:
             else CurrentContext.get('character_set', CharacterSet.DEFAULT)
         return decode(bytes(v), character_set)
 
-    def to_bytes(self, v: str, length: int = None) -> bytes:
+    def to_bytes(self, v: str, length: typing.Optional[int] = None) -> bytes:
         character_set = self._character_set if self._character_set is not None \
             else CurrentContext.get('character_set', CharacterSet.DEFAULT)
         retval = encode(v, character_set)
@@ -320,9 +321,14 @@ def __get__(self, instance, objtype=None) -> TLV:
         0x15: StringField(name="language_code", character_set=CharacterSet.ASCII_7BIT),
         0x23: ContainerType(name='receipt-numbers'),
         0x1a: BEIntField(name='max_apdu_length', length=2),
+        0x1b: BEIntField(name='diagnosis_type', length=1),
         0x1d: BEIntField(name='file_id', length=1),
         0x1e: BEIntField(name='start_position', length=4),
         0x40: BytesField(name='emv_config'),
+        # variable length -> important IDs can be found in ZvtCardType
+        0x41: BytesField(name='card_type_id'),
+        0x42: StringField(name="application_label", character_set=CharacterSet.ASCII_7BIT),
+        0x43: BytesField(name="application_id"),
         0x1f00: BEIntField(name='file_size', length=4),
         0x1f10: FlagByteField(name="cardholder_identification", data_type=CardholderIdentification),
         0x1f11: FlagByteField(name='online_tag', data_type=OnlineTag),

ecrterm/packets/types.py

@@ -81,3 +81,19 @@ class FileID(IntEnum):
     COMMUNICATION_MODULE_LOG_FILE = 0x04
     PIN_PAD_LOG_FILE = 0x05
     RECONCILIATION_DATA = 0x06
+
+
+class DiagnosisType(IntEnum):
+    LINE_DIAGNOSIS = 1
+    EXTENDED_DIAGNOSIS = 2
+    CONFIGURATION_DIAGNOSIS = 3
+    EMV_CONFIGURATION_DIAGNOSIS = 4
+    EP2_CONFIGURATION_DIAGNOSIS = 5
+
+
+class ZvtCardType(IntEnum):
+    GIROCARD = 5
+    MASTERCARD = 6
+    VISA = 10
+    VPAY = 13
+    MAESTRO = 46