FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trailing coils (#2937) 

* gpio wiring

* plumbing
This commit is contained in:
Matthew Kennedy 2021-07-09 12:51:30 -07:00 committed by GitHub
parent 8ab2fb542b
commit ff31301284
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/status_loop.cpp
View File

@ -229,7 +229,7 @@ void printOverallStatus(efitimesec_t nowSeconds) {
int cylCount = minI(CONFIG(specs.cylindersCount), MAX_CYLINDER_COUNT); int cylCount = minI(CONFIG(specs.cylindersCount), MAX_CYLINDER_COUNT);
for (int i = 0; i < cylCount; i++) { for (int i = 0; i < cylCount; i++) {
printOutPin(enginePins.coils[i].getShortName(), CONFIG(ignitionPins)[i]); printOutPin(enginePins.coils[i].getShortName(), CONFIG(ignitionPins)[i]);
printOutPin(enginePins.trailingCoils[i].getShortName(), CONFIG(trailingCoilPins)[i]);
printOutPin(enginePins.injectors[i].getShortName(), CONFIG(injectionPins)[i]); printOutPin(enginePins.injectors[i].getShortName(), CONFIG(injectionPins)[i]);
} }
for (int i = 0; i < AUX_DIGITAL_VALVE_COUNT;i++) { for (int i = 0; i < AUX_DIGITAL_VALVE_COUNT;i++) {

2
firmware/controllers/algo/engine2.cpp
View File

@ -173,7 +173,7 @@ void EngineState::periodicFastCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
timingAdvance = getAdvance(rpm, ignitionLoad PASS_ENGINE_PARAMETER_SUFFIX); timingAdvance = getAdvance(rpm, ignitionLoad PASS_ENGINE_PARAMETER_SUFFIX);
// TODO: calculate me from a table! // TODO: calculate me from a table!
trailingSparkAngle = 10; trailingSparkAngle = CONFIG(trailingSparkAngle);
multispark.count = getMultiSparkCount(rpm PASS_ENGINE_PARAMETER_SUFFIX); multispark.count = getMultiSparkCount(rpm PASS_ENGINE_PARAMETER_SUFFIX);

4
firmware/controllers/system/efi_gpio.cpp
View File

@ -42,6 +42,8 @@ static const char *sparkNames[] = { "Coil 1", "Coil 2", "Coil 3", "Coil 4", "Coi
static const char *trailNames[] = { "Trail 1", "Trail 2", "Trail 3", "Trail 4", "Trail 5", "Trail 6", "Trail 7", "Trail 8", static const char *trailNames[] = { "Trail 1", "Trail 2", "Trail 3", "Trail 4", "Trail 5", "Trail 6", "Trail 7", "Trail 8",
"Trail 9", "Trail 10", "Trail 11", "Trail 12"}; "Trail 9", "Trail 10", "Trail 11", "Trail 12"};
static const char* trailShortNames[] = { "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9", "tA", "tB", "tD" };
const char *vvtNames[] = { const char *vvtNames[] = {
PROTOCOL_VVT1_NAME, PROTOCOL_VVT1_NAME,
PROTOCOL_VVT2_NAME, PROTOCOL_VVT2_NAME,
@ -138,6 +140,7 @@ EnginePins::EnginePins() :
enginePins.coils[i].shortName = sparkShortNames[i]; enginePins.coils[i].shortName = sparkShortNames[i];
enginePins.trailingCoils[i].name = trailNames[i]; enginePins.trailingCoils[i].name = trailNames[i];
enginePins.trailingCoils[i].shortName = trailShortNames[i];
enginePins.injectors[i].injectorIndex = i; enginePins.injectors[i].injectorIndex = i;
enginePins.injectors[i].name = injectorNames[i]; enginePins.injectors[i].name = injectorNames[i];
@ -236,6 +239,7 @@ void EnginePins::reset() {
void EnginePins::stopIgnitionPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void EnginePins::stopIgnitionPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
for (int i = 0; i < MAX_CYLINDER_COUNT; i++) { for (int i = 0; i < MAX_CYLINDER_COUNT; i++) {
unregisterOutputIfPinOrModeChanged(enginePins.coils[i], ignitionPins[i], ignitionPinMode); unregisterOutputIfPinOrModeChanged(enginePins.coils[i], ignitionPins[i], ignitionPinMode);
unregisterOutputIfPinOrModeChanged(enginePins.trailingCoils[i], trailingCoilPins[i], ignitionPinMode);
} }
} }