rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

LP-607 Update to WMM-2015v2

Browse Source
This commit is contained in:
Laurent Lalanne 2019-02-07 21:50:58 +01:00
parent aba11f0e10
commit 5f955ebb14
1 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
flight/libraries/WorldMagModel.c
View File

@ -2,7 +2,7 @@
******************************************************************************
*
* @file WorldMagModel.c
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2019.
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief Source file for the World Magnetic Model
* This is a port of code available from the US NOAA.
@ -61,96 +61,96 @@
// first column not used but it will be optimized out by compiler
static const float CoeffFile[91][6] = {
{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f },
{ 1.0f, 0.0f, -29438.5f, 0.0f, 10.7f, 0.0f },
{ 1.0f, 1.0f, -1501.1f, 4796.2f, 17.9f, -26.8f },
{ 2.0f, 0.0f, -2445.3f, 0.0f, -8.6f, 0.0f },
{ 2.0f, 1.0f, 3012.5f, -2845.6f, -3.3f, -27.1f },
{ 2.0f, 2.0f, 1676.6f, -642.0f, 2.4f, -13.3f },
{ 3.0f, 0.0f, 1351.1f, 0.0f, 3.1f, 0.0f },
{ 3.0f, 1.0f, -2352.3f, -115.3f, -6.2f, 8.4f },
{ 3.0f, 2.0f, 1225.6f, 245.0f, -0.4f, -0.4f },
{ 3.0f, 3.0f, 581.9f, -538.3f, -10.4f, 2.3f },
{ 4.0f, 0.0f, 907.2f, 0.0f, -0.4f, 0.0f },
{ 4.0f, 1.0f, 813.7f, 283.4f, 0.8f, -0.6f },
{ 4.0f, 2.0f, 120.3f, -188.6f, -9.2f, 5.3f },
{ 4.0f, 3.0f, -335.0f, 180.9f, 4.0f, 3.0f },
{ 4.0f, 4.0f, 70.3f, -329.5f, -4.2f, -5.3f },
{ 5.0f, 0.0f, -232.6f, 0.0f, -0.2f, 0.0f },
{ 5.0f, 1.0f, 360.1f, 47.4f, 0.1f, 0.4f },
{ 5.0f, 2.0f, 192.4f, 196.9f, -1.4f, 1.6f },
{ 5.0f, 3.0f, -141.0f, -119.4f, 0.0f, -1.1f },
{ 5.0f, 4.0f, -157.4f, 16.1f, 1.3f, 3.3f },
{ 5.0f, 5.0f, 4.3f, 100.1f, 3.8f, 0.1f },
{ 6.0f, 0.0f, 69.5f, 0.0f, -0.5f, 0.0f },
{ 6.0f, 1.0f, 67.4f, -20.7f, -0.2f, 0.0f },
{ 6.0f, 2.0f, 72.8f, 33.2f, -0.6f, -2.2f },
{ 6.0f, 3.0f, -129.8f, 58.8f, 2.4f, -0.7f },
{ 6.0f, 4.0f, -29.0f, -66.5f, -1.1f, 0.1f },
{ 6.0f, 5.0f, 13.2f, 7.3f, 0.3f, 1.0f },
{ 6.0f, 6.0f, -70.9f, 62.5f, 1.5f, 1.3f },
{ 7.0f, 0.0f, 81.6f, 0.0f, 0.2f, 0.0f },
{ 7.0f, 1.0f, -76.1f, -54.1f, -0.2f, 0.7f },
{ 7.0f, 2.0f, -6.8f, -19.4f, -0.4f, 0.5f },
{ 7.0f, 3.0f, 51.9f, 5.6f, 1.3f, -0.2f },
{ 7.0f, 4.0f, 15.0f, 24.4f, 0.2f, -0.1f },
{ 7.0f, 5.0f, 9.3f, 3.3f, -0.4f, -0.7f },
{ 7.0f, 6.0f, -2.8f, -27.5f, -0.9f, 0.1f },
{ 7.0f, 7.0f, 6.7f, -2.3f, 0.3f, 0.1f },
{ 8.0f, 0.0f, 24.0f, 0.0f, 0.0f, 0.0f },
{ 8.0f, 1.0f, 8.6f, 10.2f, 0.1f, -0.3f },
{ 8.0f, 2.0f, -16.9f, -18.1f, -0.5f, 0.3f },
{ 8.0f, 3.0f, -3.2f, 13.2f, 0.5f, 0.3f },
{ 8.0f, 4.0f, -20.6f, -14.6f, -0.2f, 0.6f },
{ 8.0f, 5.0f, 13.3f, 16.2f, 0.4f, -0.1f },
{ 8.0f, 6.0f, 11.7f, 5.7f, 0.2f, -0.2f },
{ 8.0f, 7.0f, -16.0f, -9.1f, -0.4f, 0.3f },
{ 8.0f, 8.0f, -2.0f, 2.2f, 0.3f, 0.0f },
{ 9.0f, 0.0f, 5.4f, 0.0f, 0.0f, 0.0f },
{ 9.0f, 1.0f, 8.8f, -21.6f, -0.1f, -0.2f },
{ 9.0f, 2.0f, 3.1f, 10.8f, -0.1f, -0.1f },
{ 9.0f, 3.0f, -3.1f, 11.7f, 0.4f, -0.2f },
{ 9.0f, 4.0f, 0.6f, -6.8f, -0.5f, 0.1f },
{ 9.0f, 5.0f, -13.3f, -6.9f, -0.2f, 0.1f },
{ 9.0f, 6.0f, -0.1f, 7.8f, 0.1f, 0.0f },
{ 9.0f, 7.0f, 8.7f, 1.0f, 0.0f, -0.2f },
{ 9.0f, 8.0f, -9.1f, -3.9f, -0.2f, 0.4f },
{ 9.0f, 9.0f, -10.5f, 8.5f, -0.1f, 0.3f },
{ 10.0f, 0.0f, -1.9f, 0.0f, 0.0f, 0.0f },
{ 10.0f, 1.0f, -6.5f, 3.3f, 0.0f, 0.1f },
{ 10.0f, 2.0f, 0.2f, -0.3f, -0.1f, -0.1f },
{ 10.0f, 3.0f, 0.6f, 4.6f, 0.3f, 0.0f },
{ 10.0f, 4.0f, -0.6f, 4.4f, -0.1f, 0.0f },
{ 10.0f, 5.0f, 1.7f, -7.9f, -0.1f, -0.2f },
{ 10.0f, 6.0f, -0.7f, -0.6f, -0.1f, 0.1f },
{ 10.0f, 7.0f, 2.1f, -4.1f, 0.0f, -0.1f },
{ 10.0f, 8.0f, 2.3f, -2.8f, -0.2f, -0.2f },
{ 10.0f, 9.0f, -1.8f, -1.1f, -0.1f, 0.1f },
{ 10.0f, 10.0f, -3.6f, -8.7f, -0.2f, -0.1f },
{ 11.0f, 0.0f, 3.1f, 0.0f, 0.0f, 0.0f },
{ 11.0f, 1.0f, -1.5f, -0.1f, 0.0f, 0.0f },
{ 11.0f, 2.0f, -2.3f, 2.1f, -0.1f, 0.1f },
{ 11.0f, 3.0f, 2.1f, -0.7f, 0.1f, 0.0f },
{ 11.0f, 4.0f, -0.9f, -1.1f, 0.0f, 0.1f },
{ 11.0f, 5.0f, 0.6f, 0.7f, 0.0f, 0.0f },
{ 11.0f, 6.0f, -0.7f, -0.2f, 0.0f, 0.0f },
{ 11.0f, 7.0f, 0.2f, -2.1f, 0.0f, 0.1f },
{ 11.0f, 8.0f, 1.7f, -1.5f, 0.0f, 0.0f },
{ 11.0f, 9.0f, -0.2f, -2.5f, 0.0f, -0.1f },
{ 11.0f, 10.0f, 0.4f, -2.0f, -0.1f, 0.0f },
{ 1.0f, 0.0f, -29438.2f, 0.0f, 7.0f, 0.0f },
{ 1.0f, 1.0f, -1493.5f, 4796.3f, 9.0f, -30.2f },
{ 2.0f, 0.0f, -2444.5f, 0.0f, -11.0f, 0.0f },
{ 2.0f, 1.0f, 3014.7f, -2842.4f, -6.2f, -29.6f },
{ 2.0f, 2.0f, 1679.0f, -638.8f, 0.3f, -17.3f },
{ 3.0f, 0.0f, 1351.8f, 0.0f, 2.4f, 0.0f },
{ 3.0f, 1.0f, -2351.6f, -113.7f, -5.7f, 6.5f },
{ 3.0f, 2.0f, 1223.6f, 246.5f, 2.0f, -0.8f },
{ 3.0f, 3.0f, 582.3f, -537.4f, -11.0f, -2.0f },
{ 4.0f, 0.0f, 907.5f, 0.0f, -0.8f, 0.0f },
{ 4.0f, 1.0f, 814.8f, 283.3f, -0.9f, -0.4f },
{ 4.0f, 2.0f, 117.8f, -188.6f, -6.5f, 5.8f },
{ 4.0f, 3.0f, -335.6f, 180.7f, 5.2f, 3.8f },
{ 4.0f, 4.0f, 69.7f, -330.0f, -4.0f, -3.5f },
{ 5.0f, 0.0f, -232.9f, 0.0f, -0.3f, 0.0f },
{ 5.0f, 1.0f, 360.1f, 46.9f, 0.6f, 0.2f },
{ 5.0f, 2.0f, 191.7f, 196.5f, -0.8f, 2.3f },
{ 5.0f, 3.0f, -141.3f, -119.9f, 0.1f, -0.0f },
{ 5.0f, 4.0f, -157.2f, 16.0f, 1.2f, 3.3f },
{ 5.0f, 5.0f, 7.7f, 100.6f, 1.4f, -0.6f },
{ 6.0f, 0.0f, 69.4f, 0.0f, -0.8f, 0.0f },
{ 6.0f, 1.0f, 67.7f, -20.1f, -0.5f, 0.3f },
{ 6.0f, 2.0f, 72.3f, 32.8f, -0.1f, -1.5f },
{ 6.0f, 3.0f, -129.1f, 59.1f, 1.6f, -1.2f },
{ 6.0f, 4.0f, -28.4f, -67.1f, -1.6f, 0.4f },
{ 6.0f, 5.0f, 13.6f, 8.1f, 0.0f, 0.2f },
{ 6.0f, 6.0f, -70.3f, 61.9f, 1.2f, 1.3f },
{ 7.0f, 0.0f, 81.7f, 0.0f, -0.3f, 0.0f },
{ 7.0f, 1.0f, -75.9f, -54.3f, -0.2f, 0.6f },
{ 7.0f, 2.0f, -7.1f, -19.5f, -0.3f, 0.5f },
{ 7.0f, 3.0f, 52.2f, 6.0f, 0.9f, -0.8f },
{ 7.0f, 4.0f, 15.0f, 24.5f, 0.1f, -0.2f },
{ 7.0f, 5.0f, 9.1f, 3.5f, -0.6f, -1.1f },
{ 7.0f, 6.0f, -3.0f, -27.7f, -0.9f, 0.1f },
{ 7.0f, 7.0f, 5.9f, -2.9f, 0.7f, 0.2f },
{ 8.0f, 0.0f, 24.2f, 0.0f, -0.1f, 0.0f },
{ 8.0f, 1.0f, 8.9f, 10.1f, 0.2f, -0.4f },
{ 8.0f, 2.0f, -16.9f, -18.3f, -0.2f, 0.6f },
{ 8.0f, 3.0f, -3.1f, 13.3f, 0.5f, -0.1f },
{ 8.0f, 4.0f, -20.7f, -14.5f, -0.1f, 0.6f },
{ 8.0f, 5.0f, 13.3f, 16.2f, 0.4f, -0.2f },
{ 8.0f, 6.0f, 11.6f, 6.0f, 0.4f, -0.5f },
{ 8.0f, 7.0f, -16.3f, -9.2f, -0.1f, 0.5f },
{ 8.0f, 8.0f, -2.1f, 2.4f, 0.4f, 0.1f },
{ 9.0f, 0.0f, 5.5f, 0.0f, -0.1f, 0.0f },
{ 9.0f, 1.0f, 8.8f, -21.8f, -0.1f, -0.3f },
{ 9.0f, 2.0f, 3.0f, 10.7f, -0.0f, 0.1f },
{ 9.0f, 3.0f, -3.2f, 11.8f, 0.4f, -0.4f },
{ 9.0f, 4.0f, 0.6f, -6.8f, -0.4f, 0.3f },
{ 9.0f, 5.0f, -13.2f, -6.9f, 0.0f, 0.1f },
{ 9.0f, 6.0f, -0.1f, 7.9f, 0.3f, -0.0f },
{ 9.0f, 7.0f, 8.7f, 1.0f, 0.0f, -0.1f },
{ 9.0f, 8.0f, -9.1f, -3.9f, -0.0f, 0.5f },
{ 9.0f, 9.0f, -10.4f, 8.5f, -0.3f, 0.2f },
{ 10.0f, 0.0f, -2.0f, 0.0f, 0.0f, 0.0f },
{ 10.0f, 1.0f, -6.1f, 3.3f, -0.0f, 0.0f },
{ 10.0f, 2.0f, 0.2f, -0.4f, -0.1f, 0.1f },
{ 10.0f, 3.0f, 0.6f, 4.6f, 0.2f, -0.2f },
{ 10.0f, 4.0f, -0.5f, 4.4f, -0.1f, 0.1f },
{ 10.0f, 5.0f, 1.8f, -7.9f, -0.2f, -0.1f },
{ 10.0f, 6.0f, -0.7f, -0.6f, -0.0f, 0.1f },
{ 10.0f, 7.0f, 2.2f, -4.2f, -0.1f, -0.0f },
{ 10.0f, 8.0f, 2.4f, -2.9f, -0.2f, -0.1f },
{ 10.0f, 9.0f, -1.8f, -1.1f, -0.1f, 0.2f },
{ 10.0f, 10.0f, -3.6f, -8.8f, -0.0f, -0.0f },
{ 11.0f, 0.0f, 3.0f, 0.0f, -0.0f, 0.0f },
{ 11.0f, 1.0f, -1.4f, -0.0f, 0.0f, 0.0f },
{ 11.0f, 2.0f, -2.3f, 2.1f, -0.0f, 0.1f },
{ 11.0f, 3.0f, 2.1f, -0.6f, 0.0f, 0.0f },
{ 11.0f, 4.0f, -0.8f, -1.1f, -0.0f, 0.1f },
{ 11.0f, 5.0f, 0.6f, 0.7f, -0.1f, -0.0f },
{ 11.0f, 6.0f, -0.7f, -0.2f, 0.0f, -0.0f },
{ 11.0f, 7.0f, 0.1f, -2.1f, -0.0f, 0.1f },
{ 11.0f, 8.0f, 1.7f, -1.5f, -0.0f, -0.0f },
{ 11.0f, 9.0f, -0.2f, -2.6f, -0.1f, -0.1f },
{ 11.0f, 10.0f, 0.4f, -2.0f, -0.0f, -0.0f },
{ 11.0f, 11.0f, 3.5f, -2.3f, -0.1f, -0.1f },
{ 12.0f, 0.0f, -2.0f, 0.0f, 0.1f, 0.0f },
{ 12.0f, 1.0f, -0.3f, -1.0f, 0.0f, 0.0f },
{ 12.0f, 2.0f, 0.4f, 0.5f, 0.0f, 0.0f },
{ 12.0f, 3.0f, 1.3f, 1.8f, 0.1f, -0.1f },
{ 12.0f, 4.0f, -0.9f, -2.2f, -0.1f, 0.0f },
{ 12.0f, 5.0f, 0.9f, 0.3f, 0.0f, 0.0f },
{ 12.0f, 6.0f, 0.1f, 0.7f, 0.1f, 0.0f },
{ 12.0f, 7.0f, 0.5f, -0.1f, 0.0f, 0.0f },
{ 12.0f, 0.0f, -2.0f, 0.0f, 0.0f, 0.0f },
{ 12.0f, 1.0f, -0.1f, -1.0f, 0.0f, -0.0f },
{ 12.0f, 2.0f, 0.5f, 0.3f, -0.0f, 0.0f },
{ 12.0f, 3.0f, 1.2f, 1.8f, 0.0f, -0.1f },
{ 12.0f, 4.0f, -0.9f, -2.2f, -0.1f, 0.1f },
{ 12.0f, 5.0f, 0.9f, 0.3f, -0.0f, -0.0f },
{ 12.0f, 6.0f, 0.1f, 0.7f, 0.0f, 0.0f },
{ 12.0f, 7.0f, 0.6f, -0.1f, -0.0f, -0.0f },
{ 12.0f, 8.0f, -0.4f, 0.3f, 0.0f, 0.0f },
{ 12.0f, 9.0f, -0.4f, 0.2f, 0.0f, 0.0f },
{ 12.0f, 10.0f, 0.2f, -0.9f, 0.0f, 0.0f },
{ 12.0f, 11.0f, -0.9f, -0.2f, 0.0f, 0.0f },
{ 12.0f, 12.0f, 0.0f, 0.7f, 0.0f, 0.0f }
{ 12.0f, 9.0f, -0.5f, 0.2f, -0.0f, 0.0f },
{ 12.0f, 10.0f, 0.2f, -0.9f, -0.0f, -0.0f },
{ 12.0f, 11.0f, -0.9f, -0.2f, -0.0f, 0.0f },
{ 12.0f, 12.0f, -0.0f, 0.8f, -0.1f, -0.1f }
};
static WMMtype_Ellipsoid *Ellip = NULL;
@ -194,7 +194,7 @@ int WMM_Initialize()
// Really, Really needs to be read from a file - out of date in 2020 at latest
MagneticModel->EditionDate = 0.0f; /* OP change. Originally 5.7863328170559505e-307, truncates to 0.0f */
MagneticModel->epoch = 2015.0f;
sprintf(MagneticModel->ModelName, "WMM-2015");
sprintf(MagneticModel->ModelName, "WMM-2015v2");
return 0; // OK
}