From b6cb51a49192d22745ed2f9ab144712a49b455f0 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Thu, 11 Sep 2014 01:55:42 +0000 Subject: [PATCH] --- DUREX Vendor Control/Base.lproj/Localizable.strings | 3 ++- DUREX Vendor Control/CommunicationProtocol.m | 22 ++++++++++------------ DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate | Bin 137739 -> 0 bytes DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | 38 +++++++++++++++++++++++++++++++++++--- DUREX Vendor Control/en.lproj/Localizable.strings | 3 ++- DUREX Vendor Control/es.lproj/Localizable.strings | 3 ++- 6 files changed, 51 insertions(+), 18 deletions(-) diff --git a/DUREX Vendor Control/Base.lproj/Localizable.strings b/DUREX Vendor Control/Base.lproj/Localizable.strings index fc52438..4ff9800 100644 --- a/DUREX Vendor Control/Base.lproj/Localizable.strings +++ b/DUREX Vendor Control/Base.lproj/Localizable.strings @@ -86,4 +86,5 @@ "Report sent successfully" = "Report sent successfully"; "Success!" = "Success!"; "Connection to server failed" = "Connection to server failed"; -"Error" = "Error"; \ No newline at end of file +"Error" = "Error"; +"Product" = "Product"; \ No newline at end of file diff --git a/DUREX Vendor Control/CommunicationProtocol.m b/DUREX Vendor Control/CommunicationProtocol.m index c1f414e..f7b20f7 100644 --- a/DUREX Vendor Control/CommunicationProtocol.m +++ b/DUREX Vendor Control/CommunicationProtocol.m @@ -359,21 +359,20 @@ [self writeMessage:command]; //NSString *answer = [self readMessage]; - NSMutableString *answer = [[NSMutableString alloc]initWithString:@"P400255002550025510"]; - for(int i = 0; i < 18; i++) + NSMutableString *answer = [[NSMutableString alloc]initWithString:@"P400015000150001500000001001003005002000001002"]; + for(int i = 0; i < 4; i++) { [answer appendString:@"0"]; + [answer appendString:@"1"]; } - for(int i = 0; i < 9; i++) + for(int i = 0; i < 12; i++) { - [answer appendString:@"4"]; - } - for(int i = 0; i < 32; i++) - { - [answer appendString:@"2"]; + [answer appendString:@"0"]; + [answer appendString:@"0"]; } - [answer appendString:@"1"]; - [answer appendString:@"1"]; + + [answer appendString:@"0"]; + [answer appendString:@"0"]; if([answer length] > 1 && [[answer substringToIndex:2]isEqualToString:@"P4"]) { @@ -415,8 +414,7 @@ [command appendString:endDate]; [self writeMessage:command]; //NSString *answer = [self readMessage]; - - /*NSMutableString *answer = [[NSMutableString alloc]initWithString:@"P21405141651010000000000620850050101P21407225404000002000100621050000001P2P2"];*/ + NSMutableString *answer = [[NSMutableString alloc]initWithString:@"P21408161036000001000000110450000001P21409012216000100000000220900000100P21409032307000000010502330800000000P21409070540000000020000440350000001P2P2"]; if([answer length] > 1 && [[answer substringToIndex:2]isEqualToString:@"P2"]) { diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate index 7b25ff8..b18b587 100644 Binary files a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate and b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index c5de594..07f5387 100644 --- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -106,11 +106,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "CommunicationProtocol.m" - timestampString = "431825237.058289" + timestampString = "431950031.704831" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "378" - endingLineNumber = "378" + startingLineNumber = "377" + endingLineNumber = "377" landmarkName = "-readSensorData" landmarkType = "5"> @@ -483,5 +483,37 @@ landmarkType = "5"> + + + + + + + + diff --git a/DUREX Vendor Control/en.lproj/Localizable.strings b/DUREX Vendor Control/en.lproj/Localizable.strings index 934b0e5..077a4b4 100644 --- a/DUREX Vendor Control/en.lproj/Localizable.strings +++ b/DUREX Vendor Control/en.lproj/Localizable.strings @@ -86,4 +86,5 @@ "Report sent successfully" = "Report sent successfully"; "Success!" = "Success!"; "Connection to server failed" = "Connection to server failed"; -"Error" = "Error"; \ No newline at end of file +"Error" = "Error"; +"Product" = "Product"; \ No newline at end of file diff --git a/DUREX Vendor Control/es.lproj/Localizable.strings b/DUREX Vendor Control/es.lproj/Localizable.strings index 233d233..3d53d07 100644 --- a/DUREX Vendor Control/es.lproj/Localizable.strings +++ b/DUREX Vendor Control/es.lproj/Localizable.strings @@ -86,4 +86,5 @@ "Report sent successfully" = "Informe enviado satisfactoriamente"; "Success!" = "Éxito!"; "Connection to server failed" = "Conexión al servidor fallida"; -"Error" = "Error"; \ No newline at end of file +"Error" = "Error"; +"Product" = "Producto"; \ No newline at end of file -- libgit2 0.22.2