Merge branch 'master' into phil-dist_model_v5

philip-lamb · philip-lamb · commit 17e444ff1478 · 2018-04-12T10:50:28.000+12:00
* master:
  Allow calibration with iOS photo preset.
diff --git a/iOS/SettingsViewController.mm b/iOS/SettingsViewController.mm
@@ -89,7 +89,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-    self.cameraResPresets = [NSArray arrayWithObjects:@"cif", @"480p" /*@"vga"*/, @"720p", @"1080p", @"low", @"medium", @"high", nil];
+    self.cameraResPresets = [NSArray arrayWithObjects:@"cif", @"480p" /*@"vga"*/, @"720p", @"1080p", @"low", @"medium", @"high", @"photo", nil];
     
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ - (void)viewDidLoad`
`89`	`89`	`{`
`90`	`90`	`[super viewDidLoad];`
`91`	`91`
`92`		`- self.cameraResPresets = [NSArray arrayWithObjects:@"cif", @"480p" /@"vga"/, @"720p", @"1080p", @"low", @"medium", @"high", nil];`
	`92`	`+ self.cameraResPresets = [NSArray arrayWithObjects:@"cif", @"480p" /@"vga"/, @"720p", @"1080p", @"low", @"medium", @"high", @"photo", nil];`
`93`	`93`
`94`	`94`	`NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];`
`95`	`95`