Fixed a mode switch issue. 

git-svn-id: https://arducopter.googlecode.com/svn/trunk@2685 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
jasonshort 2011-06-26 17:02:47 +00:00
parent cbb4f3da76
commit 33362a86c2
3 changed files with 8 additions and 5 deletions

View File

@ -234,8 +234,8 @@ const char *comma = ",";
const char* flight_mode_strings[] = { const char* flight_mode_strings[] = {
"STABILIZE", "STABILIZE",
"ACRO", "ACRO",
"ALT_HOLD",
"SIMPLE", "SIMPLE",
"ALT_HOLD",
"AUTO", "AUTO",
"GCS_AUTO", "GCS_AUTO",
"LOITER", "LOITER",
@ -830,7 +830,6 @@ void slow_loop()
loop_step = 6; loop_step = 6;
slow_loopCounter++; slow_loopCounter++;
superslow_loopCounter++; superslow_loopCounter++;
// Serial.printf("sc: %4.4f \n", imu._sensor_compensation(0,50));
if(superslow_loopCounter > 800){ // every 4 minutes if(superslow_loopCounter > 800){ // every 4 minutes
#if HIL_MODE != HIL_MODE_ATTITUDE #if HIL_MODE != HIL_MODE_ATTITUDE
@ -926,6 +925,9 @@ void super_slow_loop()
hil.send_message(MSG_HEARTBEAT); hil.send_message(MSG_HEARTBEAT);
#endif #endif
//Serial.printf("r:%d p:%d\n",dcm.roll_sensor, dcm.pitch_sensor);
//if(gcs_simple.read()){ //if(gcs_simple.read()){
// Serial.print("!"); // Serial.print("!");
/* /*
@ -1460,4 +1462,5 @@ void check_DCM()
} }

View File

@ -17,7 +17,7 @@ public:
// The increment will prevent old parameters from being used incorrectly // The increment will prevent old parameters from being used incorrectly
// by newer code. // by newer code.
// //
static const uint16_t k_format_version = 101; static const uint16_t k_format_version = 102;
// The parameter software_type is set up solely for ground station use // The parameter software_type is set up solely for ground station use
// and identifies the software type (eg ArduPilotMega versus ArduCopterMega) // and identifies the software type (eg ArduPilotMega versus ArduCopterMega)

View File

@ -40,7 +40,7 @@ const struct Menu::command main_menu_commands[] PROGMEM = {
}; };
// Create the top-level menu object. // Create the top-level menu object.
MENU(main_menu, "AC 2.0.27 Beta", main_menu_commands); MENU(main_menu, "AC 2.0.28 Beta", main_menu_commands);
void init_ardupilot() void init_ardupilot()
{ {