diff --git a/firmware/config/boards/prometheus/board_configuration.cpp b/firmware/config/boards/prometheus/board_configuration.cpp index 648f63c2e7..3a1861ac65 100644 --- a/firmware/config/boards/prometheus/board_configuration.cpp +++ b/firmware/config/boards/prometheus/board_configuration.cpp @@ -184,8 +184,6 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->malfunctionIndicatorPin = GPIOC_1; engineConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT; - // starter block - setFsio(0, (is469 ? GPIOB_10 : GPIOB_1), STARTER_RELAY_LOGIC PASS_CONFIG_PARAMETER_SUFFIX); // debug pad diff --git a/firmware/config/boards/subaru_eg33/board_configuration.cpp b/firmware/config/boards/subaru_eg33/board_configuration.cpp index 1d9ffc3504..743733c483 100644 --- a/firmware/config/boards/subaru_eg33/board_configuration.cpp +++ b/firmware/config/boards/subaru_eg33/board_configuration.cpp @@ -155,9 +155,6 @@ void setBoardDefaultConfiguration(void) { engineConfiguration->malfunctionIndicatorPin = TLE6240_PIN_7; engineConfiguration->malfunctionIndicatorPinMode = OM_DEFAULT; - /* Starter input signal connected through MC33972 - SG11 */ - //setFsio(0, (GPIOB_1), STARTER_RELAY_LOGIC PASS_CONFIG_PARAMETER_SUFFIX); - /* not used */ engineConfiguration->displayMode = DM_NONE; engineConfiguration->HD44780_rs = GPIO_UNASSIGNED; diff --git a/firmware/config/engines/bmw_m73_mre.cpp b/firmware/config/engines/bmw_m73_mre.cpp index d21201d16e..03934eb6a3 100644 --- a/firmware/config/engines/bmw_m73_mre.cpp +++ b/firmware/config/engines/bmw_m73_mre.cpp @@ -84,7 +84,7 @@ void setEngineBMW_M73_microRusEfi(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // enable ETB // set_rpn_expression 8 "0" - setFsio(7, GPIOC_8, "0" PASS_CONFIG_PARAMETER_SUFFIX); + // TODO LUA setFsio(7, GPIOC_8, "0" PASS_CONFIG_PARAMETER_SUFFIX); CONFIG(debugMode) = DBG_ELECTRONIC_THROTTLE_PID; diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index 88a798d085..375894e692 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -211,34 +211,6 @@ void setFordEscortGt(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->vbattDividerCoeff = ((float) (10 + 33)) / 10 * 2; // VICS solenoid -#if EFI_FSIO - /** - * to test - * set_fsio_setting 1 5000 - */ - engineConfiguration->scriptSetting[0] = 5000; - // set_fsio_expression 1 "rpm > fsio_setting(1)" - setFsioExt(0, GPIOE_3, RPM_ABOVE_USER_SETTING_1, 150 PASS_CONFIG_PARAMETER_SUFFIX); - - // warning light - /** - * to test - * set_fsio_setting 2 1800 - * set_fsio_setting 3 95 - * set_fsio_setting 4 14 - * - * set_fsio_expression 2 "rpm > fsio_setting(2)" - * set_rpn_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" - * eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" - */ - engineConfiguration->scriptSetting[1] = 6200; // RPM threshold - engineConfiguration->scriptSetting[2] = 90; // CLT threshold - engineConfiguration->scriptSetting[3] = 13.5; // voltage threshold - -// setFsio(1, GPIOC_13, "rpm 2 fsio_setting > coolant 3 fsio_setting > | vbatt 4 fsio_setting < |" PASS_CONFIG_PARAMETER_SUFFIX); - setFsio(1, GPIOD_7, RPM_ABOVE_USER_SETTING_2 PASS_CONFIG_PARAMETER_SUFFIX); -#endif /* EFI_FSIO */ - static const float ignitionRpmBins[] = { 800, diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 854713aa98..0e9171544d 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -285,40 +285,6 @@ void setMiataNA6_MAP_Frankenso(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // */ // engineConfiguration->fsioAdc[0] = EFI_ADC_NONE; - - // warning light - /** - * to test - * set_fsio_setting 1 1800 - * set_fsio_setting 2 95 - * set_fsio_setting 4 14 - * - * set_rpn_expression 1 "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting < |" - * rpn_eval "rpm 1 fsio_setting > coolant 2 fsio_setting > | vbatt 4 fsio_setting < |" - */ - /* -//WARNING: these indeces are off - engineConfiguration->fsio_setting[0] = 6400; // RPM threshold - engineConfiguration->fsio_setting[1] = 100; // CLT threshold, fsio_setting #2 - engineConfiguration->scriptSetting[2] = 13.0; // voltage threshold, fsio_setting #3 - - // set_fsio_setting 4 3000 - engineConfiguration->scriptSetting[3] = 3000; // oil pressure RPM, fsio_setting #4 - // set_fsio_setting 5 0.52 - engineConfiguration->scriptSetting[4] = 0.52; // oil pressure threshold, fsio_setting #5 -*/ - -// * set_rpn_expression 1 "rpm 3 fsio_setting >" - // rpn_eval "rpm 1 fsio_setting >" - // rpn_eval "fsio_analog_input" - - // set_fsio_expression 0 "((rpm > fsio_setting(4) & (fsio_analog_input < fsio_setting(5)) | rpm > fsio_setting(1) | (coolant > fsio_setting(2) > | (vbatt < fsio_setting(3)" - -#if EFI_FSIO - // todo: convert - setFsio(0, GPIOC_13, COMBINED_WARNING_LIGHT PASS_CONFIG_PARAMETER_SUFFIX); -#endif /* EFI_FSIO */ - engineConfiguration->injectionPins[0] = GPIOD_3; // #1&3 pin 3U engineConfiguration->injectionPins[1] = GPIOE_2; // #2&4 pin 3V engineConfiguration->injectionPins[2] = GPIO_UNASSIGNED; diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 4e7e0660f6..64dba3b143 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -393,13 +393,6 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { // engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8; engineConfiguration->vvtPins[0] = GPIOE_3; // VVT solenoid control - // /** - // * set_fsio_setting 1 0.55 - // */ - engineConfiguration->scriptSetting[0] = 0.0; -// setFsioExt(0, GPIOE_3, "0 fsio_setting", 400 PASS_CONFIG_PARAMETER_SUFFIX); - - // high-side driver with +12v VP jumper engineConfiguration->tachOutputPin = GPIOE_8; // tachometer @@ -639,7 +632,7 @@ void setMiataNB2_MRE_ETB(DECLARE_CONFIG_PARAMETER_SIGNATURE) { #if EFI_FSIO // enable ETB // set_rpn_expression 8 "0" - setFsio(7, GPIOC_8, "0" PASS_CONFIG_PARAMETER_SUFFIX); + // todo lua ETB setFsio(7, GPIOC_8, "0" PASS_CONFIG_PARAMETER_SUFFIX); #endif /* EFI_FSIO */ //set idle_offset 0 diff --git a/firmware/config/engines/me7pnp.cpp b/firmware/config/engines/me7pnp.cpp index ee577fae9b..cad2a6ae34 100644 --- a/firmware/config/engines/me7pnp.cpp +++ b/firmware/config/engines/me7pnp.cpp @@ -131,10 +131,8 @@ void vag_18_Turbo(DECLARE_CONFIG_PARAMETER_SIGNATURE) { //ETB Settings #if EFI_FSIO -#if defined(STM32_HAS_GPIOF) && STM32_HAS_GPIOF - setFsio (14, GPIOF_13, "1" PASS_CONFIG_PARAMETER_SUFFIX); -#endif /* STM32_HAS_GPIOF */ - setFsioExt (3, GPIOE_0, "0.15 90 coolant 120 min max 90 - 30 / 0.8 * +", 25 PASS_CONFIG_PARAMETER_SUFFIX); + // todo lua setFsio (14, GPIOF_13, "1" PASS_CONFIG_PARAMETER_SUFFIX); + // todo lua setFsioExt (3, GPIOE_0, "0.15 90 coolant 120 min max 90 - 30 / 0.8 * +", 25 PASS_CONFIG_PARAMETER_SUFFIX); #endif // is this needed? engineConfiguration->vvtOutputFrequency[3] = 25; CONFIG(etb_use_two_wires) = true; diff --git a/firmware/config/engines/mitsubishi.cpp b/firmware/config/engines/mitsubishi.cpp index cf012947ec..107581d350 100644 --- a/firmware/config/engines/mitsubishi.cpp +++ b/firmware/config/engines/mitsubishi.cpp @@ -74,10 +74,7 @@ void setMitsubishiConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->HD44780height = 4; setEgoSensor(ES_Innovate_MTX_L PASS_CONFIG_PARAMETER_SUFFIX); -#if EFI_FSIO - setFsioExt(0, GPIOC_9, RPM_ABOVE_6000_SOLENOID_80_DUTY, 200 PASS_CONFIG_PARAMETER_SUFFIX); - setFsioExt(1, GPIOC_7, RPM_ABOVE_2000_SOLENOID_50_DUTY, 200 PASS_CONFIG_PARAMETER_SUFFIX); -#endif /* EFI_FSIO */ + } diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 40503a5ea5..737a2fe42e 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -722,22 +722,6 @@ static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) { engineConfiguration->isEngineControlEnabled = true; #endif // EFI_ENGINE_CONTROL -#if EFI_FSIO - /** - * to test: - * set_fsio_setting 1 5000 - * set_fsio_output_pin 1 PE3 - * set debug_mode 23 - * writeconfig - * - * fsioinfo - */ - engineConfiguration->scriptSetting[0] = 5000; - // simple warning light as default configuration - // set_fsio_expression 1 "rpm > fsio_setting(1)" - setFsio(0, GPIO_UNASSIGNED, RPM_ABOVE_USER_SETTING_1 PASS_CONFIG_PARAMETER_SUFFIX); -#endif /* EFI_FSIO */ - strncpy(config->luaScript, "function onTick()\nend", efi::size(config->luaScript)); }