Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 08:38:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rover: more mavlink fixes

Browse Source
This commit is contained in:
Andrew Tridgell 2012-12-19 07:17:06 +11:00
parent 45615e5698
commit 1c2a220888
1 changed files with 17 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
APMrover2/GCS_Mavlink.pde
View File

@ -347,7 +347,6 @@ static void NOINLINE send_vfr_hud(mavlink_channel_t chan)
0); 0);
} }
#if HIL_MODE != HIL_MODE_ATTITUDE
static void NOINLINE send_raw_imu1(mavlink_channel_t chan) static void NOINLINE send_raw_imu1(mavlink_channel_t chan)
{ {
Vector3f accel = ins.get_accel(); Vector3f accel = ins.get_accel();
@ -401,8 +400,6 @@ static void NOINLINE send_ahrs(mavlink_channel_t chan)
ahrs.get_error_yaw()); ahrs.get_error_yaw());
} }
#endif // HIL_MODE != HIL_MODE_ATTITUDE
#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
// report simulator state // report simulator state
static void NOINLINE send_simstate(mavlink_channel_t chan) static void NOINLINE send_simstate(mavlink_channel_t chan)
@ -419,18 +416,6 @@ static void NOINLINE send_hwstatus(mavlink_channel_t chan)
hal.i2c->lockup_count()); hal.i2c->lockup_count());
} }
static void NOINLINE send_gps_status(mavlink_channel_t chan)
{
mavlink_msg_gps_status_send(
chan,
g_gps->num_sats,
NULL,
NULL,
NULL,
NULL,
NULL);
}
static void NOINLINE send_current_waypoint(mavlink_channel_t chan) static void NOINLINE send_current_waypoint(mavlink_channel_t chan)
{ {
mavlink_msg_mission_current_send( mavlink_msg_mission_current_send(
@ -826,7 +811,11 @@ GCS_MAVLINK::data_stream_send(void)
if (stream_trigger(STREAM_RAW_CONTROLLER)) { if (stream_trigger(STREAM_RAW_CONTROLLER)) {
send_message(MSG_SERVO_OUT); send_message(MSG_SERVO_OUT);
} }
if (stream_trigger(STREAM_RC_CHANNELS)) {
send_message(MSG_RADIO_OUT);
}
#endif #endif
// don't send any other stream types while in the delay callback
return; return;
} }
@ -1636,70 +1625,44 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
break; break;
} }
#if HIL_MODE != HIL_MODE_DISABLED #if HIL_MODE != HIL_MODE_DISABLED
case MAVLINK_MSG_ID_HIL_STATE: case MAVLINK_MSG_ID_HIL_STATE:
{ {
mavlink_hil_state_t packet; mavlink_hil_state_t packet;
mavlink_msg_hil_state_decode(msg, &packet); mavlink_msg_hil_state_decode(msg, &packet);
float vel = sqrt((packet.vx * (float)packet.vx) + (packet.vy * (float)packet.vy)); float vel = sqrt((packet.vx * (float)packet.vx) + (packet.vy * (float)packet.vy));
float cog = wrap_360_cd(ToDeg(atan2(packet.vy, packet.vx)) * 100); float cog = wrap_360_cd(ToDeg(atan2(packet.vy, packet.vx)) * 100);
// set gps hil sensor // set gps hil sensor
g_gps->setHIL(packet.time_usec/1000, g_gps->setHIL(packet.time_usec/1000,
packet.lat*1.0e-7, packet.lon*1.0e-7, packet.alt*1.0e-3, packet.lat*1.0e-7, packet.lon*1.0e-7, packet.alt*1.0e-3,
vel*1.0e-2, cog*1.0e-2, 0, 10); vel*1.0e-2, cog*1.0e-2, 0, 10);
#if HIL_MODE == HIL_MODE_SENSORS
// rad/sec // rad/sec
Vector3f gyros; Vector3f gyros;
gyros.x = packet.rollspeed; gyros.x = packet.rollspeed;
gyros.y = packet.pitchspeed; gyros.y = packet.pitchspeed;
gyros.z = packet.yawspeed; gyros.z = packet.yawspeed;
// m/s/s // m/s/s
Vector3f accels; Vector3f accels;
accels.x = packet.xacc * (gravity/1000.0); accels.x = packet.xacc * (gravity/1000.0);
accels.y = packet.yacc * (gravity/1000.0); accels.y = packet.yacc * (gravity/1000.0);
accels.z = packet.zacc * (gravity/1000.0); accels.z = packet.zacc * (gravity/1000.0);
ins.set_gyro(gyros); ins.set_gyro(gyros);
ins.set_accel(accels); ins.set_accel(accels);
#else #if HIL_MODE == HIL_MODE_ATTITUDE
// set AHRS hil sensor // set AHRS hil sensor
ahrs.setHil(packet.roll,packet.pitch,packet.yaw,packet.rollspeed, ahrs.setHil(packet.roll,packet.pitch,packet.yaw,packet.rollspeed,
packet.pitchspeed,packet.yawspeed); packet.pitchspeed,packet.yawspeed);
#endif
#endif
break; break;
} }
#endif
#if HIL_MODE == HIL_MODE_ATTITUDE
case MAVLINK_MSG_ID_ATTITUDE:
{
// decode
mavlink_attitude_t packet;
mavlink_msg_attitude_decode(msg, &packet);
// set AHRS hil sensor
ahrs.setHil(packet.roll,packet.pitch,packet.yaw,packet.rollspeed,
packet.pitchspeed,packet.yawspeed);
break;
}
#endif
#if HIL_MODE == HIL_MODE_SENSORS
case MAVLINK_MSG_ID_DIGICAM_CONTROL:
{
g.camera.control_msg(msg);
break;
}
#endif // HIL_MODE #endif // HIL_MODE
#if MOUNT == ENABLED #if MOUNT == ENABLED