Merge branch 'forPat'

Conflicts: AeroQuad32/platform_aeroquad32.h
kh4 · Jan 27, 2013 · e1f929c · e1f929c
2 parents 5d9cbe2 + ae12991
commit e1f929c
Show file tree

Hide file tree

Showing 453 changed files with 104,744 additions and 104,744 deletions.
diff --git a/AeroQuad/AeroQuad.h b/AeroQuad/AeroQuad.h
@@ -365,4 +365,4 @@ byte fastTransfer = OFF; // Used for troubleshooting
 //byte testSignal = LOW;
 //////////////////////////////////////////////////////
 
-#endif // _AQ_GLOBAL_HEADER_DEFINITION_H_
+#endif // _AQ_GLOBAL_HEADER_DEFINITION_H_
diff --git a/AeroQuad/AeroQuad.ino b/AeroQuad/AeroQuad.ino
@@ -1623,4 +1623,4 @@ void loop () {
 }
 
 
-
+
diff --git a/AeroQuad/AltitudeControlProcessor.h b/AeroQuad/AltitudeControlProcessor.h
@@ -117,4 +117,4 @@ void processAltitudeHold()
 
 #endif
 
-#endif // _AQ_ALTITUDE_CONTROL_PROCESSOR_H_
+#endif // _AQ_ALTITUDE_CONTROL_PROCESSOR_H_
diff --git a/AeroQuad/DataStorage.h b/AeroQuad/DataStorage.h
@@ -500,4 +500,4 @@ void initReceiverFromEEPROM() {
 }
 
 #endif // _AQ_DATA_STORAGE_H_
-
+
diff --git a/AeroQuad/FlightCommandProcessor.h b/AeroQuad/FlightCommandProcessor.h
@@ -282,4 +282,4 @@ void readPilotCommands() {
 }
 
 #endif // _AQ_FLIGHT_COMMAND_READER_
-
+
diff --git a/AeroQuad/FlightControlProcessor.h b/AeroQuad/FlightControlProcessor.h
@@ -346,4 +346,4 @@ void processFlightControl() {
 }
 
 #endif //#define _AQ_PROCESS_FLIGHT_CONTROL_H_
-
+
diff --git a/AeroQuad/GpsNavigator.h b/AeroQuad/GpsNavigator.h
@@ -410,4 +410,4 @@ void initHomeBase() {
 
 
 
-
+
diff --git a/AeroQuad/HeadingHoldProcessor.h b/AeroQuad/HeadingHoldProcessor.h
@@ -121,4 +121,4 @@ void processHeading()
 
 
 
-
+
diff --git a/AeroQuad/MavLink.h b/AeroQuad/MavLink.h
@@ -1429,4 +1429,4 @@ void sendSerialTelemetry() {
 }
 
 #endif //#define _AQ_MAVLINK_H_
-
+
diff --git a/AeroQuad/OSDDisplayController.h b/AeroQuad/OSDDisplayController.h
@@ -92,4 +92,4 @@ void updateOSD() {
   }
 }
 
-#endif
+#endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -117,4 +117,4 @@ void processAltitudeHold()

		#endif

		#endif // _AQ_ALTITUDE_CONTROL_PROCESSOR_H_
		#endif // _AQ_ALTITUDE_CONTROL_PROCESSOR_H_
Original file line number	Diff line number	Diff line change
Expand Up		@@ -500,4 +500,4 @@ void initReceiverFromEEPROM() {
		}

		#endif // _AQ_DATA_STORAGE_H_
Original file line number	Diff line number	Diff line change
Expand Up		@@ -282,4 +282,4 @@ void readPilotCommands() {
		}

		#endif // _AQ_FLIGHT_COMMAND_READER_
Original file line number	Diff line number	Diff line change
Expand Up		@@ -346,4 +346,4 @@ void processFlightControl() {
		}

		#endif //#define _AQ_PROCESS_FLIGHT_CONTROL_H_
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1429,4 +1429,4 @@ void sendSerialTelemetry() {
		}

		#endif //#define _AQ_MAVLINK_H_
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,4 +92,4 @@ void updateOSD() { @@
       }
     }
-    #endif
+    #endif