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

refactoring

This commit is contained in:
rusefi 2020-01-12 05:17:42 -05:00
parent f74cf3bfbe
commit 113fc4be36
12 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:11:26 EST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:13:50 EST 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -1825,7 +1825,7 @@ struct engine_configuration_s {
bool secondTriggerChannelEnabled : 1;
/**
offset 1476 bit 4 */
bool needSecondTriggerInputDeprecated : 1;
bool unusedBit4_1476 : 1;
/**
offset 1476 bit 5 */
bool isMapAveragingEnabled : 1;
@ -3125,4 +3125,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:11:26 EST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:13:50 EST 2020

4
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -1525,8 +1525,6 @@
#define narrowToWideOxygenBins_offset_hex 8d8
#define nbVvtIndex_offset 2416
#define nbVvtIndex_offset_hex 970
#define needSecondTriggerInputDeprecated_offset 1476
#define needSecondTriggerInputDeprecated_offset_hex 5c4
#define noAccelAfterHardLimitPeriodSecs_offset 1536
#define noAccelAfterHardLimitPeriodSecs_offset_hex 600
#define o2heaterPin_offset 742
@ -2018,6 +2016,8 @@
#define unusedAnotherOne_offset_hex 2e8
#define unusedAtOldBoardConfigurationEnd_offset 988
#define unusedAtOldBoardConfigurationEnd_offset_hex 3dc
#define unusedBit4_1476_offset 1476
#define unusedBit4_1476_offset_hex 5c4
#define unusedBit_249_10_offset 976
#define unusedBit_249_10_offset_hex 3d0
#define unusedBit_249_11_offset 976

6
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:17 EST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:13:41 EST 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -1825,7 +1825,7 @@ struct engine_configuration_s {
bool secondTriggerChannelEnabled : 1;
/**
offset 1476 bit 4 */
bool needSecondTriggerInputDeprecated : 1;
bool unusedBit4_1476 : 1;
/**
offset 1476 bit 5 */
bool isMapAveragingEnabled : 1;
@ -3125,4 +3125,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:17 EST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:13:41 EST 2020

4
firmware/controllers/generated/rusefi_generated.h
View File

@ -1525,8 +1525,6 @@
#define narrowToWideOxygenBins_offset_hex 8d8
#define nbVvtIndex_offset 2416
#define nbVvtIndex_offset_hex 970
#define needSecondTriggerInputDeprecated_offset 1476
#define needSecondTriggerInputDeprecated_offset_hex 5c4
#define noAccelAfterHardLimitPeriodSecs_offset 1536
#define noAccelAfterHardLimitPeriodSecs_offset_hex 600
#define o2heaterPin_offset 742
@ -2018,6 +2016,8 @@
#define unusedAnotherOne_offset_hex 2e8
#define unusedAtOldBoardConfigurationEnd_offset 988
#define unusedAtOldBoardConfigurationEnd_offset_hex 3dc
#define unusedBit4_1476_offset 1476
#define unusedBit4_1476_offset_hex 5c4
#define unusedBit_249_10_offset 976
#define unusedBit_249_10_offset_hex 3d0
#define unusedBit_249_11_offset 976

4
firmware/controllers/trigger/decoders/trigger_mazda.cpp
View File

@ -152,9 +152,6 @@ void initializeMazdaMiataVVtTestShape(TriggerWaveform *s) {
}
void configureMazdaProtegeSOHC(TriggerWaveform *s) {
// todo: move to into configuration definition s->needSecondTriggerInput = FALSE;
s->initialize(FOUR_STROKE_CAM_SENSOR, false);
// s->initialState[0] = 1;
@ -182,7 +179,6 @@ void configureMazdaProtegeSOHC(TriggerWaveform *s) {
}
void configureMazdaProtegeLx(TriggerWaveform *s) {
// todo: move to into configuration definition s->needSecondTriggerInput = FALSE;
s->initialize(FOUR_STROKE_CAM_SENSOR, true);
s->useOnlyPrimaryForSync = true;

2
firmware/integration/rusefi_config.txt
View File

@ -786,7 +786,7 @@ custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "Automatic", "Manual"
bit isIgnitionEnabled;+Enable ignition - This is default off for new projects as a safety feature, set to "true" to enable ignition and further ignition settings.
bit isCylinderCleanupEnabled;+When enabled if TPS is held above 95% no fuel is injected while cranking to clear excess fuel from the cylinders.
bit secondTriggerChannelEnabled
bit needSecondTriggerInputDeprecated
bit unusedBit4_1476
bit isMapAveragingEnabled
bit overrideCrankingIacSetting;+This setting overrides the normal multiplication values that have been set for the idle air control valve during cranking. If this setting is enabled the "IAC multiplier" table in the Cranking settings tab needs to be adjusted appropriately or potentially no IAC opening will occur.
bit useSeparateAdvanceForIdle;+This activates a separate ignition timing table for idle conditions, this can help idle stability by using ignition retard and advance either side of the desired idle speed. Extra retard at low idle speeds will prevent stalling and extra advance at high idle speeds can help reduce engine power and slow the idle speed.

4
firmware/tunerstudio/rusefi.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:17 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:13:41 EST 2020
pageSize = 20000
page = 1
@ -614,7 +614,7 @@ page = 1
isIgnitionEnabled = bits, U32, 1476, [1:1], "false", "true"
isCylinderCleanupEnabled= bits, U32, 1476, [2:2], "false", "true"
secondTriggerChannelEnabled= bits, U32, 1476, [3:3], "false", "true"
needSecondTriggerInputDeprecated= bits, U32, 1476, [4:4], "false", "true"
unusedBit4_1476 = bits, U32, 1476, [4:4], "false", "true"
isMapAveragingEnabled = bits, U32, 1476, [5:5], "false", "true"
overrideCrankingIacSetting= bits, U32, 1476, [6:6], "false", "true"
useSeparateAdvanceForIdle= bits, U32, 1476, [7:7], "false", "true"

4
firmware/tunerstudio/rusefi_frankenso.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:22 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:13:46 EST 2020
pageSize = 20000
page = 1
@ -614,7 +614,7 @@ page = 1
isIgnitionEnabled = bits, U32, 1476, [1:1], "false", "true"
isCylinderCleanupEnabled= bits, U32, 1476, [2:2], "false", "true"
secondTriggerChannelEnabled= bits, U32, 1476, [3:3], "false", "true"
needSecondTriggerInputDeprecated= bits, U32, 1476, [4:4], "false", "true"
unusedBit4_1476 = bits, U32, 1476, [4:4], "false", "true"
isMapAveragingEnabled = bits, U32, 1476, [5:5], "false", "true"
overrideCrankingIacSetting= bits, U32, 1476, [6:6], "false", "true"
useSeparateAdvanceForIdle= bits, U32, 1476, [7:7], "false", "true"

4
firmware/tunerstudio/rusefi_kinetis.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:11:26 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:13:50 EST 2020
pageSize = 20000
page = 1
@ -614,7 +614,7 @@ page = 1
isIgnitionEnabled = bits, U32, 1476, [1:1], "false", "true"
isCylinderCleanupEnabled= bits, U32, 1476, [2:2], "false", "true"
secondTriggerChannelEnabled= bits, U32, 1476, [3:3], "false", "true"
needSecondTriggerInputDeprecated= bits, U32, 1476, [4:4], "false", "true"
unusedBit4_1476 = bits, U32, 1476, [4:4], "false", "true"
isMapAveragingEnabled = bits, U32, 1476, [5:5], "false", "true"
overrideCrankingIacSetting= bits, U32, 1476, [6:6], "false", "true"
useSeparateAdvanceForIdle= bits, U32, 1476, [7:7], "false", "true"

4
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:19 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:13:44 EST 2020
pageSize = 20000
page = 1
@ -614,7 +614,7 @@ page = 1
isIgnitionEnabled = bits, U32, 1476, [1:1], "false", "true"
isCylinderCleanupEnabled= bits, U32, 1476, [2:2], "false", "true"
secondTriggerChannelEnabled= bits, U32, 1476, [3:3], "false", "true"
needSecondTriggerInputDeprecated= bits, U32, 1476, [4:4], "false", "true"
unusedBit4_1476 = bits, U32, 1476, [4:4], "false", "true"
isMapAveragingEnabled = bits, U32, 1476, [5:5], "false", "true"
overrideCrankingIacSetting= bits, U32, 1476, [6:6], "false", "true"
useSeparateAdvanceForIdle= bits, U32, 1476, [7:7], "false", "true"

4
firmware/tunerstudio/rusefi_prometheus.ini
View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:24 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:13:48 EST 2020
pageSize = 20000
page = 1
@ -614,7 +614,7 @@ page = 1
isIgnitionEnabled = bits, U32, 1476, [1:1], "false", "true"
isCylinderCleanupEnabled= bits, U32, 1476, [2:2], "false", "true"
secondTriggerChannelEnabled= bits, U32, 1476, [3:3], "false", "true"
needSecondTriggerInputDeprecated= bits, U32, 1476, [4:4], "false", "true"
unusedBit4_1476 = bits, U32, 1476, [4:4], "false", "true"
isMapAveragingEnabled = bits, U32, 1476, [5:5], "false", "true"
overrideCrankingIacSetting= bits, U32, 1476, [6:6], "false", "true"
useSeparateAdvanceForIdle= bits, U32, 1476, [7:7], "false", "true"

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

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:17 EST 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:13:41 EST 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -1009,7 +1009,6 @@ public class Fields {
public static final int narrowToWideOxygenBins_offset = 2264;
public static final int nbVvtIndex_offset = 2416;
public static final int nbVvtIndex_offset_hex = 970;
public static final int needSecondTriggerInputDeprecated_offset = 1476;
public static final int noAccelAfterHardLimitPeriodSecs_offset = 1536;
public static final int noAccelAfterHardLimitPeriodSecs_offset_hex = 600;
public static final int o2heaterPin_offset = 742;
@ -1335,6 +1334,7 @@ public class Fields {
public static final int unused_offset = 972;
public static final int unusedAnotherOne_offset = 744;
public static final int unusedAtOldBoardConfigurationEnd_offset = 988;
public static final int unusedBit4_1476_offset = 1476;
public static final int unusedBit_249_10_offset = 976;
public static final int unusedBit_249_11_offset = 976;
public static final int unusedBit_249_12_offset = 976;
@ -1960,7 +1960,7 @@ public class Fields {
public static final Field ISIGNITIONENABLED = Field.create("ISIGNITIONENABLED", 1476, FieldType.BIT, 1);
public static final Field ISCYLINDERCLEANUPENABLED = Field.create("ISCYLINDERCLEANUPENABLED", 1476, FieldType.BIT, 2);
public static final Field SECONDTRIGGERCHANNELENABLED = Field.create("SECONDTRIGGERCHANNELENABLED", 1476, FieldType.BIT, 3);
public static final Field NEEDSECONDTRIGGERINPUTDEPRECATED = Field.create("NEEDSECONDTRIGGERINPUTDEPRECATED", 1476, FieldType.BIT, 4);
public static final Field UNUSEDBIT4_1476 = Field.create("UNUSEDBIT4_1476", 1476, FieldType.BIT, 4);
public static final Field ISMAPAVERAGINGENABLED = Field.create("ISMAPAVERAGINGENABLED", 1476, FieldType.BIT, 5);
public static final Field OVERRIDECRANKINGIACSETTING = Field.create("OVERRIDECRANKINGIACSETTING", 1476, FieldType.BIT, 6);
public static final Field USESEPARATEADVANCEFORIDLE = Field.create("USESEPARATEADVANCEFORIDLE", 1476, FieldType.BIT, 7);
@ -2830,7 +2830,7 @@ public class Fields {
ISIGNITIONENABLED,
ISCYLINDERCLEANUPENABLED,
SECONDTRIGGERCHANNELENABLED,
NEEDSECONDTRIGGERINPUTDEPRECATED,
UNUSEDBIT4_1476,
ISMAPAVERAGINGENABLED,
OVERRIDECRANKINGIACSETTING,
USESEPARATEADVANCEFORIDLE,