Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add odometer to OSD #9335

Merged
merged 7 commits into from Oct 7, 2023
Merged

Add odometer to OSD #9335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
91ee7cc
Add Odometer to OSD
MrD-RC Apr 15, 2023
2c05e40
Tested and working in HITL
MrD-RC Aug 27, 2023
de2c439
Merge branch 'master' into MrD_Add-odometer-to-OSD
MrD-RC Aug 27, 2023
524b0d0
Final updates
MrD-RC Aug 28, 2023
6b71d77
Merge branch 'master' into MrD_Add-odometer-to-OSD
MrD-RC Oct 1, 2023
ed415c8
Tabs to spaces
MrD-RC Oct 1, 2023
c1847b3
Update osd_unittest.cc
MrD-RC Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 32 additions & 33 deletions src/main/common/maths.h
View file
Open in desktop
Expand Up @@ -25,15 +25,15 @@
#endif

// Undefine this for use libc sinf/cosf. Keep this defined to use fast sin/cos approximations
#define FAST_MATH // order 9 approximation
//#define VERY_FAST_MATH // order 7 approximation
#define FAST_MATH // order 9 approximation
//#define VERY_FAST_MATH // order 7 approximation

// Use floating point M_PI instead explicitly.
#define M_PIf 3.14159265358979323846f
#define M_LN2f 0.69314718055994530942f
#define M_Ef 2.71828182845904523536f
#define M_PIf 3.14159265358979323846f
#define M_LN2f 0.69314718055994530942f
#define M_Ef 2.71828182845904523536f

#define RAD (M_PIf / 180.0f)
#define RAD (M_PIf / 180.0f)

#define DEGREES_TO_CENTIDEGREES(angle) ((angle) * 100)
#define CENTIDEGREES_TO_DEGREES(angle) ((angle) / 100.0f)
Expand All @@ -56,46 +56,46 @@
#define RADIANS_TO_CENTIDEGREES(angle) (((angle) * 100.0f) / RAD)
#define CENTIDEGREES_TO_RADIANS(angle) (((angle) / 100.0f) * RAD)

#define CENTIMETERS_TO_CENTIFEET(cm) (cm / 0.3048f)
#define CENTIMETERS_TO_FEET(cm) (cm / 30.48f)
#define CENTIMETERS_TO_METERS(cm) (cm / 100.0f)
#define CENTIMETERS_TO_CENTIFEET(cm) (cm / 0.3048f)
#define CENTIMETERS_TO_FEET(cm) (cm / 30.48f)
#define CENTIMETERS_TO_METERS(cm) (cm / 100.0f)

#define METERS_TO_CENTIMETERS(m) (m * 100)
#define METERS_TO_CENTIMETERS(m) (m * 100)

#define CMSEC_TO_CENTIMPH(cms) (cms * 2.2369363f)
#define CMSEC_TO_CENTIKPH(cms) (cms * 3.6f)
#define CMSEC_TO_CENTIKNOTS(cms) (cms * 1.943845f)
#define CMSEC_TO_CENTIMPH(cms) (cms * 2.2369363f)
#define CMSEC_TO_CENTIKPH(cms) (cms * 3.6f)
#define CMSEC_TO_CENTIKNOTS(cms) (cms * 1.943845f)

#define C_TO_KELVIN(temp) (temp + 273.15f)

// Standard Sea Level values
// Ref:https://en.wikipedia.org/wiki/Standard_sea_level
#define SSL_AIR_DENSITY 1.225f // kg/m^3
#define SSL_AIR_PRESSURE 101325.01576f // Pascal
#define SSL_AIR_TEMPERATURE 288.15f // K
#define SSL_AIR_DENSITY 1.225f // kg/m^3
#define SSL_AIR_PRESSURE 101325.01576f // Pascal
#define SSL_AIR_TEMPERATURE 288.15f // K

// copied from https://code.google.com/p/cxutil/source/browse/include/cxutil/utility.h#70
#define _CHOOSE2(binoper, lexpr, lvar, rexpr, rvar) \
( __extension__ ({ \
__typeof__(lexpr) lvar = (lexpr); \
__typeof__(rexpr) rvar = (rexpr); \
lvar binoper rvar ? lvar : rvar; \
}))
#define _CHOOSE2(binoper, lexpr, lvar, rexpr, rvar) \
( __extension__ ({ \
__typeof__(lexpr) lvar = (lexpr); \
__typeof__(rexpr) rvar = (rexpr); \
lvar binoper rvar ? lvar : rvar; \
}))
#define _CHOOSE_VAR2(prefix, unique) prefix##unique
#define _CHOOSE_VAR(prefix, unique) _CHOOSE_VAR2(prefix, unique)
#define _CHOOSE(binoper, lexpr, rexpr) \
_CHOOSE2( \
binoper, \
lexpr, _CHOOSE_VAR(_left, __COUNTER__), \
rexpr, _CHOOSE_VAR(_right, __COUNTER__) \
#define _CHOOSE(binoper, lexpr, rexpr) \
_CHOOSE2( \
binoper, \
lexpr, _CHOOSE_VAR(_left, __COUNTER__), \
rexpr, _CHOOSE_VAR(_right, __COUNTER__) \
)
#define MIN(a, b) _CHOOSE(<, a, b)
#define MAX(a, b) _CHOOSE(>, a, b)

#define _ABS_II(x, var) \
( __extension__ ({ \
__typeof__(x) var = (x); \
var < 0 ? -var : var; \
#define _ABS_II(x, var) \
( __extension__ ({ \
__typeof__(x) var = (x); \
var < 0 ? -var : var; \
}))
#define _ABS_I(x, var) _ABS_II(x, var)
#define ABS(x) _ABS_I(x, _CHOOSE_VAR(_abs, __COUNTER__))
Expand All @@ -114,8 +114,7 @@ typedef union {
fp_angles_def angles;
} fp_angles_t;

typedef struct stdev_s
{
typedef struct stdev_s {
float m_oldM, m_newM, m_oldS, m_newS;
int m_n;
} stdev_t;
Expand Down
1 change: 1 addition & 0 deletions src/main/drivers/osd_symbols.h
View file
Open in desktop
Expand Up @@ -228,6 +228,7 @@
#define SYM_HOME_DIST 0x165 // 357 DIST
#define SYM_AH_CH_CENTER 0x166 // 358 Crossair center
#define SYM_FLIGHT_DIST_REMAINING 0x167 // 359 Flight distance reminaing
#define SYM_ODOMETER 0x168 // 360 Odometer

#define SYM_AH_CH_TYPE3 0x190 // 400 to 402, crosshair 3
#define SYM_AH_CH_TYPE4 0x193 // 403 to 405, crosshair 4
Expand Down
4 changes: 2 additions & 2 deletions src/main/fc/stats.h
View file
Open in desktop
Expand Up @@ -3,8 +3,8 @@
#ifdef USE_STATS

typedef struct statsConfig_s {
uint32_t stats_total_time; // [s]
uint32_t stats_total_dist; // [m]
uint32_t stats_total_time; // [Seconds]
uint32_t stats_total_dist; // [Metres]
#ifdef USE_ADC
uint32_t stats_total_energy; // deciWatt hour (x0.1Wh)
#endif
Expand Down