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

#495 

compacting data structure without changing the size yet
This commit is contained in:
rusefi 2017-11-19 12:07:07 -05:00
parent 314c356159
commit 7222640454
9 changed files with 3892 additions and 4013 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/algo/engine_configuration.cpp
View File

@ -280,6 +280,7 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) {
for (int i = 0; i < AUX_DIGITAL_VALVE_COUNT; i++) {
engineConfiguration->auxValves[i] = GPIO_UNASSIGNED;
}
engineConfiguration->LIS302DLCsPin = GPIO_UNASSIGNED;
boardConfiguration->joystickCenterPin = GPIO_UNASSIGNED;
boardConfiguration->joystickAPin = GPIO_UNASSIGNED;

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

2
firmware/hw_layer/accelerometer.cpp
View File

@ -73,8 +73,6 @@ static msg_t ivThread(int param) {
}
void initAccelerometer(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
if (engineConfiguration->LIS302DLCsPin == GPIOA_0)
return; // temporary code to handle old configurations
if (engineConfiguration->LIS302DLCsPin == GPIO_UNASSIGNED)
return; // not used

15
firmware/integration/rusefi_config.txt
View File

@ -41,7 +41,7 @@ struct_no_prefix engine_configuration_s
!
! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
! so not forget to change fileVersion in rusefi.ini
#define TS_FILE_VERSION 20161225
#define TS_FILE_VERSION 20171101
#define WARMUP_TARGET_AFR_SIZE 4
@ -199,7 +199,6 @@ int engineSnifferRpmThreshold;Engine sniffer would be disabled above this rpm\ns
struct injector_s
float flow;+cc/min, cubic centimeter per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min;"cm3/min", 1, 0, 0, 1000, 2
float unusedlag;
float[VBAT_INJECTOR_CURVE_SIZE] battLagCorrBins;set_flat_injector_lag LAG\nset_injector_lag VOLTAGE LAG;"volts", 1, 0, 0.0, 20.0, 2
float[VBAT_INJECTOR_CURVE_SIZE] battLagCorr;ms delay between injector open and close dead times;"ms", 1, 0, 0.0, 50.0, 2
@ -374,11 +373,6 @@ custom trigger_type_e 4 bits, U32, @OFFSET@, [0:5], @@trigger_type_e_enum@@
int customTotalToothCount;;"number", 1, 0.0, 0, 500.0, 0
int customSkippedToothCount;;"number", 1, 0.0, 0, 500.0, 0
float unusedcustomSyncRatioFrom;;"number", 1, 0.0, 0, 1000.0, 4
float unusedcustomSyncRatioTo;;"number", 1, 0.0, 0, 1000.0, 4
bool32_t unusedcustomUseRiseEdge;
end_struct
trigger_config_s trigger;
@ -734,12 +728,9 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@
float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2
float startOfCrankingPrimingPulse;;"ms", 1, 0, 0, 200, 1
int16_t afterCrankingIACtaperDuration;;"cycles", 1, 0, 0, 5000, 0
int16_t unusedShortHere;;"seconds", 1, 0, 0, 6000, 0
int16_t iacByTpsTaper;Extra IAC, in percent between 0 and 100, tapered between zero and idle deactivation TPS value;"percent", 1, 0, 0, 500, 0
int16_t unusedShort;
brain_pin_e LIS302DLCsPin;
float unusedalternatorControl;
int tpsAccelLength;;"cycles", 1, 0, 1, 200, 0
float tpsAccelEnrichmentThreshold;;"roc", 1, 0, 0, 200, 3
@ -762,7 +753,6 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@
float slowAdcAlpha;+ExpAverage alpha coefficient;"coeff", 1, 0, 0, 200, 3
debug_mode_e debugMode;set debug_mode X
brain_pin_e[AUX_DIGITAL_VALVE_COUNT iterate] auxValves
float[2] unusedwarmupAfrPid;
float[WARMUP_TARGET_AFR_SIZE] warmupTargetAfrBins;CLT-based target AFR for PID-based control;"C", 1, 0, -100.0, 250.0, 2
float[WARMUP_TARGET_AFR_SIZE] warmupTargetAfr;;"AFR", 1, 0, 0.0, 20.0, 2
@ -781,7 +771,6 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
float mapHighValueVoltage;MAP voltage for low point;"v", 1, 0, 0.0, 10, 2
float egoValueShift;EGO value correction;"value", 1, 0, -10.0, 10, 2
brain_input_pin_e camInput;
int[4] unused4;
int crankingIACposition;IAC cranking position;"percent", 1, 0, -100.0, 100,
float tChargeMinRpmMinTps;;"mult", 1, 0, 0, 3, 4
float tChargeMinRpmMaxTps;;"mult", 1, 0, 0, 3, 4
@ -837,7 +826,7 @@ brain_pin_e brakePedalPin
oil_pressure_config_s oilPressure;
int[21] unusedEnd;
int[33] unusedEnd;
end_struct

2
firmware/rusefi.cpp
View File

@ -260,5 +260,5 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20171106;
return 20171108;
}

1335
firmware/tunerstudio/rusefi.ini
View File

File diff suppressed because it is too large Load Diff

3170
java_console/models/src/com/rusefi/config/Fields.java
View File

File diff suppressed because it is too large Load Diff

16
java_console/rusefi.xml
View File

@ -1,6 +1,6 @@
<roms>
<!-- Generated by ConfigDefinition utility on Thu Nov 09 13:37:49 EST 2017 -->
<!-- Generated by ConfigDefinition utility on Sun Nov 19 11:49:46 EST 2017 -->
<rom>
<romid>
@ -166,13 +166,13 @@
<table type="3D" name="Baro Correction"
category="Fuel"
storageaddress="68c" sizex="4"
storageaddress="67c" sizex="4"
sizey="4" storagetype="float" endian="big">
<scaling units="Pressure" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
<table type="X Axis" storageaddress="66c" storagetype="float" endian="big">
<table type="X Axis" storageaddress="65c" storagetype="float" endian="big">
<scaling units="kPa" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
<table type="Y Axis" storageaddress="67c" storagetype="float" endian="big">
<table type="Y Axis" storageaddress="66c" storagetype="float" endian="big">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
@ -198,20 +198,20 @@
</table>
<table type="2D" name="Engine Noise" storageaddress="79c"
<table type="2D" name="Engine Noise" storageaddress="78c"
sizex="8" storagetype="float" endian="big">
<scaling units="Volts" expression="x" to_byte="x" format="0.00"
fineincrement=".01" coarseincrement="0.1"/>
<table type="X Axis" storageaddress="7bc" storagetype="float" endian="big">
<table type="X Axis" storageaddress="7ac" storagetype="float" endian="big">
<scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>
<table type="2D" name="Injector Lag" storageaddress="30"
<table type="2D" name="Injector Lag" storageaddress="2c"
sizex="8" storagetype="float" endian="big">
<scaling units="ms" expression="x" to_byte="x" format="0.00"
fineincrement=".01" coarseincrement="0.1"/>
<table type="X Axis" storageaddress="10" storagetype="float" endian="big">
<table type="X Axis" storageaddress="c" storagetype="float" endian="big">
<scaling units="Volts" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1"/>
</table>
</table>