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:12:09 -05:00
parent 1fe6899781
commit f74cf3bfbe
11 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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 Fri Jan 10 22:43:32 PST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:11:26 EST 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -339,10 +339,10 @@ struct trigger_config_s {
trigger_type_e type;
/**
offset 4 bit 0 */
bool unusedCustomIsSynchronizationNeeded : 1;
bool unusedTriggerBit0 : 1;
/**
offset 4 bit 1 */
bool unusedCustomNeedSecondTriggerInput : 1;
bool unusedTriggerBit1 : 1;
/**
* This option could be used if your second trigger channel is broken
offset 4 bit 2 */
@ -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 Fri Jan 10 22:43:32 PST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:11:26 EST 2020

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

@ -1926,10 +1926,10 @@
#define trigger_unusedBit_4_8_offset_hex 210
#define trigger_unusedBit_4_9_offset 528
#define trigger_unusedBit_4_9_offset_hex 210
#define trigger_unusedCustomIsSynchronizationNeeded_offset 528
#define trigger_unusedCustomIsSynchronizationNeeded_offset_hex 210
#define trigger_unusedCustomNeedSecondTriggerInput_offset 528
#define trigger_unusedCustomNeedSecondTriggerInput_offset_hex 210
#define trigger_unusedTriggerBit0_offset 528
#define trigger_unusedTriggerBit0_offset_hex 210
#define trigger_unusedTriggerBit1_offset 528
#define trigger_unusedTriggerBit1_offset_hex 210
#define trigger_useOnlyFirstChannel_offset 528
#define trigger_useOnlyFirstChannel_offset_hex 210
#define triggerCompCenterVolt_offset 4036

8
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 Fri Jan 10 22:43:28 PST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:17 EST 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -339,10 +339,10 @@ struct trigger_config_s {
trigger_type_e type;
/**
offset 4 bit 0 */
bool unusedCustomIsSynchronizationNeeded : 1;
bool unusedTriggerBit0 : 1;
/**
offset 4 bit 1 */
bool unusedCustomNeedSecondTriggerInput : 1;
bool unusedTriggerBit1 : 1;
/**
* This option could be used if your second trigger channel is broken
offset 4 bit 2 */
@ -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 Fri Jan 10 22:43:28 PST 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:17 EST 2020

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

@ -1926,10 +1926,10 @@
#define trigger_unusedBit_4_8_offset_hex 210
#define trigger_unusedBit_4_9_offset 528
#define trigger_unusedBit_4_9_offset_hex 210
#define trigger_unusedCustomIsSynchronizationNeeded_offset 528
#define trigger_unusedCustomIsSynchronizationNeeded_offset_hex 210
#define trigger_unusedCustomNeedSecondTriggerInput_offset 528
#define trigger_unusedCustomNeedSecondTriggerInput_offset_hex 210
#define trigger_unusedTriggerBit0_offset 528
#define trigger_unusedTriggerBit0_offset_hex 210
#define trigger_unusedTriggerBit1_offset 528
#define trigger_unusedTriggerBit1_offset_hex 210
#define trigger_useOnlyFirstChannel_offset 528
#define trigger_useOnlyFirstChannel_offset_hex 210
#define triggerCompCenterVolt_offset 4036

4
firmware/integration/rusefi_config.txt
View File

@ -458,8 +458,8 @@ custom bool32_t 4 bits, U32, @OFFSET@, [0:0], "false", "true"
custom trigger_type_e 4 bits, U32, @OFFSET@, [0:7], @@trigger_type_e_enum@@
trigger_type_e type;set trigger_type X
bit unusedCustomIsSynchronizationNeeded;
bit unusedCustomNeedSecondTriggerInput;
bit unusedTriggerBit0;
bit unusedTriggerBit1;
bit useOnlyFirstChannel;+This option could be used if your second trigger channel is broken
int customTotalToothCount;;"number", 1, 0.0, 0, 500.0, 0

6
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 03:44:59 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:17 EST 2020
pageSize = 20000
page = 1
@ -205,8 +205,8 @@ page = 1
;no TS info - skipping overrideCrankingIgnition offset 516
sensorChartFrequency = scalar, S32, 520, "index", 1, 0, 0, 300, 0 ; size 4
trigger_type = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
trigger_unusedCustomIsSynchronizationNeeded= bits, U32, 528, [0:0], "false", "true"
trigger_unusedCustomNeedSecondTriggerInput= bits, U32, 528, [1:1], "false", "true"
trigger_unusedTriggerBit0= bits, U32, 528, [0:0], "false", "true"
trigger_unusedTriggerBit1= bits, U32, 528, [1:1], "false", "true"
trigger_useOnlyFirstChannel= bits, U32, 528, [2:2], "false", "true"
trigger_unusedBit_4_3 = bits, U32, 528, [3:3], "false", "true"
trigger_unusedBit_4_4 = bits, U32, 528, [4:4], "false", "true"

6
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 03:45:05 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:22 EST 2020
pageSize = 20000
page = 1
@ -205,8 +205,8 @@ page = 1
;no TS info - skipping overrideCrankingIgnition offset 516
sensorChartFrequency = scalar, S32, 520, "index", 1, 0, 0, 300, 0 ; size 4
trigger_type = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
trigger_unusedCustomIsSynchronizationNeeded= bits, U32, 528, [0:0], "false", "true"
trigger_unusedCustomNeedSecondTriggerInput= bits, U32, 528, [1:1], "false", "true"
trigger_unusedTriggerBit0= bits, U32, 528, [0:0], "false", "true"
trigger_unusedTriggerBit1= bits, U32, 528, [1:1], "false", "true"
trigger_useOnlyFirstChannel= bits, U32, 528, [2:2], "false", "true"
trigger_unusedBit_4_3 = bits, U32, 528, [3:3], "false", "true"
trigger_unusedBit_4_4 = bits, U32, 528, [4:4], "false", "true"

6
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 03:45:10 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Sun Jan 12 05:11:26 EST 2020
pageSize = 20000
page = 1
@ -205,8 +205,8 @@ page = 1
;no TS info - skipping overrideCrankingIgnition offset 516
sensorChartFrequency = scalar, S32, 520, "index", 1, 0, 0, 300, 0 ; size 4
trigger_type = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
trigger_unusedCustomIsSynchronizationNeeded= bits, U32, 528, [0:0], "false", "true"
trigger_unusedCustomNeedSecondTriggerInput= bits, U32, 528, [1:1], "false", "true"
trigger_unusedTriggerBit0= bits, U32, 528, [0:0], "false", "true"
trigger_unusedTriggerBit1= bits, U32, 528, [1:1], "false", "true"
trigger_useOnlyFirstChannel= bits, U32, 528, [2:2], "false", "true"
trigger_unusedBit_4_3 = bits, U32, 528, [3:3], "false", "true"
trigger_unusedBit_4_4 = bits, U32, 528, [4:4], "false", "true"

6
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 03:45:02 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:19 EST 2020
pageSize = 20000
page = 1
@ -205,8 +205,8 @@ page = 1
;no TS info - skipping overrideCrankingIgnition offset 516
sensorChartFrequency = scalar, S32, 520, "index", 1, 0, 0, 300, 0 ; size 4
trigger_type = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
trigger_unusedCustomIsSynchronizationNeeded= bits, U32, 528, [0:0], "false", "true"
trigger_unusedCustomNeedSecondTriggerInput= bits, U32, 528, [1:1], "false", "true"
trigger_unusedTriggerBit0= bits, U32, 528, [0:0], "false", "true"
trigger_unusedTriggerBit1= bits, U32, 528, [1:1], "false", "true"
trigger_useOnlyFirstChannel= bits, U32, 528, [2:2], "false", "true"
trigger_unusedBit_4_3 = bits, U32, 528, [3:3], "false", "true"
trigger_unusedBit_4_4 = bits, U32, 528, [4:4], "false", "true"

6
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 03:45:08 EST 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:24 EST 2020
pageSize = 20000
page = 1
@ -205,8 +205,8 @@ page = 1
;no TS info - skipping overrideCrankingIgnition offset 516
sensorChartFrequency = scalar, S32, 520, "index", 1, 0, 0, 300, 0 ; size 4
trigger_type = bits, U32, 524, [0:7], "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"
trigger_unusedCustomIsSynchronizationNeeded= bits, U32, 528, [0:0], "false", "true"
trigger_unusedCustomNeedSecondTriggerInput= bits, U32, 528, [1:1], "false", "true"
trigger_unusedTriggerBit0= bits, U32, 528, [0:0], "false", "true"
trigger_unusedTriggerBit1= bits, U32, 528, [1:1], "false", "true"
trigger_useOnlyFirstChannel= bits, U32, 528, [2:2], "false", "true"
trigger_unusedBit_4_3 = bits, U32, 528, [3:3], "false", "true"
trigger_unusedBit_4_4 = bits, U32, 528, [4:4], "false", "true"

18
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 03:44:59 EST 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Sun Jan 12 05:11:17 EST 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -1288,10 +1288,10 @@ public class Fields {
public static final int trigger_unusedBit_4_8_offset_hex = 210;
public static final int trigger_unusedBit_4_9_offset = 528;
public static final int trigger_unusedBit_4_9_offset_hex = 210;
public static final int trigger_unusedCustomIsSynchronizationNeeded_offset = 528;
public static final int trigger_unusedCustomIsSynchronizationNeeded_offset_hex = 210;
public static final int trigger_unusedCustomNeedSecondTriggerInput_offset = 528;
public static final int trigger_unusedCustomNeedSecondTriggerInput_offset_hex = 210;
public static final int trigger_unusedTriggerBit0_offset = 528;
public static final int trigger_unusedTriggerBit0_offset_hex = 210;
public static final int trigger_unusedTriggerBit1_offset = 528;
public static final int trigger_unusedTriggerBit1_offset_hex = 210;
public static final int trigger_useOnlyFirstChannel_offset = 528;
public static final int trigger_useOnlyFirstChannel_offset_hex = 210;
public static final int triggerCompCenterVolt_offset = 4036;
@ -1547,8 +1547,8 @@ public class Fields {
public static final Field SENSORCHARTFREQUENCY = Field.create("SENSORCHARTFREQUENCY", 520, FieldType.INT);
public static final String[] trigger_type_e = {"custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "trg44", "trg45", "INVALID"};
public static final Field TRIGGER_TYPE = Field.create("TRIGGER_TYPE", 524, FieldType.INT, trigger_type_e);
public static final Field TRIGGER_UNUSEDCUSTOMISSYNCHRONIZATIONNEEDED = Field.create("TRIGGER_UNUSEDCUSTOMISSYNCHRONIZATIONNEEDED", 528, FieldType.BIT, 0);
public static final Field TRIGGER_UNUSEDCUSTOMNEEDSECONDTRIGGERINPUT = Field.create("TRIGGER_UNUSEDCUSTOMNEEDSECONDTRIGGERINPUT", 528, FieldType.BIT, 1);
public static final Field TRIGGER_UNUSEDTRIGGERBIT0 = Field.create("TRIGGER_UNUSEDTRIGGERBIT0", 528, FieldType.BIT, 0);
public static final Field TRIGGER_UNUSEDTRIGGERBIT1 = Field.create("TRIGGER_UNUSEDTRIGGERBIT1", 528, FieldType.BIT, 1);
public static final Field TRIGGER_USEONLYFIRSTCHANNEL = Field.create("TRIGGER_USEONLYFIRSTCHANNEL", 528, FieldType.BIT, 2);
public static final Field TRIGGER_UNUSEDBIT_4_3 = Field.create("TRIGGER_UNUSEDBIT_4_3", 528, FieldType.BIT, 3);
public static final Field TRIGGER_UNUSEDBIT_4_4 = Field.create("TRIGGER_UNUSEDBIT_4_4", 528, FieldType.BIT, 4);
@ -2426,8 +2426,8 @@ public class Fields {
OVERRIDECRANKINGIGNITION,
SENSORCHARTFREQUENCY,
TRIGGER_TYPE,
TRIGGER_UNUSEDCUSTOMISSYNCHRONIZATIONNEEDED,
TRIGGER_UNUSEDCUSTOMNEEDSECONDTRIGGERINPUT,
TRIGGER_UNUSEDTRIGGERBIT0,
TRIGGER_UNUSEDTRIGGERBIT1,
TRIGGER_USEONLYFIRSTCHANNEL,
TRIGGER_UNUSEDBIT_4_3,
TRIGGER_UNUSEDBIT_4_4,