Final touches before release.

Esse commit está contido em:
Mani Monajjemi
2012-07-01 20:21:47 -07:00
commit bf71f192a9
2 arquivos alterados com 6 adições e 3 exclusões
+4 -1
Ver Arquivo
@@ -53,7 +53,10 @@ extern "C" {
//Roadmap: We have the pointer to ARDroneDriver here, so it is doable to return back ros params //Roadmap: We have the pointer to ARDroneDriver here, so it is doable to return back ros params
//using this class. //using this class.
ardrone_application_default_config.bitrate_ctrl_mode = (int) rosDriver->getRosParam("~bitrate_ctrl_mode", (double) VBC_MODE_DISABLED); ardrone_application_default_config.bitrate_ctrl_mode = (int) rosDriver->getRosParam("~bitrate_ctrl_mode", (double) VBC_MODE_DISABLED);
ardrone_application_default_config.max_bitrate = (int) rosDriver->getRosParam("~max_bitrate", 4000.0); if (IS_ARDRONE2)
{
ardrone_application_default_config.max_bitrate = (int) rosDriver->getRosParam("~max_bitrate", 4000.0);
}
ardrone_application_default_config.bitrate = (int) rosDriver->getRosParam("~bitrate", 4000.0); ardrone_application_default_config.bitrate = (int) rosDriver->getRosParam("~bitrate", 4000.0);
ardrone_application_default_config.outdoor = (bool) rosDriver->getRosParam("~outdoor", 0.0); ardrone_application_default_config.outdoor = (bool) rosDriver->getRosParam("~outdoor", 0.0);
ardrone_application_default_config.flight_without_shell = (bool) rosDriver->getRosParam("~flight_without_shell", 1.0); ardrone_application_default_config.flight_without_shell = (bool) rosDriver->getRosParam("~flight_without_shell", 1.0);
+2 -2
Ver Arquivo
@@ -137,8 +137,8 @@ C_RESULT update_teleop(void)
); );
// These lines are for testing, they should be moved to configurations // These lines are for testing, they should be moved to configurations
// Bit 0 of control_flag: should we hover? // Bit 0 of control_flag == 0: should we hover?
// Bit 1 of control_flag: should we use combined yaw mode? // Bit 1 of control_flag == 1: should we use combined yaw mode?
int32_t control_flag = 0x00; int32_t control_flag = 0x00;
int32_t combined_yaw = 0x00; int32_t combined_yaw = 0x00;