diff --git a/conf/messages.xml b/conf/messages.xml index 99b131dfe2..c23cdc0525 100644 --- a/conf/messages.xml +++ b/conf/messages.xml @@ -328,6 +328,7 @@ + diff --git a/sw/lib/perl/Paparazzi/Aircraft.pm b/sw/lib/perl/Paparazzi/Aircraft.pm index f2527a481b..58a007845e 100644 --- a/sw/lib/perl/Paparazzi/Aircraft.pm +++ b/sw/lib/perl/Paparazzi/Aircraft.pm @@ -64,6 +64,11 @@ sub populate { target_east => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], target_north => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + cam_east => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + cam_north => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + target_east => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + target_north => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + throttle => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], rpm => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], temp => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], @@ -71,6 +76,18 @@ sub populate { amp => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], energy => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + rc_status => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + rc_mode => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + + gps_hybrid_mode => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + gps_hybrid_factor => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + contrast_status => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + contrast_value => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + + + + + ); } diff --git a/sw/lib/perl/Paparazzi/AircraftsManager.pm b/sw/lib/perl/Paparazzi/AircraftsManager.pm index 1bd871bd58..85cd183e96 100644 --- a/sw/lib/perl/Paparazzi/AircraftsManager.pm +++ b/sw/lib/perl/Paparazzi/AircraftsManager.pm @@ -123,10 +123,14 @@ sub on_ac_msg { sub listen_to_ac { my ($self, $ac_id) = @_; my @ac_events = ( ['FLIGHT_PARAM', \&on_ac_msg], - ['NAV_STATUS', \&on_ac_msg], ['AP_STATUS', \&on_ac_msg], + ['NAV_STATUS', \&on_ac_msg], + ['CAM_STATUS', \&on_ac_msg], ['ENGINE_STATUS', \&on_ac_msg], - # ['SATS', \&ivyOnSats], + ['FLY_BY_WIRE', \&on_ac_msg], + ['INFRARED', \&on_ac_msg], + ['INFLIGH_CALIB', \&on_ac_msg], +# ['SATS', \&ivyOnSats], ); foreach my $event (@ac_events) { Paparazzi::IvyProtocol::bind_msg("ground", "ground", $event->[0],