Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 12:23:23 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

removed some bugs :)

Browse Source
This commit is contained in:
Antoine Drouin
2005-08-24 19:02:15 +00:00
parent 78e60559b4
commit 8a94041687
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/control_panel.xml
+1
View File
@@ -83,6 +83,7 @@
<session name="soft sim 2"> <session name="soft sim 2">
<variable name="ivy_bus" value="127:3333"/> <variable name="ivy_bus" value="127:3333"/>
<program name="receive"/> <program name="receive"/>
<program name="http server"/>
<program name="sim"><arg flag="-a" constant="Thon1"/></program> <program name="sim"><arg flag="-a" constant="Thon1"/></program>
<program name="sim"><arg flag="-a" constant="Thon2"/></program> <program name="sim"><arg flag="-a" constant="Thon2"/></program>
<program name="cockpit"></program> <program name="cockpit"></program>
sw/ground_segment/cockpit/Paparazzi/Strip.pm
+1 -1
View File
@@ -361,7 +361,7 @@ sub string_of_time {
sub attach_to_aircraft { sub attach_to_aircraft {
my ($self) = @_; my ($self) = @_;
my @options = ('airframe', 'flight_plan', 'ap_mode', 'rc_status', 'gps_mode', 'contrast_status', 'contrast_value', 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) { foreach my $option (@options) {
$self->get('-aircraft')->attach($self, $option, [\&aircraft_config_changed]); $self->get('-aircraft')->attach($self, $option, [\&aircraft_config_changed]);
} }
sw/lib/perl/Paparazzi/Aircraft.pm
+4 -9
View File
@@ -49,8 +49,9 @@ sub populate {
climb => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 0.], 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'], 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.], 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.], 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_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_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.], 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.], 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], -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.], x
# 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.],
-svsinfo => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, undef], -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'], rc_status => [S_NOINIT, S_PASSIVE, S_RDWR, S_OVRWRT, S_NOPRPG, 'REALLY_LOST'],
sw/lib/perl/Paparazzi/Airframe.pm
+1 -1
View File
@@ -21,7 +21,7 @@ sub completeinit {
$self->SUPER::completeinit(); $self->SUPER::completeinit();
my $airframe_url = $self->get('-url'); my $airframe_url = $self->get('-url');
my $airframe_xml = LWP::Simple::get($airframe_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 { sub parse_airframe {
sw/lib/perl/Paparazzi/Flightplan.pm
+7 -1
View File
@@ -86,7 +86,13 @@ sub completeinit {
# my $flight_plan_xml =""; # my $flight_plan_xml ="";
my $flight_plan_xml = LWP::Simple::get($flight_plan_url); 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; # print "#######flight_plan_xml\n".$flight_plan_xml;