From e1b4ec31321841277924057fbbb4e84690077c5b Mon Sep 17 00:00:00 2001
From: jasonshort <jasonshort@f9c3cf11-9bcb-44bc-f272-b75c42450872>
Date: Sat, 29 Jan 2011 05:55:23 +0000
Subject: [PATCH] fixed Current logging output.

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1572 f9c3cf11-9bcb-44bc-f272-b75c42450872
---
 ArduCopterMega/Log.pde  | 18 +++++++++++++-----
 ArduCopterMega/test.pde |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ArduCopterMega/Log.pde b/ArduCopterMega/Log.pde
index 8546c1e6da..605040a1fa 100644
--- a/ArduCopterMega/Log.pde
+++ b/ArduCopterMega/Log.pde
@@ -245,7 +245,7 @@ void Log_Write_Startup(byte type)
 	struct Location cmd = get_wp_with_index(0);
 		Log_Write_Cmd(0, &cmd);
 	
-	for (int i=1; i<wp_total; i++){
+	for (int i = 1; i < wp_total; i++){
 		cmd = get_wp_with_index(i);
 		Log_Write_Cmd(i, &cmd);
 	}
@@ -537,13 +537,15 @@ void Log_Read(int start_page, int end_page)
 			case 0:	
 				if(data==HEAD_BYTE1)	// Head byte 1
 					log_step++;
-				break; 
+				break;
+				
 			case 1:
 				if(data==HEAD_BYTE2)	// Head byte 2
 					log_step++;
 				else
 					log_step = 0;
-				break; 
+				break;
+				
 			case 2:
 				if(data==LOG_ATTITUDE_MSG){
 					Log_Read_Attitude();
@@ -573,20 +575,26 @@ void Log_Read(int start_page, int end_page)
 					Log_Read_Cmd();
 					log_step++;
 					
+				}else if(data==LOG_CURRENT_MSG){
+					Log_Read_Current();
+					log_step++;
+					
 				}else if(data==LOG_STARTUP_MSG){
 					Log_Read_Startup();
 					log_step++;
+					
 				}else {
-					if(data==LOG_GPS_MSG){
+					if(data == LOG_GPS_MSG){
 						Log_Read_GPS();
 						log_step++;
 					} else {
 						Serial.print("Error Reading Packet: ");
 						Serial.print(packet_count); 
-						log_step=0;	 // Restart, we have a problem...
+						log_step = 0;	 // Restart, we have a problem...
 					}
 				}
 				break;
+				
 			case 3:
 				if(data==END_BYTE){
 					 packet_count++;
diff --git a/ArduCopterMega/test.pde b/ArduCopterMega/test.pde
index 26dc46349b..d280db82da 100644
--- a/ArduCopterMega/test.pde
+++ b/ArduCopterMega/test.pde
@@ -264,7 +264,7 @@ test_stabilize(uint8_t argc, const Menu::arg *argv)
 			ts_num++;
 			if (ts_num > 10){
 				ts_num = 0;
-				Serial.printf_P(PSTR("r: %d, p:%d, rc1:%d, Int%4.4f, "),
+				Serial.printf_P(PSTR("r: %d, p:%d, rc1:%d, Int:%4.4f, "),
 					(int)(dcm.roll_sensor/100),
 					(int)(dcm.pitch_sensor/100),
 					rc_1.pwm_out,