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

5V-compatible adcVcc + trigger_input_comp + Kinetis COMP driver impr. (#1036) 

* adcVcc is not only for 3V STM32

* update ini files

* Kinetis: improve COMP driver

* Improve trigger_input_comp.cpp (hysteresis)
This commit is contained in:
andreika-git 2019-12-01 19:08:55 +02:00 committed by rusefi
parent ed9bae63af
commit 70fcb50a62
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
firmware/hw_layer/trigger_input_comp.cpp
View File

@ -23,25 +23,36 @@ EXTERN_ENGINE
;
static Logging *logger;
static int centeredDacValue = 127;
static const int dacNoiseDeltaMin = 1; // = 5V * 1/256 (8-bit DAC) = ~20mV
static const int dacNoiseDeltaMax = 15; // = ~300mV
// todo: interpolate between min and max depending on the signal level (adaptive hysteresis)
static const int dacNoiseDelta = dacNoiseDeltaMax;
static void comp_shaft_callback(COMPDriver *comp) {
bool isRising = (comp_lld_get_status(comp) & COMP_IRQ_RISING) != 0;
uint32_t status = comp_lld_get_status(comp);
int isPrimary = (comp == EFI_COMP_PRIMARY_DEVICE);
if (!isPrimary && !TRIGGER_SHAPE(needSecondTriggerInput)) {
return;
}
trigger_event_e signal;
if (isRising) {
if (status & COMP_IRQ_RISING) {
signal = isPrimary ? (engineConfiguration->invertPrimaryTriggerSignal ? SHAFT_PRIMARY_FALLING : SHAFT_PRIMARY_RISING) :
(engineConfiguration->invertSecondaryTriggerSignal ? SHAFT_SECONDARY_FALLING : SHAFT_SECONDARY_RISING);
} else {
hwHandleShaftSignal(signal);
// shift the threshold down a little bit to avoid false-triggering (threshold hysteresis)
comp_lld_set_dac_value(comp, centeredDacValue - dacNoiseDelta);
}
if (status & COMP_IRQ_FALLING) {
signal = isPrimary ? (engineConfiguration->invertPrimaryTriggerSignal ? SHAFT_PRIMARY_RISING : SHAFT_PRIMARY_FALLING) :
(engineConfiguration->invertSecondaryTriggerSignal ? SHAFT_SECONDARY_RISING : SHAFT_SECONDARY_FALLING);
hwHandleShaftSignal(signal);
// shift the threshold up a little bit to avoid false-triggering (threshold hysteresis)
comp_lld_set_dac_value(comp, centeredDacValue + dacNoiseDelta);
}
hwHandleShaftSignal(signal);
#ifdef EFI_TRIGGER_DEBUG_BLINK
__blink(1);
#endif
}
// todo: add cam support?
@ -74,13 +85,9 @@ void turnOnTriggerInputPins(Logging *sharedLogger) {
void startTriggerInputPins(void) {
//efiAssertVoid(CUSTOM_ERR_, !isCompEnabled, "isCompEnabled");
const float vRef = 5.0f;
const float vSensorRef = 2.5f; // 2.5V resistor divider
// when VR sensor is silent, there's still some noise around vRef, so we need a small threshold to avoid false triggering
const float noSignalThreshold = 0.05f;
const int maxDacValue = 255;
const int vDac = (int)(int)efiRound(maxDacValue * (vSensorRef - noSignalThreshold) / vRef, 1.0f);
constexpr float vSensorRef = 2.5f; // 2.5V resistor divider; todo: migrate to settings?
constexpr float maxDacValue = 255.0f;
centeredDacValue = (int)efiRound(maxDacValue / engineConfiguration->adcVcc * vSensorRef, 1.0f);
int channel = EFI_COMP_TRIGGER_CHANNEL; // todo: use getInputCaptureChannel(hwPin);
@ -89,7 +96,7 @@ void startTriggerInputPins(void) {
// no generic hal support for extended COMP configuration, so we use hal_lld layer...
osalSysLock();
comp_lld_set_dac_value(EFI_COMP_PRIMARY_DEVICE, vDac);
comp_lld_set_dac_value(EFI_COMP_PRIMARY_DEVICE, centeredDacValue);
comp_lld_channel_enable(EFI_COMP_PRIMARY_DEVICE, channel);
osalSysUnlock();

2
firmware/integration/rusefi_config.txt
View File

@ -460,7 +460,7 @@ custom spi_device_e 1 bits,U32, @OFFSET@, [0:2], "Off", "SPI1", "SPI2", "SPI3"
float globalFuelCorrection;set global_fuel_correction X;"coef", 1, 0.0, 0, 1000.0, 2
float adcVcc;; "volts", 1, 0.0, 0, 4.0, 3
float adcVcc;; "volts", 1, 0.0, 0, 6.0, 3
float maxKnockSubDeg;maximum total number of degrees to subtract from ignition advance\nwhen knocking
brain_input_pin_e[CAM_INPUTS_COUNT iterate] camInputs;+Camshaft input could be used either just for engine phase detection if your trigger shape does not include cam sensor as 'primary' channel, or it could be used for Variable Valve timing on one of the camshafts.\nTODO #660

2
firmware/tunerstudio/rusefi.input
View File

@ -2214,7 +2214,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
commandButton = "Reinit", cmd_tle8888_init
dialog = connection, "", yAxis
field = "STM32 vRef voltage", adcVcc
field = "ADC vRef voltage", adcVcc
panel = tsPort
panel = canBus
panel = sdCard