Imanol-Mikel Barba Sabariego / btvendor · Commits

Commit b6cb51a49192d22745ed2f9ab144712a49b455f0

Authored by Imanol-Mikel Barba Sabariego
1 parent 3600f6c7

--no commit message

Inline Side-by-side
Showing 6 changed files with 51 additions and 18 deletions
DUREX Vendor Control/Base.lproj/Localizable.strings
  View file @b6cb51a
@@ -86,4 +86,5 @@ @@ -86,4 +86,5 @@
86 "Report sent successfully" = "Report sent successfully"; 86 "Report sent successfully" = "Report sent successfully";
87 "Success!" = "Success!"; 87 "Success!" = "Success!";
88 "Connection to server failed" = "Connection to server failed"; 88 "Connection to server failed" = "Connection to server failed";
89 -"Error" = "Error";  
90 \ No newline at end of file 89 \ No newline at end of file
  90 +"Error" = "Error";
  91 +"Product" = "Product";
91 \ No newline at end of file 92 \ No newline at end of file
DUREX Vendor Control/CommunicationProtocol.m
  View file @b6cb51a
@@ -359,21 +359,20 @@ @@ -359,21 +359,20 @@
359 [self writeMessage:command]; 359 [self writeMessage:command];
360 //NSString *answer = [self readMessage]; 360 //NSString *answer = [self readMessage];
361 361
362 - NSMutableString *answer = [[NSMutableString alloc]initWithString:@"P400255002550025510"];  
363 - for(int i = 0; i < 18; i++) 362 + NSMutableString *answer = [[NSMutableString alloc]initWithString:@"P400015000150001500000001001003005002000001002"];
  363 + for(int i = 0; i < 4; i++)
364 { 364 {
365 [answer appendString:@"0"]; 365 [answer appendString:@"0"];
  366 + [answer appendString:@"1"];
366 } 367 }
367 - for(int i = 0; i < 9; i++) 368 + for(int i = 0; i < 12; i++)
368 { 369 {
369 - [answer appendString:@"4"];  
370 - }  
371 - for(int i = 0; i < 32; i++)  
372 - {  
373 - [answer appendString:@"2"]; 370 + [answer appendString:@"0"];
  371 + [answer appendString:@"0"];
374 } 372 }
375 - [answer appendString:@"1"];  
376 - [answer appendString:@"1"]; 373 +
  374 + [answer appendString:@"0"];
  375 + [answer appendString:@"0"];
377 376
378 if([answer length] > 1 && [[answer substringToIndex:2]isEqualToString:@"P4"]) 377 if([answer length] > 1 && [[answer substringToIndex:2]isEqualToString:@"P4"])
379 { 378 {
@@ -415,8 +414,7 @@ @@ -415,8 +414,7 @@
415 [command appendString:endDate]; 414 [command appendString:endDate];
416 [self writeMessage:command]; 415 [self writeMessage:command];
417 //NSString *answer = [self readMessage]; 416 //NSString *answer = [self readMessage];
418 -  
419 - /*NSMutableString *answer = [[NSMutableString alloc]initWithString:@"P21405141651010000000000620850050101P21407225404000002000100621050000001P2P2"];*/ 417 +
420 NSMutableString *answer = [[NSMutableString alloc]initWithString:@"P21408161036000001000000110450000001P21409012216000100000000220900000100P21409032307000000010502330800000000P21409070540000000020000440350000001P2P2"]; 418 NSMutableString *answer = [[NSMutableString alloc]initWithString:@"P21408161036000001000000110450000001P21409012216000100000000220900000100P21409032307000000010502330800000000P21409070540000000020000440350000001P2P2"];
421 if([answer length] > 1 && [[answer substringToIndex:2]isEqualToString:@"P2"]) 419 if([answer length] > 1 && [[answer substringToIndex:2]isEqualToString:@"P2"])
422 { 420 {
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
View file @b6cb51a
No preview for this file type
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  View file @b6cb51a
@@ -106,11 +106,11 @@ @@ -106,11 +106,11 @@
106 ignoreCount = "0" 106 ignoreCount = "0"
107 continueAfterRunningActions = "No" 107 continueAfterRunningActions = "No"
108 filePath = "CommunicationProtocol.m" 108 filePath = "CommunicationProtocol.m"
109 - timestampString = "431825237.058289" 109 + timestampString = "431950031.704831"
110 startingColumnNumber = "9223372036854775807" 110 startingColumnNumber = "9223372036854775807"
111 endingColumnNumber = "9223372036854775807" 111 endingColumnNumber = "9223372036854775807"
112 - startingLineNumber = "378"  
113 - endingLineNumber = "378" 112 + startingLineNumber = "377"
  113 + endingLineNumber = "377"
114 landmarkName = "-readSensorData" 114 landmarkName = "-readSensorData"
115 landmarkType = "5"> 115 landmarkType = "5">
116 </BreakpointContent> 116 </BreakpointContent>
@@ -483,5 +483,37 @@ @@ -483,5 +483,37 @@
483 landmarkType = "5"> 483 landmarkType = "5">
484 </BreakpointContent> 484 </BreakpointContent>
485 </BreakpointProxy> 485 </BreakpointProxy>
  486 + <BreakpointProxy
  487 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  488 + <BreakpointContent
  489 + shouldBeEnabled = "No"
  490 + ignoreCount = "0"
  491 + continueAfterRunningActions = "No"
  492 + filePath = "MenuTableViewController.m"
  493 + timestampString = "431950315.399317"
  494 + startingColumnNumber = "9223372036854775807"
  495 + endingColumnNumber = "9223372036854775807"
  496 + startingLineNumber = "856"
  497 + endingLineNumber = "856"
  498 + landmarkName = "-tableView:cellForRowAtIndexPath:"
  499 + landmarkType = "5">
  500 + </BreakpointContent>
  501 + </BreakpointProxy>
  502 + <BreakpointProxy
  503 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  504 + <BreakpointContent
  505 + shouldBeEnabled = "No"
  506 + ignoreCount = "0"
  507 + continueAfterRunningActions = "No"
  508 + filePath = "MenuTableViewController.m"
  509 + timestampString = "431950324.585151"
  510 + startingColumnNumber = "9223372036854775807"
  511 + endingColumnNumber = "9223372036854775807"
  512 + startingLineNumber = "854"
  513 + endingLineNumber = "854"
  514 + landmarkName = "-tableView:cellForRowAtIndexPath:"
  515 + landmarkType = "5">
  516 + </BreakpointContent>
  517 + </BreakpointProxy>
486 </Breakpoints> 518 </Breakpoints>
487 </Bucket> 519 </Bucket>
DUREX Vendor Control/en.lproj/Localizable.strings
  View file @b6cb51a
@@ -86,4 +86,5 @@ @@ -86,4 +86,5 @@
86 "Report sent successfully" = "Report sent successfully"; 86 "Report sent successfully" = "Report sent successfully";
87 "Success!" = "Success!"; 87 "Success!" = "Success!";
88 "Connection to server failed" = "Connection to server failed"; 88 "Connection to server failed" = "Connection to server failed";
89 -"Error" = "Error";  
90 \ No newline at end of file 89 \ No newline at end of file
  90 +"Error" = "Error";
  91 +"Product" = "Product";
91 \ No newline at end of file 92 \ No newline at end of file
DUREX Vendor Control/es.lproj/Localizable.strings
  View file @b6cb51a
@@ -86,4 +86,5 @@ @@ -86,4 +86,5 @@
86 "Report sent successfully" = "Informe enviado satisfactoriamente"; 86 "Report sent successfully" = "Informe enviado satisfactoriamente";
87 "Success!" = "Éxito!"; 87 "Success!" = "Éxito!";
88 "Connection to server failed" = "Conexión al servidor fallida"; 88 "Connection to server failed" = "Conexión al servidor fallida";
89 -"Error" = "Error";  
90 \ No newline at end of file 89 \ No newline at end of file
  90 +"Error" = "Error";
  91 +"Product" = "Producto";
91 \ No newline at end of file 92 \ No newline at end of file