From bebb946e4ce4158dca7c3311effaf516c9945967 Mon Sep 17 00:00:00 2001 From: ksclam <4546682+ksclam@users.noreply.github.com> Date: Tue, 28 Nov 2023 23:44:26 -0500 Subject: [PATCH 1/2] Bug fix on tag killing operation --- CS710iOSClient/CSLRfidDemoApp.storyboard | 4 ++-- CS710iOSClient/Info.plist | 2 +- CS710iOSClient/ViewControllers/CSLTagKillVC.m | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CS710iOSClient/CSLRfidDemoApp.storyboard b/CS710iOSClient/CSLRfidDemoApp.storyboard index 02c926c..7e5faac 100644 --- a/CS710iOSClient/CSLRfidDemoApp.storyboard +++ b/CS710iOSClient/CSLRfidDemoApp.storyboard @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="uy9-1K-dab"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="uy9-1K-dab"> <device id="retina4_0" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> diff --git a/CS710iOSClient/Info.plist b/CS710iOSClient/Info.plist index 4b4e5b4..35475f4 100644 --- a/CS710iOSClient/Info.plist +++ b/CS710iOSClient/Info.plist @@ -19,7 +19,7 @@ <key>CFBundleShortVersionString</key> <string>$(MARKETING_VERSION)</string> <key>CFBundleVersion</key> - <string>376</string> + <string>379</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSBluetoothAlwaysUsageDescription</key> diff --git a/CS710iOSClient/ViewControllers/CSLTagKillVC.m b/CS710iOSClient/ViewControllers/CSLTagKillVC.m index 5ee8462..1429785 100644 --- a/CS710iOSClient/ViewControllers/CSLTagKillVC.m +++ b/CS710iOSClient/ViewControllers/CSLTagKillVC.m @@ -128,7 +128,7 @@ - (void) didReceiveTagResponsePacket: (CSLBleReader *) sender tagReceived:(CSLBl - (void) didReceiveTagAccessData:(CSLBleReader *)sender tagReceived:(CSLBleTag *)tag { if ([CSLRfidAppEngine sharedAppEngine].reader.readerModelNumber == CS710 && tag.AccessCommand == KILL) { //a killed tag would have 0x00 (No error) or 0x04 (no access reply) as the tag has already been killed - if (tag.AccessError == 0x10 && (tag.BackScatterError == 0x00 ||tag.BackScatterError == 0x04)) { + if (tag.AccessError == 0x10 && tag.BackScatterError == 0x00) { killCommandAccepted=true; } killCommandCompleted=true; From fce7308a928a22190fa45af46c0f94918be6de54 Mon Sep 17 00:00:00 2001 From: ksclam <4546682+ksclam@users.noreply.github.com> Date: Tue, 28 Nov 2023 23:47:15 -0500 Subject: [PATCH 2/2] Release 1.2.380 --- CS710iOSClient.xcodeproj/project.pbxproj | 4 ++-- CS710iOSClient/Info.plist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CS710iOSClient.xcodeproj/project.pbxproj b/CS710iOSClient.xcodeproj/project.pbxproj index 49565d7..73a498f 100644 --- a/CS710iOSClient.xcodeproj/project.pbxproj +++ b/CS710iOSClient.xcodeproj/project.pbxproj @@ -590,7 +590,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -617,7 +617,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1; + MARKETING_VERSION = 1.2; PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/CS710iOSClient/Info.plist b/CS710iOSClient/Info.plist index 35475f4..7c85b38 100644 --- a/CS710iOSClient/Info.plist +++ b/CS710iOSClient/Info.plist @@ -19,7 +19,7 @@ <key>CFBundleShortVersionString</key> <string>$(MARKETING_VERSION)</string> <key>CFBundleVersion</key> - <string>379</string> + <string>380</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSBluetoothAlwaysUsageDescription</key>