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

auto-sync

This commit is contained in:
rusEfi 2017-02-13 18:03:38 -05:00
parent 430dea4bc2
commit 19e57be01a
9 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -713,7 +713,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->isMapAveragingEnabled = true;
engineConfiguration->isTunerStudioEnabled = true;
engineConfiguration->isWaveAnalyzerEnabled = true;
engineConfiguration->isIdleThreadEnabled = true;
engineConfiguration->debugMode = DBG_ALTERNATOR_PID;

6
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 Sun Feb 12 01:30:52 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 17:43:53 EST 2017
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1286,7 +1286,7 @@ typedef struct {
bool isWaveAnalyzerEnabled : 1;
/**
offset 1500 bit 10 */
bool isIdleThreadEnabled : 1;
bool anotherUnusedBit212 : 1;
/**
* enable trigger_details
offset 1500 bit 11 */
@ -2049,4 +2049,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 12 01:30:52 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 17:43:53 EST 2017

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

@ -649,7 +649,7 @@
#define anotherUnusedBit2_offset 1500
#define isTunerStudioEnabled_offset 1500
#define isWaveAnalyzerEnabled_offset 1500
#define isIdleThreadEnabled_offset 1500
#define anotherUnusedBit212_offset 1500
#define isPrintTriggerSynchDetails_offset 1500
#define isManualSpinningMode_offset 1500
#define twoWireBatchInjection_offset 1500

4
firmware/controllers/engine_controller.cpp
View File

@ -633,9 +633,7 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
#endif /* EFI_ENGINE_CONTROL */
#if EFI_IDLE_CONTROL || defined(__DOXYGEN__)
if (engineConfiguration->isIdleThreadEnabled) {
startIdleThread(sharedLogger, engine);
}
startIdleThread(sharedLogger, engine);
#endif
if (engineConfiguration->externalKnockSenseAdc != EFI_ADC_NONE) {

6
firmware/controllers/settings.cpp
View File

@ -260,11 +260,11 @@ void printConfiguration(engine_configuration_s *engineConfiguration) {
printOutputs(engineConfiguration);
scheduleMsg(&logger, "map_avg=%s/ts=%s/wa=%s/it=%s/fastAdc=%s",
scheduleMsg(&logger, "map_avg=%s/ts=%s/wa=%s/fastAdc=%s",
boolToString(engineConfiguration->isMapAveragingEnabled),
boolToString(engineConfiguration->isTunerStudioEnabled),
boolToString(engineConfiguration->isWaveAnalyzerEnabled),
boolToString(engineConfiguration->isIdleThreadEnabled), boolToString(boardConfiguration->isFastAdcEnabled));
boolToString(boardConfiguration->isFastAdcEnabled));
scheduleMsg(&logger, "isManualSpinningMode=%s/isCylinderCleanupEnabled=%s",
boolToString(engineConfiguration->isManualSpinningMode),
@ -894,8 +894,6 @@ static void enableOrDisable(const char *param, bool isEnabled) {
engineConfiguration->isTunerStudioEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "wave_analyzer")) {
engineConfiguration->isWaveAnalyzerEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "idle_thread")) {
engineConfiguration->isIdleThreadEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "manual_spinning")) {
engineConfiguration->isManualSpinningMode = isEnabled;
} else if (strEqualCaseInsensitive(param, "cylinder_cleanup")) {

2
firmware/integration/rusefi_config.txt
View File

@ -613,7 +613,7 @@ custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "false", "true"
bit anotherUnusedBit2
bit isTunerStudioEnabled
bit isWaveAnalyzerEnabled
bit isIdleThreadEnabled
bit anotherUnusedBit212
bit isPrintTriggerSynchDetails;+enable trigger_details
bit isManualSpinningMode;Usually if we have no trigger events that means engine is stopped\nUnless we are troubleshooting and spinning the engine by hand - this case a longer\ndelay is needed
bit twoWireBatchInjection;+This is needed if batched injection and individual injector wiring\nenable two_wire_batch_injection

8
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,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 Sun Feb 12 20:28:45 EST 2017
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 17:43:53 EST 2017
pageSize = 16376
page = 1
@ -454,7 +454,7 @@ page = 1
anotherUnusedBit2 = bits, U32, 1500, [7:7], "false", "true"
isTunerStudioEnabled = bits, U32, 1500, [8:8], "false", "true"
isWaveAnalyzerEnabled = bits, U32, 1500, [9:9], "false", "true"
isIdleThreadEnabled = bits, U32, 1500, [10:10], "false", "true"
anotherUnusedBit212 = bits, U32, 1500, [10:10], "false", "true"
isPrintTriggerSynchDetails= bits, U32, 1500, [11:11], "false", "true"
isManualSpinningMode = bits, U32, 1500, [12:12], "false", "true"
twoWireBatchInjection = bits, U32, 1500, [13:13], "false", "true"
@ -1886,6 +1886,10 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Manual mode", idleMode
field = "Cranking Extra", crankingIdleAdjustment
field = "Auto target", targetIdleRpm, { idleMode == 0}
field = "idle P", idleRpmPid_pFactor
field = "idle I", idleRpmPid_iFactor
field = "idle D", idleRpmPid_dFactor
field = "idle offset", idleRpmPid_offset
slider = "Manual Idle Position", manIdlePosition, horizontal
field = ""
field = "use stepper", useStepperIdle

4
firmware/tunerstudio/rusefi.input
View File

@ -1818,6 +1818,10 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Manual mode", idleMode
field = "Cranking Extra", crankingIdleAdjustment
field = "Auto target", targetIdleRpm, { idleMode == 0}
field = "idle P", idleRpmPid_pFactor
field = "idle I", idleRpmPid_iFactor
field = "idle D", idleRpmPid_dFactor
field = "idle offset", idleRpmPid_offset
slider = "Manual Idle Position", manIdlePosition, horizontal
field = ""
field = "use stepper", useStepperIdle

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

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 12 20:28:45 EST 2017
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Feb 13 17:43:53 EST 2017
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -653,7 +653,7 @@ public class Fields {
public static final int anotherUnusedBit2_offset = 1500;
public static final int isTunerStudioEnabled_offset = 1500;
public static final int isWaveAnalyzerEnabled_offset = 1500;
public static final int isIdleThreadEnabled_offset = 1500;
public static final int anotherUnusedBit212_offset = 1500;
public static final int isPrintTriggerSynchDetails_offset = 1500;
public static final int isManualSpinningMode_offset = 1500;
public static final int twoWireBatchInjection_offset = 1500;
@ -1420,7 +1420,7 @@ public class Fields {
public static final Field ANOTHERUNUSEDBIT2 = Field.create("ANOTHERUNUSEDBIT2", 1500, FieldType.BIT, 7);
public static final Field ISTUNERSTUDIOENABLED = Field.create("ISTUNERSTUDIOENABLED", 1500, FieldType.BIT, 8);
public static final Field ISWAVEANALYZERENABLED = Field.create("ISWAVEANALYZERENABLED", 1500, FieldType.BIT, 9);
public static final Field ISIDLETHREADENABLED = Field.create("ISIDLETHREADENABLED", 1500, FieldType.BIT, 10);
public static final Field ANOTHERUNUSEDBIT212 = Field.create("ANOTHERUNUSEDBIT212", 1500, FieldType.BIT, 10);
public static final Field ISPRINTTRIGGERSYNCHDETAILS = Field.create("ISPRINTTRIGGERSYNCHDETAILS", 1500, FieldType.BIT, 11);
public static final Field ISMANUALSPINNINGMODE = Field.create("ISMANUALSPINNINGMODE", 1500, FieldType.BIT, 12);
public static final Field TWOWIREBATCHINJECTION = Field.create("TWOWIREBATCHINJECTION", 1500, FieldType.BIT, 13);