Merge pull request #34 from cslrfid/release-2.9

Bug fix on data input validation

Author: ksclam

CS108iOSClient.xcodeproj/project.pbxproj

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

CS108iOSClient/CSLRfidDemoApp.storyboard

@@ -584,7 +584,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="60" translatesAutoresizingMaskIntoConstraints="NO" id="Y6L-Xl-CtA" userLabel="Power">
                                         <rect key="frame" x="0.0" y="0.0" width="310" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Power (dBm)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lFJ-9N-x0b">
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Power (0-300)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lFJ-9N-x0b">
                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="34"/>
                                                 <fontDescription key="fontDescription" name="Lato-Regular" family="Lato" pointSize="15"/>
                                                 <nil key="textColor"/>

CS108iOSClient/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>2681</string>
+	<string>2690</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>

CS108iOSClient/ViewControllers/CSLMoreFunctionsVC.m

@@ -43,6 +43,13 @@ - (IBAction)btnMultibankPressed:(id)sender {
 }
 
 - (IBAction)btnFiltersPressed:(id)sender {
+    
+    UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Not Available" message:@"Feature to be implemented" preferredStyle:UIAlertControllerStyleAlert];
+    
+    UIAlertAction *ok = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil];
+    [alert addAction:ok];
+    [self presentViewController:alert animated:YES completion:nil];
+    
 }
 
 - (IBAction)btnMQTTPressed:(id)sender {

CS108iOSClient/ViewControllers/CSLSettingsVC.m

@@ -287,7 +287,7 @@ - (IBAction)txtTagPopulationChanged:(id)sender {
 - (IBAction)txtPowerChanged:(id)sender {
     NSScanner* scan = [NSScanner scannerWithString:txtPower.text];
     int val;
-    if ([scan scanInt:&val] && [scan isAtEnd] && [txtPower.text intValue] >= 0 && [txtPower.text intValue] <= 320) //valid int between 0 to 320
+    if ([scan scanInt:&val] && [scan isAtEnd] && [txtPower.text intValue] >= 0 && [txtPower.text intValue] <= 300) //valid int between 0 to 300
     {
         NSLog(@"Power value entered: OK");
     }

CS108iOSClient/ViewControllers/CSLTemperatureTagSettingsVC.m

@@ -221,7 +221,7 @@ - (IBAction)txtHighTemperatureThresholdChanged:(id)sender {
 - (IBAction)txtOcrssiMinChanged:(id)sender {
     NSScanner* scan = [NSScanner scannerWithString:self.txtOcrssiMin.text];
     int val;
-    if ([scan scanInt:&val] && [scan isAtEnd] && [self.txtOcrssiMin.text intValue] >= 0 && [self.txtOcrssiMin.text intValue] <= 15) //valid int between 0 to 15
+    if ([scan scanInt:&val] && [scan isAtEnd] && [self.txtOcrssiMin.text intValue] >= 0 && [self.txtOcrssiMin.text intValue] <= 31) //valid int between 0 to 15
     {
         NSLog(@"On-chip RSSI low value entered: OK");
     }
@@ -232,7 +232,7 @@ - (IBAction)txtOcrssiMinChanged:(id)sender {
 - (IBAction)txtOcrssiMaxChanged:(id)sender {
     NSScanner* scan = [NSScanner scannerWithString:self.txtOcrssiMax.text];
     int val;
-    if ([scan scanInt:&val] && [scan isAtEnd] && [self.txtOcrssiMax.text intValue] >= 0 && [self.txtOcrssiMax.text intValue] <= 15) //valid int between 0 to 15
+    if ([scan scanInt:&val] && [scan isAtEnd] && [self.txtOcrssiMax.text intValue] >= 0 && [self.txtOcrssiMax.text intValue] <= 31) //valid int between 0 to 15
     {
         NSLog(@"On-chip RSSI high value entered: OK");
     }