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

trigger signal debug pins - logic level output #2959 

test driven development is still amazing
This commit is contained in:
Andrey 2021-07-15 09:29:14 -04:00
parent 8a49009f44
commit 85d6d6c70d
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/ford_aspire.cpp
View File

@ -90,7 +90,7 @@ void setFordAspireEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->useOnlyRisingEdgeForTrigger = true; engineConfiguration->useOnlyRisingEdgeForTrigger = true;
engineConfiguration->trigger.type = TT_FORD_ASPIRE; engineConfiguration->trigger.type = TT_FORD_ASPIRE;
// todo #2959 engineConfiguration->triggerInputDebugPins[0] = GPIOC_15; engineConfiguration->triggerInputDebugPins[0] = GPIOC_15;
engineConfiguration->injectionPins[4] = GPIO_UNASSIGNED; engineConfiguration->injectionPins[4] = GPIO_UNASSIGNED;
engineConfiguration->injectionPins[5] = GPIO_UNASSIGNED; engineConfiguration->injectionPins[5] = GPIO_UNASSIGNED;

4
firmware/hw_layer/digital_input/trigger/trigger_input.cpp
View File

@ -175,12 +175,12 @@ void turnOnTriggerInputPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
void stopTriggerDebugPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void stopTriggerDebugPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
for (int i = 0; i < TRIGGER_INPUT_PIN_COUNT; i++) { for (int i = 0; i < TRIGGER_INPUT_PIN_COUNT; i++) {
if (isConfigurationChanged(triggerInputDebugPins[i])) { if (isConfigurationChanged(triggerInputDebugPins[i])) {
efiSetPadUnused(CONFIG(triggerInputDebugPins[i]) PASS_ENGINE_PARAMETER_SUFFIX); efiSetPadUnused(activeConfiguration.triggerInputDebugPins[i] PASS_ENGINE_PARAMETER_SUFFIX);
} }
} }
for (int i = 0; i < CAM_INPUTS_COUNT; i++) { for (int i = 0; i < CAM_INPUTS_COUNT; i++) {
if (isConfigurationChanged(camInputsDebug[i])) { if (isConfigurationChanged(camInputsDebug[i])) {
efiSetPadUnused(CONFIG(camInputsDebug[i]) PASS_ENGINE_PARAMETER_SUFFIX); efiSetPadUnused(activeConfiguration.camInputsDebug[i] PASS_ENGINE_PARAMETER_SUFFIX);
} }
} }
} }

1
unit_tests/engine_test_helper.cpp
View File

@ -114,6 +114,7 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType, configuration_callb
memset(mockPinStates, 0, sizeof(mockPinStates)); memset(mockPinStates, 0, sizeof(mockPinStates));
initHardware(PASS_ENGINE_PARAMETER_SIGNATURE); initHardware(PASS_ENGINE_PARAMETER_SIGNATURE);
rememberCurrentConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
} }
EngineTestHelper::~EngineTestHelper() { EngineTestHelper::~EngineTestHelper() {

21
unit_tests/tests/test_change_engine_type.cpp
View File

@ -8,9 +8,30 @@
#include "engine_test_helper.h" #include "engine_test_helper.h"
#include "settings.h" #include "settings.h"
extern engine_configuration_s & activeConfiguration;
TEST(misc, changeEngineType) { TEST(misc, changeEngineType) {
/**
* this configuration has triggerInputDebugPins defined
*/
WITH_ENGINE_TEST_HELPER (FORD_ASPIRE_1996); WITH_ENGINE_TEST_HELPER (FORD_ASPIRE_1996);
brain_pin_e brainPin = engineConfiguration->triggerInputDebugPins[0];
ASSERT_TRUE(brainPin != GPIO_UNASSIGNED);
ASSERT_TRUE(activeConfiguration.triggerInputDebugPins[0] != GPIO_UNASSIGNED);
int pinIndex = brainPin_to_index(brainPin);
ASSERT_TRUE(nullptr != getBrainUsedPin(pinIndex PASS_ENGINE_PARAMETER_SUFFIX));
// above we have asserted that triggerInputDebugPins is in fact used
// now let's change into engine type without triggerInputDebugPins and assert shut down
setEngineType((int)CITROEN_TU3JP PASS_ENGINE_PARAMETER_SUFFIX); setEngineType((int)CITROEN_TU3JP PASS_ENGINE_PARAMETER_SUFFIX);
ASSERT_TRUE(activeConfiguration.triggerInputDebugPins[0] == GPIO_UNASSIGNED);
ASSERT_TRUE(engineConfiguration->triggerInputDebugPins[0] == GPIO_UNASSIGNED);
ASSERT_TRUE(engineConfiguration->triggerInputDebugPins[0] == GPIO_UNASSIGNED);
ASSERT_TRUE(nullptr == getBrainUsedPin(pinIndex PASS_ENGINE_PARAMETER_SUFFIX));
} }