Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 04:46:51 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Antoine Drouin
2005-08-20 22:42:34 +00:00
parent cdc856d034
commit fbe379ecc7
5 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/cockpit/Paparazzi/PFD_Panel.pm
+26 -26
View File
@@ -104,57 +104,57 @@ sub build_gui {
sub set_mode { sub set_mode {
my ($self, $name, $previous_val, $new_val) = @_; my ($self, $name, $previous_val, $new_val) = @_;
my $mode = $self->{modes_by_name}->{$name}; # my $mode = $self->{modes_by_name}->{$name};
if (defined $mode) { # if (defined $mode) {
if (!defined $previous_val || $previous_val != $new_val) { # if (!defined $previous_val || $previous_val != $new_val) {
my $zinc = $self->get('-zinc'); # my $zinc = $self->get('-zinc');
$zinc->itemconfigure( $mode->{tabular}, 1, # $zinc->itemconfigure( $mode->{tabular}, 1,
-text => $mode->{str}[$new_val], # -text => $mode->{str}[$new_val],
-color =>$mode->{color}[$new_val], # -color =>$mode->{color}[$new_val],
); # );
} # }
} # }
} }
sub gps_mode() { sub gps_mode() {
my ($self, $previous_mode, $new_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() { sub ap_mode() {
my ($self, $previous_mode, $new_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 { sub rc_mode {
my ($self, $previous_mode, $new_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 { sub lls_mode {
my ($self, $previous_mode, $new_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 { sub if_mode {
my ($self, $previous_mode, $new_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 { sub lls_value {
my ($self, $previous_val, $new_val) = @_; my ($self, $previous_val, $new_val) = @_;
my $mode = $self->{modes_by_name}->{lls}; # my $mode = $self->{modes_by_name}->{lls};
if (defined $mode) { # if (defined $mode) {
if (!defined $previous_val || $previous_val != $new_val) { # if (!defined $previous_val || $previous_val != $new_val) {
my $zinc = $self->get('-zinc'); # my $zinc = $self->get('-zinc');
my $str_val = sprintf ("%.4f", $new_val); # my $str_val = sprintf ("%.4f", $new_val);
$zinc->itemconfigure( $mode->{tabular}, 2, # $zinc->itemconfigure( $mode->{tabular}, 2,
-text => $str_val, # -text => $str_val,
-color => "green", # -color => "green",
); # );
} # }
} # }
} }
sw/ground_segment/cockpit/cockpit.pl
+1 -1
View File
@@ -216,7 +216,7 @@ sub onShowPage {
# } # }
Paparazzi::Environment::parse_command_line($options) || pod2usage(-verbose => 0); Paparazzi::Environment::parse_command_line($options) || pod2usage(-verbose => 0);
print Dumper($options); #print Dumper($options);
my $cockpit = Cockpit->new(); my $cockpit = Cockpit->new();
MainLoop(); MainLoop();
sw/supervision/Paparazzi/CpGui.pm
+1 -1
View File
@@ -244,7 +244,7 @@ sub build_list_page {
$hlist->header('create', $i, -text => $header[$i]); $hlist->header('create', $i, -text => $header[$i]);
} }
my $section_h = $self->get('-'.$section); 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}) { foreach my $item (keys %{$section_h}) {
my $e = $hlist->addchild(""); my $e = $hlist->addchild("");
&$row_fun($self, $hlist, $e, $section_h, $item); &$row_fun($self, $hlist, $e, $section_h, $item);
sw/supervision/Paparazzi/CpSessionMgr.pm
+3 -2
View File
@@ -91,7 +91,7 @@ sub toggle_program_in_session {
my ($self, $session_name, $pgm_idx) = @_; my ($self, $session_name, $pgm_idx) = @_;
my $session = $self->get('-sessions')->{$session_name}; my $session = $self->get('-sessions')->{$session_name};
my $session_program = $session->{pgms}->[$pgm_idx]; 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}) { if (defined $session_program->{pid}) {
print "killing program $session_program->{name} => $session_program->{pid}\n"; print "killing program $session_program->{name} => $session_program->{pid}\n";
$self->SUPER::stop_program($session_program->{pid}); $self->SUPER::stop_program($session_program->{pid});
@@ -106,8 +106,9 @@ sub toggle_program_in_session {
push @pgm_options, @session_options; push @pgm_options, @session_options;
push @pgm_args, @session_args; push @pgm_args, @session_args;
my $command = $self->find_binary($program); 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]); $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";
} }
} }
sw/supervision/paparazzi.pl
+1 -1
View File
@@ -56,7 +56,7 @@ sub parse_args {
foreach my $var (keys %{$options}) { foreach my $var (keys %{$options}) {
$variables->{$var} = $options->{$var} if defined $options->{$var}; $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() { sub catchSigTerm() {