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 2016-05-01 10:10:49 -04:00
parent 321e3ebf4f
commit 0579f4f0eb
9 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/engines/ford_festiva.cpp
View File

@ -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
*/

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

@ -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);

14
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -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

4
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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

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

@ -80,6 +80,7 @@ typedef enum {
HONDA_ACCORD_CD_DIP = 18,
// Frankenstein board
MIATA_1990 = 19,
MIATA_1994_DEVIATOR = 20,
MIATA_1996 = 21,

2
firmware/controllers/algo/rusefi_generated.h
View File

@ -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

2
firmware/controllers/trigger/trigger_mazda.cpp
View File

@ -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;
/**

4
firmware/integration/rusefi_config.txt
View File

@ -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

6
firmware/tunerstudio/rusefi.ini
View File

@ -41,7 +41,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; 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 Sat Apr 30 09:55:07 EDT 2016
pageSize = 17080
page = 1
@ -668,7 +668,7 @@ page = 1
[OutputChannels]
; see TS_FILE_VERSION in firmware code
fileVersion = { 20160122 }
fileVersion = { 20160430 }
ochGetCommand = "O"
@ -1066,7 +1066,7 @@ fileVersion = { 20160122 }
; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg
; important status
indicator = { ind_hasFatalError }, "", "FATAL ERROR", green, black, red, black
indicator = { firmwareTsVersion == fileVersion }, "NOT COMPATIBLE", "OK", red, black, green, black
indicator = { firmwareTsVersion == fileVersion }, "WRONG VERSION", "OK", red, black, green, black
indicator = { ind_check_engine }, "ok", "Check engine", green, black, red, black
indicator = { isIgnitionEnabledIndicator}, "no ignition", "ignition", red, black, green, black
indicator = { ind_injection_enabled}, "no injection", "injection", red, black, green, black