diff --git a/sw/ground_segment/cockpit/Paparazzi/PFD_Panel.pm b/sw/ground_segment/cockpit/Paparazzi/PFD_Panel.pm index c144dbef0e..6d3b6aaf1f 100644 --- a/sw/ground_segment/cockpit/Paparazzi/PFD_Panel.pm +++ b/sw/ground_segment/cockpit/Paparazzi/PFD_Panel.pm @@ -104,57 +104,57 @@ sub build_gui { sub set_mode { my ($self, $name, $previous_val, $new_val) = @_; - my $mode = $self->{modes_by_name}->{$name}; - if (defined $mode) { - if (!defined $previous_val || $previous_val != $new_val) { - my $zinc = $self->get('-zinc'); - $zinc->itemconfigure( $mode->{tabular}, 1, - -text => $mode->{str}[$new_val], - -color =>$mode->{color}[$new_val], - ); - } - } +# my $mode = $self->{modes_by_name}->{$name}; +# if (defined $mode) { +# if (!defined $previous_val || $previous_val != $new_val) { +# my $zinc = $self->get('-zinc'); +# $zinc->itemconfigure( $mode->{tabular}, 1, +# -text => $mode->{str}[$new_val], +# -color =>$mode->{color}[$new_val], +# ); +# } +# } } sub gps_mode() { my ($self, $previous_mode, $new_mode) = @_; - $self->set_mode("gps", $previous_mode, $new_mode); +# $self->set_mode("gps", $previous_mode, $new_mode); } sub ap_mode() { my ($self, $previous_mode, $new_mode) = @_; - $self->set_mode("ap", $previous_mode, $new_mode); + # $self->set_mode("ap", $previous_mode, $new_mode); } sub rc_mode { my ($self, $previous_mode, $new_mode) = @_; - $self->set_mode("rc", $previous_mode, $new_mode); + # $self->set_mode("rc", $previous_mode, $new_mode); } sub lls_mode { my ($self, $previous_mode, $new_mode) = @_; - $self->set_mode("lls", $previous_mode, $new_mode); + # $self->set_mode("lls", $previous_mode, $new_mode); } sub if_mode { my ($self, $previous_mode, $new_mode) = @_; - $self->set_mode("if", $previous_mode, $new_mode); + # $self->set_mode("if", $previous_mode, $new_mode); } sub lls_value { my ($self, $previous_val, $new_val) = @_; - my $mode = $self->{modes_by_name}->{lls}; - if (defined $mode) { - if (!defined $previous_val || $previous_val != $new_val) { - my $zinc = $self->get('-zinc'); - my $str_val = sprintf ("%.4f", $new_val); - $zinc->itemconfigure( $mode->{tabular}, 2, - -text => $str_val, - -color => "green", - ); - } - } +# my $mode = $self->{modes_by_name}->{lls}; +# if (defined $mode) { +# if (!defined $previous_val || $previous_val != $new_val) { +# my $zinc = $self->get('-zinc'); +# my $str_val = sprintf ("%.4f", $new_val); +# $zinc->itemconfigure( $mode->{tabular}, 2, +# -text => $str_val, +# -color => "green", +# ); +# } +# } } diff --git a/sw/ground_segment/cockpit/cockpit.pl b/sw/ground_segment/cockpit/cockpit.pl index d1828148d8..ee329b00dc 100755 --- a/sw/ground_segment/cockpit/cockpit.pl +++ b/sw/ground_segment/cockpit/cockpit.pl @@ -216,7 +216,7 @@ sub onShowPage { # } Paparazzi::Environment::parse_command_line($options) || pod2usage(-verbose => 0); -print Dumper($options); +#print Dumper($options); my $cockpit = Cockpit->new(); MainLoop(); diff --git a/sw/supervision/Paparazzi/CpGui.pm b/sw/supervision/Paparazzi/CpGui.pm index 09c37c9cc5..a874939b74 100755 --- a/sw/supervision/Paparazzi/CpGui.pm +++ b/sw/supervision/Paparazzi/CpGui.pm @@ -244,7 +244,7 @@ sub build_list_page { $hlist->header('create', $i, -text => $header[$i]); } my $section_h = $self->get('-'.$section); - print "CpGui variables ".Dumper($section_h) if ($section eq "variables"); +# print "CpGui variables ".Dumper($section_h) if ($section eq "variables"); foreach my $item (keys %{$section_h}) { my $e = $hlist->addchild(""); &$row_fun($self, $hlist, $e, $section_h, $item); diff --git a/sw/supervision/Paparazzi/CpSessionMgr.pm b/sw/supervision/Paparazzi/CpSessionMgr.pm index e20693beb6..a3b10ab1e2 100644 --- a/sw/supervision/Paparazzi/CpSessionMgr.pm +++ b/sw/supervision/Paparazzi/CpSessionMgr.pm @@ -91,7 +91,7 @@ sub toggle_program_in_session { my ($self, $session_name, $pgm_idx) = @_; my $session = $self->get('-sessions')->{$session_name}; my $session_program = $session->{pgms}->[$pgm_idx]; - print "processing program in session context\n".Dumper($session); +# print "processing program in session context\n".Dumper($session); if (defined $session_program->{pid}) { print "killing program $session_program->{name} => $session_program->{pid}\n"; $self->SUPER::stop_program($session_program->{pid}); @@ -106,8 +106,9 @@ sub toggle_program_in_session { push @pgm_options, @session_options; push @pgm_args, @session_args; my $command = $self->find_binary($program); + print "starting $program->{name} [$command @pgm_options @pgm_args]\n"; $session_program->{pid} = $self->SUPER::start_program($command, @pgm_options[0..$#pgm_options], @pgm_args[0..$#pgm_args]); - print "launched $program_name => pid $session_program->{pid}\n"; + # print "launched $program_name => pid $session_program->{pid}\n"; } } diff --git a/sw/supervision/paparazzi.pl b/sw/supervision/paparazzi.pl index eb47ecf607..65a78c3396 100755 --- a/sw/supervision/paparazzi.pl +++ b/sw/supervision/paparazzi.pl @@ -56,7 +56,7 @@ sub parse_args { foreach my $var (keys %{$options}) { $variables->{$var} = $options->{$var} if defined $options->{$var}; } - print "in paparazzi::parse_args variables after\n".Dumper($variables); +# print "in paparazzi::parse_args variables after\n".Dumper($variables); } sub catchSigTerm() {