Skip to content

Commit

Permalink
[nav] some functions should be static (line and survey OSAM)
Browse files Browse the repository at this point in the history
  • Loading branch information
gautierhattenberger committed Nov 4, 2013
1 parent d5660a6 commit c666677
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion sw/airborne/modules/nav/nav_line_osam.c
Expand Up @@ -48,7 +48,7 @@ static float FLRadius;
/*
Translates point so (transX, transY) are (0,0) then rotates the point around z by Zrot
*/
void TranslateAndRotateFromWorld(struct Point2D *p, float Zrot, float transX, float transY)
static void TranslateAndRotateFromWorld(struct Point2D *p, float Zrot, float transX, float transY)
{
float temp;

Expand Down
13 changes: 6 additions & 7 deletions sw/airborne/modules/nav/nav_poly_survey_osam.c
Expand Up @@ -35,13 +35,12 @@
struct Point2D {float x; float y;};
struct Line {float m;float b;float x;};

void TranslateAndRotateFromWorld(struct Point2D *p, float Zrot, float transX, float transY);
void RotateAndTranslateToWorld(struct Point2D *p, float Zrot, float transX, float transY);

void FindInterceptOfTwoLines(float *x, float *y, struct Line L1, struct Line L2);
float EvaluateLineForY(float x, struct Line L);
float EvaluateLineForX(float y, struct Line L);
float DistanceEquation(struct Point2D p1,struct Point2D p2);
static void TranslateAndRotateFromWorld(struct Point2D *p, float Zrot, float transX, float transY);
static void RotateAndTranslateToWorld(struct Point2D *p, float Zrot, float transX, float transY);
static void FindInterceptOfTwoLines(float *x, float *y, struct Line L1, struct Line L2);
static float EvaluateLineForY(float x, struct Line L);
static float EvaluateLineForX(float y, struct Line L);
static float DistanceEquation(struct Point2D p1,struct Point2D p2);

#define PolygonSize 10
#define MaxFloat 1000000000
Expand Down

0 comments on commit c666677

Please sign in to comment.