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

fixing build

This commit is contained in:
rusefi 2017-12-11 11:23:53 -05:00
parent c5e762d814
commit 2cd13f578f
6 changed files with 25 additions and 17 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 Dec 11 10:13:39 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 11 11:22:10 EST 2017
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -2005,7 +2005,7 @@ typedef struct {
* CLT-based cranking position multiplier for simple manual idle controller
* offset 6512
*/
float cltCrankingCorr [CLT_CRANKING_CURVE_SIZE];
float cltCrankingCorr[CLT_CRANKING_CURVE_SIZE];
/**
* Optional timing advance table for Idle (see useSeparateAdvanceForIdle)
* offset 6544
@ -2015,7 +2015,7 @@ typedef struct {
* Optional timing advance table for Idle (see useSeparateAdvanceForIdle)
* offset 6576
*/
float idleAdvance [IDLE_ADVANCE_CURVE_SIZE];
float idleAdvance[IDLE_ADVANCE_CURVE_SIZE];
/**
* Optional VE table for Idle (see useSeparateVEForIdle)
* offset 6608
@ -2233,4 +2233,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 11 10:13:39 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 11 11:22:10 EST 2017

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

@ -1477,12 +1477,12 @@
#define unusedEnd_offset_hex ce8
#define cltCrankingCorrBins_offset 6480
#define cltCrankingCorrBins_offset_hex 1950
#define cltCrankingCorr _offset 6512
#define cltCrankingCorr _offset_hex 1970
#define cltCrankingCorr_offset 6512
#define cltCrankingCorr_offset_hex 1970
#define idleAdvanceBins_offset 6544
#define idleAdvanceBins_offset_hex 1990
#define idleAdvance _offset 6576
#define idleAdvance _offset_hex 19b0
#define idleAdvance_offset 6576
#define idleAdvance_offset_hex 19b0
#define idleVeBins_offset 6608
#define idleVeBins_offset_hex 19d0
#define idleVe_offset 6640

6
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 Dec 11 10:13:39 EST 2017
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 11 11:22:10 EST 2017
pageSize = 20000
page = 1
@ -742,9 +742,9 @@ page = 1
fsioCurve4 = array, F32, 3272, [8], "y", 1, 0, -999, 1000.0, 3
;skipping unusedEnd offset 3304
cltCrankingCorrBins = array, F32, 6480, [8], "C", 1, 0, -100.0, 250.0, 2
cltCrankingCorr = array, F32, 6512, [8], "%", 1, 0, 0.0, 500.0, 2
cltCrankingCorr = array, F32, 6512, [8], "%", 1, 0, 0.0, 500.0, 2
idleAdvanceBins = array, F32, 6544, [8], "RPM", 1, 0, 0.0, 18000, 2
idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2
idleAdvance = array, F32, 6576, [8], "deg", 1, 0, -20, 90, 2
idleVeBins = array, F32, 6608, [8], "RPM", 1, 0, 0.0, 18000, 2
idleVe = array, F32, 6640, [8], ,"%", 1, 0, 0, 999.0, 2
fsioFormulas1 = string, ASCII, 6672, 200

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 Mon Dec 11 10:13:39 EST 2017
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Dec 11 11:22:10 EST 2017
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int BLOCKING_FACTOR = 400;
@ -990,11 +990,11 @@ public class Fields {
public static final int unusedEnd_offset = 3304;
public static final int cltCrankingCorrBins_offset = 6480;
public static final int cltCrankingCorrBins_offset_hex = 1950;
public static final int cltCrankingCorr _offset = 6512;
public static final int cltCrankingCorr _offset_hex = 1970;
public static final int cltCrankingCorr_offset = 6512;
public static final int cltCrankingCorr_offset_hex = 1970;
public static final int idleAdvanceBins_offset = 6544;
public static final int idleAdvanceBins_offset_hex = 1990;
public static final int idleAdvance _offset = 6576;
public static final int idleAdvance_offset = 6576;
public static final int idleVeBins_offset = 6608;
public static final int idleVe_offset = 6640;
public static final int fsioFormulas1_offset = 6672;

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

12
java_tools/configuration_definition/src/com/rusefi/ConfigField.java
View File

@ -17,7 +17,7 @@ import static com.rusefi.ConfigDefinition.EOL;
* 1/15/15
*/
public class ConfigField {
public static final ConfigField VOID = new ConfigField(null, null, false, null, null, 1, null, false);
public static final ConfigField VOID = new ConfigField("", null, false, null, null, 1, null, false);
private static final String typePattern = "([\\w\\d_]+)(\\[([\\w\\d]+)(\\s([\\w\\d]+))?\\])?";
private static final String namePattern = "[[\\w\\d\\s_]]+";
@ -51,6 +51,9 @@ public class ConfigField {
public ConfigField(String name, String comment, boolean isBit, String arraySizeAsText, String type,
int arraySize, String tsInfo, boolean isIterate) {
if (name == null)
throw new NullPointerException(comment + " " + isBit + " " + type);
assertNoWhitespaces(name);
this.name = name;
this.comment = comment;
this.isBit = isBit;
@ -66,6 +69,11 @@ public class ConfigField {
this.isIterate = isIterate;
}
public static void assertNoWhitespaces(String name) {
if (name.contains(" ") || name.contains("\t"))
throw new IllegalArgumentException("Invalid name: " + name);
}
/**
* @see ConfigDefinitionTest#testParseLine()
*/
@ -74,7 +82,7 @@ public class ConfigField {
if (!matcher.matches())
return null;
String name = matcher.group(6);
String name = matcher.group(6).trim();
String comment = matcher.group(8);
String type = matcher.group(1);
int arraySize;