continuing review

CopterExpress · Jun 24, 2022 · b12b4d1 · b12b4d1
1 parent 0700458
commit b12b4d1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/clover_blocks/www/index.html b/clover_blocks/www/index.html
@@ -492,6 +492,8 @@
 </html>
 
 
+
 =======
 </html>
+
 >>>>>>> a78f6506b8dbaf1bcb2bebd475478dcd0f09044e
diff --git a/clover_blocks/www/main.css b/clover_blocks/www/main.css
@@ -136,6 +136,8 @@ body[data-tab="python"] #python { display: block !important; }
 <<<<<<< HEAD
 }
 
+
 =======
 }
+
 >>>>>>> a78f6506b8dbaf1bcb2bebd475478dcd0f09044e
diff --git a/clover_blocks/www/main.js b/clover_blocks/www/main.js
@@ -328,4 +328,5 @@ programSelect.addEventListener('change', function(e) {
 
 =======
 });
+
 >>>>>>> a78f6506b8dbaf1bcb2bebd475478dcd0f09044e
diff --git a/clover_simulation/launch/simulator.launch b/clover_simulation/launch/simulator.launch
@@ -3,7 +3,7 @@
     <arg name="mav_id" default="0"/>
     <arg name="est" default="ekf2"/> <!-- PX4 estimator: lpe, ekf2 -->
     <arg name="vehicle" default="clover"/> <!-- PX4 vehicle configuration: clover, clover_vpe -->
-    <arg name="main_camera" default="false"/> <!-- Simulated vision position estimation camera (optical flow, ArUco) -->
+    <arg name="main_camera" default="true"/> <!-- Simulated vision position estimation camera (optical flow, ArUco) -->
     <arg name="maintain_camera_rate" default="true"/> <!-- Slow simulation down to maintain camera rate -->
     <arg name="rangefinder" default="true"/> <!-- Simulated downward-facing rangefinder, vl53l1x-like -->
     <arg name="led" default="true"/> <!-- Simulated LED strip, ws281x-like -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -492,6 +492,8 @@ @@
     </html>
     =======
     </html>
     >>>>>>> a78f6506b8dbaf1bcb2bebd475478dcd0f09044e
Original file line number	Diff line number	Diff line change
Expand Up		@@ -328,4 +328,5 @@ programSelect.addEventListener('change', function(e) {

		=======
		});

		>>>>>>> a78f6506b8dbaf1bcb2bebd475478dcd0f09044e