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

auto-sync

This commit is contained in:
rusEfi 2016-07-22 18:04:12 -04:00
parent e3f427050f
commit a5c62666e5
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,6 +412,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->iat.config.bias_resistor = 2700; engineConfiguration->iat.config.bias_resistor = 2700;
engineConfiguration->warningPeriod = 10;
engineConfiguration->step1rpm = 3000; engineConfiguration->step1rpm = 3000;
engineConfiguration->step1timing = 10; engineConfiguration->step1timing = 10;
engineConfiguration->step1RpmWindow = 500; engineConfiguration->step1RpmWindow = 500;

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 Thu Jul 21 23:14:17 EDT 2016 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 22 17:07:24 EDT 2016
// begin // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -1302,7 +1302,7 @@ typedef struct {
/** /**
* offset 1526 * offset 1526
*/ */
int16_t unusedShort; int16_t warningPeriod;
/** /**
* offset 1528 * offset 1528
*/ */
@ -1905,4 +1905,4 @@ typedef struct {
#endif #endif
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jul 21 23:14:17 EDT 2016 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 22 17:07:24 EDT 2016

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

@ -660,7 +660,7 @@
#define acCutoffLowRpm_offset 1520 #define acCutoffLowRpm_offset 1520
#define acCutoffHighRpm_offset 1522 #define acCutoffHighRpm_offset 1522
#define acIdleRpmBump_offset 1524 #define acIdleRpmBump_offset 1524
#define unusedShort_offset 1526 #define warningPeriod_offset 1526
#define vRefAdcChannel_offset 1528 #define vRefAdcChannel_offset 1528
#define knockDetectionWindowStart_offset 1532 #define knockDetectionWindowStart_offset 1532
#define knockDetectionWindowEnd_offset 1536 #define knockDetectionWindowEnd_offset 1536

2
firmware/controllers/error_handling.cpp
View File

@ -55,7 +55,7 @@ static bool isWarningStreamInitialized = false;
static MemoryStream warningStream; static MemoryStream warningStream;
bool isWarningNow(efitimesec_t now) { bool isWarningNow(efitimesec_t now) {
return absI(now - engine->engineState.timeOfPreviousWarning) < 10; return absI(now - engine->engineState.timeOfPreviousWarning) < engineConfiguration->warningPeriod;
} }
/** /**

6
firmware/controllers/settings.cpp
View File

@ -947,8 +947,8 @@ static void setInjectorLag(float value) {
} }
static void getValue(const char *paramStr) { static void getValue(const char *paramStr) {
if (strEqualCaseInsensitive(paramStr, "todo")) { if (strEqualCaseInsensitive(paramStr, "warningPeriod")) {
scheduleMsg(&logger, "something"); scheduleMsg(&logger, "warningPeriod=%d", engineConfiguration->warningPeriod);
} }
#if EFI_RTC || defined(__DOXYGEN__) #if EFI_RTC || defined(__DOXYGEN__)
@ -975,6 +975,8 @@ static void setValue(const char *paramStr, const char *valueStr) {
} else if (strEqualCaseInsensitive(paramStr, "alt_p")) { } else if (strEqualCaseInsensitive(paramStr, "alt_p")) {
setAltPFactor(valueF); setAltPFactor(valueF);
#endif #endif
} else if (strEqualCaseInsensitive(paramStr, "warningPeriod")) {
engineConfiguration->warningPeriod = valueI;
} else if (strEqualCaseInsensitive(paramStr, "step1rpm")) { } else if (strEqualCaseInsensitive(paramStr, "step1rpm")) {
engineConfiguration->step1rpm = valueI; engineConfiguration->step1rpm = valueI;
} else if (strEqualCaseInsensitive(paramStr, "step1timing")) { } else if (strEqualCaseInsensitive(paramStr, "step1timing")) {

2
firmware/integration/rusefi_config.txt
View File

@ -611,7 +611,7 @@ custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "false", "true"
int16_t acCutoffHighRpm; int16_t acCutoffHighRpm;
int16_t acIdleRpmBump; int16_t acIdleRpmBump;
int16_t unusedShort; int16_t warningPeriod;
adc_channel_e vRefAdcChannel; adc_channel_e vRefAdcChannel;

4
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,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 Thu Jul 21 23:14:17 EDT 2016 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 22 17:07:24 EDT 2016
pageSize = 16376 pageSize = 16376
page = 1 page = 1
@ -466,7 +466,7 @@ page = 1
;skipping acCutoffLowRpm offset 1520 ;skipping acCutoffLowRpm offset 1520
;skipping acCutoffHighRpm offset 1522 ;skipping acCutoffHighRpm offset 1522
;skipping acIdleRpmBump offset 1524 ;skipping acIdleRpmBump offset 1524
;skipping unusedShort offset 1526 ;skipping warningPeriod offset 1526
vRefAdcChannel = bits, U32, 1528, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" vRefAdcChannel = bits, U32, 1528, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
;skipping knockDetectionWindowStart offset 1532 ;skipping knockDetectionWindowStart offset 1532
;skipping knockDetectionWindowEnd offset 1536 ;skipping knockDetectionWindowEnd offset 1536

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

@ -1,6 +1,6 @@
package com.rusefi.config; package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jul 21 23:14:17 EDT 2016 // this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jul 22 17:07:24 EDT 2016
public class Fields { public class Fields {
public static final int LE_COMMAND_LENGTH = 200; public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4; public static final int FSIO_ADC_COUNT = 4;
@ -664,7 +664,7 @@ public class Fields {
public static final int acCutoffLowRpm_offset = 1520; public static final int acCutoffLowRpm_offset = 1520;
public static final int acCutoffHighRpm_offset = 1522; public static final int acCutoffHighRpm_offset = 1522;
public static final int acIdleRpmBump_offset = 1524; public static final int acIdleRpmBump_offset = 1524;
public static final int unusedShort_offset = 1526; public static final int warningPeriod_offset = 1526;
public static final int vRefAdcChannel_offset = 1528; public static final int vRefAdcChannel_offset = 1528;
public static final int knockDetectionWindowStart_offset = 1532; public static final int knockDetectionWindowStart_offset = 1532;
public static final int knockDetectionWindowEnd_offset = 1536; public static final int knockDetectionWindowEnd_offset = 1536;
@ -1380,7 +1380,7 @@ public class Fields {
public static final Field ACCUTOFFLOWRPM = Field.create("ACCUTOFFLOWRPM", 1520, FieldType.INT); public static final Field ACCUTOFFLOWRPM = Field.create("ACCUTOFFLOWRPM", 1520, FieldType.INT);
public static final Field ACCUTOFFHIGHRPM = Field.create("ACCUTOFFHIGHRPM", 1522, FieldType.INT); public static final Field ACCUTOFFHIGHRPM = Field.create("ACCUTOFFHIGHRPM", 1522, FieldType.INT);
public static final Field ACIDLERPMBUMP = Field.create("ACIDLERPMBUMP", 1524, FieldType.INT); public static final Field ACIDLERPMBUMP = Field.create("ACIDLERPMBUMP", 1524, FieldType.INT);
public static final Field UNUSEDSHORT = Field.create("UNUSEDSHORT", 1526, FieldType.INT); public static final Field WARNINGPERIOD = Field.create("WARNINGPERIOD", 1526, FieldType.INT);
public static final Field VREFADCCHANNEL = Field.create("VREFADCCHANNEL", 1528, FieldType.INT, adc_channel_e); public static final Field VREFADCCHANNEL = Field.create("VREFADCCHANNEL", 1528, FieldType.INT, adc_channel_e);
public static final Field KNOCKDETECTIONWINDOWSTART = Field.create("KNOCKDETECTIONWINDOWSTART", 1532, FieldType.FLOAT); public static final Field KNOCKDETECTIONWINDOWSTART = Field.create("KNOCKDETECTIONWINDOWSTART", 1532, FieldType.FLOAT);
public static final Field KNOCKDETECTIONWINDOWEND = Field.create("KNOCKDETECTIONWINDOWEND", 1536, FieldType.FLOAT); public static final Field KNOCKDETECTIONWINDOWEND = Field.create("KNOCKDETECTIONWINDOWEND", 1536, FieldType.FLOAT);