diff --git a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp index e2d744bf44..cc3956ac7c 100644 --- a/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen-nb1/board_configuration.cpp @@ -31,20 +31,15 @@ static void setInjectorPins() { engineConfiguration->clutchDownPin = GPIOC_4; // Clutch switch input engineConfiguration->clutchDownPinMode = PI_PULLDOWN; engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH; - engineConfiguration->malfunctionIndicatorPin = GPIOG_4; //1E - Check Engine Light + engineConfiguration->malfunctionIndicatorPin = H144_OUT_IO8; } static void setIgnitionPins() { - engineConfiguration->ignitionPins[0] = GPIOI_8; // 3F - IGN_1 (1&4) - engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED ; // GPIOE_4 - engineConfiguration->ignitionPins[2] = GPIOE_5; // 3I - IGN_2 (2&3) - engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; // GPIOE_3 + engineConfiguration->ignitionPins[0] = H144_IGN_1; + engineConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; + engineConfiguration->ignitionPins[2] = H144_IGN_2; + engineConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; - //engineConfiguration->ignitionPins[4] = GPIOE_2; - //engineConfiguration->ignitionPins[5] = GPIOI_5; - //engineConfiguration->ignitionPins[6] = GPIOI_6; - //engineConfiguration->ignitionPins[7] = GPIOI_7; - // disable remainder for (int i = 4; i < MAX_CYLINDER_COUNT; i++) { engineConfiguration->ignitionPins[i] = GPIO_UNASSIGNED; @@ -129,11 +124,13 @@ void setBoardDefaultConfiguration(void) { CONFIG(enableSoftwareKnock) = true; - engineConfiguration->acRelayPin = GPIOH_15; // 1J - AC Relay + engineConfiguration->acSwitch = H144_IN_D_AUX3; + engineConfiguration->acRelayPin = H144_OUT_IO6; engineConfiguration->fuelPumpPin = GPIOG_2; // OUT_IO9 engineConfiguration->idle.solenoidPin = GPIOD_14; // OUT_PWM5 engineConfiguration->fanPin = GPIOD_12; // OUT_PWM8 engineConfiguration->mainRelayPin = GPIOI_2; // OUT_LOW3 + engineConfiguration->tachOutputPin = H144_OUT_PWM1; // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); @@ -150,6 +147,11 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS; // IM_WASTED_SPARK engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->injectionMode = IM_SIMULTANEOUS;//IM_BATCH;// IM_SEQUENTIAL; + + engineConfiguration->clutchDownPin = H144_IN_D_2; + engineConfiguration->clutchDownPinMode = PI_PULLDOWN; + engineConfiguration->launchActivationMode = CLUTCH_INPUT_LAUNCH; +// ? engineConfiguration->malfunctionIndicatorPin = GPIOG_4; //1E - Check Engine Light } /** diff --git a/firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml b/firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml index 95c39fdc8d..93b40a9588 100644 --- a/firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen-nb1/connectors/main.yaml @@ -1,6 +1,6 @@ # # CONNECTOR MAPPING NEEDED -# +# https://github.com/rusefi/rusefi/blob/master/firmware/config/boards/hellen/hellen_meta.h # pins: @@ -76,6 +76,7 @@ pins: type: ls - pin: 1S + #H144_OUT_IO6 id: GPIOG_11 class: outputs ts_name: 1S - AC Relay @@ -146,6 +147,7 @@ pins: function: Crankshaft Sensor - pin: 2K +# H144_OUT_PWM1 id: GPIOD_13 class: outputs ts_name: 2K - TACH diff --git a/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml b/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml index 9d362cdf0b..f696cf33f7 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml @@ -1,3 +1,5 @@ +# https://github.com/rusefi/rusefi/blob/master/firmware/config/boards/hellen/hellen_meta.h + pins: - pin: K1 function: GND diff --git a/firmware/config/boards/hellen/hellen88bmw/connectors/main.yaml b/firmware/config/boards/hellen/hellen88bmw/connectors/main.yaml index 1c2448cd66..77cfb4657a 100644 --- a/firmware/config/boards/hellen/hellen88bmw/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen88bmw/connectors/main.yaml @@ -1,3 +1,5 @@ +# https://github.com/rusefi/rusefi/blob/master/firmware/config/boards/hellen/hellen_meta.h + pins: - pin: 1 class: outputs diff --git a/firmware/config/boards/hellen/hellen_meta.h b/firmware/config/boards/hellen/hellen_meta.h index 14505f5acc..fd01c14519 100644 --- a/firmware/config/boards/hellen/hellen_meta.h +++ b/firmware/config/boards/hellen/hellen_meta.h @@ -64,6 +64,8 @@ #define H144_IN_AUX2 EFI_ADC_14 #define H144_IN_D_2 GPIOE_13 +// A22 +#define H144_IN_D_AUX3 GPIOC_5 #define H144_IN_D_AUX4 GPIOA_7 #define H176_LS_1 GPIOG_7 diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 5819d209f9..7c4704972b 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -271,6 +271,7 @@ static void setCommonMazdaNB(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setMazdaMiataNbInjectorLag(PASS_CONFIG_PARAMETER_SIGNATURE); engineConfiguration->idleMode = IM_AUTO; + engineConfiguration->tachPulsePerRev = 2; setOperationMode(engineConfiguration, FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR); engineConfiguration->specs.displacement = 1.839; @@ -400,7 +401,6 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // high-side driver with +12v VP jumper engineConfiguration->tachOutputPin = GPIOE_8; // tachometer - engineConfiguration->tachPulsePerRev = 2; // set global_trigger_offset_angle 0 engineConfiguration->globalTriggerAngleOffset = 0; @@ -806,6 +806,8 @@ void setMiataNB2_ProteusEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) #if HW_HELLEN void setHellenNB1(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setMazdaMiataEngineNB1Defaults(PASS_CONFIG_PARAMETER_SIGNATURE); + + engineConfiguration->injector.flow = 256; } void setMiataNB2_Hellen72(DECLARE_CONFIG_PARAMETER_SIGNATURE) {