Skip to content
Snippets Groups Projects
Commit f44c8ca2 authored by Luca Conterio's avatar Luca Conterio
Browse files

Align 'testing' with 'master'

parents 3ccd5f39 5bf2c8f7
No related branches found
No related tags found
No related merge requests found
Showing
with 1532 additions and 1426 deletions
File added
File added
File added
File added
File added
No preview for this file type
No preview for this file type
Subproject commit b4f10db48e95f5281e6987f768dee363d57ce348
Subproject commit 9c53735bbfec2903641fedf1821ef8a05ab2ece8
......@@ -93,9 +93,9 @@ static constexpr float ABK_UPDATE_PERIOD = 0.05 * 1000; // ms -> 20 Hz
static constexpr float ABK_UPDATE_PERIOD_SECONDS = ABK_UPDATE_PERIOD / 1000;
#ifdef EUROC
static constexpr int SHADOW_MODE_DURATION = 6.3 * 1000; // 0.8 mach
static constexpr int SHADOW_MODE_DURATION = 6.2 * 1000; // 0.8 mach
static constexpr int AIRBRAKES_ACTIVATION_AFTER_SHADOW_MODE =
1.2 * 1000; // 0.7 mach
1.1 * 1000; // 0.7 mach
#else
static constexpr int SHADOW_MODE_DURATION = 3.5 * 1000;
#endif
......@@ -103,26 +103,26 @@ static constexpr int SHADOW_MODE_DURATION = 3.5 * 1000;
#ifdef EUROC
struct Coefficients
{
float n000 = 0.4912038462193552;
float n100 = -1.2829337399401595;
float n200 = 5.4496525366603175;
float n300 = -14.373489732912505;
float n400 = 23.041565019164537;
float n500 = -20.665098183955564;
float n600 = 7.781756180733372;
float n010 = 8.578612850167778;
float n020 = 139.0917211542655;
float n110 = 0.7488030083983109;
float n120 = -143.1155855707458;
float n210 = 85.43971374816863;
float n220 = 1012.1982268667119;
float n310 = -318.72827049284604;
float n320 = -3465.8287321207386;
float n410 = 465.76527224155507;
float n420 = 5018.865244618964;
float n510 = -216.65938340162148;
float n520 = -2334.271751434503;
float n001 = 2.7225033263675867e-06;
float n000 = 0.48691724895766536;
float n100 = -1.0201967915455747;
float n200 = 3.1601195121881624;
float n300 = -5.207372520459633;
float n400 = 5.348364517420158;
float n500 = -4.6411809574995235;
float n600 = 2.410373760485268;
float n010 = 8.065292810990796;
float n020 = 143.73493969843133;
float n110 = 1.231780014534557;
float n120 = -130.29216244392964;
float n210 = 68.58740070791052;
float n220 = 1073.263262818047;
float n310 = -259.68709984180873;
float n320 = -3750.7093392408874;
float n410 = 385.3808010115668;
float n420 = 5464.924806439974;
float n510 = -180.76701763197605;
float n520 = -2554.179469197033;
float n001 = 2.7555579144973302e-06;
};
#else
struct Coefficients
......
......@@ -28,7 +28,7 @@ namespace DeathStackBoard
// State timeouts
// Automatically end the mission after a very long time, in order to safely
// close the logs if radio comms have been lost
static constexpr unsigned int TIMEOUT_END_MISSION = 30 * 60 * 1000;
static constexpr unsigned int TIMEOUT_END_MISSION = 15 * 60 * 1000;
static constexpr unsigned int FMM_PRIORITY = 2;
......
......@@ -104,11 +104,11 @@ static const unsigned int JAMMING_FACTOR = 3;
#ifdef EUROC
// static const float LAT0 =
// 39.371507F; // [deg]
// 39.390278F; // [deg]
// // Latitude of the launch location
// // (campo militar santa margarida)
// static const float LON0 =
// -8.278039F; // [deg]
// -8.289167; // [deg]
// // Longitude of the launch location
// // (campo militar santa margarida)
......
......@@ -27,7 +27,7 @@ static constexpr unsigned int DEFERRED_EVENTS_QUEUE_SIZE = 100;
// Default reference values settings
#ifdef EUROC
static const float DEFAULT_REFERENCE_ALTITUDE = 171.0f;
static const float DEFAULT_REFERENCE_ALTITUDE = 160.0f;
static const float DEFAULT_REFERENCE_PRESSURE = 100022.4f;
#else
static const float DEFAULT_REFERENCE_ALTITUDE = 1420.0f;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment