Skip to content

Commit 312735c

Browse files
ksclamksclam
authored
Merge pull request #5 from cslrfid/release-3.4
Release 3.4
2 parents 1c228ca + ca3c4e6 commit 312735c

36 files changed

+2178
-535
lines changed

‎CS108iOSClient.xcodeproj/project.pbxproj

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
42AFE64223C83F6100D71099 /* CSLInventoryVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42AFE64123C83F6100D71099 /* CSLInventoryVC.swift */; };
3232
42B903CF23D7C8180041713C /* CSLSettingsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42B903CE23D7C8180041713C /* CSLSettingsVC.swift */; };
3333
42D5C9D423D1755500BD0D64 /* CSLTabVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42D5C9D323D1755500BD0D64 /* CSLTabVC.swift */; };
34+
CA478098277AEFEB002E3AFA /* CSLPostfilterVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA478097277AEFEB002E3AFA /* CSLPostfilterVC.swift */; };
35+
CA47809A277AF01C002E3AFA /* CSLPrefilterVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA478099277AF01C002E3AFA /* CSLPrefilterVC.swift */; };
36+
CA47809C277AF431002E3AFA /* CSLFilterTabVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA47809B277AF431002E3AFA /* CSLFilterTabVC.swift */; };
3437
CA4E78E6213528FC0035F075 /* CSLBleReader.m in Sources */ = {isa = PBXBuildFile; fileRef = CA4E78E5213528FC0035F075 /* CSLBleReader.m */; };
3538
CA4E78E9213698DD0035F075 /* CSLBleTag.m in Sources */ = {isa = PBXBuildFile; fileRef = CA4E78E8213698DD0035F075 /* CSLBleTag.m */; };
3639
CA506644215996A000C3C9C8 /* digital-7 (mono).ttf in Resources */ = {isa = PBXBuildFile; fileRef = CA506643215996A000C3C9C8 /* digital-7 (mono).ttf */; };
@@ -49,6 +52,8 @@
4952
CABA71662132631F00D15BB1 /* CSLCircularQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = CABA71602132631F00D15BB1 /* CSLCircularQueue.m */; };
5053
CABA71672132631F00D15BB1 /* CSLBlePacket.m in Sources */ = {isa = PBXBuildFile; fileRef = CABA71642132631F00D15BB1 /* CSLBlePacket.m */; };
5154
CABA71682132631F00D15BB1 /* CSLBleInterface.m in Sources */ = {isa = PBXBuildFile; fileRef = CABA71652132631F00D15BB1 /* CSLBleInterface.m */; };
55+
CAD26A69278826890037B28C /* CSLReaderConfigurations.m in Sources */ = {isa = PBXBuildFile; fileRef = CAD26A67278826880037B28C /* CSLReaderConfigurations.m */; };
56+
CAD26A6B278884EE0037B28C /* CSLTagKillVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAD26A6A278884EE0037B28C /* CSLTagKillVC.swift */; };
5257
CAD9B73F248F570100AE01A8 /* CSLReaderFrequency.m in Sources */ = {isa = PBXBuildFile; fileRef = CAD9B73E248F570100AE01A8 /* CSLReaderFrequency.m */; };
5358
CADDF6AA21DDF41E00E05D75 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CADDF6A921DDF41E00E05D75 /* CoreGraphics.framework */; };
5459
CAECD0C1214973EF003321CF /* CSLRfidDemoApp.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CAECD0C0214973EF003321CF /* CSLRfidDemoApp.storyboard */; };
@@ -105,6 +110,9 @@
105110
84CF1AC1DC7B7241A83886CF /* Pods-CS108iOSClient.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CS108iOSClient.debug.xcconfig"; path = "Target Support Files/Pods-CS108iOSClient/Pods-CS108iOSClient.debug.xcconfig"; sourceTree = "<group>"; };
106111
88353A6E485674B1C2AB0B20 /* Pods_CS108iOSClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CS108iOSClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
107112
8C38EEE82B5D5911C071188B /* Pods-CS108iOSClient.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CS108iOSClient.release.xcconfig"; path = "Target Support Files/Pods-CS108iOSClient/Pods-CS108iOSClient.release.xcconfig"; sourceTree = "<group>"; };
113+
CA478097277AEFEB002E3AFA /* CSLPostfilterVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CSLPostfilterVC.swift; sourceTree = "<group>"; };
114+
CA478099277AF01C002E3AFA /* CSLPrefilterVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CSLPrefilterVC.swift; sourceTree = "<group>"; };
115+
CA47809B277AF431002E3AFA /* CSLFilterTabVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CSLFilterTabVC.swift; sourceTree = "<group>"; };
108116
CA4E78E4213528FC0035F075 /* CSLBleReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSLBleReader.h; sourceTree = "<group>"; };
109117
CA4E78E5213528FC0035F075 /* CSLBleReader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CSLBleReader.m; sourceTree = "<group>"; };
110118
CA4E78E7213698DD0035F075 /* CSLBleTag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CSLBleTag.h; sourceTree = "<group>"; };
@@ -135,6 +143,9 @@
135143
CABA71632132631F00D15BB1 /* CSLBleInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSLBleInterface.h; sourceTree = "<group>"; };
136144
CABA71642132631F00D15BB1 /* CSLBlePacket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSLBlePacket.m; sourceTree = "<group>"; };
137145
CABA71652132631F00D15BB1 /* CSLBleInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSLBleInterface.m; sourceTree = "<group>"; };
146+
CAD26A67278826880037B28C /* CSLReaderConfigurations.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSLReaderConfigurations.m; sourceTree = "<group>"; };
147+
CAD26A68278826880037B28C /* CSLReaderConfigurations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSLReaderConfigurations.h; sourceTree = "<group>"; };
148+
CAD26A6A278884EE0037B28C /* CSLTagKillVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CSLTagKillVC.swift; sourceTree = "<group>"; };
138149
CAD9B73D248F570000AE01A8 /* CSLReaderFrequency.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSLReaderFrequency.h; sourceTree = "<group>"; };
139150
CAD9B73E248F570100AE01A8 /* CSLReaderFrequency.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSLReaderFrequency.m; sourceTree = "<group>"; };
140151
CADDF6A921DDF41E00E05D75 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -218,6 +229,10 @@
218229
4296980323E995B20023BC8B /* AppDelegate.swift */,
219230
428F452C2404F3E400A25F9D /* CS108iOSClient-Swift.h */,
220231
42AFE63C23C8333600D71099 /* CS108iOSClient-Bridging-Header.h */,
232+
CA478097277AEFEB002E3AFA /* CSLPostfilterVC.swift */,
233+
CA478099277AF01C002E3AFA /* CSLPrefilterVC.swift */,
234+
CA47809B277AF431002E3AFA /* CSLFilterTabVC.swift */,
235+
CAD26A6A278884EE0037B28C /* CSLTagKillVC.swift */,
221236
);
222237
path = ViewControllers;
223238
sourceTree = "<group>";
@@ -244,6 +259,8 @@
244259
CA78737921514DC9009B7FE6 /* model */ = {
245260
isa = PBXGroup;
246261
children = (
262+
CAD26A68278826880037B28C /* CSLReaderConfigurations.h */,
263+
CAD26A67278826880037B28C /* CSLReaderConfigurations.m */,
247264
CAD9B73D248F570000AE01A8 /* CSLReaderFrequency.h */,
248265
CAD9B73E248F570100AE01A8 /* CSLReaderFrequency.m */,
249266
CA78737A21514E61009B7FE6 /* CSLRfidAppEngine.h */,
@@ -339,7 +356,7 @@
339356
CABA713D21325BF500D15BB1 /* Project object */ = {
340357
isa = PBXProject;
341358
attributes = {
342-
LastUpgradeCheck = 1130;
359+
LastUpgradeCheck = 1310;
343360
ORGANIZATIONNAME = "Convergence Systems Limited";
344361
TargetAttributes = {
345362
CABA714421325BF500D15BB1 = {
@@ -449,6 +466,7 @@
449466
4272750B23E2C033008485F6 /* CSLDeviceTV.swift in Sources */,
450467
42AFE64223C83F6100D71099 /* CSLInventoryVC.swift in Sources */,
451468
CAF7FFF822376AB00016F6E7 /* CSLTemperatureTagSettings.m in Sources */,
469+
CAD26A69278826890037B28C /* CSLReaderConfigurations.m in Sources */,
452470
4234D142240E16C600FA6396 /* CSLTemperatureTagListCell.swift in Sources */,
453471
CA78737C21514E61009B7FE6 /* CSLRfidAppEngine.m in Sources */,
454472
4234D148241FC2DB00FA6396 /* CSLPowerLevelVC.swift in Sources */,
@@ -470,14 +488,18 @@
470488
4234D14A242006ED00FA6396 /* CSLAntennaPortVC.swift in Sources */,
471489
CA5C9BA1217FF7400079827C /* CSLBleReader+AccessControl.m in Sources */,
472490
CAF5CC2B21640E7F00C420EF /* CSLReaderBarcode.m in Sources */,
491+
CA478098277AEFEB002E3AFA /* CSLPostfilterVC.swift in Sources */,
473492
4234D144240E2BFE00FA6396 /* CSLTemperatureUploadVC.swift in Sources */,
474493
CA7873822155F59C009B7FE6 /* CSLReaderInfo.m in Sources */,
475494
4272751123E91EDD008485F6 /* CSLAboutVC.swift in Sources */,
495+
CA47809C277AF431002E3AFA /* CSLFilterTabVC.swift in Sources */,
496+
CA47809A277AF01C002E3AFA /* CSLPrefilterVC.swift in Sources */,
476497
42B903CF23D7C8180041713C /* CSLSettingsVC.swift in Sources */,
477498
CA4E78E6213528FC0035F075 /* CSLBleReader.m in Sources */,
478499
CAD9B73F248F570100AE01A8 /* CSLReaderFrequency.m in Sources */,
479500
4296980623EA5B610023BC8B /* main.swift in Sources */,
480501
4234D14E24200F2800FA6396 /* GaugeView.swift in Sources */,
502+
CAD26A6B278884EE0037B28C /* CSLTagKillVC.swift in Sources */,
481503
CA78737F21543B6F009B7FE6 /* CSLReaderSettings.m in Sources */,
482504
4234D146241FBC3000FA6396 /* CSLTemperatureDetailsVC.swift in Sources */,
483505
CA4E78E9213698DD0035F075 /* CSLBleTag.m in Sources */,
@@ -524,6 +546,7 @@
524546
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
525547
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
526548
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
549+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
527550
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
528551
CLANG_WARN_STRICT_PROTOTYPES = YES;
529552
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -549,7 +572,7 @@
549572
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
550573
GCC_WARN_UNUSED_FUNCTION = YES;
551574
GCC_WARN_UNUSED_VARIABLE = YES;
552-
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
575+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
553576
MTL_ENABLE_DEBUG_INFO = YES;
554577
ONLY_ACTIVE_ARCH = YES;
555578
SDKROOT = iphoneos;
@@ -582,6 +605,7 @@
582605
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
583606
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
584607
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
608+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
585609
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
586610
CLANG_WARN_STRICT_PROTOTYPES = YES;
587611
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -601,7 +625,7 @@
601625
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
602626
GCC_WARN_UNUSED_FUNCTION = YES;
603627
GCC_WARN_UNUSED_VARIABLE = YES;
604-
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
628+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
605629
MTL_ENABLE_DEBUG_INFO = NO;
606630
SDKROOT = iphoneos;
607631
SWIFT_COMPILATION_MODE = wholemodule;
@@ -616,7 +640,7 @@
616640
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
617641
CLANG_ENABLE_MODULES = YES;
618642
CODE_SIGN_STYLE = Automatic;
619-
CURRENT_PROJECT_VERSION = 304;
643+
CURRENT_PROJECT_VERSION = 310;
620644
DEVELOPMENT_TEAM = ZDHT9HGJF7;
621645
FRAMEWORK_SEARCH_PATHS = (
622646
"$(inherited)",
@@ -627,7 +651,7 @@
627651
"$(inherited)",
628652
"@executable_path/Frameworks",
629653
);
630-
MARKETING_VERSION = S3.3;
654+
MARKETING_VERSION = S3.4;
631655
PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
632656
PRODUCT_NAME = CS108Swift;
633657
SWIFT_OBJC_BRIDGING_HEADER = "CS108iOSClient/ViewControllers/CS108iOSClient-Bridging-Header.h";
@@ -644,7 +668,7 @@
644668
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
645669
CLANG_ENABLE_MODULES = YES;
646670
CODE_SIGN_STYLE = Automatic;
647-
CURRENT_PROJECT_VERSION = 304;
671+
CURRENT_PROJECT_VERSION = 310;
648672
DEVELOPMENT_TEAM = ZDHT9HGJF7;
649673
FRAMEWORK_SEARCH_PATHS = (
650674
"$(inherited)",
@@ -655,7 +679,7 @@
655679
"$(inherited)",
656680
"@executable_path/Frameworks",
657681
);
658-
MARKETING_VERSION = S3.3;
682+
MARKETING_VERSION = S3.4;
659683
PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS108iOSClient;
660684
PRODUCT_NAME = CS108Swift;
661685
SWIFT_OBJC_BRIDGING_HEADER = "CS108iOSClient/ViewControllers/CS108iOSClient-Bridging-Header.h";

‎CS108iOSClient.xcodeproj/xcuserdata/TurtleMac01.xcuserdatad/xcschemes/CS108iOSClient.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1310"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CS108iOSClient.xcworkspace/xcuserdata/TurtleMac01.xcuserdatad/UserInterfaceState.xcuserstate

43.7 KB
Binary file not shown.

‎CS108iOSClient/Assets.xcassets/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"info" : {
3-
"version" : 1,
4-
"author" : "xcode"
3+
"author" : "xcode",
4+
"version" : 1
55
}
6-
}
6+
}

‎CS108iOSClient/Assets.xcassets/filter-icon.imageset/Contents.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "filter-icon@25px.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "filter-icon@50px.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "filter-icon@75px.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}

‎CS108iOSClient/Assets.xcassets/filter-icon.imageset/filter-icon@25px.png

2.08 KB
Loading

‎CS108iOSClient/Assets.xcassets/filter-icon.imageset/filter-icon@50px.png

4.05 KB
Loading

‎CS108iOSClient/Assets.xcassets/filter-icon.imageset/filter-icon@75px.png

5.63 KB
Loading

‎CS108iOSClient/CSLReader/CSLBleReader+AccessControl.h

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@
2525
#define TAGWRDAT_6 0x0A0F
2626
#define TAGWRDAT_7 0x0A10
2727

28+
#define INV_EPC_MSK_0_3 0x0912
29+
#define INV_EPC_MSK_4_7 0x0913
30+
#define INV_EPC_MSK_8_11 0x0914
31+
#define INV_EPC_MSK_12_15 0x0915
32+
#define INV_EPC_MSK_16_19 0x0916
33+
#define INV_EPC_MSK_20_23 0x0917
34+
#define INV_EPC_MSK_24_27 0x0918
35+
#define INV_EPC_MSK_28_31 0x0919
36+
2837
///Query sessions
2938
typedef NS_ENUM(Byte, MEMORYBANK)
3039
{
@@ -65,12 +74,19 @@ NS_ASSUME_NONNULL_BEGIN
6574
- (BOOL) sendHostCommandWrite;
6675
- (BOOL) sendHostCommandSearch;
6776
- (BOOL) sendHostCommandLock;
77+
- (BOOL) sendHostCommandKill;
6878

6979
/**
7080
Clear all tag select criteria (8 in total)
7181
@return TRUE if the operation is successful
7282
*/
7383
- (BOOL) clearAllTagSelect;
84+
/**
85+
Select EPC match index
86+
@param idx Index of the selection
87+
@return TRUE if the operation is successful
88+
*/
89+
- (BOOL) setEpcMatchSelect:(Byte)idx;
7490
/**
7591
EPC match configuration
7692
@param match_enable 1 = EPC matching enabled, 0 = EPC matching disabled
@@ -80,6 +96,13 @@ NS_ASSUME_NONNULL_BEGIN
8096
@return TRUE if the operation is successful
8197
*/
8298
- (BOOL) setEpcMatchConfiguration:(BOOL)match_enable matchOn:(BOOL)epc_notEpc matchLength:(UInt16)match_length matchOffset:(UInt16)match_offset;
99+
/**
100+
Select EPC match mask
101+
@param maskLength Length of mask
102+
@param mask Mask data
103+
@return TRUE if the operation is successful
104+
*/
105+
- (BOOL) setEpcMatchMask:(UInt32)maskLength maskData:(NSData*)mask;
83106
/**
84107
Delay time between inventory cycle.
85108
@param cycle_delay Time delay in-between each inventory cycle in ms (use to reduce tag rate). The values should be between 0 to 2000. 0 means fastest tag rate.
@@ -141,6 +164,16 @@ NS_ASSUME_NONNULL_BEGIN
141164
@return TRUE if the operation is successful
142165
*/
143166
- (BOOL) startTagMemoryLock:(UInt32)lockCommandConfigBits ACCPWD:(UInt32)password maskBank:(MEMORYBANK)mask_bank maskPointer:(UInt16)mask_pointer maskLength:(UInt32)mask_Length maskData:(NSData*)mask_data;
167+
/**
168+
Send singular tag kill command
169+
@param password Access password for the tag
170+
@param mask_bank Mask bank to be used for tag selection
171+
@param mask_pointer Pointer to the start of the memory address, to be expressed by bits
172+
@param mask_Length Size of the mask expressed in number of bits
173+
@param mask_data mask value
174+
@return TRUE if the operation is successful
175+
*/
176+
- (BOOL) startTagMemoryKill:(UInt32)password maskBank:(MEMORYBANK)mask_bank maskPointer:(UInt16)mask_pointer maskLength:(UInt32)mask_Length maskData:(NSData*)mask_data;
144177
/**
145178
Send singular tag search command
146179
@param mask_bank Mask bank to be used for tag selection

0 commit comments

Comments
 (0)