From bdd4f663fe1c76dc0962f70a8fc72aaf0d795e33 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 11 Jun 2016 01:02:20 -0400 Subject: [PATCH] auto-sync --- .../config/engines/chevrolet_camaro_4.cpp | 38 +++++++++++++++++++ ...ngine_configuration_generated_structures.h | 6 ++- firmware/integration/rusefi_config.txt | 4 +- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/firmware/config/engines/chevrolet_camaro_4.cpp b/firmware/config/engines/chevrolet_camaro_4.cpp index b821b956be..905a8eb8b2 100644 --- a/firmware/config/engines/chevrolet_camaro_4.cpp +++ b/firmware/config/engines/chevrolet_camaro_4.cpp @@ -9,17 +9,23 @@ */ #include "chevrolet_camaro_4.h" +#include "engine_math.h" EXTERN_ENGINE ; void setCamaro4(DECLARE_ENGINE_PARAMETER_F) { + setAlgorithm(LM_SPEED_DENSITY PASS_ENGINE_PARAMETER); engineConfiguration->specs.displacement = 5.7; engineConfiguration->specs.cylindersCount = 8; engineConfiguration->specs.firingOrder = FO_1_8_7_2_6_5_4_3; + boardConfiguration->triggerInputPins[0] = GPIOA_5; + boardConfiguration->triggerInputPins[1] = GPIOC_6; + engineConfiguration->injectionMode = IM_BATCH; + engineConfiguration->twoWireBatchInjection = true; // set_ignition_mode 2 engineConfiguration->ignitionMode = IM_WASTED_SPARK; @@ -37,6 +43,38 @@ void setCamaro4(DECLARE_ENGINE_PARAMETER_F) { // set_global_trigger_offset_angle 230 engineConfiguration->globalTriggerAngleOffset = 230; + engineConfiguration->iat.adcChannel = EFI_ADC_11; + + engineConfiguration->clt.adcChannel = EFI_ADC_12; + engineConfiguration->clt.config.bias_resistor = 2700; + + engineConfiguration->vbattAdcChannel = EFI_ADC_14; + + engineConfiguration->afr.hwChannel = EFI_ADC_13; + engineConfiguration->hasMafSensor = false; + + boardConfiguration->injectionPins[0] = GPIOE_6; + boardConfiguration->injectionPins[1] = GPIOE_5; + boardConfiguration->injectionPins[2] = GPIOD_7; + boardConfiguration->injectionPins[3] = GPIOC_13; + boardConfiguration->injectionPins[4] = GPIOE_3; + boardConfiguration->injectionPins[5] = GPIOE_4; + boardConfiguration->injectionPins[6] = GPIOD_3; + boardConfiguration->injectionPins[7] = GPIOE_2; + + + boardConfiguration->ignitionPins[0] = GPIOC_9; + boardConfiguration->ignitionPins[1] = GPIOC_7; + boardConfiguration->ignitionPins[2] = GPIOE_14; + boardConfiguration->ignitionPins[3] = GPIOE_12; + boardConfiguration->ignitionPins[4] = GPIOE_10; + boardConfiguration->ignitionPins[5] = GPIOE_8; + boardConfiguration->ignitionPins[6] = GPIOD_9; + boardConfiguration->ignitionPins[7] = GPIOD_8; + + boardConfiguration->fuelPumpPin = GPIOB_8; + boardConfiguration->fanPin = GPIO_UNASSIGNED; + boardConfiguration->mainRelayPin = GPIOD_5; } diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 6622c01dd2..ad1ceeb6f7 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri May 27 20:30:17 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jun 10 18:45:59 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -887,6 +887,7 @@ typedef struct { */ injection_mode_e crankingInjectionMode; /** + * 'batched' means two injectors are wired together * offset 432 */ injection_mode_e injectionMode; @@ -902,6 +903,7 @@ typedef struct { */ angle_t crankingTimingAngle; /** + * 'wasted' means one coil is driving two spark plugs in two cylinders, with one of the aparks not doing anything since it's happening on the exhaust cycle * offset 444 */ ignition_mode_e ignitionMode; @@ -1712,4 +1714,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri May 27 20:30:17 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jun 10 18:45:59 EDT 2016 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index f94bc2508c..7f2e5f56f6 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -219,12 +219,12 @@ engine_load_mode_e algorithm;+This setting controls which algorithm is used for custom injection_mode_e 4 bits, U32, @OFFSET@, [0:1], "Simultaneous", "Sequential", "Batch", "INVALID" injection_mode_e crankingInjectionMode; -injection_mode_e injectionMode; +injection_mode_e injectionMode;+'batched' means two injectors are wired together angle_t injectionOffset;+this is about deciding when the injector starts it's squirt\nSee also injectionPhase map;"deg", 1, 0.0, -720, 720, 2 angle_t crankingTimingAngle;+Timing advance while engine cranking; "deg", 1, 0.0, -360, 360, 2 custom ignition_mode_e 4 bits, U32, @OFFSET@, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID" -ignition_mode_e ignitionMode; +ignition_mode_e ignitionMode;+'wasted' means one coil is driving two spark plugs in two cylinders, with one of the aparks not doing anything since it's happening on the exhaust cycle angle_t ignitionOffset;+this value could be used to offset the whole ignition timing table by a constant;"RPM", 1, 0, 0, 3000.0, 0