diff --git a/firmware/config/boards/microrusefi/board_configuration.cpp b/firmware/config/boards/microrusefi/board_configuration.cpp index ad38a0203f..a58cf86b3d 100644 --- a/firmware/config/boards/microrusefi/board_configuration.cpp +++ b/firmware/config/boards/microrusefi/board_configuration.cpp @@ -33,6 +33,7 @@ static void setInjectorPins() { } static void setIgnitionPins() { + // todo: I wonder if these are not right in light of the network rename and the +12 VP issue? boardConfiguration->ignitionPins[0] = GPIOD_4; boardConfiguration->ignitionPins[1] = GPIOD_3; boardConfiguration->ignitionPins[2] = GPIOD_2; @@ -125,6 +126,9 @@ static void setupDefaultSensorInputs() { // Direct hall-only cam input engineConfiguration->camInputs[0] = GPIOA_5; + // open question if it's great to have TPS in default TPS - the down-side is for + // vehicles without TPS or for first start without TPS one would have to turn in off + // to avoid cranking corrections based on wrong TPS data // tps = "20 - AN volt 5" engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE; diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 6eb65baacc..7393bda2fa 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -304,6 +304,17 @@ void setMiataNA6_VAF_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) { boardConfiguration->triggerInputPins[1] = GPIOA_5; engineConfiguration->camInputs[0] = GPIO_UNASSIGNED; + boardConfiguration->ignitionPins[0] = GPIOD_7; + boardConfiguration->ignitionPins[1] = GPIO_UNASSIGNED; + boardConfiguration->ignitionPins[2] = GPIOD_6; + boardConfiguration->ignitionPins[3] = GPIO_UNASSIGNED; + + // tps = "20 - AN volt 5" + //engineConfiguration->tps1_1AdcChannel = EFI_ADC_13; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_NONE; + + + // MIL check engine: // IAC: GPIOE_9: "7 - Lowside 1" diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 1a76080f14..64c495167a 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -812,6 +812,6 @@ int getRusEfiVersion(void) { if (initBootloader() != 0) return 123; #endif /* EFI_BOOTLOADER_INCLUDE_CODE */ - return 20190816; + return 20190817; } #endif /* EFI_UNIT_TEST */ diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 6648b05b01..161d2c27ff 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,12 +1,12 @@ // This file was generated by Version2Header -// Fri Aug 16 23:36:54 EDT 2019 +// Sat Aug 17 22:41:05 EDT 2019 #ifndef GIT_HASH -#define GIT_HASH "b09ab8a57ff5433dc3d2f4f4bf58f6b82f4484a2" +#define GIT_HASH "70c74bec0d2bfb0e158eafe4a57db530ad419907" #endif #ifndef VCS_VERSION -#define VCS_VERSION "19733" +#define VCS_VERSION "19736" #endif