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

#442

This commit is contained in:
rusEfi 2017-06-12 08:18:19 -04:00
parent abbfdff5c4
commit eab1aa8e68
6 changed files with 13 additions and 11 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 Sun Jun 11 15:35:28 EDT 2017 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 08:15:34 EDT 2017
// begin // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -1168,7 +1168,7 @@ typedef struct {
/** /**
* offset 572 * offset 572
*/ */
int unusedAnother; float adcVcc;
/** /**
* maximum total number of degrees to subtract from ignition advance * maximum total number of degrees to subtract from ignition advance
* when knocking * when knocking
@ -2118,4 +2118,4 @@ typedef struct {
#endif #endif
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 11 15:35:28 EDT 2017 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 08:15:34 EDT 2017

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

@ -319,8 +319,8 @@
#define hip9011SpiDevice_offset_hex 234 #define hip9011SpiDevice_offset_hex 234
#define globalFuelCorrection_offset 568 #define globalFuelCorrection_offset 568
#define globalFuelCorrection_offset_hex 238 #define globalFuelCorrection_offset_hex 238
#define unusedAnother_offset 572 #define adcVcc_offset 572
#define unusedAnother_offset_hex 23c #define adcVcc_offset_hex 23c
#define maxKnockSubDeg_offset 576 #define maxKnockSubDeg_offset 576
#define maxKnockSubDeg_offset_hex 240 #define maxKnockSubDeg_offset_hex 240
#define mafAdcChannel_offset 580 #define mafAdcChannel_offset 580

2
firmware/integration/rusefi_config.txt
View File

@ -374,7 +374,7 @@ custom spi_device_e 4 bits,U32, @OFFSET@, [0:1], "Off", "SPI1", "SPI2", "SPI3"
float globalFuelCorrection;;"coef", 1, 0.0, 0, 1000.0, 2 float globalFuelCorrection;;"coef", 1, 0.0, 0, 1000.0, 2
int unusedAnother; float adcVcc;; "volts", 1, 0.0, 0, 4.0, 3
float maxKnockSubDeg;maximum total number of degrees to subtract from ignition advance\nwhen knocking float maxKnockSubDeg;maximum total number of degrees to subtract from ignition advance\nwhen knocking
adc_channel_e mafAdcChannel;See hasMafSensor adc_channel_e mafAdcChannel;See hasMafSensor

5
firmware/tunerstudio/rusefi.ini
View File

@ -45,7 +45,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jun 11 15:31:14 EDT 2017 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 08:15:34 EDT 2017
pageSize = 16376 pageSize = 16376
page = 1 page = 1
@ -169,7 +169,7 @@ page = 1
trigger_unusedcustomUseRiseEdge = bits, U32, 560, [0:0], "false", "true" trigger_unusedcustomUseRiseEdge = bits, U32, 560, [0:0], "false", "true"
hip9011SpiDevice = bits,U32, 564, [0:1], "Off", "SPI1", "SPI2", "SPI3" hip9011SpiDevice = bits,U32, 564, [0:1], "Off", "SPI1", "SPI2", "SPI3"
globalFuelCorrection = scalar, F32, 568, "coef", 1, 0.0, 0, 1000.0, 2 globalFuelCorrection = scalar, F32, 568, "coef", 1, 0.0, 0, 1000.0, 2
;skipping unusedAnother offset 572 adcVcc = scalar, F32, 572, "volts", 1, 0.0, 0, 4.0, 3
;skipping maxKnockSubDeg offset 576 ;skipping maxKnockSubDeg offset 576
mafAdcChannel = bits, U32, 580, [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" mafAdcChannel = bits, U32, 580, [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"
afr_hwChannel = bits, U32, 584, [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" afr_hwChannel = bits, U32, 584, [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"
@ -2216,6 +2216,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56"
panel = canBus panel = canBus
panel = sdCard panel = sdCard
panel = gpsReceiver panel = gpsReceiver
field = "stm32 voltage", adcVcc
dialog = connection, "", border dialog = connection, "", border
panel = lcdScreen, East panel = lcdScreen, East

1
firmware/tunerstudio/rusefi.input
View File

@ -1452,6 +1452,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56"
panel = canBus panel = canBus
panel = sdCard panel = sdCard
panel = gpsReceiver panel = gpsReceiver
field = "stm32 voltage", adcVcc
dialog = connection, "", border dialog = connection, "", border
panel = lcdScreen, East panel = lcdScreen, East

6
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config; package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed Jun 07 23:04:15 EDT 2017 // this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 08:15:34 EDT 2017
public class Fields { public class Fields {
public static final int LE_COMMAND_LENGTH = 200; public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4; public static final int FSIO_ADC_COUNT = 4;
@ -249,7 +249,7 @@ public class Fields {
public static final int hip9011SpiDevice_offset_hex = 234; public static final int hip9011SpiDevice_offset_hex = 234;
public static final int globalFuelCorrection_offset = 568; public static final int globalFuelCorrection_offset = 568;
public static final int globalFuelCorrection_offset_hex = 238; public static final int globalFuelCorrection_offset_hex = 238;
public static final int unusedAnother_offset = 572; public static final int adcVcc_offset = 572;
public static final int maxKnockSubDeg_offset = 576; public static final int maxKnockSubDeg_offset = 576;
public static final int maxKnockSubDeg_offset_hex = 240; public static final int maxKnockSubDeg_offset_hex = 240;
public static final int mafAdcChannel_offset = 580; public static final int mafAdcChannel_offset = 580;
@ -1208,7 +1208,7 @@ public class Fields {
public static final Field TRIGGER_UNUSEDCUSTOMUSERISEEDGE = Field.create("TRIGGER_UNUSEDCUSTOMUSERISEEDGE", 560, FieldType.INT); public static final Field TRIGGER_UNUSEDCUSTOMUSERISEEDGE = Field.create("TRIGGER_UNUSEDCUSTOMUSERISEEDGE", 560, FieldType.INT);
public static final Field HIP9011SPIDEVICE = Field.create("HIP9011SPIDEVICE", 564, FieldType.INT); public static final Field HIP9011SPIDEVICE = Field.create("HIP9011SPIDEVICE", 564, FieldType.INT);
public static final Field GLOBALFUELCORRECTION = Field.create("GLOBALFUELCORRECTION", 568, FieldType.FLOAT); public static final Field GLOBALFUELCORRECTION = Field.create("GLOBALFUELCORRECTION", 568, FieldType.FLOAT);
public static final Field UNUSEDANOTHER = Field.create("UNUSEDANOTHER", 572, FieldType.INT); public static final Field ADCVCC = Field.create("ADCVCC", 572, FieldType.FLOAT);
public static final Field MAXKNOCKSUBDEG = Field.create("MAXKNOCKSUBDEG", 576, FieldType.FLOAT); public static final Field MAXKNOCKSUBDEG = Field.create("MAXKNOCKSUBDEG", 576, FieldType.FLOAT);
public static final Field MAFADCCHANNEL = Field.create("MAFADCCHANNEL", 580, FieldType.INT, adc_channel_e); public static final Field MAFADCCHANNEL = Field.create("MAFADCCHANNEL", 580, FieldType.INT, adc_channel_e);
public static final Field AFR_HWCHANNEL = Field.create("AFR_HWCHANNEL", 584, FieldType.INT, adc_channel_e); public static final Field AFR_HWCHANNEL = Field.create("AFR_HWCHANNEL", 584, FieldType.INT, adc_channel_e);