diff --git a/conf/control_panel.xml b/conf/control_panel.xml index 8f9e753cb0..7b2e049fc1 100644 --- a/conf/control_panel.xml +++ b/conf/control_panel.xml @@ -83,6 +83,7 @@ + diff --git a/sw/ground_segment/cockpit/Paparazzi/Strip.pm b/sw/ground_segment/cockpit/Paparazzi/Strip.pm index 54d28a5a2d..059d572cd8 100644 --- a/sw/ground_segment/cockpit/Paparazzi/Strip.pm +++ b/sw/ground_segment/cockpit/Paparazzi/Strip.pm @@ -361,7 +361,7 @@ sub string_of_time { sub attach_to_aircraft { my ($self) = @_; my @options = ('airframe', 'flight_plan', 'ap_mode', 'rc_status', 'gps_mode', 'contrast_status', 'contrast_value', - 'flight_time', 'alt', 'target_alt', 'speed', 'climb', 'bat'); + 'flight_time', 'alt', 'target_alt', 'speed', 'climb');#, 'bat'); foreach my $option (@options) { $self->get('-aircraft')->attach($self, $option, [\&aircraft_config_changed]); } diff --git a/sw/lib/perl/Paparazzi/Aircraft.pm b/sw/lib/perl/Paparazzi/Aircraft.pm index afafeb6003..4d61296038 100644 --- a/sw/lib/perl/Paparazzi/Aircraft.pm +++ b/sw/lib/perl/Paparazzi/Aircraft.pm @@ -49,8 +49,9 @@ sub populate { climb => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], ap_mode => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 'MANUAL'], - lat_mode => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], - gaz_mode => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + lat_mode => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + horiz_mode => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], + gaz_mode => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], target_climb => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], target_alt => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], target_course=> [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], @@ -70,13 +71,7 @@ sub populate { target_north => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], -engine_status => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, undef], -# 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.], -# bat => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], -# amp => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], -# energy => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], - +x -svsinfo => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, undef], rc_status => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 'REALLY_LOST'], diff --git a/sw/lib/perl/Paparazzi/Airframe.pm b/sw/lib/perl/Paparazzi/Airframe.pm index 78180793e9..644441c79f 100644 --- a/sw/lib/perl/Paparazzi/Airframe.pm +++ b/sw/lib/perl/Paparazzi/Airframe.pm @@ -21,7 +21,7 @@ sub completeinit { $self->SUPER::completeinit(); my $airframe_url = $self->get('-url'); my $airframe_xml = LWP::Simple::get($airframe_url); - $self->parse_airframe($airframe_xml); + $self->parse_airframe($airframe_xml) if defined $airframe_xml; } sub parse_airframe { diff --git a/sw/lib/perl/Paparazzi/Flightplan.pm b/sw/lib/perl/Paparazzi/Flightplan.pm index 467ac54385..992705217a 100644 --- a/sw/lib/perl/Paparazzi/Flightplan.pm +++ b/sw/lib/perl/Paparazzi/Flightplan.pm @@ -86,7 +86,13 @@ sub completeinit { # my $flight_plan_xml =""; my $flight_plan_xml = LWP::Simple::get($flight_plan_url); - $self->configure( -compiled_xml => $flight_plan_xml); + if (defined $flight_plan_xml) { + $self->configure( -compiled_xml => $flight_plan_xml); + } + else { + print "############WARNING : could not get $flight_plan_url\n"; + return; + } # print "#######flight_plan_xml\n".$flight_plan_xml;