Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArduPlane: more "int" to "int16_t" and added cast to (int) in printf statements. 

Also modified dump_log function's last_log_num to be int16_t which matches return type from DataFlash's find_last_log method.
This commit is contained in:
rmackay9 2012-08-18 18:55:14 +09:00
parent 9973e4ae13
commit ac240dffd3
3 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ArduPlane/Log.pde
View File

@ -50,8 +50,8 @@ print_log_menu(void)
{ {
int16_t log_start; int16_t log_start;
int16_t log_end; int16_t log_end;
int temp; int16_t temp;
int last_log_num = DataFlash.find_last_log(); int16_t last_log_num = DataFlash.find_last_log();
uint16_t num_logs = DataFlash.get_num_logs(); uint16_t num_logs = DataFlash.get_num_logs();
@ -83,13 +83,13 @@ print_log_menu(void)
if (num_logs == 0) { if (num_logs == 0) {
Serial.printf_P(PSTR("\nNo logs\n\n")); Serial.printf_P(PSTR("\nNo logs\n\n"));
}else{ }else{
Serial.printf_P(PSTR("\n%d logs\n"), num_logs); Serial.printf_P(PSTR("\n%d logs\n"), (int)num_logs);
for(int i=num_logs;i>=1;i--) { for(int16_t i=num_logs;i>=1;i--) {
int last_log_start = log_start, last_log_end = log_end; int16_t last_log_start = log_start, last_log_end = log_end;
temp = last_log_num-i+1; temp = last_log_num-i+1;
DataFlash.get_log_boundaries(temp, log_start, log_end); DataFlash.get_log_boundaries(temp, log_start, log_end);
Serial.printf_P(PSTR("Log %d, start %d, end %d\n"), temp, log_start, log_end); Serial.printf_P(PSTR("Log %d, start %d, end %d\n"), (int)temp, (int)log_start, (int)log_end);
if (last_log_start == log_start && last_log_end == log_end) { if (last_log_start == log_start && last_log_end == log_end) {
// we are printing bogus logs // we are printing bogus logs
break; break;
@ -103,10 +103,10 @@ print_log_menu(void)
static int8_t static int8_t
dump_log(uint8_t argc, const Menu::arg *argv) dump_log(uint8_t argc, const Menu::arg *argv)
{ {
int dump_log; int16_t dump_log;
int16_t dump_log_start; int16_t dump_log_start;
int16_t dump_log_end; int16_t dump_log_end;
byte last_log_num; int16_t last_log_num;
// check that the requested log number can be read // check that the requested log number can be read
dump_log = argv[1].i; dump_log = argv[1].i;
@ -115,9 +115,9 @@ dump_log(uint8_t argc, const Menu::arg *argv)
if (dump_log == -2) { if (dump_log == -2) {
for(uint16_t count=1; count<=DataFlash.df_NumPages; count++) { for(uint16_t count=1; count<=DataFlash.df_NumPages; count++) {
DataFlash.StartRead(count); DataFlash.StartRead(count);
Serial.printf_P(PSTR("DF page, log file #, log page: %d,\t"), count); Serial.printf_P(PSTR("DF page, log file #, log page: %d,\t"), (int)count);
Serial.printf_P(PSTR("%d,\t"), DataFlash.GetFileNumber()); Serial.printf_P(PSTR("%d,\t"), (int)DataFlash.GetFileNumber());
Serial.printf_P(PSTR("%d\n"), DataFlash.GetFilePage()); Serial.printf_P(PSTR("%d\n"), (int)DataFlash.GetFilePage());
} }
return(-1); return(-1);
} else if (dump_log <= 0) { } else if (dump_log <= 0) {
@ -131,9 +131,9 @@ dump_log(uint8_t argc, const Menu::arg *argv)
DataFlash.get_log_boundaries(dump_log, dump_log_start, dump_log_end); DataFlash.get_log_boundaries(dump_log, dump_log_start, dump_log_end);
Serial.printf_P(PSTR("Dumping Log %d, start pg %d, end pg %d\n"), Serial.printf_P(PSTR("Dumping Log %d, start pg %d, end pg %d\n"),
dump_log, (int)dump_log,
dump_log_start, (int)dump_log_start,
dump_log_end); (int)dump_log_end);
Log_Read(dump_log_start, dump_log_end); Log_Read(dump_log_start, dump_log_end);
Serial.printf_P(PSTR("Done\n")); Serial.printf_P(PSTR("Done\n"));
@ -274,7 +274,7 @@ static void Log_Write_Startup(byte type)
struct Location cmd = get_cmd_with_index(0); struct Location cmd = get_cmd_with_index(0);
Log_Write_Cmd(0, &cmd); Log_Write_Cmd(0, &cmd);
for (int i = 1; i <= g.command_total; i++){ for (int16_t i = 1; i <= g.command_total; i++){
cmd = get_cmd_with_index(i); cmd = get_cmd_with_index(i);
Log_Write_Cmd(i, &cmd); Log_Write_Cmd(i, &cmd);
} }
@ -388,10 +388,10 @@ static void Log_Write_Current()
static void Log_Read_Current() static void Log_Read_Current()
{ {
Serial.printf_P(PSTR("CURR: %d, %4.4f, %4.4f, %d\n"), Serial.printf_P(PSTR("CURR: %d, %4.4f, %4.4f, %d\n"),
DataFlash.ReadInt(), (int)DataFlash.ReadInt(),
((float)DataFlash.ReadInt() / 100.f), ((float)DataFlash.ReadInt() / 100.f),
((float)DataFlash.ReadInt() / 100.f), ((float)DataFlash.ReadInt() / 100.f),
DataFlash.ReadInt()); (int)DataFlash.ReadInt());
} }
// Read an control tuning packet // Read an control tuning packet
@ -400,7 +400,7 @@ static void Log_Read_Control_Tuning()
float logvar; float logvar;
Serial.printf_P(PSTR("CTUN:")); Serial.printf_P(PSTR("CTUN:"));
for (int y = 1; y < 10; y++) { for (int16_t y = 1; y < 10; y++) {
logvar = DataFlash.ReadInt(); logvar = DataFlash.ReadInt();
if(y < 8) logvar = logvar/100.f; if(y < 8) logvar = logvar/100.f;
if(y == 9) logvar = logvar/10000.f; if(y == 9) logvar = logvar/10000.f;
@ -419,7 +419,7 @@ static void Log_Read_Nav_Tuning()
} }
Serial.printf_P(PSTR("NTUN: %4.4f, %d, %4.4f, %4.4f, %4.4f, %4.4f, %4.4f,\n"), // \n Serial.printf_P(PSTR("NTUN: %4.4f, %d, %4.4f, %4.4f, %4.4f, %4.4f, %4.4f,\n"), // \n
d[0]/100.0, d[0]/100.0,
d[1], (int)d[1],
((uint16_t)d[2])/100.0, ((uint16_t)d[2])/100.0,
((uint16_t)d[3])/100.0, ((uint16_t)d[3])/100.0,
d[4]/100.0, d[4]/100.0,
@ -431,13 +431,13 @@ static void Log_Read_Nav_Tuning()
static void Log_Read_Performance() static void Log_Read_Performance()
{ {
int32_t pm_time; int32_t pm_time;
int logvar; int16_t logvar;
Serial.printf_P(PSTR("PM:")); Serial.printf_P(PSTR("PM:"));
pm_time = DataFlash.ReadLong(); pm_time = DataFlash.ReadLong();
Serial.print(pm_time); Serial.print(pm_time);
Serial.print(comma); Serial.print(comma);
for (int y = 1; y <= 12; y++) { for (int16_t y = 1; y <= 12; y++) {
if(y < 3 || y > 7){ if(y < 3 || y > 7){
logvar = DataFlash.ReadInt(); logvar = DataFlash.ReadInt();
}else{ }else{
@ -456,12 +456,12 @@ static void Log_Read_Cmd()
int32_t logvarl; int32_t logvarl;
Serial.printf_P(PSTR("CMD:")); Serial.printf_P(PSTR("CMD:"));
for(int i = 1; i < 4; i++) { for(int16_t i = 1; i < 4; i++) {
logvarb = DataFlash.ReadByte(); logvarb = DataFlash.ReadByte();
Serial.print(logvarb, DEC); Serial.print(logvarb, DEC);
Serial.print(comma); Serial.print(comma);
} }
for(int i = 1; i < 4; i++) { for(int16_t i = 1; i < 4; i++) {
logvarl = DataFlash.ReadLong(); logvarl = DataFlash.ReadLong();
Serial.print(logvarl, DEC); Serial.print(logvarl, DEC);
Serial.print(comma); Serial.print(comma);
@ -491,8 +491,8 @@ static void Log_Read_Attitude()
d[1] = DataFlash.ReadInt(); d[1] = DataFlash.ReadInt();
d[2] = DataFlash.ReadInt(); d[2] = DataFlash.ReadInt();
Serial.printf_P(PSTR("ATT: %d, %d, %u\n"), Serial.printf_P(PSTR("ATT: %d, %d, %u\n"),
d[0], d[1], (int)d[0], (int)d[1],
(uint16_t)d[2]); (unsigned)d[2]);
} }
// Read a mode packet // Read a mode packet
@ -530,7 +530,7 @@ static void Log_Read_Raw()
{ {
float logvar; float logvar;
Serial.printf_P(PSTR("RAW:")); Serial.printf_P(PSTR("RAW:"));
for (int y = 0; y < 6; y++) { for (int16_t y = 0; y < 6; y++) {
logvar = (float)DataFlash.ReadLong() / t7; logvar = (float)DataFlash.ReadLong() / t7;
Serial.print(logvar); Serial.print(logvar);
Serial.print(comma); Serial.print(comma);
@ -541,7 +541,7 @@ static void Log_Read_Raw()
// Read the DataFlash log memory : Packet Parser // Read the DataFlash log memory : Packet Parser
static void Log_Read(int16_t start_page, int16_t end_page) static void Log_Read(int16_t start_page, int16_t end_page)
{ {
int packet_count = 0; int16_t packet_count = 0;
#ifdef AIRFRAME_NAME #ifdef AIRFRAME_NAME
Serial.printf_P(PSTR((AIRFRAME_NAME) Serial.printf_P(PSTR((AIRFRAME_NAME)
@ -558,16 +558,16 @@ static void Log_Read(int16_t start_page, int16_t end_page)
packet_count = Log_Read_Process(start_page, end_page); packet_count = Log_Read_Process(start_page, end_page);
} }
Serial.printf_P(PSTR("Number of packets read: %d\n"), packet_count); Serial.printf_P(PSTR("Number of packets read: %d\n"), (int)packet_count);
} }
// Read the DataFlash log memory : Packet Parser // Read the DataFlash log memory : Packet Parser
static int Log_Read_Process(int16_t start_page, int16_t end_page) static int16_t Log_Read_Process(int16_t start_page, int16_t end_page)
{ {
byte data; byte data;
byte log_step = 0; byte log_step = 0;
int page = start_page; int16_t page = start_page;
int packet_count = 0; int16_t packet_count = 0;
DataFlash.StartRead(start_page); DataFlash.StartRead(start_page);
while (page < end_page && page != -1){ while (page < end_page && page != -1){
@ -635,7 +635,7 @@ static int Log_Read_Process(int16_t start_page, int16_t end_page)
if(data == END_BYTE){ if(data == END_BYTE){
packet_count++; packet_count++;
}else{ }else{
Serial.printf_P(PSTR("Error Reading END_BYTE: %d\n"),data); Serial.printf_P(PSTR("Error Reading END_BYTE: %d\n"),(int)data);
} }
log_step = 0; // Restart sequence: new packet... log_step = 0; // Restart sequence: new packet...
break; break;

8
ArduPlane/radio.pde
View File

@ -107,10 +107,10 @@ static void read_radio()
/* /*
Serial.printf_P(PSTR("OUT 1: %d\t2: %d\t3: %d\t4: %d \n"), Serial.printf_P(PSTR("OUT 1: %d\t2: %d\t3: %d\t4: %d \n"),
g.rc_1.control_in, (int)g.rc_1.control_in,
g.rc_2.control_in, (int)g.rc_2.control_in,
g.rc_3.control_in, (int)g.rc_3.control_in,
g.rc_4.control_in); (int)g.rc_4.control_in);
*/ */
} }

52
ArduPlane/test.pde
View File

@ -109,14 +109,14 @@ test_radio_pwm(uint8_t argc, const Menu::arg *argv)
read_radio(); read_radio();
Serial.printf_P(PSTR("IN:\t1: %d\t2: %d\t3: %d\t4: %d\t5: %d\t6: %d\t7: %d\t8: %d\n"), Serial.printf_P(PSTR("IN:\t1: %d\t2: %d\t3: %d\t4: %d\t5: %d\t6: %d\t7: %d\t8: %d\n"),
g.channel_roll.radio_in, (int)g.channel_roll.radio_in,
g.channel_pitch.radio_in, (int)g.channel_pitch.radio_in,
g.channel_throttle.radio_in, (int)g.channel_throttle.radio_in,
g.channel_rudder.radio_in, (int)g.channel_rudder.radio_in,
g.rc_5.radio_in, (int)g.rc_5.radio_in,
g.rc_6.radio_in, (int)g.rc_6.radio_in,
g.rc_7.radio_in, (int)g.rc_7.radio_in,
g.rc_8.radio_in); (int)g.rc_8.radio_in);
if(Serial.available() > 0){ if(Serial.available() > 0){
return (0); return (0);
@ -175,14 +175,14 @@ test_radio(uint8_t argc, const Menu::arg *argv)
set_servos(); set_servos();
Serial.printf_P(PSTR("IN 1: %d\t2: %d\t3: %d\t4: %d\t5: %d\t6: %d\t7: %d\t8: %d\n"), Serial.printf_P(PSTR("IN 1: %d\t2: %d\t3: %d\t4: %d\t5: %d\t6: %d\t7: %d\t8: %d\n"),
g.channel_roll.control_in, (int)g.channel_roll.control_in,
g.channel_pitch.control_in, (int)g.channel_pitch.control_in,
g.channel_throttle.control_in, (int)g.channel_throttle.control_in,
g.channel_rudder.control_in, (int)g.channel_rudder.control_in,
g.rc_5.control_in, (int)g.rc_5.control_in,
g.rc_6.control_in, (int)g.rc_6.control_in,
g.rc_7.control_in, (int)g.rc_7.control_in,
g.rc_8.control_in); (int)g.rc_8.control_in);
if(Serial.available() > 0){ if(Serial.available() > 0){
return (0); return (0);
@ -217,7 +217,7 @@ test_failsafe(uint8_t argc, const Menu::arg *argv)
read_radio(); read_radio();
if(g.channel_throttle.control_in > 0){ if(g.channel_throttle.control_in > 0){
Serial.printf_P(PSTR("THROTTLE CHANGED %d \n"), g.channel_throttle.control_in); Serial.printf_P(PSTR("THROTTLE CHANGED %d \n"), (int)g.channel_throttle.control_in);
fail_test++; fail_test++;
} }
@ -228,7 +228,7 @@ test_failsafe(uint8_t argc, const Menu::arg *argv)
} }
if(g.throttle_fs_enabled && g.channel_throttle.get_failsafe()){ if(g.throttle_fs_enabled && g.channel_throttle.get_failsafe()){
Serial.printf_P(PSTR("THROTTLE FAILSAFE ACTIVATED: %d, "), g.channel_throttle.radio_in); Serial.printf_P(PSTR("THROTTLE FAILSAFE ACTIVATED: %d, "), (int)g.channel_throttle.radio_in);
Serial.println(flight_mode_strings[readSwitch()]); Serial.println(flight_mode_strings[readSwitch()]);
fail_test++; fail_test++;
} }
@ -336,9 +336,9 @@ test_wp_print(struct Location *cmd, byte wp_index)
(int)cmd->id, (int)cmd->id,
(int)cmd->options, (int)cmd->options,
(int)cmd->p1, (int)cmd->p1,
cmd->alt, (long)cmd->alt,
cmd->lat, (long)cmd->lat,
cmd->lng); (long)cmd->lng);
} }
static int8_t static int8_t
@ -374,7 +374,7 @@ test_modeswitch(uint8_t argc, const Menu::arg *argv)
delay(20); delay(20);
byte switchPosition = readSwitch(); byte switchPosition = readSwitch();
if (oldSwitchPosition != switchPosition){ if (oldSwitchPosition != switchPosition){
Serial.printf_P(PSTR("Position %d\n"), switchPosition); Serial.printf_P(PSTR("Position %d\n"), (int)switchPosition);
oldSwitchPosition = switchPosition; oldSwitchPosition = switchPosition;
} }
if(Serial.available() > 0){ if(Serial.available() > 0){
@ -450,10 +450,10 @@ test_gps(uint8_t argc, const Menu::arg *argv)
if (g_gps->new_data){ if (g_gps->new_data){
Serial.printf_P(PSTR("Lat: %ld, Lon %ld, Alt: %ldm, #sats: %d\n"), Serial.printf_P(PSTR("Lat: %ld, Lon %ld, Alt: %ldm, #sats: %d\n"),
g_gps->latitude, (long)g_gps->latitude,
g_gps->longitude, (long)g_gps->longitude,
g_gps->altitude/100, (long)g_gps->altitude/100,
g_gps->num_sats); (int)g_gps->num_sats);
}else{ }else{
Serial.printf_P(PSTR(".")); Serial.printf_P(PSTR("."));
} }