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

auto-sync

This commit is contained in:
rusEfi 2015-03-30 12:04:59 -05:00
parent f3f7910d58
commit 1c72f4ccda
6 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/binary/tunerstudio_configuration.h
View File

@ -16,11 +16,11 @@
/**
* this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
*/
#define TS_FILE_VERSION 20150314
#define TS_FILE_VERSION 20150330
#define PAGE_COUNT 2
#define PAGE_0_SIZE 14008
#define PAGE_0_SIZE 15288
#define PAGE_1_SIZE 1152
#define TS_OUTPUT_SIZE 196

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

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Sun Mar 29 20:08:11 EDT 2015
// this section was generated by config_definition.jar on Mon Mar 30 12:05:08 EDT 2015
// begin
#include "rusefi_types.h"
typedef struct {
@ -1203,8 +1203,28 @@ typedef struct {
* offset 13944
*/
float injPhaseRpmBins[FUEL_RPM_COUNT];
/** total size 14008*/
/**
* offset 14008
*/
float iatIdleCorrBins[IAT_CURVE_SIZE];
/**
* offset 14072
*/
float iatIdleCorr[IAT_CURVE_SIZE];
/**
* offset 14136
*/
ignition_table_t ignitionIatCorrTable;
/**
* offset 15160
*/
float ignitionIatCorrLoadBins[IGN_LOAD_COUNT];
/**
* offset 15224
*/
float ignitionIatCorrRpmBins[IGN_RPM_COUNT];
/** total size 15288*/
} engine_configuration_s;
// end
// this section was generated by config_definition.jar on Sun Mar 29 20:08:11 EDT 2015
// this section was generated by config_definition.jar on Mon Mar 30 12:05:08 EDT 2015

20
firmware/integration/rusefi_config.txt
View File

@ -108,10 +108,10 @@ injector_s injector
float[CLT_CURVE_SIZE] cltFuelCorrBins;;"C", 1, 0, -100.0, 250.0, 2
float[CLT_CURVE_SIZE] cltFuelCorr;;"%", 100, 0, 0.0, 500.0, 2
float[CLT_CURVE_SIZE] cltFuelCorr;;"%", 1, 0, 0.0, 500.0, 2
float[IAT_CURVE_SIZE] iatFuelCorrBins;;"C", 1, 0, -100.0, 250.0, 2
float[IAT_CURVE_SIZE] iatFuelCorr;;"%", 100, 0, 0.0, 500.0, 2
float[IAT_CURVE_SIZE] iatFuelCorr;;"%", 1, 0, 0.0, 500.0, 2
int16_t directSelfStimulation;Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires?\nPS: Funny name, right? :)\ntodo: make this a bit on some bit field
@ -441,10 +441,10 @@ bit hasMapSensor;@see isMapAveragingEnabled
uint32_t digitalChartSize;;"count", 1, 0, 0, 300, 0
float[CRANKING_CURVE_SIZE] crankingFuelCoef;;"%", 100, 0, 0.0, 700.0, 2
float[CRANKING_CURVE_SIZE] crankingFuelCoef;;"%", 1, 0, 0.0, 700.0, 2
float[CRANKING_CURVE_SIZE] crankingFuelBins;;"C", 1, 0, -80.0, 170.0, 2
float[CRANKING_CURVE_SIZE] crankingCycleCoef;;"%", 100, 0, 0.0, 500.0, 2
float[CRANKING_CURVE_SIZE] crankingCycleCoef;;"%", 1, 0, 0.0, 500.0, 2
float[CRANKING_CURVE_SIZE] crankingCycleBins;;"C", 1, 0, -80.0, 170.0, 2
float ignitionDwellForCrankingMs;;"ms", 1, 0, 0, 200, 1
@ -516,14 +516,12 @@ fuel_table_t injectionPhase;
float[FUEL_LOAD_COUNT] injPhaseLoadBins;;"Load", 1, 0.0, 0, 300.0, 2
float[FUEL_RPM_COUNT] injPhaseRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
! ignition_table_t ignitionIatCorrTable;
! float[IGN_LOAD_COUNT] ignitionIatCorrLoadBins;;"Load", 1, 0.0, 0, 300.0, 2
! float[IGN_RPM_COUNT] ignitionIatCorrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
! float[IAT_CURVE_SIZE] iatIdleCorrBins;;"C", 1, 0, -100.0, 250.0, 2
! float[IAT_CURVE_SIZE] iatIdleCorr;;"%", 100, 0, 0.0, 500.0, 2
float[IAT_CURVE_SIZE] iatIdleCorrBins;;"C", 1, 0, -100.0, 250.0, 2
float[IAT_CURVE_SIZE] iatIdleCorr;;"%", 1, 0, 0.0, 500.0, 2
ignition_table_t ignitionIatCorrTable;
float[IGN_LOAD_COUNT] ignitionIatCorrLoadBins;;"Load", 1, 0.0, 0, 300.0, 2
float[IGN_RPM_COUNT] ignitionIatCorrRpmBins;;"RPM", 1, 0.0, 0, 18000.0, 2
! ve_table_t ve2Table;
! float[FUEL_LOAD_COUNT] ve2LoadBins;;"%", 1, 0.0, 0, 300.0, 2

21
firmware/tunerstudio/rusefi.ini
View File

@ -40,9 +40,9 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Mon Mar 30 10:47:35 EDT 2015
; this section was generated by ConfigDefinition.jar on Mon Mar 30 12:05:10 EDT 2015
pageSize = 14008
pageSize = 15288
page = 1
engineType = bits, S32, 0, [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB"
;skipping headerMagicValue offset 4
@ -51,9 +51,9 @@ page = 1
injector_battLagCorrBins = array, F32, 16, [8], "V", 1, 0, 0.0, 20.0, 2
injector_battLagCorr = array, F32, 48, [8], "ms/V", 1, 0, 0.0, 50.0, 2
cltFuelCorrBins = array, F32, 80, [16], "C", 1, 0, -100.0, 250.0, 2
cltFuelCorr = array, F32, 144, [16], "%", 100, 0, 0.0, 500.0, 2
cltFuelCorr = array, F32, 144, [16], "%", 1, 0, 0.0, 500.0, 2
iatFuelCorrBins = array, F32, 208, [16], "C", 1, 0, -100.0, 250.0, 2
iatFuelCorr = array, F32, 272, [16], "%", 100, 0, 0.0, 500.0, 2
iatFuelCorr = array, F32, 272, [16], "%", 1, 0, 0.0, 500.0, 2
;skipping directSelfStimulation offset 336
tpsMin = scalar, S16, 338, "ADC", 1, 0, 0, 1023, 0
tpsMax = scalar, S16, 340, "ADC", 1, 0, 0, 1023, 0
@ -416,9 +416,9 @@ page = 1
isManualSpinningMode = bits, U32, 4888, [12:12], "false", "true"
twoWireBatch = bits, U32, 4888, [13:13], "false", "true"
digitalChartSize = scalar, U32, 4892, "count", 1, 0, 0, 300, 0
crankingFuelCoef = array, F32, 4896, [8], "%", 100, 0, 0.0, 700.0, 2
crankingFuelCoef = array, F32, 4896, [8], "%", 1, 0, 0.0, 700.0, 2
crankingFuelBins = array, F32, 4928, [8], "C", 1, 0, -80.0, 170.0, 2
crankingCycleCoef = array, F32, 4960, [8], "%", 100, 0, 0.0, 500.0, 2
crankingCycleCoef = array, F32, 4960, [8], "%", 1, 0, 0.0, 500.0, 2
crankingCycleBins = array, F32, 4992, [8], "C", 1, 0, -80.0, 170.0, 2
ignitionDwellForCrankingMs = scalar, F32, 5024, "ms", 1, 0, 0, 200, 1
;skipping targetIdleRpm offset 5028
@ -496,7 +496,12 @@ page = 1
injectionPhase = array, F32, 12856, [16x16],"ms", 1, 0, 0.0, 300.0, 2
injPhaseLoadBins = array, F32, 13880, [16], "Load", 1, 0.0, 0, 300.0, 2
injPhaseRpmBins = array, F32, 13944, [16], "RPM", 1, 0.0, 0, 18000.0, 2
; total TS size = 14008
iatIdleCorrBins = array, F32, 14008, [16], "C", 1, 0, -100.0, 250.0, 2
iatIdleCorr = array, F32, 14072, [16], "%", 1, 0, 0.0, 500.0, 2
ignitionIatCorrTable = array, F32, 14136, [16x16],"deg", 1, 0, -360, 360, 2
ignitionIatCorrLoadBins = array, F32, 15160, [16], "Load", 1, 0.0, 0, 300.0, 2
ignitionIatCorrRpmBins = array, F32, 15224, [16], "RPM", 1, 0.0, 0, 18000.0, 2
; total TS size = 15288
; CONFIG_DEFINITION_END
@ -539,7 +544,7 @@ page = 1
[OutputChannels]
; see TS_FILE_VERSION in firmware code
fileVersion = { 20150314 }
fileVersion = { 20150330 }
ochGetCommand = "O"

2
java_console/io/src/com/rusefi/TsPageSize.java
View File

@ -1,5 +1,5 @@
package com.rusefi;
public interface TsPageSize {
int IMAGE_SIZE = 14008;
int IMAGE_SIZE = 15288;
}

2
java_console/rusefi.xml
View File

@ -13,7 +13,7 @@
<transmission>MT</transmission>
<memmodel>SH7055</memmodel>
<flashmethod>sti04</flashmethod>
<filesize>14008</filesize>
<filesize>15288</filesize>
</romid>
<table type="3D" name="Ignition Advance" storageaddress="24B8" sizex="16" sizey="16" storagetype="float" endian="big">