Merge pull request #32 from cslrfid/release-2.8

Release 2.8

Author: ksclam

CS108iOSClient.xcodeproj/project.pbxproj

@@ -659,6 +659,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 2.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -681,6 +682,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 2.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";

CS108iOSClient/CSLReader/CSLBleInterface.m

@@ -453,10 +453,15 @@ - (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(C
             NSLog(@"Checksum calculated: %02X%02X", ((Byte*)[cs bytes])[1], ((Byte*)[cs bytes])[0]);
             if (((Byte*)[cs bytes])[1] == packet.crc1 && ((Byte*)[cs bytes])[0] == packet.crc2) {
                 NSLog(@"Checksum verification: PASSED");
-                [recvQueue enqObject:packet];
+                packet.isCRCPassed=true;
             }
-            else
+            else {
                 NSLog(@"Checksum verification: FAILED");
+                packet.isCRCPassed=false;
+            }
+            
+            //always enqueue the packet even it has a checksum verification fail.  This will be caught during decoding
+            [recvQueue enqObject:packet];
 
             NSLog(@"Received packet payload size: 0x%2X byte(s)", ((unsigned char *)[recvBuffer bytes])[2] );
 

CS108iOSClient/CSLReader/CSLBlePacket.h

@@ -49,6 +49,8 @@ Data information of a Bluetooth LE packet
 @property (assign) Byte crc1;
 ///CRC of data packet (byte 2)
 @property (assign) Byte crc2;
+///Calculated CRC of the data packet  - Pass/Fail
+@property (assign) BOOL isCRCPassed;
 ///payload of data packet (first two bytes would be event code)
 @property NSData* payload;
 

CS108iOSClient/CSLReader/CSLBleReader.m

@@ -2134,6 +2134,8 @@ - (void)decodePacketsInBufferAsync;
     rfidPacketBufferInHexString=[[NSString alloc] init];
 
     int datalen;        //data length given on the RFID packet
+    int sequenceNumber=0;
+    
     while (self.bleDevice)  //packet decoding will continue as long as there is a connected device instance
     {
         @autoreleasepool {
@@ -2145,6 +2147,30 @@ - (void)decodePacketsInBufferAsync;
                     if ([packet isKindOfClass:[NSNull class]]) {
                         continue;
                     }
+                    
+                    if (packet.direction==Uplink && packet.deviceId==RFID) {
+                        
+                        NSLog(@"[decodePacketsInBufferAsync] Current sequence number: %d", sequenceNumber);
+                        
+                        //validate checksum of packet
+                        if (!packet.isCRCPassed) {
+                            NSLog(@"[decodePacketsInBufferAsync] Checksum verification failed.  Discarding data in buffer");
+                            [rfidPacketBuffer setLength:0];
+                            continue;
+                        }
+                    
+                        if ([rfidPacketBuffer length] == 0)
+                            sequenceNumber=packet.Reserve;
+                        else {
+                            if (packet.Reserve != (sequenceNumber+1)) {
+                                NSLog(@"[decodePacketsInBufferAsync] Packet out-of-order based on sequence number.  Discarding data in buffer");
+                                [rfidPacketBuffer setLength:0];
+                                continue;
+                            }
+                            else
+                                sequenceNumber++;
+                        }
+                    }
                 }
                 else
                     continue;
@@ -2353,7 +2379,7 @@ - (void)decodePacketsInBufferAsync;
                                 //start decode taq-response message
                                 //length of data field (in bytes) = ((pkt_len – 3) * 4) – ((flags >> 6) & 3)
                                 datalen=(((((Byte *)[rfidPacketBuffer bytes])[ptr+4] + (((((Byte *)[rfidPacketBuffer bytes])[ptr+5] << 8) & 0xFF00)))-3) * 4) - ((((Byte *)[rfidPacketBuffer bytes])[ptr+1] >> 6) & 3);
-                                tag.DATALength=datalen;
+                                tag.DATALength=datalen / 2;
 
                                 /*
                                 if (tag.DATA1Length > 0 && (((tag.DATA1Length + tag.DATA2Length) * 2) == datalen))
@@ -2384,7 +2410,9 @@ - (void)decodePacketsInBufferAsync;
 
                                 tag.ACKTimeout=(((Byte *)[rfidPacketBuffer bytes])[ptr+1] & 0x04) >> 2;
 
-                                if ((((Byte *)[rfidPacketBuffer bytes])[ptr+1] & 0x02) >> 1 && tag.BackScatterError == 0xFF && !tag.CRCError && !tag.ACKTimeout) {
+                                //if access error occurred and nothg of the following: tag backscatter error, ack time out, crc error indicated a fault,
+                                //read error code form the data field
+                                if ((((Byte *)[rfidPacketBuffer bytes])[ptr+1] & 0x01) && tag.BackScatterError == 0xFF && !tag.CRCError && !tag.ACKTimeout) {
                                     tag.AccessError=((Byte *)[rfidPacketBuffer bytes])[ptr+20];
                                 }
                                 else
@@ -2587,7 +2615,8 @@ - (void)decodePacketsInBufferAsync;
                             tag.PC =((((Byte *)[rfidPacketBuffer bytes])[ptr] << 8) & 0xFF00)+ ((Byte *)[rfidPacketBuffer bytes])[ptr+1];
 
                             //for the case where we reaches to the end of the BLE packet but not the RFID response packet, where there will be partial packet to be returned from the next packet.  The partial tag data will be combined with the next packet being returned.
-                            if ((ptr + (2 + ((tag.PC >> 11) * 2) + 1)) > ([rfidPacketBuffer length])) {
+                            //8100 (two bytes) + 8 bytes RFID packet header + payload length being calcuated ont he header
+                            if ((10 + datalen) > [rfidPacketBuffer length]) {
                                 //stop decoding and wait for the partial tag data to be appended in the next packet arrival
                                 NSLog(@"[decodePacketsInBufferAsync] partial tag data being returned.  Wait for next rfid response packet for complete tag data.");
                                 break;