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 2016-12-25 11:02:42 -05:00
parent bc436a922b
commit 5439044dd8
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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 Thu Dec 22 13:03:39 EST 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:23:53 EST 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1108,7 +1108,7 @@ typedef struct {
/**
* offset 512
*/
int firmwareVersion;
int byFirmwareVersion;
/**
* offset 516
*/
@ -2006,4 +2006,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Dec 22 13:03:39 EST 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:23:53 EST 2016

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

@ -213,8 +213,8 @@
#define operationMode_offset 500
#define displayMode_offset 504
#define logFormat_offset 508
#define firmwareVersion_offset 512
#define firmwareVersion_offset_hex 200
#define byFirmwareVersion_offset 512
#define byFirmwareVersion_offset_hex 200
#define HD44780width_offset 516
#define HD44780width_offset_hex 204
#define HD44780height_offset 520

2
firmware/controllers/flash_main.cpp
View File

@ -123,7 +123,7 @@ persisted_configuration_state_e readConfiguration(Logging * logger) {
applyNonPersistentConfiguration(logger PASS_ENGINE_PARAMETER);
}
// we can only change the state after the CRC check
engineConfiguration->firmwareVersion = getRusEfiVersion();
engineConfiguration->byFirmwareVersion = getRusEfiVersion();
return result;
}

2
firmware/integration/rusefi_config.txt
View File

@ -321,7 +321,7 @@ display_mode_e displayMode;
custom log_format_e 4 bits, U32, @OFFSET@, [0:0], "native", "Mega Log Viewer"
log_format_e logFormat;
int firmwareVersion;;"index", 1, 0, 0, 300, 0
int byFirmwareVersion;;"index", 1, 0, 0, 300, 0
int HD44780width;;"index", 1, 0, 0, 300, 0
int HD44780height;;"index", 1, 0, 0, 300, 0

4
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,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 Wed Dec 21 11:35:20 EST 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:37:45 EST 2016
pageSize = 16376
page = 1
@ -149,7 +149,7 @@ page = 1
operationMode = bits, U32, 500, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank", "INVALID", "INVALID", "INVALID"
displayMode = bits, U32, 504, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID"
logFormat = bits, U32, 508, [0:0], "native", "Mega Log Viewer"
firmwareVersion = scalar, S32, 512, "index", 1, 0, 0, 300, 0
byFirmwareVersion = scalar, S32, 512, "index", 1, 0, 0, 300, 0
HD44780width = scalar, S32, 516, "index", 1, 0, 0, 300, 0
HD44780height = scalar, S32, 520, "index", 1, 0, 0, 300, 0
tpsAdcChannel = bits, U32, 524, [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"

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 Wed Dec 21 11:35:20 EST 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Dec 25 10:37:45 EST 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -217,8 +217,8 @@ public class Fields {
public static final int operationMode_offset = 500;
public static final int displayMode_offset = 504;
public static final int logFormat_offset = 508;
public static final int firmwareVersion_offset = 512;
public static final int firmwareVersion_offset_hex = 200;
public static final int byFirmwareVersion_offset = 512;
public static final int byFirmwareVersion_offset_hex = 200;
public static final int HD44780width_offset = 516;
public static final int HD44780width_offset_hex = 204;
public static final int HD44780height_offset = 520;
@ -1095,7 +1095,7 @@ public class Fields {
public static final Field OPERATIONMODE = Field.create("OPERATIONMODE", 500, FieldType.INT);
public static final Field DISPLAYMODE = Field.create("DISPLAYMODE", 504, FieldType.INT);
public static final Field LOGFORMAT = Field.create("LOGFORMAT", 508, FieldType.INT);
public static final Field FIRMWAREVERSION = Field.create("FIRMWAREVERSION", 512, FieldType.INT);
public static final Field BYFIRMWAREVERSION = Field.create("BYFIRMWAREVERSION", 512, FieldType.INT);
public static final Field HD44780WIDTH = Field.create("HD44780WIDTH", 516, FieldType.INT);
public static final Field HD44780HEIGHT = Field.create("HD44780HEIGHT", 520, FieldType.INT);
public static final Field TPSADCCHANNEL = Field.create("TPSADCCHANNEL", 524, FieldType.INT, adc_channel_e);