From 6b421f379f59f9103aeb063d3091498077f01f47 Mon Sep 17 00:00:00 2001
From: Michael Oborne <Meee146@gmail.com>
Date: Mon, 14 May 2012 12:35:20 +0800
Subject: [PATCH] firmware build

---
 .../Firmware/firmware2.xml                    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml b/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml
index 8c213e99e2..3cc07ef407 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml
+++ b/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml
@@ -28,8 +28,8 @@
 
 #define HIL_PORT            0
 
-#define LOGGING_ENABLED DISABLED
-#define CLI_ENABLED DISABLED
+//define LOGGING_ENABLED DISABLED
+//define CLI_ENABLED DISABLED
 
 #define GPS_PROTOCOL 		GPS_PROTOCOL_MTK
 
@@ -47,7 +47,7 @@
     <url>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.hex</url>
     <url2560>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.hex</url2560>
     <url2560-2>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560-2.hex</url2560-2>
-    <name>ArduCopter V2.5.4 Quad</name>
+    <name>ArduCopter V2.5.5 Quad</name>
     <desc>
 #define FRAME_CONFIG QUAD_FRAME
 
@@ -58,7 +58,7 @@
     <url>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.hex</url>
     <url2560>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.hex</url2560>
     <url2560-2>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560-2.hex</url2560-2>
-    <name>ArduCopter V2.5.4 Tri</name>
+    <name>ArduCopter V2.5.5 Tri</name>
     <desc>
 #define FRAME_CONFIG TRI_FRAME
 
@@ -69,7 +69,7 @@
     <url>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.hex</url>
     <url2560>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.hex</url2560>
     <url2560-2>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560-2.hex</url2560-2>
-    <name>ArduCopter V2.5.4 Hexa</name>
+    <name>ArduCopter V2.5.5 Hexa</name>
     <desc>
 #define FRAME_CONFIG HEXA_FRAME
 
@@ -80,18 +80,18 @@
     <url>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.hex</url>
     <url2560>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.hex</url2560>
     <url2560-2>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560-2.hex</url2560-2>
-    <name>ArduCopter V2.5.3 Y6</name>
+    <name>ArduCopter V2.5.5 Y6</name>
     <desc>
-#define FRAME_CONFIG Y6_FRAME
+define FRAME_CONFIG Y6_FRAME
 
 </desc>
-    <format_version>117</format_version>
+    <format_version>118</format_version>
   </Firmware>
   <Firmware>
     <url>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Octav-1280.hex</url>
     <url2560>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Octav-2560.hex</url2560>
     <url2560-2>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Octav-2560-2.hex</url2560-2>
-    <name>ArduCopter V2.5.4 Octa V</name>
+    <name>ArduCopter V2.5.5 Octa V</name>
     <desc>
 #define FRAME_CONFIG OCTA_FRAME
 #define FRAME_ORIENTATION V_FRAME
@@ -103,7 +103,7 @@
     <url>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Octa-1280.hex</url>
     <url2560>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Octa-2560.hex</url2560>
     <url2560-2>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Octa-2560-2.hex</url2560-2>
-    <name>ArduCopter V2.5.4 Octa</name>
+    <name>ArduCopter V2.5.5 Octa</name>
     <desc>
 #define FRAME_CONFIG OCTA_FRAME
 
@@ -161,7 +161,7 @@
     <url>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.hex</url>
     <url2560>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.hex</url2560>
     <url2560-2>http://meee146-planner.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560-2.hex</url2560-2>
-    <name>ArduCopter V2.5.4 Quad Hil</name>
+    <name>ArduCopter V2.5.5 Quad Hil</name>
     <desc>
 #define FRAME_CONFIG QUAD_FRAME
 #define FRAME_ORIENTATION PLUS_FRAME