rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid float -> int64 conversion #1977 

cherry picking...
This commit is contained in:
rusefillc 2020-11-23 23:33:46 -05:00
parent 55379463c0
commit 90e5630e60
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/global.h
View File

@ -96,14 +96,4 @@ typedef unsigned int time_t;
#define CCM_OPTIONAL #define CCM_OPTIONAL
#endif /* EFI_USE_CCM */ #endif /* EFI_USE_CCM */
/**
* converts efitimeus_t to efitick_t
*/
#define US2NT(us) (((efitime_t)(us))*US_TO_NT_MULTIPLIER)
/**
* converts efitick_t to efitimeus_t
*/
#define NT2US(nt) ((nt) / US_TO_NT_MULTIPLIER)
#define UNIT_TEST_BUSY_WAIT_CALLBACK() {} #define UNIT_TEST_BUSY_WAIT_CALLBACK() {}

9
firmware/util/efitime.h
View File

@ -19,8 +19,17 @@
#define MS2US(MS_TIME) ((MS_TIME) * 1000) #define MS2US(MS_TIME) ((MS_TIME) * 1000)
// microseconds to ticks
#define US2NT(us) (((efitime_t)(us)) * US_TO_NT_MULTIPLIER)
#define USF2NT(us_float) ((us_float) * US_TO_NT_MULTIPLIER)
// And back
#define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)
// milliseconds to ticks // milliseconds to ticks
#define MS2NT(msTime) US2NT(MS2US(msTime)) #define MS2NT(msTime) US2NT(MS2US(msTime))
#define MSF2NT(msTimeFloat) USF2NT(MS2US(msTimeFloat))
/** /**
* We use this 'deep in past, before ECU has ever started' value as a way to unify * We use this 'deep in past, before ECU has ever started' value as a way to unify

4
simulator/simulator/global.h
View File

@ -30,10 +30,6 @@
#define US_TO_NT_MULTIPLIER 100 #define US_TO_NT_MULTIPLIER 100
#define US2NT(x) (US_TO_NT_MULTIPLIER * (x))
#define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)
// need to fight 32bit int overflow // need to fight 32bit int overflow
#define MY_US2ST(x) ((x) / 10) #define MY_US2ST(x) ((x) / 10)

4
unit_tests/global.h
View File

@ -58,10 +58,6 @@ void print(const char *fmt, ...);
#define VCS_VERSION "321" #define VCS_VERSION "321"
#define RUS_EFI_VERSION_TAG "rusEfiVersion" #define RUS_EFI_VERSION_TAG "rusEfiVersion"
#define US2NT(x) (US_TO_NT_MULTIPLIER * (x))
#define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)
#define INLINE inline #define INLINE inline
#define EFI_ERROR_CODE 0xffffffff #define EFI_ERROR_CODE 0xffffffff