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 2015-08-31 14:01:19 -04:00
parent 2879e12039
commit e5efe05f71
5 changed files with 12 additions and 4 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 by config_definition.jar on Sun Aug 30 15:14:39 EDT 2015
// this section was generated by config_definition.jar on Mon Aug 31 13:06:32 EDT 2015
// begin
#include "rusefi_types.h"
typedef struct {
@ -202,6 +202,10 @@ typedef struct {
/**
offset 4 bit 1 */
bool_t customNeedSecondTriggerInput : 1;
/**
* This option could be used if your second trigger channel is broken
offset 4 bit 2 */
bool_t useOnlyFirstChannel : 1;
/**
* offset 8
*/
@ -1496,4 +1500,4 @@ typedef struct {
} persistent_config_s;
// end
// this section was generated by config_definition.jar on Sun Aug 30 15:14:39 EDT 2015
// this section was generated by config_definition.jar on Mon Aug 31 13:06:32 EDT 2015

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

@ -167,6 +167,7 @@
#define trigger_type_offset_hex 218
#define trigger_customIsSynchronizationNeeded_offset 540
#define trigger_customNeedSecondTriggerInput_offset 540
#define trigger_useOnlyFirstChannel_offset 540
#define trigger_customTotalToothCount_offset 544
#define trigger_customTotalToothCount_offset_hex 220
#define trigger_customSkippedToothCount_offset 548

1
firmware/integration/rusefi_config.txt
View File

@ -259,6 +259,7 @@ custom trigger_type_e 4 bits, U32, @OFFSET@, [0:4], @@trigger_type_e_enum@@
bit customIsSynchronizationNeeded;
bit customNeedSecondTriggerInput;
bit useOnlyFirstChannel;This option could be used if your second trigger channel is broken
int customTotalToothCount;;"number", 1, 0.0, 0, 1000.0, 2
int customSkippedToothCount;;"number", 1, 0.0, 0, 1000.0, 2

3
firmware/tunerstudio/rusefi.ini
View File

@ -40,7 +40,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated by ConfigDefinition.jar on Sun Aug 30 15:14:44 EDT 2015
; this section was generated by ConfigDefinition.jar on Mon Aug 31 13:06:37 EDT 2015
pageSize = 15288
page = 1
@ -128,6 +128,7 @@ page = 1
trigger_type = bits, U32, 536, [0:4], "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
trigger_customIsSynchronizationNeeded= bits, U32, 540, [0:0], "false", "true"
trigger_customNeedSecondTriggerInput= bits, U32, 540, [1:1], "false", "true"
trigger_useOnlyFirstChannel= bits, U32, 540, [2:2], "false", "true"
trigger_customTotalToothCount = scalar, S32, 544, "number", 1, 0.0, 0, 1000.0, 2
trigger_customSkippedToothCount = scalar, S32, 548, "number", 1, 0.0, 0, 1000.0, 2
trigger_customSyncRatioFrom = scalar, F32, 552, "number", 1, 0.0, 0, 1000.0, 2

3
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 Sun Aug 30 15:14:44 EDT 2015
// this file was generated automatically by ConfigDefinition.jar Mon Aug 31 13:06:37 EDT 2015
public class Fields {
public static final Field ENGINETYPE = new Field("ENGINETYPE", 0, FieldType.INT);
public static final Field HEADERMAGICVALUE = new Field("HEADERMAGICVALUE", 4, FieldType.INT);
@ -80,6 +80,7 @@ public class Fields {
public static final Field TRIGGER_TYPE = new Field("TRIGGER_TYPE", 536, FieldType.INT, trigger_type_e);
public static final Field TRIGGER_CUSTOMISSYNCHRONIZATIONNEEDED = new Field("TRIGGER_CUSTOMISSYNCHRONIZATIONNEEDED", 540, FieldType.BIT, 0);
public static final Field TRIGGER_CUSTOMNEEDSECONDTRIGGERINPUT = new Field("TRIGGER_CUSTOMNEEDSECONDTRIGGERINPUT", 540, FieldType.BIT, 1);
public static final Field TRIGGER_USEONLYFIRSTCHANNEL = new Field("TRIGGER_USEONLYFIRSTCHANNEL", 540, FieldType.BIT, 2);
public static final Field TRIGGER_CUSTOMTOTALTOOTHCOUNT = new Field("TRIGGER_CUSTOMTOTALTOOTHCOUNT", 544, FieldType.INT);
public static final Field TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT = new Field("TRIGGER_CUSTOMSKIPPEDTOOTHCOUNT", 548, FieldType.INT);
public static final Field TRIGGER_CUSTOMSYNCRATIOFROM = new Field("TRIGGER_CUSTOMSYNCRATIOFROM", 552, FieldType.FLOAT);