From ea477617778b2b3956e53b6bacc7fcc699144b95 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 1 May 2016 10:10:49 -0400 Subject: [PATCH] auto-sync --- firmware/config/engines/ford_festiva.cpp | 4 ++++ firmware/config/engines/mazda_miata.cpp | 7 ++++--- firmware/config/engines/mazda_miata_1_6.cpp | 14 ++++++++++++++ .../engine_configuration_generated_structures.h | 4 ++-- firmware/controllers/algo/rusefi_enums.h | 1 + firmware/controllers/algo/rusefi_generated.h | 2 +- firmware/controllers/trigger/trigger_mazda.cpp | 2 ++ firmware/integration/rusefi_config.txt | 4 ++-- 8 files changed, 30 insertions(+), 8 deletions(-) diff --git a/firmware/config/engines/ford_festiva.cpp b/firmware/config/engines/ford_festiva.cpp index d4fe023cee..0d0e39cc93 100644 --- a/firmware/config/engines/ford_festiva.cpp +++ b/firmware/config/engines/ford_festiva.cpp @@ -3,6 +3,10 @@ * * set_engine_type 14 * + * http://rusefi.com/wiki/index.php?title=Vehicle:Mazda_Protege_1993 + * http://rusefi.com/forum/viewtopic.php?f=3&t=537 + * http://rusefi.com/forum/viewtopic.php?f=3&t=822 + * * @date Jan 3, 2016 * @author Andrey Belomutskiy, (c) 2012-2016 */ diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp index b0f461df69..a0d495962e 100644 --- a/firmware/config/engines/mazda_miata.cpp +++ b/firmware/config/engines/mazda_miata.cpp @@ -5,7 +5,7 @@ * set_engine_type 14 * http://rusefi.com/wiki/index.php?title=Vehicle:Mazda_Protege_1993 * - * MIATA_1990 = 19 + * MIATA_1990 = 19 (Frankenstein board) * MIATA_1994_DEVIATOR = 20 * MIATA_1996 = 21 * MIATA_1994_SPAGS = 24 @@ -140,8 +140,6 @@ static void commonMiataNa(DECLARE_ENGINE_PARAMETER_F) { boardConfiguration->idle.solenoidFrequency = 160; - engineConfiguration->globalTriggerAngleOffset = 294; - // Frankenstein: high side #1 is PE8 // Frankenstein: high side #2 is PE10 // Frankenstein: high side #3 is PE12 @@ -200,6 +198,9 @@ void common079721_2351(engine_configuration_s *engineConfiguration, board_config } +/** + * Frankenstein board + */ void setMiata1990(DECLARE_ENGINE_PARAMETER_F) { common079721_2351(engineConfiguration, boardConfiguration); diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp index 85af70f433..3c8cf21497 100644 --- a/firmware/config/engines/mazda_miata_1_6.cpp +++ b/firmware/config/engines/mazda_miata_1_6.cpp @@ -1,6 +1,7 @@ /* * @file mazda_miata_1_6.cpp * + * Frankenso board * set_engine_type 41 * * @date Apr 16, 2016 @@ -10,6 +11,7 @@ #include "engine_template.h" #include "custom_engine.h" #include "fsio_impl.h" +#include "thermistors.h" EXTERN_ENGINE; @@ -23,8 +25,20 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->vbattDividerCoeff = 9.75;// ((float) (8.2 + 33)) / 8.2 * 2; + boardConfiguration->idle.solenoidFrequency = 160; boardConfiguration->idle.solenoidPin = GPIO_UNASSIGNED; + setCommonNTCSensor(&engineConfiguration->clt); + engineConfiguration->clt.config.bias_resistor = 2700; + setCommonNTCSensor(&engineConfiguration->iat); + engineConfiguration->iat.config.bias_resistor = 2700; + + /** + * oil pressure line + * adc4/pa4/W47 + */ + + // warning light /** * to test diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 6684003f30..8407698f88 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 25 22:10:39 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 01 09:49:44 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1707,4 +1707,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 25 22:10:39 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun May 01 09:49:44 EDT 2016 diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 3f550b362b..6810aa972d 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -80,6 +80,7 @@ typedef enum { HONDA_ACCORD_CD_DIP = 18, + // Frankenstein board MIATA_1990 = 19, MIATA_1994_DEVIATOR = 20, MIATA_1996 = 21, diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 465dd2ed0d..dcd6099c07 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1,5 +1,5 @@ #define LE_COMMAND_LENGTH 200 -#define TS_FILE_VERSION 20160312 +#define TS_FILE_VERSION 20160430 #define WARMUP_TARGET_AFR_SIZE 4 #define MAP_ANGLE_SIZE 8 #define MAP_WINDOW_SIZE 8 diff --git a/firmware/controllers/trigger/trigger_mazda.cpp b/firmware/controllers/trigger/trigger_mazda.cpp index 144f774970..b2868ceb05 100644 --- a/firmware/controllers/trigger/trigger_mazda.cpp +++ b/firmware/controllers/trigger/trigger_mazda.cpp @@ -25,6 +25,8 @@ void initializeMazdaMiataNaShape(TriggerShape *s DECLARE_ENGINE_PARAMETER_S) { s->setTriggerSynchronizationGap(MIATA_NA_GAP); s->useRiseEdge = false; + s->tdcPosition = 294; + s->isSynchronizationNeeded = true; /** diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 9b05cfc61b..e2650605ff 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -19,8 +19,8 @@ struct_no_prefix engine_configuration_s ! ! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version -! -#define TS_FILE_VERSION 20160312 +! so not forget to change fileVersion in rusefi.ini +#define TS_FILE_VERSION 20160430 #define WARMUP_TARGET_AFR_SIZE 4