Merge branch 'quad-impl-lidar' of git.ece.iastate.edu:danc/MicroCART_17-18 into quad-impl-lidar

quad/sw/modular_quad_pid/src/iic_utils.c

@@ -63,7 +63,7 @@ int iic0_mpu9150_start(){
 	// Set clock reference to Z Gyro
 	iic0_mpu9150_write(0x6B, 0x03);
 	// Configure Digital Low/High Pass filter
-	iic0_mpu9150_write(0x1A,0x06); // Level 4 low pass on gyroscope
+	iic0_mpu9150_write(0x1A,0x06); // Level 6 low pass on gyroscope
 
 	// Configure Gyro to 2000dps, Accel. to +/-8G
 	iic0_mpu9150_write(0x1B, 0x18);

quad/sw/modular_quad_pid/src/initialize_components.c

@@ -24,13 +24,9 @@ int protection_loops(modular_structs_t *structs)
 
 	// wait until throttle is low and the gear switch is engaged (so you don't immediately break out of the main loop below)
 	// also wait for the flight mode to be set to manual
-	while(rc_commands[THROTTLE] > 125000 || read_kill(rc_commands[GEAR]) || !read_flap(rc_commands[FLAP]))
-		read_rec_all(rc_commands);
-
-	// wait until the ground station has connected to the quad and acknowledged that its ready to start
-	while (!structs->user_input_struct.receivedBeginUpdate) {
+	while(rc_commands[THROTTLE] > 125000 || read_kill(rc_commands[GEAR]) || !read_flap(rc_commands[FLAP])) {
 		process_received(structs);
-		usleep(10000);
+		read_rec_all(rc_commands);
 	}
 
 	// let the pilot/observers know that the quad is now active

quad/sw/modular_quad_pid/src/log_data.c

@@ -143,7 +143,7 @@ void printLogging(){
 
 					);
 
-	strcat(buf,comments);
+	//strcat(buf,comments);
 	strcat(buf,header);
 	strcat(buf,units);
 

website/content/pages/documents.md

@@ -4,11 +4,14 @@ sortorder: 005
 
 ## Project Plan
 
-[Project Plan 1](/files/ProjectPlan1Template.docx.pdf)
+[Project Plan 1](/files/ProjectPlan1Template.docx.pdf)  
+[Project Plan 2](/files/ProjectPlanVersion2.pdf)  
+[Project Plan 3](/files/ProjectPlanVersion3.pdf)  
 
 ## Design Document
 
-[Design Document 1](/files/DesignDocument1.docx.pdf)
+[Design Document 1](/files/DesignDocument1.docx.pdf)  
+[Design Document 2](/files/DesignDocument2.pdf)  
 
 ## Weekly Reports
 <iframe src="https://drive.google.com/embeddedfolderview?id=0BywzM7Q_7PUSeF8tdWpmMVN0eG8#list" width="100%" height="500" frameborder="0"></iframe>