Skip to content

Commit

Permalink
Fixed angle of avoidance and message
Browse files Browse the repository at this point in the history
  • Loading branch information
EwoudSmeur committed Sep 14, 2016
1 parent 15f91c5 commit 246e66d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sw/airborne/modules/sensors/kalamos_uart.c
Expand Up @@ -139,7 +139,7 @@ static inline void kalamos_parse_msg(void)
land_cmd.z = -k2p_package.descend_z * kalamos_land_z_gain;

float psi = stateGetNedToBodyEulers_f()->psi;
float heading_to_go = psi + k2p_package.avoid_psi + M_PI_2;
float heading_to_go = psi + k2p_package.avoid_psi + M_PI;
FLOAT_ANGLE_NORMALIZE(heading_to_go);

struct EnuCoor_f target;
Expand Down Expand Up @@ -220,7 +220,7 @@ if (kalamos_enable_opticflow)
// Send Telemetry report
char hoertje = k2p_package.status;
hoertje+=48; //fuck you pprz
DOWNLINK_SEND_KALAMOS(DefaultChannel, DefaultDevice, &hoertje, &k2p_package.height,&k2p_package.descend_x,&k2p_package.descend_y,&k2p_package.descend_z,&k2p_package.joe_enu_x,&k2p_package.joe_enu_y,&k2p_package.land_enu_x,&k2p_package.land_enu_y,&k2p_package.flow_x,&k2p_package.flow_y);
DOWNLINK_SEND_KALAMOS(DefaultChannel, DefaultDevice, &hoertje, &k2p_package.height,&k2p_package.avoid_psi,&k2p_package.avoid_rate,&k2p_package.descend_z,&k2p_package.joe_enu_x,&k2p_package.joe_enu_y,&k2p_package.land_enu_x,&k2p_package.land_enu_y,&k2p_package.flow_x,&k2p_package.flow_y);


pprz_msg_send_IMCU_DEBUG(&(kalamos.transport.trans_tx), kalamos.device,
Expand Down

0 comments on commit 246e66d

Please sign in to comment.