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

#480

This commit is contained in:
rusefi 2017-10-16 14:52:42 -04:00
parent ff23ba8597
commit 17949423b0
6 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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 Mon Aug 28 20:53:46 EDT 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Oct 16 14:44:28 EDT 2017
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1246,10 +1246,10 @@ typedef struct {
bool isAlternatorControlEnabled : 1;
/**
offset 1488 bit 14 */
bool unusedBit__3 : 1;
bool invertPrimaryTriggerSignal : 1;
/**
offset 1488 bit 15 */
bool unusedbit_8 : 1;
bool invertSecondaryTriggerSignal : 1;
/**
offset 1488 bit 16 */
bool cutFuelOnHardLimit : 1;
@ -2158,4 +2158,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Aug 28 20:53:46 EDT 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Oct 16 14:44:28 EDT 2017

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

@ -866,10 +866,10 @@
#define tachPulseDurationAsDutyCycle_offset_hex 5d0
#define isAlternatorControlEnabled_offset 1488
#define isAlternatorControlEnabled_offset_hex 5d0
#define unusedBit__3_offset 1488
#define unusedBit__3_offset_hex 5d0
#define unusedbit_8_offset 1488
#define unusedbit_8_offset_hex 5d0
#define invertPrimaryTriggerSignal_offset 1488
#define invertPrimaryTriggerSignal_offset_hex 5d0
#define invertSecondaryTriggerSignal_offset 1488
#define invertSecondaryTriggerSignal_offset_hex 5d0
#define cutFuelOnHardLimit_offset 1488
#define cutFuelOnHardLimit_offset_hex 5d0
#define cutSparkOnHardLimit_offset 1488

4
firmware/integration/rusefi_config.txt
View File

@ -603,8 +603,8 @@ bit vvtDisplayInverted
bit useFSIO16ForTimingAdjustment;See fsioTimingAdjustment
bit tachPulseDurationAsDutyCycle
bit isAlternatorControlEnabled
bit unusedBit__3
bit unusedbit_8
bit invertPrimaryTriggerSignal
bit invertSecondaryTriggerSignal
bit cutFuelOnHardLimit
bit cutSparkOnHardLimit
bit step1fuelCutEnable

10
firmware/tunerstudio/rusefi.ini
View File

@ -63,7 +63,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 Mon Aug 28 22:50:54 EDT 2017
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Oct 16 14:44:28 EDT 2017
pageSize = 16376
page = 1
@ -456,8 +456,8 @@ page = 1
useFSIO16ForTimingAdjustment= bits, U32, 1488, [11:11], "false", "true"
tachPulseDurationAsDutyCycle= bits, U32, 1488, [12:12], "false", "true"
isAlternatorControlEnabled= bits, U32, 1488, [13:13], "false", "true"
unusedBit__3 = bits, U32, 1488, [14:14], "false", "true"
unusedbit_8 = bits, U32, 1488, [15:15], "false", "true"
invertPrimaryTriggerSignal= bits, U32, 1488, [14:14], "false", "true"
invertSecondaryTriggerSignal= bits, U32, 1488, [15:15], "false", "true"
cutFuelOnHardLimit = bits, U32, 1488, [16:16], "false", "true"
cutSparkOnHardLimit = bits, U32, 1488, [17:17], "false", "true"
step1fuelCutEnable = bits, U32, 1488, [18:18], "false", "true"
@ -1763,7 +1763,9 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "!ECU reboot needed to apply pin assignment"
field = "#Cam is primary if you have cam sensor"
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20}
field = "Invert Primary", invertPrimaryTriggerSignal
field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20}
field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20}
field = "Cam Sync/VVT input", camInput
field = "VVT mode", vvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}

4
firmware/tunerstudio/rusefi.input
View File

@ -991,7 +991,9 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "!ECU reboot needed to apply pin assignment"
field = "#Cam is primary if you have cam sensor"
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20}
field = "Invert Primary", invertPrimaryTriggerSignal
field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20}
field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20}
field = "Cam Sync/VVT input", camInput
field = "VVT mode", vvtMode, {trigger_type != 80}
field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80}

10
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 Mon Aug 28 22:50:54 EDT 2017
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Oct 16 14:44:28 EDT 2017
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int BLOCKING_FACTOR = 400;
@ -635,8 +635,8 @@ public class Fields {
public static final int useFSIO16ForTimingAdjustment_offset = 1488;
public static final int tachPulseDurationAsDutyCycle_offset = 1488;
public static final int isAlternatorControlEnabled_offset = 1488;
public static final int unusedBit__3_offset = 1488;
public static final int unusedbit_8_offset = 1488;
public static final int invertPrimaryTriggerSignal_offset = 1488;
public static final int invertSecondaryTriggerSignal_offset = 1488;
public static final int cutFuelOnHardLimit_offset = 1488;
public static final int cutSparkOnHardLimit_offset = 1488;
public static final int step1fuelCutEnable_offset = 1488;
@ -1509,8 +1509,8 @@ public class Fields {
public static final Field USEFSIO16FORTIMINGADJUSTMENT = Field.create("USEFSIO16FORTIMINGADJUSTMENT", 1488, FieldType.BIT, 11);
public static final Field TACHPULSEDURATIONASDUTYCYCLE = Field.create("TACHPULSEDURATIONASDUTYCYCLE", 1488, FieldType.BIT, 12);
public static final Field ISALTERNATORCONTROLENABLED = Field.create("ISALTERNATORCONTROLENABLED", 1488, FieldType.BIT, 13);
public static final Field UNUSEDBIT__3 = Field.create("UNUSEDBIT__3", 1488, FieldType.BIT, 14);
public static final Field UNUSEDBIT_8 = Field.create("UNUSEDBIT_8", 1488, FieldType.BIT, 15);
public static final Field INVERTPRIMARYTRIGGERSIGNAL = Field.create("INVERTPRIMARYTRIGGERSIGNAL", 1488, FieldType.BIT, 14);
public static final Field INVERTSECONDARYTRIGGERSIGNAL = Field.create("INVERTSECONDARYTRIGGERSIGNAL", 1488, FieldType.BIT, 15);
public static final Field CUTFUELONHARDLIMIT = Field.create("CUTFUELONHARDLIMIT", 1488, FieldType.BIT, 16);
public static final Field CUTSPARKONHARDLIMIT = Field.create("CUTSPARKONHARDLIMIT", 1488, FieldType.BIT, 17);
public static final Field STEP1FUELCUTENABLE = Field.create("STEP1FUELCUTENABLE", 1488, FieldType.BIT, 18);