Skip to content

Commit

Permalink
Merge pull request #1085 from PX4/geo_flashefficiency
Browse files Browse the repository at this point in the history
geo lookup lib: Moved to separate module and compiling with -Os to save ...
  • Loading branch information
thomasgubler committed Jun 28, 2014
2 parents 13f9ce9 + e78d496 commit cd28679
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 4 deletions.
1 change: 1 addition & 0 deletions makefiles/config_aerocore_default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ MODULES += lib/mathlib/math/filter
MODULES += lib/ecl
MODULES += lib/external_lgpl
MODULES += lib/geo
MODULES += lib/geo_lookup
MODULES += lib/conversion
MODULES += lib/launchdetection

Expand Down
1 change: 1 addition & 0 deletions makefiles/config_px4fmu-v1_default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ MODULES += lib/mathlib/math/filter
MODULES += lib/ecl
MODULES += lib/external_lgpl
MODULES += lib/geo
MODULES += lib/geo_lookup
MODULES += lib/conversion
MODULES += lib/launchdetection

Expand Down
1 change: 1 addition & 0 deletions makefiles/config_px4fmu-v2_default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ MODULES += lib/mathlib/math/filter
MODULES += lib/ecl
MODULES += lib/external_lgpl
MODULES += lib/geo
MODULES += lib/geo_lookup
MODULES += lib/conversion
MODULES += lib/launchdetection

Expand Down
2 changes: 1 addition & 1 deletion src/lib/geo/geo.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

__BEGIN_DECLS

#include "geo_mag_declination.h"
#include "geo_lookup/geo_mag_declination.h"

#include <stdbool.h>

Expand Down
5 changes: 2 additions & 3 deletions src/lib/geo/module.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
############################################################################
#
# Copyright (C) 2012 PX4 Development Team. All rights reserved.
# Copyright (c) 2012-2014 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -35,5 +35,4 @@
# Geo library
#

SRCS = geo.c \
geo_mag_declination.c
SRCS = geo.c
File renamed without changes.
File renamed without changes.
40 changes: 40 additions & 0 deletions src/lib/geo_lookup/module.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
############################################################################
#
# Copyright (c) 2014 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the
# distribution.
# 3. Neither the name PX4 nor the names of its contributors may be
# used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################

#
# Geo lookup table / data library
#

SRCS = geo_mag_declination.c

MAXOPTIMIZATION = -Os

0 comments on commit cd28679

Please sign in to comment.