enable logs default

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1768 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
jasonshort 2011-03-11 02:49:12 +00:00
parent 667aa34fbd
commit 20fdbda315
4 changed files with 10 additions and 4 deletions

View File

@ -115,7 +115,7 @@
#define RELAY_TOGGLE 5 #define RELAY_TOGGLE 5
#define STOP_REPEAT 10 #define STOP_REPEAT 10
//#define MAV_CMD_CONDITION_YAW 23 #define MAV_CMD_CONDITION_YAW 23
// GCS Message ID's // GCS Message ID's
#define MSG_ACKNOWLEDGE 0x00 #define MSG_ACKNOWLEDGE 0x00

View File

@ -98,9 +98,12 @@ setup_factory(uint8_t argc, const Menu::arg *argv)
return(-1); return(-1);
AP_Var::erase_all(); AP_Var::erase_all();
Serial.printf_P(PSTR("\nFACTORY RESET complete - please reset APM to continue")); Serial.printf_P(PSTR("\nFACTORY RESET complete - please reset APM to continue"));
default_log_bitmask();
default_gains();
for (;;) { for (;;) {
} }
// note, cannot actually return here // note, cannot actually return here
return(0); return(0);
} }
@ -643,7 +646,7 @@ default_throttle()
save_EEPROM_throttle(); save_EEPROM_throttle();
} }
void default_logs() void default_log_bitmask()
{ {
// convenience macro for testing LOG_* and setting LOGBIT_* // convenience macro for testing LOG_* and setting LOGBIT_*

View File

@ -304,6 +304,7 @@ void set_mode(byte mode)
if (g.log_bitmask & MASK_LOG_MODE) if (g.log_bitmask & MASK_LOG_MODE)
Log_Write_Mode(control_mode); Log_Write_Mode(control_mode);
} }
void set_failsafe(boolean mode) void set_failsafe(boolean mode)

View File

@ -774,8 +774,10 @@ test_rawgps(uint8_t argc, const Menu::arg *argv)
while(1){ while(1){
if (Serial3.available()) if (Serial3.available())
Serial1.write(Serial3.read()); Serial1.write(Serial3.read());
if (Serial1.available()) if (Serial1.available())
Serial3.write(Serial1.read()); Serial3.write(Serial1.read());
if(Serial.available() > 0){ if(Serial.available() > 0){
return (0); return (0);
} }