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

Purge rover v8 config (#2116) 

* bye

* goodbye, rover v8

* that snuck in

* use a different config for that test
This commit is contained in:
Matthew Kennedy 2020-12-22 07:05:54 -08:00 committed by GitHub
parent 37c502120f
commit 8737ba62c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 1 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp
View File

@ -939,8 +939,6 @@ case PROTEUS:
return "PROTEUS";
case PROTEUS_MIATA_NB2:
return "PROTEUS_MIATA_NB2";
case ROVER_V8:
return "ROVER_V8";
case SACHS:
return "SACHS";
case SUBARUEJ20G_DEFAULTS:

2
firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp
View File

@ -735,8 +735,6 @@ case PROTEUS:
return "PROTEUS";
case PROTEUS_MIATA_NB2:
return "PROTEUS_MIATA_NB2";
case ROVER_V8:
return "ROVER_V8";
case SACHS:
return "SACHS";
case SUBARUEJ20G_DEFAULTS:

1
firmware/config/engines/engines.mk
View File

@ -21,7 +21,6 @@ ENGINES_SRC_CPP = $(PROJECT_DIR)/config/engines/ford_aspire.cpp \
$(PROJECT_DIR)/config/engines/honda_accord.cpp \
$(PROJECT_DIR)/config/engines/subaru.cpp \
$(PROJECT_DIR)/config/engines/GY6_139QMB.cpp \
$(PROJECT_DIR)/config/engines/rover_v8.cpp \
$(PROJECT_DIR)/config/engines/mazda_626.cpp \
$(PROJECT_DIR)/config/engines/sachs.cpp \
$(PROJECT_DIR)/config/engines/test_engine.cpp \

147
firmware/config/engines/rover_v8.cpp
View File

@ -1,147 +0,0 @@
/**
* @file rover_v8.cpp
*
* V8, firing order 18436572
*
* set engine_type 10
*
* ROVER_V8 = 10
*
* @date Jun 27, 2014
* @author Andrey Belomutskiy, (c) 2012-2020
*/
#include "global.h"
#include "rover_v8.h"
#include "engine_math.h"
#include "allsensors.h"
void setFrankenstein_01_LCD(engine_configuration_s *engineConfiguration) {
engineConfiguration->HD44780_rs = GPIOE_9;
engineConfiguration->HD44780_e = GPIOE_11;
engineConfiguration->HD44780_db4 = GPIOE_13;
engineConfiguration->HD44780_db5 = GPIOE_15;
engineConfiguration->HD44780_db6 = GPIOB_11;
engineConfiguration->HD44780_db7 = GPIOB_13;
}
EXTERN_CONFIG;
void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setDefaultFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
// set trigger_type 9
engineConfiguration->trigger.type = TT_TOOTHED_WHEEL_36_1;
engineConfiguration->is_enabled_spi_2 = false;
engineConfiguration->isHip9011Enabled = false;
CONFIG(hip9011IntHoldPin) = GPIO_UNASSIGNED;
setFrankenstein_01_LCD(engineConfiguration);
engineConfiguration->specs.displacement = 3.528;
engineConfiguration->specs.cylindersCount = 8;
engineConfiguration->specs.firingOrder = FO_1_8_4_3_6_5_7_2;
// set_rpm_hard_limit 4000
engineConfiguration->rpmHardLimit = 4000; // yes, 4k. let's play it safe for now
// set_cranking_rpm 350
engineConfiguration->cranking.rpm = 350;
// set cranking_injection_mode 0
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
// set injection_mode 1
engineConfiguration->injectionMode = IM_SEQUENTIAL;
// set ignition_mode 2
engineConfiguration->ignitionMode = IM_WASTED_SPARK;
/*
* this configuration is used on HW CI - in HW CI 'inverted' would rightfully fail unless there is pull-up
engineConfiguration->ignitionPinMode = OM_INVERTED;
*/
// set_ignition_channels
engineConfiguration->ignitionPins[0] = GPIOE_8; // Frankenstein: low side - out #x (?)
engineConfiguration->ignitionPins[7] = GPIOE_10; // Frankenstein: low side - out #x (?)
engineConfiguration->ignitionPins[3] = GPIOE_12; // Frankenstein: low side - out #x (?)
engineConfiguration->ignitionPins[2] = GPIOE_14; // Frankenstein: low side - out #x (?)
// Frankenstein: low side - out #1: PC14
// Frankenstein: low side - out #2: PC15
// Frankenstein: low side - out #3: PE6
// Frankenstein: low side - out #4: PC13
// Frankenstein: low side - out #5: PE4
// Frankenstein: low side - out #6: PE5
// Frankenstein: low side - out #7: PE2
// Frankenstein: low side - out #8: PE3
// Frankenstein: low side - out #9: PE0
// Frankenstein: low side - out #10: PE1
// Frankenstein: low side - out #11: PB8
// Frankenstein: low side - out #12: PB9
engineConfiguration->injectionPins[0] = GPIOC_14; // Frankenstein: low side - out #1
engineConfiguration->injectionPins[1] = GPIOC_15; // Frankenstein: low side - out #2
engineConfiguration->injectionPins[2] = GPIOE_6; // Frankenstein: low side - out #3
engineConfiguration->injectionPins[3] = GPIOC_13; // Frankenstein: low side - out #4
engineConfiguration->injectionPins[4] = GPIOE_4; // Frankenstein: low side - out #5
engineConfiguration->injectionPins[5] = GPIOE_5; // Frankenstein: low side - out #6
engineConfiguration->injectionPins[6] = GPIOE_2; // Frankenstein: low side - out #7
engineConfiguration->injectionPins[7] = GPIOE_3; // Frankenstein: low side - out #8
// not valid ICU pin engineConfiguration->vehicleSpeedSensorInputPin = GPIOC_2;
//GPIOE_0 AND GPIOE_1 are bad pins since they conflict with accelerometer
//no malfunction indicator pin needed, since we use CAN_BUS_MAZDA_RX8
//engineConfiguration->fuelPumpPin = GPIOE_0; // Frankenstein: low side - out #9
//engineConfiguration->malfunctionIndicatorPin = GPIOE_1; // Frankenstein: low side - out #10
engineConfiguration->fuelPumpPin = GPIOB_8; // Frankenstein: low side - out #11
engineConfiguration->fuelPumpPinMode = OM_DEFAULT;
engineConfiguration->mainRelayPin = GPIOB_9; // Frankenstein: low side - out #12
engineConfiguration->triggerInputPins[0] = GPIOC_6; // 2G YEL/BLU
engineConfiguration->triggerInputPins[1] = GPIOA_5; // 2E White CKP
setCommonNTCSensor(&engineConfiguration->clt, 2700);
setCommonNTCSensor(&engineConfiguration->iat, 2700);
engineConfiguration->tps1_1AdcChannel = EFI_ADC_3; //Frankenstein: inp2
engineConfiguration->vbattAdcChannel = EFI_ADC_0; //Frankenstein: inp5
engineConfiguration->clt.adcChannel = EFI_ADC_11;
engineConfiguration->iat.adcChannel = EFI_ADC_13;
/**
* TPS 0% 0.9v
* TPS 100% 2.34v
*/
engineConfiguration->tpsMin = convertVoltageTo10bitADC(1.250);
engineConfiguration->tpsMax = convertVoltageTo10bitADC(4.538);
// Stepper logic:
engineConfiguration->idle.stepperDirectionPin = GPIOB_10;
engineConfiguration->idle.stepperStepPin = GPIOB_15;
engineConfiguration->stepperEnablePin = GPIOB_14;
engineConfiguration->idleStepperReactionTime = 10;
engineConfiguration->idleStepperTotalSteps = 150;
engineConfiguration->useStepperIdle = false;
// set injection_pin_mode 0
engineConfiguration->injectionPinMode = OM_DEFAULT;
engineConfiguration->canTxPin = GPIOB_6;
engineConfiguration->canRxPin = GPIOB_12;
engineConfiguration->canWriteEnabled = true;
engineConfiguration->canReadEnabled = false;
engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8;
setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX);
// todo: make this official Frankenstein joystick?
engineConfiguration->joystickCenterPin = GPIOD_8;
engineConfiguration->joystickAPin = GPIOD_10;
engineConfiguration->joystickBPin = GPIO_UNASSIGNED;
engineConfiguration->joystickCPin = GPIO_UNASSIGNED;
engineConfiguration->joystickDPin = GPIOD_11;
}

12
firmware/config/engines/rover_v8.h
View File

@ -1,12 +0,0 @@
/**
* @file rover_v8.h
*
* @date Jun 27, 2014
* @author Andrey Belomutskiy, (c) 2012-2020
*/
#pragma once
#include "engine_configuration.h"
void setFrankenstein_01_LCD(engine_configuration_s *engineConfiguration);
void setRoverv8(DECLARE_CONFIG_PARAMETER_SIGNATURE);

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

@ -881,8 +881,6 @@ case PROTEUS:
return "PROTEUS";
case PROTEUS_MIATA_NB2:
return "PROTEUS_MIATA_NB2";
case ROVER_V8:
return "ROVER_V8";
case SACHS:
return "SACHS";
case SUBARUEJ20G_DEFAULTS:

4
firmware/controllers/algo/engine_configuration.cpp
View File

@ -61,7 +61,6 @@
#include "m111.h"
#include "citroenBerlingoTU3JP.h"
#include "rover_v8.h"
#include "mitsubishi.h"
#include "subaru.h"
#include "test_engine.h"
@ -1320,9 +1319,6 @@ void resetConfigurationExt(Logging * logger, configuration_callback_t boardCallb
case CITROEN_TU3JP:
setCitroenBerlingoTU3JPConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case ROVER_V8:
setRoverv8(PASS_CONFIG_PARAMETER_SIGNATURE);
break;
case SUBARU_2003_WRX:
setSubaru2003Wrx(PASS_CONFIG_PARAMETER_SIGNATURE);
break;

3
firmware/controllers/algo/rusefi_enums.h
View File

@ -55,9 +55,6 @@ typedef enum {
*/
GY6_139QMB = 8,
ROVER_V8 = ET_ROVER_V8,
MIATA_PROTEUS_TCU = ET_MIATA_TCU_PROTEUS,
MAZDA_MIATA_NB1 = 9,
MRE_MIATA_NB2_MAP = ET_MRE_MIATA_NB2_MAP,

2
firmware/controllers/settings.cpp
View File

@ -140,8 +140,6 @@ const char* getConfigurationName(engine_type_e engineType) {
return "EscrtGT";
case CITROEN_TU3JP:
return "TU3JP";
case ROVER_V8:
return "Rvrv8";
case MITSU_4G93:
return "Mi4G93";
case MIATA_1990:

1
firmware/integration/rusefi_config.txt
View File

@ -435,7 +435,6 @@ end_struct
#define ET_FORD_ASPIRE 3
#define ET_FORD_FIESTA 4
#define ET_FORD_INLINE_6 7
#define ET_ROVER_V8 10
#define ET_FORD_ESCORT_GT 14
#define ET_BMW_E34 25
#define ET_SACHS 29

5
java_console/autotest/src/com/rusefi/FunctionalTest.java
View File

@ -293,11 +293,6 @@ public class FunctionalTest {
assertWaveFall(msg, chart, EngineChart.INJECTOR_4, 0.493, x + 540);
}
@Test
public void testRoverV8() {
ecu.setEngineType(ET_ROVER_V8);
}
@Test
public void testFordFiesta() {
ecu.setEngineType(ET_FORD_FIESTA);

2
unit_tests/tests/test_hardware_reinit.cpp
View File

@ -12,6 +12,6 @@ TEST(hardware, reinit) {
ButtonDebounce::startConfigurationList();
resetConfigurationExt(nullptr, nullptr, ROVER_V8 PASS_ENGINE_PARAMETER_SUFFIX);
resetConfigurationExt(nullptr, nullptr, DODGE_NEON_1995 PASS_ENGINE_PARAMETER_SUFFIX);
resetConfigurationExt(nullptr, nullptr, MIATA_NA6_MAP PASS_ENGINE_PARAMETER_SUFFIX);
}

1
unit_tests/tests/trigger/test_trigger_decoder.cpp
View File

@ -503,7 +503,6 @@ TEST(misc, testTriggerDecoder) {
testTriggerDecoder2("testSubary", SUBARU_2003_WRX, 0, 0.4000, 0.0);
testTriggerDecoder2("testFordEscortGt", FORD_ESCORT_GT, 0, 0.8096, 0.3844);
testTriggerDecoder2("testRoverV8", ROVER_V8, 0, 0.4861, 0);
testTriggerDecoder2("NISSAN_PRIMERA", NISSAN_PRIMERA, 2, 0.9611, 0.0);