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

Merge branch 'master' of https://github.com/rusefi/rusefi

This commit is contained in:
rusefi 2017-07-22 21:59:34 -04:00
parent 03b7590f77 7d7c0b5d99
commit c5b67694d3
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/Makefile
View File

@ -236,11 +236,10 @@ INCDIR = $(PORTINC) \
$(CHIBIOS)/os/hal/lib/streams \ $(CHIBIOS)/os/hal/lib/streams \
$(CHIBIOS)/os/various \ $(CHIBIOS)/os/various \
$(CHIBIOS)/os/various/devices_lib/accel \ $(CHIBIOS)/os/various/devices_lib/accel \
$(CHIBIOS_CONTRIB)/os/various \ $(CHIBIOS_CONTRIB)/os/various \
config/stm32f4ems \ config/stm32f4ems \
config/engines \ config/engines \
config \ config \
chibios/os/various \
ext \ ext \
ext_algo \ ext_algo \
util \ util \

3
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -268,7 +268,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
engineConfiguration->vvtMode = MIATA_NB2; engineConfiguration->vvtMode = MIATA_NB2;
boardConfiguration->vvtCamSensorUseRise = true; boardConfiguration->vvtCamSensorUseRise = true;
engineConfiguration->vvtDisplayInverted = true; engineConfiguration->vvtDisplayInverted = true;
engineConfiguration->vvtOffset = 83; engineConfiguration->vvtOffset = 98; // 2003 red car value
engineConfiguration->activateAuxPid1 = true; // todo: remove this field? engineConfiguration->activateAuxPid1 = true; // todo: remove this field?
engineConfiguration->auxPidFrequency[0] = 300; engineConfiguration->auxPidFrequency[0] = 300;
@ -411,6 +411,7 @@ void setMazdaMiata2003EngineConfigurationNewBoard(DECLARE_ENGINE_PARAMETER_SIGNA
memcpy(config->veLoadBins, ve18vvtLoadBins, sizeof(ve18vvtLoadBins)); memcpy(config->veLoadBins, ve18vvtLoadBins, sizeof(ve18vvtLoadBins));
copyFuelTable(mapBased18vvtVeTable_NA_fuel_rail, config->veTable); copyFuelTable(mapBased18vvtVeTable_NA_fuel_rail, config->veTable);
engineConfiguration->vvtOffset = 83; // 2002 green car value
memcpy(config->afrRpmBins, targetAfrRpmBins, sizeof(targetAfrRpmBins)); memcpy(config->afrRpmBins, targetAfrRpmBins, sizeof(targetAfrRpmBins));
memcpy(config->afrLoadBins, targetAfrLoadBins, sizeof(targetAfrLoadBins)); memcpy(config->afrLoadBins, targetAfrLoadBins, sizeof(targetAfrLoadBins));

2
firmware/integration/rusefi_config.txt
View File

@ -725,7 +725,7 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@
int tpsAccelLength;;"cycles", 1, 0, 1, 200, 0 int tpsAccelLength;;"cycles", 1, 0, 1, 200, 0
float tpsAccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3 float tpsAccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3
float vvtOffset;set vvt_offset X;"value", 1, 0, -720, 1000, 5 float vvtOffset;set vvt_offset X;"value", 1, 0, -720, 1000, 1
int engineLoadAccelLength;;"cycles", 1, 0, 1, 200, 0 int engineLoadAccelLength;;"cycles", 1, 0, 1, 200, 0

4
firmware/tunerstudio/rusefi.ini
View File

@ -59,7 +59,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 15 15:30:50 EDT 2017 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 22 20:43:02 EDT 2017
pageSize = 16376 pageSize = 16376
page = 1 page = 1
@ -576,7 +576,7 @@ page = 1
;skipping unusedalternatorControl offset 2168 ;skipping unusedalternatorControl offset 2168
tpsAccelLength = scalar, S32, 2184, "cycles", 1, 0, 1, 200, 0 tpsAccelLength = scalar, S32, 2184, "cycles", 1, 0, 1, 200, 0
tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3 tpsAccelEnrichmentThreshold = scalar, F32, 2188, "roc", 1, 0, 0, 200, 3
vvtOffset = scalar, F32, 2192, "value", 1, 0, -720, 1000, 5 vvtOffset = scalar, F32, 2192, "value", 1, 0, -720, 1000, 1
engineLoadAccelLength = scalar, S32, 2196, "cycles", 1, 0, 1, 200, 0 engineLoadAccelLength = scalar, S32, 2196, "cycles", 1, 0, 1, 200, 0
engineLoadDecelEnleanmentThreshold = scalar, F32, 2200, "roc", 1, 0, 0, 200, 3 engineLoadDecelEnleanmentThreshold = scalar, F32, 2200, "roc", 1, 0, 0, 200, 3
engineLoadDecelEnleanmentMultiplier = scalar, F32, 2204, "coeff", 1, 0, 0, 200, 3 engineLoadDecelEnleanmentMultiplier = scalar, F32, 2204, "coeff", 1, 0, 0, 200, 3

4
simulator/Makefile
View File

@ -85,8 +85,6 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/rt/ports/SIMIA32/compilers/GCC/port.mk include $(CHIBIOS)/os/rt/ports/SIMIA32/compilers/GCC/port.mk
# Other files (optional). # Other files (optional).
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/shell/shell.mk
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
include ${CHIBIOS}/os/hal/ports/simulator/win32/platform.mk include ${CHIBIOS}/os/hal/ports/simulator/win32/platform.mk
@ -172,7 +170,7 @@ INCDIR = . \
$(PROJECT_DIR)/config/engines \ $(PROJECT_DIR)/config/engines \
$(PROJECT_DIR)/ext_algo \ $(PROJECT_DIR)/ext_algo \
$(PROJECT_DIR)/controllers \ $(PROJECT_DIR)/controllers \
$(PROJECT_DIR)/hw_layer \ $(PROJECT_DIR)/hw_layer \
$(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/hw_layer/algo \
$(PROJECT_DIR)/development \ $(PROJECT_DIR)/development \
$(PROJECT_DIR)/controllers/algo \ $(PROJECT_DIR)/controllers/algo \