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

misc clean-up

This commit is contained in:
rusefi 2019-12-02 10:03:50 -05:00
parent 87143bef9f
commit 0583fd0b6c
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -77,6 +77,12 @@ case EFI_ADC_ERROR:
return "EFI_ADC_ERROR"; return "EFI_ADC_ERROR";
case EFI_ADC_NONE: case EFI_ADC_NONE:
return "EFI_ADC_NONE"; return "EFI_ADC_NONE";
#if EFI_UNIT_TEST
case TEST_MAF_CHANNEL:
case TEST_CLT_CHANNEL:
case TEST_IAT_CHANNEL:
return "EFI_TEST";
#endif /* EFI_UNIT_TEST */
} }
return NULL; return NULL;
} }

7
firmware/controllers/algo/rusefi_types.h
View File

@ -4,8 +4,8 @@
* @date Jan 12, 2015 * @date Jan 12, 2015
* @author Andrey Belomutskiy, (c) 2012-2017 * @author Andrey Belomutskiy, (c) 2012-2017
*/ */
#ifndef CONTROLLERS_ALGO_RUSEFI_TYPES_H_
#define CONTROLLERS_ALGO_RUSEFI_TYPES_H_ #pragma once
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
@ -90,7 +90,6 @@ typedef uint8_t iac_pid_mult_t[IAC_PID_MULT_SIZE][IAC_PID_MULT_SIZE];
typedef float baro_corr_table_t[BARO_CORR_SIZE][BARO_CORR_SIZE]; typedef float baro_corr_table_t[BARO_CORR_SIZE][BARO_CORR_SIZE];
typedef float fsio_table_8x8_f32t[FSIO_TABLE_8][FSIO_TABLE_8]; typedef float fsio_table_8x8_f32t[FSIO_TABLE_8][FSIO_TABLE_8];
typedef uint8_t fsio_table_8x8_u8t[FSIO_TABLE_8][FSIO_TABLE_8];
typedef float tps_tps_table_t[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE]; typedef float tps_tps_table_t[TPS_TPS_ACCEL_TABLE][TPS_TPS_ACCEL_TABLE];
typedef uint8_t fsio_table_8x8_u8t[FSIO_TABLE_8][FSIO_TABLE_8]; typedef uint8_t fsio_table_8x8_u8t[FSIO_TABLE_8][FSIO_TABLE_8];
@ -131,5 +130,3 @@ typedef void (*VoidCharPtrCharPtrVoidPtr)(const char *, const char *, void*);
typedef void (*VoidCharPtrCharPtrCharPtr)(const char *, const char *, const char *); typedef void (*VoidCharPtrCharPtrCharPtr)(const char *, const char *, const char *);
typedef void (*VoidCharPtrCharPtrCharPtrCharPtrCharPtr)(const char *, const char *, const char *, const char *, const char *); typedef void (*VoidCharPtrCharPtrCharPtrCharPtrCharPtr)(const char *, const char *, const char *, const char *, const char *);
#endif /* CONTROLLERS_ALGO_RUSEFI_TYPES_H_ */

4
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -453,10 +453,10 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
if (needToSkipFall(type) || needToSkipRise(type) || (!considerEventForGap())) { if (needToSkipFall(type) || needToSkipRise(type) || (!considerEventForGap())) {
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
if (printTriggerDebug) { if (printTriggerDebug) {
printf("%s isLessImportant %s now=%lld index=%d\r\n", printf("%s isLessImportant %s now=%d index=%d\r\n",
getTrigger_type_e(engineConfiguration->trigger.type), getTrigger_type_e(engineConfiguration->trigger.type),
getTrigger_event_e(signal), getTrigger_event_e(signal),
nowNt, (int)nowNt,
currentCycle.current_index); currentCycle.current_index);
} }
#endif /* EFI_UNIT_TEST */ #endif /* EFI_UNIT_TEST */

2
unit_tests/engine_test_helper.cpp
View File

@ -181,7 +181,7 @@ void EngineTestHelper::assertEvent(const char *msg, int index, void *callback, e
InjectionEvent *actualEvent = (InjectionEvent *)event->action.getArgument(); InjectionEvent *actualEvent = (InjectionEvent *)event->action.getArgument();
assertEqualsLM(msg, expectedEvent->outputs[0], (long)actualEvent->outputs[0]); assertEqualsLM(msg, (long)expectedEvent->outputs[0], (long)actualEvent->outputs[0]);
// but this would not work assertEqualsLM(msg, expectedPair, (long)eventPair); // but this would not work assertEqualsLM(msg, expectedPair, (long)eventPair);
} }