*** empty log message ***

sw/ground_segment/cockpit/Paparazzi/GuiConfig.pm

@@ -0,0 +1,12 @@
+package Paparazzi::Traces;
+@ISA = qw (Exporter);
+@EXPORT = qw (get_ressource);
+
+use strict;
+
+
+sub get_ressource {
+  my ($ressource_name) = @_;
+
+
+}

sw/ground_segment/cockpit/Paparazzi/Strip.pm

@@ -234,7 +234,7 @@ sub set_bat {
 ##############################################################################
 sub attach_to_aircraft {
   my ($self) = @_;
-  my @options = ('airframe', 'flight_plan', 'ap_mode', 'rc_status', 'gps_mode', 'contrast_status', 'contrast_value',
+  my @options = ('airframe', 'ap_mode', 'rc_status', 'gps_mode', 'contrast_status', 'contrast_value',
 		 'flight_time', 'alt', 'target_alt', 'speed', 'climb', '-engine_status');
   foreach my $option (@options) {
     $self->get('-aircraft')->attach($self, $option, [\&aircraft_config_changed]);

sw/ground_segment/cockpit/cockpit.pl

@@ -19,6 +19,7 @@ use constant COCKPIT_DEBUG => 0;
 use constant APP_NAME => "Cockpit";
 use constant MESSAGE_WHEN_READY => APP_NAME.': READY';
 
+use Paparazzi::Traces;
 use Paparazzi::IvyProtocol;
 use Paparazzi::AircraftsManager;
 use Paparazzi::Aircraft;
@@ -49,8 +50,6 @@ sub completeinit {
   my $self = shift;
   $self->SUPER::completeinit();
   $self->{selected_ac} = undef;
-  $self->{wind_dir} = 0.;
-  $self->{wind_speed} = 0.;
   $self->build_gui();
   my $protocol_file = Paparazzi::Environment::get_config("messages.xml");
   Paparazzi::IvyProtocol::init(-file      => $protocol_file,
@@ -68,7 +67,7 @@ sub completeinit {
 
 sub on_new_aircraft {
   my ($self, $ac_manager, $event, $ac_id) = @_;
-  print "in Cockpit : on_new_aircraft\n";
+  trace(TRACE_DEBUG, "cockpit::on_new_aircraft $ac_id");
   my $aircraft = $self->{aircrafts_manager}->get_aircraft_by_id($ac_id);
   $self->{strip_panel}->add_strip($aircraft);
   $self->{md}->add_aircraft($aircraft);
@@ -115,20 +114,19 @@ sub build_gui {
 
 sub on_foo {
   my ($self) = @_;
-  print "in ivy_on_foo\n"; # if (COCKPIT_DEBUG);
   $self->{aircrafts_manager}->start();
   Paparazzi::IvyProtocol::bind_msg("ground", "ground", "SELECTED", {}, [\&ivy_on_selected, $self]);
 }
 
 sub ivy_on_selected {
   my ($sender_name, $msg_class, $msg_name, $fields, $self) = @_;
-  print "in ivy_on_selected\n"; # if (COCKPIT_DEBUG);
   my $ac_id = $fields->{aircraft_id};
+  trace(TRACE_DEBUG, "cockpit::ivy_on_selected : selecting aircraft $ac_id\n");
   if (defined $self->{aircrafts_manager}->get_aircraft_by_id($ac_id)) {
     $self->select_ac($ac_id);
   }
   else {
-    Traces::trace(1, "cockpit::ivy_on_selected : received select order for unknown aircraft $ac_id\n");
+    trace(TRACE_ERROR, "cockpit::ivy_on_selected : received select order for unknown aircraft $ac_id\n");
   }
 }
 
@@ -150,8 +148,7 @@ sub select_ac {
 
 sub onShowPage {
   my ($self, $component, $signal, $page) = @_;
-  print "cockpit::onShowPage $page\n";
-  print "$self->{nd}\n";
+  trace(TRACE_DEBUG, "cockpit::onShowPage $page");
   $self->{nd}->configure('-page' => $page);
 }
 

sw/lib/perl/Paparazzi/Flightplan.pm

@@ -84,9 +84,7 @@ sub completeinit {
   $self->SUPER::completeinit();
   my $parser = XML::DOM::Parser->new();
   my $flight_plan_url = $self->get('-url');
-
-  print "###### flight_plan_url $flight_plan_url\n";
-
+  trace(TRACE_DEBUG, "Flightplan::completeinit : url $flight_plan_url\n");
   my $flight_plan_xml = LWP::Simple::get($flight_plan_url);
   if (defined $flight_plan_xml) {
     $self->configure( -compiled_xml => $flight_plan_xml);
@@ -95,7 +93,7 @@ sub completeinit {
     $self->parse_flight_plan();
   }
   else {
-    print "############WARNING : could not get $flight_plan_url\n";
+    trace(TRACE_ERROR, "Flightplan::completeinit : WARNING : could not get $flight_plan_url\n");
     return;
   }
 }
@@ -200,13 +198,8 @@ sub parse_mission {
     $blocks->{$block_name} = get_block_id($block_no) unless defined $blocks->{block_name};
   }
   
-#  use Data::Dumper;
-#  print Dumper($blocks);
-#  print Dumper(\$blocks_stages);
-
   foreach my $block ($doc->getElementsByTagName('block')) {
     my $block_name = $block->getAttribute('NAME').$block->getAttribute('name');
-#    print "################### $block_name\n";
     my $block_description = $block->getAttribute('description');
     my $block_id = $blocks->{$block_name};
 
@@ -219,9 +212,7 @@ sub parse_mission {
 	my $stage_id = $blocks_stages->{$block_name}->{$key};
 	my $tags = [$block_id];
 	push(@{$tags}, ($stage_id)) if defined $stage_id;
-	#				$self->Subwidget('text')->insert('end', $line."\n", $tags);
 	if (defined $stage_id) {
-	  # print "reading $block_id $stage_id  block name  $block_name\n";
 	  $self->{mission}->{$block_id}->{stage}->{$stage_id}->{text} = $line;
 					
 	  # Parse the stage_line to get a wp_name defined with `wp="wp_name"`

sw/lib/perl/Paparazzi/Traces.pm

@@ -1,6 +1,6 @@
 package Paparazzi::Traces;
-
-@export = qw (TRACE_ERROR TRACE_DEBUG TRACE_JUNK);
+@ISA = qw (Exporter);
+@EXPORT = qw (trace TRACE_ERROR TRACE_DEBUG TRACE_JUNK);
 
 use strict;
 
@@ -12,7 +12,7 @@ my $tracelevel = 2;
 
 sub trace {
   my ($level, $msg) = @_;
-  print $msg if $level >= $tracelevel;
+  print $msg.'\n' if $level <= $tracelevel;
 }