From 16b52878ebf8867b8a152632584b5a3bf74a7ec9 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 7 Sep 2014 19:04:36 -0500 Subject: [PATCH] auto-sync --- firmware/config/engines/mazda_miata.cpp | 15 +++++++++++---- firmware/emulation/engine_emulator.cpp | 7 ++++--- firmware/svnversion.h | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index 97c1592dfa..00dee14916 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -271,14 +271,21 @@ void setMiata1994(engine_configuration_s *engineConfiguration, board_configurati boardConfiguration->idleValvePin = GPIOB_9; boardConfiguration->ignitionPins[0] = GPIOC_7; // Frankenso high side #3 - boardConfiguration->ignitionPins[1] = GPIOE_14; // Frankenso high side #2 - boardConfiguration->ignitionPins[2] = GPIO_NONE; + boardConfiguration->ignitionPins[1] = GPIO_NONE; + boardConfiguration->ignitionPins[2] = GPIOE_14; // Frankenso high side #2 boardConfiguration->ignitionPins[3] = GPIO_NONE; boardConfiguration->ignitionPinMode = OM_DEFAULT; setFrankenso_01_LCD(boardConfiguration); + engineConfiguration->tpsAdcChannel = EFI_ADC_2; + engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; + engineConfiguration->mafAdcChannel = EFI_ADC_0; + engineConfiguration->cltAdcChannel = EFI_ADC_12; + engineConfiguration->iatAdcChannel = EFI_ADC_11; + + /** * VBatt */ @@ -310,8 +317,8 @@ void setMiata1996(engine_configuration_s *engineConfiguration, board_configurati engineConfiguration->tpsAdcChannel = EFI_ADC_13; boardConfiguration->ignitionPins[0] = GPIOE_12; // Frankenstein: high side #3 - boardConfiguration->ignitionPins[1] = GPIOE_14; // Frankenstein: high side #4 - boardConfiguration->ignitionPins[2] = GPIO_NONE; + boardConfiguration->ignitionPins[1] = GPIO_NONE; + boardConfiguration->ignitionPins[2] = GPIOE_14; // Frankenstein: high side #4 boardConfiguration->ignitionPins[3] = GPIO_NONE; boardConfiguration->ignitionPinMode = OM_DEFAULT; diff --git a/firmware/emulation/engine_emulator.cpp b/firmware/emulation/engine_emulator.cpp index eaac2d8e0b..97f34d9ebc 100644 --- a/firmware/emulation/engine_emulator.cpp +++ b/firmware/emulation/engine_emulator.cpp @@ -9,13 +9,14 @@ #include "main.h" #include "engine_emulator.h" -extern "C" { +#include "advance_map.h" +#include "fuel_math.h" #include "status_loop.h" -#include "advance_map.h" #include "wave_analyzer.h" -#include "fuel_math.h" #include "pin_repository.h" + +extern "C" { #include "poten.h" } #include "trigger_emulator.h" diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 5a4b145d8e..835abaf70c 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Sat Sep 06 19:16:30 EDT 2014 +// Sun Sep 07 19:26:38 EDT 2014 #ifndef VCS_VERSION -#define VCS_VERSION "4575" +#define VCS_VERSION "4591" #endif