From ef2597a626f91792290360b246845ee13b7657dc Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Wed, 27 Nov 2013 20:14:17 +0900
Subject: [PATCH] DataFlash: rename Log_Write_SERVO to Log_Write_RCOU

---
 libraries/DataFlash/DataFlash.h | 10 +++++-----
 libraries/DataFlash/LogFile.cpp |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/DataFlash/DataFlash.h b/libraries/DataFlash/DataFlash.h
index 26de011437..fe0f6f2c25 100644
--- a/libraries/DataFlash/DataFlash.h
+++ b/libraries/DataFlash/DataFlash.h
@@ -48,7 +48,7 @@ public:
     void Log_Write_GPS(const GPS *gps, int32_t relative_alt);
     void Log_Write_IMU(const AP_InertialSensor &ins);
     void Log_Write_RCIN(void);
-    void Log_Write_SERVO(void);
+    void Log_Write_RCOUT(void);
     void Log_Write_Message(const char *message);
     void Log_Write_Message_P(const prog_char_t *message);
 
@@ -182,7 +182,7 @@ struct PACKED log_RCIN {
     uint16_t chan8;
 };
 
-struct PACKED log_SERVO {
+struct PACKED log_RCOUT {
     LOG_PACKET_HEADER;
     uint32_t timestamp;
     uint16_t chan1;
@@ -208,8 +208,8 @@ struct PACKED log_SERVO {
       "MSG",  "Z",     "Message"}, \
     { LOG_RCIN_MSG, sizeof(log_RCIN), \
       "RCIN",  "Ihhhhhhhh",     "TimeMS,Chan1,Chan2,Chan3,Chan4,Chan5,Chan6,Chan7,Chan8" }, \
-    { LOG_SERVO_MSG, sizeof(log_SERVO), \
-      "SRVO",  "Ihhhhhhhh",     "TimeMS,Chan1,Chan2,Chan3,Chan4,Chan5,Chan6,Chan7,Chan8" }
+    { LOG_RCOUT_MSG, sizeof(log_RCOUT), \
+      "RCOU",  "Ihhhhhhhh",     "TimeMS,Chan1,Chan2,Chan3,Chan4,Chan5,Chan6,Chan7,Chan8" }
 
 // message types for common messages
 #define LOG_FORMAT_MSG	  128
@@ -218,7 +218,7 @@ struct PACKED log_SERVO {
 #define LOG_IMU_MSG		  131
 #define LOG_MESSAGE_MSG	  132
 #define LOG_RCIN_MSG      133
-#define LOG_SERVO_MSG     134
+#define LOG_RCOUT_MSG     134
 
 #include "DataFlash_Block.h"
 #include "DataFlash_File.h"
diff --git a/libraries/DataFlash/LogFile.cpp b/libraries/DataFlash/LogFile.cpp
index 32aad24835..c09627b586 100644
--- a/libraries/DataFlash/LogFile.cpp
+++ b/libraries/DataFlash/LogFile.cpp
@@ -666,10 +666,10 @@ void DataFlash_Class::Log_Write_RCIN(void)
 }
 
 // Write an SERVO packet
-void DataFlash_Class::Log_Write_SERVO(void)
+void DataFlash_Class::Log_Write_RCOUT(void)
 {
-    struct log_SERVO pkt = {
-        LOG_PACKET_HEADER_INIT(LOG_SERVO_MSG),
+    struct log_RCOUT pkt = {
+        LOG_PACKET_HEADER_INIT(LOG_RCOUT_MSG),
         timestamp     : hal.scheduler->millis(),
         chan1         : hal.rcout->read(0),
         chan2         : hal.rcout->read(1),