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

auto-sync

This commit is contained in:
rusEfi 2016-06-14 03:02:57 -04:00
parent 318cc84987
commit 96128bf1b2
7 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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 Jun 12 23:06:44 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 14 02:28:29 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1607,9 +1607,14 @@ typedef struct {
*/
adc_channel_e fsioAdc[FSIO_ADC_COUNT];
/**
* Fixed timing, useful for TDC testing
* offset 2392
*/
int unused[164];
float fixedTiming;
/**
* offset 2396
*/
int unused[163];
/** total size 3048*/
} engine_configuration_s;
@ -1798,4 +1803,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 12 23:06:44 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 14 02:28:29 EDT 2016

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

@ -819,8 +819,9 @@
#define fsioAdc3_offset_hex 950
#define fsioAdc4_offset 2388
#define fsioAdc4_offset_hex 954
#define unused_offset 2392
#define unused_offset_hex 958
#define fixedTiming_offset 2392
#define fixedTiming_offset_hex 958
#define unused_offset 2396
#define le_formulas1_offset 3048
#define le_formulas2_offset 3248
#define le_formulas3_offset 3448

2
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -149,7 +149,7 @@ void TriggerState::decodeTriggerEvent(trigger_event_e const signal, efitime_t no
bool isPrimary = triggerWheel == T_PRIMARY;
if (isLessImportant(signal)) {
if (isLessImportant(type)) {
#if EFI_UNIT_TEST || defined(__DOXYGEN__)
if (printTriggerDebug) {
printf("%s isLessImportant %s %d\r\n",

5
firmware/controllers/trigger/trigger_decoder.h
View File

@ -126,9 +126,8 @@ bool isTriggerDecoderError(void);
#define considerEventForGap() (!TRIGGER_SHAPE(useOnlyPrimaryForSync) || isPrimary)
// todo: there is a bug here! signal is only allowed to be primary, but should be comparing for value, not signal!
#define isLessImportant(signal) ((TRIGGER_SHAPE(useRiseEdge) && signal != SHAFT_PRIMARY_RISING) \
|| (!TRIGGER_SHAPE(useRiseEdge) && signal != SHAFT_PRIMARY_FALLING) \
#define isLessImportant(type) ((TRIGGER_SHAPE(useRiseEdge) && type != TV_RISE) \
|| (!TRIGGER_SHAPE(useRiseEdge) && type != TV_FALL) \
|| (!considerEventForGap()) \
)

3
firmware/integration/rusefi_config.txt
View File

@ -693,7 +693,8 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
brain_pin_e dizzySparkOutputPin;
pin_output_mode_e dizzySparkOutputPinMode;
adc_channel_e[FSIO_ADC_COUNT iterate] fsioAdc;
int[164] unused;
float fixedTiming;Fixed timing, useful for TDC testing;"deg", 1, 0, -720, 720, 2
int[163] unused;
end_struct

20
firmware/tunerstudio/rusefi.ini
View File

@ -41,7 +41,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 Jun 12 22:41:42 EDT 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 14 02:28:29 EDT 2016
pageSize = 17080
page = 1
@ -568,7 +568,8 @@ page = 1
fsioAdc2 = bits, U32, 2380, [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"
fsioAdc3 = bits, U32, 2384, [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"
fsioAdc4 = bits, U32, 2388, [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 unused offset 2392
fixedTiming = scalar, F32, 2392, "deg", 1, 0, -720, 720, 2
;skipping unused offset 2396
le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2
le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2
le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2
@ -1323,15 +1324,18 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
[UserDefined]
dialog = baseInjection, "Injection"
field = "Mode", injectionMode
field = "Enabled", isInjectionEnabled
field = "Mode", injectionMode, {isInjectionEnabled == 1}
field = "#Batch injection with individual wiring"
field = "Two wire batch", twoWireBatchInjection, {injectionMode == 2}
field = "Two wire batch", twoWireBatchInjection, {isInjectionEnabled == 1 && injectionMode == 2}
dialog = baseIgnition, "Ignition"
field = "Mode", ignitionMode
field = "Enabled", isIgnitionEnabled
field = "Mode", ignitionMode, {isIgnitionEnabled == 1}
field = "#Wasted spark with individual coils"
field = "Two wire wasted", twoWireBatchIgnition, {ignitionMode == 2}
; dead property field = "Timing Mode", timingMode
field = "Two wire wasted", twoWireBatchIgnition, {isIgnitionEnabled == 1 && ignitionMode == 2}
field = "Timing Mode", timingMode, {isIgnitionEnabled == 1}
field = "Fixed Timinig", fixedTiming, {isIgnitionEnabled == 1 && timingMode == 1}
; Engine->Base Engine Settings
@ -1713,8 +1717,6 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Fuel Algorithm", algorithm
field = ""
field = "#System hack's"
field = "Injection", isInjectionEnabled
field = "Ignition", isIgnitionEnabled
field = "Global fuel correction", globalFuelCorrection
field = "Ignition Math Logic @", ignMathCalculateAtIndex
field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex

8
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 Jun 12 22:41:42 EDT 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 14 02:28:29 EDT 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -823,8 +823,9 @@ public class Fields {
public static final int fsioAdc3_offset_hex = 950;
public static final int fsioAdc4_offset = 2388;
public static final int fsioAdc4_offset_hex = 954;
public static final int unused_offset = 2392;
public static final int unused_offset_hex = 958;
public static final int fixedTiming_offset = 2392;
public static final int fixedTiming_offset_hex = 958;
public static final int unused_offset = 2396;
public static final int le_formulas1_offset = 3048;
public static final int le_formulas2_offset = 3248;
public static final int le_formulas3_offset = 3448;
@ -1410,6 +1411,7 @@ public class Fields {
public static final Field FSIOADC2 = Field.create("FSIOADC2", 2380, FieldType.INT, adc_channel_e);
public static final Field FSIOADC3 = Field.create("FSIOADC3", 2384, FieldType.INT, adc_channel_e);
public static final Field FSIOADC4 = Field.create("FSIOADC4", 2388, FieldType.INT, adc_channel_e);
public static final Field FIXEDTIMING = Field.create("FIXEDTIMING", 2392, FieldType.FLOAT);
public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3048, FieldType.INT);
public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3248, FieldType.INT);
public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT);