diff --git a/sw/ground_segment/cockpit/Paparazzi/HistoryView.pm b/sw/ground_segment/cockpit/Paparazzi/HistoryView.pm index de9d4348f3..b3fead22bb 100644 --- a/sw/ground_segment/cockpit/Paparazzi/HistoryView.pm +++ b/sw/ground_segment/cockpit/Paparazzi/HistoryView.pm @@ -78,3 +78,5 @@ sub build_gui { $zinc->add('rectangle', $self->{main_group}, [0, 0, $width, $height], -visible => 1, -linecolor => "green"); } + +1; diff --git a/sw/ground_segment/cockpit/Paparazzi/InfraredPage.pm b/sw/ground_segment/cockpit/Paparazzi/InfraredPage.pm index 35890af1f3..ea8ee26fbd 100644 --- a/sw/ground_segment/cockpit/Paparazzi/InfraredPage.pm +++ b/sw/ground_segment/cockpit/Paparazzi/InfraredPage.pm @@ -17,7 +17,7 @@ sub populate { $args->{-title} = TITLE; $self->SUPER::populate($args); $self->configspec( - -lls => [S_NOINIT, S_METHOD, S_RDWR, S_OVRWRT, S_NOPRPG, 0.0015], +# -lls => [S_NOINIT, S_METHOD, S_RDWR, S_OVRWRT, S_NOPRPG, 0.0015], ); } @@ -33,6 +33,11 @@ sub set_aircraft { $prev_ac->detach($self, $field, [\&update_field]) if ($prev_ac); $new_ac->attach($self, $field, [\&update_field]) if ($new_ac); } + foreach my $field (@fields) { + my $text = $new_ac->get($field); + $self->get('-zinc')->itemconfigure($self->{'value_'.$field}, -text => $text); + } + $self->{aircraft} = $new_ac; } sub update_field { @@ -42,8 +47,10 @@ sub update_field { } sub onTimer { - my ( $self) = @_; - $self->{history}->put_value(scalar $self->get('-lls')); + my ($self) = @_; + if (defined $self->{aircraft}) { + $self->{history}->put_value(scalar $self->{aircraft}->get('gps_hybrid_factor')); + } } sub lls { diff --git a/sw/ground_segment/cockpit/cockpit.pl b/sw/ground_segment/cockpit/cockpit.pl index a05d16f73b..3777979abb 100755 --- a/sw/ground_segment/cockpit/cockpit.pl +++ b/sw/ground_segment/cockpit/cockpit.pl @@ -39,7 +39,7 @@ my $options = { ivy_bus => "127.255.255.255:2005", render => 1, - tracelevel => 3, + tracelevel => 1, }; sub populate {