rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2014-09-13 08:04:55 -05:00
parent 648f115704
commit 06eb8def3f
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/hw_layer/microsecond_timer.c
View File

@ -4,6 +4,9 @@
* Here we have a 1MHz timer dedicated to event scheduling. We are using one of the 32-bit timers here,
* so this timer can schedule events up to 4B/100M ~ 4000 seconds ~ 1 hour from current time.
*
* GPT5 timer clock: 84000000Hz
* If only it was a better multiplier of 2 (84000000 = 328125 * 256)
*
* @date Apr 14, 2014
* @author Andrey Belomutskiy, (c) 2012-2014
*/

7
unit_tests/global.h
View File

@ -14,6 +14,13 @@
#include "efitime.h"
#define US_TO_NT_MULTIPLIER 100
#define US2NT(x) (US_TO_NT_MULTIPLIER * (x))
#define NT2US(x) ((x) / US_TO_NT_MULTIPLIER)
typedef int bool_t;
typedef void * Logging;

4
unit_tests/main.cpp
View File

@ -45,6 +45,10 @@ uint64_t getTimeNowUs(void) {
return timeNow;
}
uint64_t getTimeNowNt(void) {
return getTimeNowUs() * US_TO_NT_MULTIPLIER;
}
void assertEqualsM(const char *msg, float expected, float actual) {
if (cisnan(actual) && !cisnan(expected)) {
printf("Unexpected: %s %.4f while expected %.4f\r\n", msg, actual, expected);

30
unit_tests/test_signal_executor.cpp
View File

@ -26,7 +26,7 @@ void setOutputPinValue(io_pin_e pin, int value) {
EventQueue schedulingQueue;
void scheduleTask(const char *msg, scheduling_s *scheduling, int delayUs, schfunc_t callback, void *param) {
schedulingQueue.insertTask(scheduling, getTimeNowUs(), delayUs, callback, param);
schedulingQueue.insertTask(scheduling, getTimeNowUs() + delayUs, callback, param);
}
void initSignalExecutorImpl(void) {
@ -50,7 +50,7 @@ typedef struct {
static void complexCallback(TestPwm *testPwm) {
callbackCounter++;
eq.insertTask(&testPwm->s, complexTestNow, testPwm->period, (schfunc_t)complexCallback, testPwm);
eq.insertTask(&testPwm->s, complexTestNow + testPwm->period, (schfunc_t)complexCallback, testPwm);
}
static void testSignalExecutor2(void) {
@ -63,8 +63,8 @@ static void testSignalExecutor2(void) {
complexTestNow = 0;
callbackCounter = 0;
eq.insertTask(&p1.s, 0, 0, (schfunc_t)complexCallback, &p1);
eq.insertTask(&p2.s, 0, 0, (schfunc_t)complexCallback, &p2);
eq.insertTask(&p1.s, 0, (schfunc_t)complexCallback, &p1);
eq.insertTask(&p2.s, 0, (schfunc_t)complexCallback, &p2);
eq.executeAll(complexTestNow);
assertEqualsM("callbackCounter #1", 2, callbackCounter);
assertEquals(2, eq.size());
@ -87,9 +87,9 @@ void testSignalExecutor(void) {
scheduling_s s2;
scheduling_s s3;
eq.insertTask(&s1, 0, 10, callback, NULL);
eq.insertTask(&s2, 0, 11, callback, NULL);
eq.insertTask(&s3, 0, 12, callback, NULL);
eq.insertTask(&s1, 10, callback, NULL);
eq.insertTask(&s2, 11, callback, NULL);
eq.insertTask(&s3, 12, callback, NULL);
callbackCounter = 0;
eq.executeAll(10);
assertEquals(1, callbackCounter);
@ -98,9 +98,9 @@ void testSignalExecutor(void) {
assertEquals(1, callbackCounter);
eq.clear();
eq.insertTask(&s1, 0, 12, callback, NULL);
eq.insertTask(&s2, 0, 11, callback, NULL);
eq.insertTask(&s3, 0, 10, callback, NULL);
eq.insertTask(&s1, 12, callback, NULL);
eq.insertTask(&s2, 11, callback, NULL);
eq.insertTask(&s3, 10, callback, NULL);
callbackCounter = 0;
eq.executeAll(10);
assertEquals(1, callbackCounter);
@ -110,7 +110,7 @@ void testSignalExecutor(void) {
eq.clear();
callbackCounter = 0;
eq.insertTask(&s1, 0, 10, callback, NULL);
eq.insertTask(&s1, 10, callback, NULL);
assertEquals(10, eq.getNextEventTime(0));
eq.executeAll(1);
@ -121,8 +121,8 @@ void testSignalExecutor(void) {
assertEquals(EMPTY_QUEUE, eq.getNextEventTime(0));
eq.insertTask(&s1, 0, 10, callback, NULL);
eq.insertTask(&s2, 0, 13, callback, NULL);
eq.insertTask(&s1, 10, callback, NULL);
eq.insertTask(&s2, 13, callback, NULL);
assertEquals(10, eq.getNextEventTime(0));
eq.executeAll(1);
@ -131,8 +131,8 @@ void testSignalExecutor(void) {
eq.clear();
callbackCounter = 0;
// both events are scheduled for the same time
eq.insertTask(&s1, 0, 10, callback, NULL);
eq.insertTask(&s2, 0, 10, callback, NULL);
eq.insertTask(&s1, 10, callback, NULL);
eq.insertTask(&s2, 10, callback, NULL);
eq.executeAll(11);