From 7682ba74177cd37ad93b68c1a4aade7639d1bab6 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 9 Oct 2021 23:35:28 -0400 Subject: [PATCH] Hyundai --- .../hellen154hyundai/board_configuration.cpp | 22 +++++++++++----- .../hellen154hyundai/connectors/main.yaml | 26 +++++++++++++++++++ .../hellen/hellen154hyundai/prepend.txt | 1 + firmware/integration/rusefi_config.txt | 2 ++ firmware/tunerstudio/rusefi.input | 5 ++++ 5 files changed, 49 insertions(+), 7 deletions(-) diff --git a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp index 5c46dd4f54..5af15b73b0 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp +++ b/firmware/config/boards/hellen/hellen154hyundai/board_configuration.cpp @@ -71,8 +71,8 @@ static void setupDefaultSensorInputs() { engineConfiguration->camInputs[0] = GPIOA_6; engineConfiguration->camInputs[1 * CAMS_PER_BANK] = GPIOA_7; - engineConfiguration->tps1_1AdcChannel = EFI_ADC_4; - engineConfiguration->tps1_2AdcChannel = EFI_ADC_8; + engineConfiguration->tps1_1AdcChannel = H144_IN_TPS; + engineConfiguration->tps1_2AdcChannel = H144_IN_AUX1; engineConfiguration->throttlePedalPositionAdcChannel = EFI_ADC_3; engineConfiguration->throttlePedalPositionSecondAdcChannel = EFI_ADC_14; @@ -81,9 +81,9 @@ static void setupDefaultSensorInputs() { engineConfiguration->afr.hwChannel = EFI_ADC_1; - engineConfiguration->clt.adcChannel = EFI_ADC_12; + engineConfiguration->clt.adcChannel = H144_IN_CLT; - engineConfiguration->iat.adcChannel = EFI_ADC_13; + engineConfiguration->iat.adcChannel = H144_IN_IAT; engineConfiguration->auxTempSensor1.adcChannel = EFI_ADC_NONE; engineConfiguration->auxTempSensor2.adcChannel = EFI_ADC_NONE; @@ -134,15 +134,23 @@ void setBoardDefaultConfiguration(void) { // engineConfiguration->idle.solenoidPin = GPIOD_14; // OUT_PWM5 // engineConfiguration->fanPin = GPIOD_12; // OUT_PWM8 engineConfiguration->mainRelayPin = GPIOG_14; // pin: 111a, OUT_IO3 + engineConfiguration->malfunctionIndicatorPin = H144_OUT_PWM8; // "required" hardware is done - set some reasonable defaults setupDefaultSensorInputs(); - engineConfiguration->etbIo[0].directionPin1 = GPIOD_15; // out_pwm7 - engineConfiguration->etbIo[0].directionPin2 = GPIOD_14; // out_pwm6 - engineConfiguration->etbIo[0].controlPin = GPIOD_13; // ETB_EN out_pwm1 + engineConfiguration->etbIo[0].directionPin1 = H144_OUT_PWM2; + engineConfiguration->etbIo[0].directionPin2 = H144_OUT_PWM3; + engineConfiguration->etbIo[0].controlPin = H144_OUT_IO12; CONFIG(etb_use_two_wires) = true; + // wastegate DC motor + engineConfiguration->etbIo[1].directionPin1 = H144_OUT_PWM4; + engineConfiguration->etbIo[1].directionPin2 = H144_OUT_PWM5; + engineConfiguration->etbIo[1].controlPin = H144_OUT_IO13; + CONFIG(etb_use_two_wires) = true; + CONFIG(etbFunctions)[1] = ETB_Wastegate; + // Some sensible defaults for other options setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR); diff --git a/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml b/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml index 1ddb8d5aeb..20f416629e 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml +++ b/firmware/config/boards/hellen/hellen154hyundai/connectors/main.yaml @@ -90,10 +90,16 @@ pins: function: Manifold Pressure Sensor - pin: K32 +# IN_AUX1 AIN23 PB0 + id: EFI_ADC_8 + class: analog_inputs ts_name: TPS 2 function: TPS 2 sensor input - pin: K33 +# IN_CLT AIN11 + id: EFI_ADC_12 + class: analog_inputs ts_name: CLT function: CLT @@ -101,6 +107,9 @@ pins: function: Analog Ground - pin: K36 +# IN_AUX2 AIN21 PC4 + id: EFI_ADC_14 + class: analog_inputs ts_name: PPS 2 function: PPS 2 sensor input @@ -113,6 +122,13 @@ pins: - pin: K44 function: Analog Ground + - pin: K53 + # IN_IAT AIN14 PC3 + id: EFI_ADC_13 + class: analog_inputs + ts_name: IAT + function: IAT + - pin: K57 function: Analog Ground @@ -138,6 +154,14 @@ pins: function: Fuel Pump Relay type: ls + - pin: K71 + ts_name: ETB w1 + function: DC Motor w1 + + - pin: K72 + ts_name: ETB w2 + function: DC Motor w2 + - pin: K77 function: CAN bus high type: can @@ -150,6 +174,8 @@ pins: function: Analog Ground - pin: K80 +# IN_TPS AIN17 PA4 + class: analog_inputs ts_name: TPS 1 function: TPS 1 sensor input diff --git a/firmware/config/boards/hellen/hellen154hyundai/prepend.txt b/firmware/config/boards/hellen/hellen154hyundai/prepend.txt index 84041b9b71..607a9af115 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/prepend.txt +++ b/firmware/config/boards/hellen/hellen154hyundai/prepend.txt @@ -24,3 +24,4 @@ #define show_Frankenso_presets false #define show_microRusEFI_presets false #define show_Proteus_presets false +#define show_Hellen_hyundai_154 true diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index b651cd4dea..8cd74b99fe 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -535,6 +535,7 @@ end_struct #define ET_HELLEN_121_VAG_8_CYL 81 #define ET_HELLEN_154_HYUNDAI 82 +#define ET_HELLEN_154_HYUNDAI_COUPE_BK1 82 #define ET_HELLEN_NB1 83 #define ET_HELLEN_121_NISSAN_4_CYL 84 #define ET_HELLEN_121_NISSAN_8_CYL 85 @@ -548,6 +549,7 @@ end_struct #define ET_PROTEUS_VAG_80_18T 92 #define ET_PROTEUS_N73 93 #define ET_HELLEN_NB1_36 94 +#define ET_HELLEN_154_HYUNDAI_COUPE_BK2 95 #define ET_PROTEUS_ANALOG_PWM_TEST 106 #define ET_TEST_ROTARY 107 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 0c61531ec2..20d57d8985 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1790,6 +1790,8 @@ cmd_set_engine_type_hellen_128_merc_4 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@ cmd_set_engine_type_hellen_128_merc_6 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_128_MERCEDES_6_CYL_16_hex@@" cmd_set_engine_type_hellen_128_merc_8 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_128_MERCEDES_8_CYL_16_hex@@" +cmd_set_engine_type_hellen_couple_bk1 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_154_HYUNDAI_COUPE_BK1_16_hex@@" +cmd_set_engine_type_hellen_couple_bk2 = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_HELLEN_154_HYUNDAI_COUPE_BK2_16_hex@@" ; MIATA_NA6_MAP = 41 cmd_set_engine_type_Frankenso_Miata_NA6_MAP = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@ET_FRANKENSO_MIATA_NA6_16_hex@@" @@ -3565,6 +3567,9 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" commandButton = "Hellen 128 Merc 6 cyl", cmd_set_engine_type_hellen_128_merc_6@@if_show_Hellen128merc_presets commandButton = "Hellen 128 Merc v8", cmd_set_engine_type_hellen_128_merc_8@@if_show_Hellen128merc_presets + commandButton = "Hellen Genesis Couple BK1", cmd_set_engine_type_hellen_couple_bk1@@if_show_Hellen_hyundai_154 + commandButton = "Hellen Genesis Couple BK2", cmd_set_engine_type_hellen_couple_bk2@@if_show_Hellen_hyundai_154 + commandButton = "ETB test bench", cmd_set_engine_type_etb_test@@if_show_test_presets commandButton = "TLE8888 test bench", cmd_set_engine_type_8888_test@@if_show_test_presets commandButton = "Reset firmware settings", cmd_set_engine_type_default