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

auto-sync

This commit is contained in:
rusEfi 2014-10-22 18:02:58 -05:00
parent d0f6957b0f
commit 9b346fc09c
7 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
firmware/config/engines/mazda_miata.cpp
View File

@ -3,8 +3,9 @@
*
* FORD_ESCORT_GT = 14
* MIATA_1990 = 19
* MIATA_1994 = 20
* MIATA_1994_DEVIATOR = 20
* MIATA_1996 = 21
* MIATA_1994_SPAGS = 24
*
* @date Apr 11, 2014
* @author Andrey Belomutskiy, (c) 2012-2014
@ -211,11 +212,7 @@ void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configur
setDefaultCrankingFuel(engineConfiguration);
}
/**
* Frankenso board
* set_engine_type 20
*/
void setMiata1994(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
static void setMiata1994_common(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
commonMiataNa(engineConfiguration, boardConfiguration);
engineConfiguration->displacement = 1.839;
@ -267,10 +264,6 @@ void setMiata1994(engine_configuration_s *engineConfiguration, board_configurati
boardConfiguration->fuelPumpPin = GPIOE_4;
boardConfiguration->injectionPins[0] = GPIOD_7;
boardConfiguration->injectionPins[1] = GPIOE_2;
boardConfiguration->injectionPins[2] = GPIOB_8;
boardConfiguration->injectionPins[3] = GPIOB_7;
boardConfiguration->injectionPins[4] = GPIO_NONE;
boardConfiguration->injectionPins[5] = GPIO_NONE;
boardConfiguration->injectionPinMode = OM_DEFAULT;
@ -292,13 +285,39 @@ void setMiata1994(engine_configuration_s *engineConfiguration, board_configurati
engineConfiguration->cltAdcChannel = EFI_ADC_12;
engineConfiguration->iatAdcChannel = EFI_ADC_11;
/**
* VBatt
*/
engineConfiguration->vbattAdcChannel = EFI_ADC_14;
engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2;
}
/**
* Frankenso board
* set_engine_type 20
*/
void setMiata1994_d(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
setMiata1994_common(engineConfiguration, boardConfiguration);
engineConfiguration->vbattDividerCoeff = ((float) (8.2 + 33)) / 8.2 * 2;
/**
* This board was avoiding PE0 & PE1 mosfets altogether
*/
boardConfiguration->injectionPins[0] = GPIOD_7;
boardConfiguration->injectionPins[1] = GPIOE_2;
boardConfiguration->injectionPins[2] = GPIOB_8;
boardConfiguration->injectionPins[3] = GPIOB_7;
}
void setMiata1994_s(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration) {
setMiata1994_common(engineConfiguration, boardConfiguration);
engineConfiguration->vbattDividerCoeff = ((float) (10.0 + 33)) / 10 * 2;
/**
* This board has PE0 & PE1 mosfets rewires tp PD3 and PD5
*/
boardConfiguration->injectionPins[0] = GPIOD_7;
boardConfiguration->injectionPins[1] = GPIOE_2;
boardConfiguration->injectionPins[2] = GPIOB_8;
boardConfiguration->injectionPins[3] = GPIOB_7;
}
/**

3
firmware/config/engines/mazda_miata.h
View File

@ -16,7 +16,8 @@
void setFordEscortGt(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void setMiata1990(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void setMiata1994(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void setMiata1994_d(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void setMiata1994_s(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
void setMiata1996(engine_configuration_s *engineConfiguration, board_configuration_s *boardConfiguration);
#endif /* MAZDA_MIATA_H_ */

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

@ -231,8 +231,10 @@ case AUDI_AAN:
return "AUDI_AAN";
case MIATA_1996:
return "MIATA_1996";
case MIATA_1994:
return "MIATA_1994";
case MIATA_1994_DEVIATOR:
return "MIATA_1994d";
case MIATA_1994_SPAGS:
return "MIATA_1994s";
case FORD_INLINE_6_1995:
return "FORD_INLINE_6_1995";
case MIATA_1990:

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

@ -478,8 +478,11 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType, engine_co
case MIATA_1990:
setMiata1990(engineConfiguration, boardConfiguration);
break;
case MIATA_1994:
setMiata1994(engineConfiguration, boardConfiguration);
case MIATA_1994_DEVIATOR:
setMiata1994_d(engineConfiguration, boardConfiguration);
break;
case MIATA_1994_SPAGS:
setMiata1994_s(engineConfiguration, boardConfiguration);
break;
case MIATA_1996:
setMiata1996(engineConfiguration, boardConfiguration);

6
firmware/controllers/algo/enum_strings.cpp
View File

@ -60,8 +60,10 @@ const char* getConfigurationName(engine_type_e engineType) {
return "Mitsu 4G93";
case MIATA_1990:
return "Miata 1990";
case MIATA_1994:
return "Miata 1994";
case MIATA_1994_DEVIATOR:
return "Miata 1994d";
case MIATA_1994_SPAGS:
return "Miata 1994s";
case MIATA_1996:
return "Miata 1996";
default:

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

@ -84,14 +84,15 @@ typedef enum {
HONDA_ACCORD_CD_DIP = 18,
MIATA_1990 = 19,
MIATA_1994 = 20,
MIATA_1994_DEVIATOR = 20,
MIATA_1996 = 21,
SUBARU_2003_WRX = 22,
DODGE_NEON_2003 = 23,
MIATA_1994_SPAGS = 24,
ET_UNUSED = 24,
ET_UNUSED = 25,
Force_4b_engine_type = ENUM_SIZE_HACK,
} engine_type_e;

2
unit_tests/test_trigger_decoder.cpp
View File

@ -528,7 +528,7 @@ void testTriggerDecoder(void) {
testTriggerDecoder2("testMitsu", MITSU_4G93, 3, 0.3750, 0.3889);
// testTriggerDecoder2("miata 1990", MIATA_1990, 0, 0.6280, 0.0);
testTriggerDecoder2("miata 1994", MIATA_1994, 11, 0.2917, 0.3716);
testTriggerDecoder2("miata 1994", MIATA_1994_DEVIATOR, 11, 0.2917, 0.3716);
testTriggerDecoder2("citroen", CITROEN_TU3JP, 0, 0.4833, 0.0);
printGapRatio = true;