try bew install binary formula for llvm, doc update for image_apis

senakicir · Sep 5, 2017 · a5b79a0 · a5b79a0
1 parent 9b28fc1
commit a5b79a0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/docs/image_apis.md b/docs/image_apis.md
@@ -75,14 +75,16 @@ To change resolution, FOV etc, you can use [settings.json](settings.md). For exa
 
 ```
 {
-  "SceneCaptureSettings" : {
-    "Width": 256,
-    "Height": 144,
-    "FOV_Degrees": 90,
-    "AutoExposureSpeed": 100,
-    "MotionBlurAmount": 0
-  },
-  "DefaultVehicleConfig": "SimpleFlight",
+  "CaptureSettings": [
+    {
+      "ImageType": 0,
+      "Width": 256,
+      "Height": 144,
+      "FOV_Degrees": 90,
+      "AutoExposureSpeed": 100,
+      "MotionBlurAmount": 0
+    }
+  ],
   "UsageScenario": "ComputerVision"
 }
 ```

diff --git a/setup.sh b/setup.sh
@@ -16,7 +16,9 @@ if [ "$(uname)" == "Darwin" ]; then
         sudo dseditgroup -o edit -a `whoami` -t user dialout
     fi
 
-    brew install llvm@3.9
+    #below takes way too long
+    # brew install llvm@3.9
+    brew install homebrew/versions/llvm39
 else
     if [[ ! -z "${whoami}" ]]; then #this happens when running in travis
         sudo /usr/sbin/useradd -G dialout $USER