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

#4

This commit is contained in:
rusefi 2017-05-27 23:22:24 -04:00
parent 7c7cd41471
commit a8a3063247
4 changed files with 71 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
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 May 25 08:26:42 EDT 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:14:55 EDT 2017
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -644,11 +644,15 @@ typedef struct {
/**
* offset 576
*/
float alternatorPidMin;
int16_t alternatorPidMin;
/**
* offset 578
*/
int16_t alternatorPidMax;
/**
* offset 580
*/
float alternatorPidMax;
int unusedHere;
/**
* offset 584
*/
@ -1846,11 +1850,15 @@ typedef struct {
/**
* offset 2824
*/
float aux1PidMin;
int16_t aux1PidMin;
/**
* offset 2826
*/
int16_t aux1PidMax;
/**
* offset 2828
*/
float aux1PidMax;
int unusedThere;
/**
* offset 2832
*/
@ -1890,7 +1898,19 @@ typedef struct {
/**
* offset 2868
*/
int unused[45];
int16_t idleValvePidMin;
/**
* offset 2870
*/
int16_t idleValvePidMax;
/**
* offset 2872
*/
float idlePidActivationTime;
/**
* offset 2876
*/
int unused[43];
/** total size 3048*/
} engine_configuration_s;
@ -2105,4 +2125,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu May 25 08:26:42 EDT 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:14:55 EDT 2017

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

@ -679,8 +679,10 @@
#define consoleUartDevice_offset_hex 4ac
#define alternatorPidMin_offset 1200
#define alternatorPidMin_offset_hex 4b0
#define alternatorPidMax_offset 1204
#define alternatorPidMax_offset_hex 4b4
#define alternatorPidMax_offset 1202
#define alternatorPidMax_offset_hex 4b2
#define unusedHere_offset 1204
#define unusedHere_offset_hex 4b4
#define nb2ratioFrom_offset 1208
#define nb2ratioFrom_offset_hex 4b8
#define nb2ratioTo_offset 1212
@ -1363,8 +1365,10 @@
#define timing_offset_cylinder12_offset_hex b04
#define aux1PidMin_offset 2824
#define aux1PidMin_offset_hex b08
#define aux1PidMax_offset 2828
#define aux1PidMax_offset_hex b0c
#define aux1PidMax_offset 2826
#define aux1PidMax_offset_hex b0a
#define unusedThere_offset 2828
#define unusedThere_offset_hex b0c
#define sdCardSpiDevice_offset 2832
#define sdCardSpiDevice_offset_hex b10
#define spi3SckMode_offset 2836
@ -1383,8 +1387,14 @@
#define brakePedalPin_offset_hex b2c
#define brakePedalPinMode_offset 2864
#define brakePedalPinMode_offset_hex b30
#define unused_offset 2868
#define unused_offset_hex b34
#define idleValvePidMin_offset 2868
#define idleValvePidMin_offset_hex b34
#define idleValvePidMax_offset 2870
#define idleValvePidMax_offset_hex b36
#define idlePidActivationTime_offset 2872
#define idlePidActivationTime_offset_hex b38
#define unused_offset 2876
#define unused_offset_hex b3c
#define le_formulas1_offset 3048
#define le_formulas1_offset_hex be8
#define le_formulas2_offset 3248

15
firmware/integration/rusefi_config.txt
View File

@ -524,8 +524,9 @@ bit is_enabled_spi_2
custom uart_device_e 4 bits,U32, @OFFSET@, [0:1], "Off", "UART1", "UART2", "UART3"
uart_device_e consoleUartDevice;
float alternatorPidMin;;"v", 1, 0, 0, 3000.0, 3
float alternatorPidMax;;"v", 1, 0, 0, 3000.0, 3
int16_t alternatorPidMin;;"v", 1, 0, 0, 3000.0, 3
int16_t alternatorPidMax;;"v", 1, 0, 0, 3000.0, 3
int unusedHere;
float nb2ratioFrom;;"value", 1, 0, 0, 1000, 5
float nb2ratioTo;;"value", 1, 0, 0, 1000, 5
@ -791,8 +792,9 @@ int16_t etbFreq;;"Hz", 1, 0, 0, 500, 10
custom cfg_float_t_1f 4 scalar, F32, @OFFSET@, "Val", 1, 0, -20000000, 20000000, 1
cfg_float_t_1f[IGNITION_PIN_COUNT iterate] timing_offset_cylinder;
float aux1PidMin;;"v", 1, 0, 0, 3000.0, 3
float aux1PidMax;;"v", 1, 0, 0, 3000.0, 3
int16_t aux1PidMin;;"v", 1, 0, 0, 100.0, 0
int16_t aux1PidMax;;"v", 1, 0, 0, 100.0, 0
int unusedThere;
spi_device_e sdCardSpiDevice;
pin_mode_e spi3SckMode;
@ -803,7 +805,10 @@ spi_device_e sdCardSpiDevice;
pin_mode_e spi1MisoMode;
brain_pin_e brakePedalPin
pin_input_mode_e brakePedalPinMode;
int[45] unused;
int16_t idleValvePidMin;;"%", 1, 0, 0, 100.0, 0
int16_t idleValvePidMax;;"%", 1, 0, 0, 100.0, 0
float idlePidActivationTime;;"seconds", 1, 0, 0, 60, 1
int[43] unused;
end_struct

26
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 Thu May 25 08:26:42 EDT 2017
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 27 23:14:55 EDT 2017
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -511,7 +511,8 @@ public class Fields {
public static final int gpioPinModes16_offset = 1192;
public static final int consoleUartDevice_offset = 1196;
public static final int alternatorPidMin_offset = 1200;
public static final int alternatorPidMax_offset = 1204;
public static final int alternatorPidMax_offset = 1202;
public static final int unusedHere_offset = 1204;
public static final int nb2ratioFrom_offset = 1208;
public static final int nb2ratioTo_offset = 1212;
public static final int triggerErrorPin_offset = 1216;
@ -949,7 +950,8 @@ public class Fields {
public static final int timing_offset_cylinder11_offset = 2816;
public static final int timing_offset_cylinder12_offset = 2820;
public static final int aux1PidMin_offset = 2824;
public static final int aux1PidMax_offset = 2828;
public static final int aux1PidMax_offset = 2826;
public static final int unusedThere_offset = 2828;
public static final int sdCardSpiDevice_offset = 2832;
public static final int spi3SckMode_offset = 2836;
public static final int spi3MosiMode_offset = 2840;
@ -959,7 +961,10 @@ public class Fields {
public static final int spi1MisoMode_offset = 2856;
public static final int brakePedalPin_offset = 2860;
public static final int brakePedalPinMode_offset = 2864;
public static final int unused_offset = 2868;
public static final int idleValvePidMin_offset = 2868;
public static final int idleValvePidMax_offset = 2870;
public static final int idlePidActivationTime_offset = 2872;
public static final int unused_offset = 2876;
public static final int le_formulas1_offset = 3048;
public static final int le_formulas2_offset = 3248;
public static final int le_formulas3_offset = 3448;
@ -1357,8 +1362,9 @@ public class Fields {
public static final Field GPIOPINMODES15 = Field.create("GPIOPINMODES15", 1188, FieldType.INT, pin_output_mode_e);
public static final Field GPIOPINMODES16 = Field.create("GPIOPINMODES16", 1192, FieldType.INT, pin_output_mode_e);
public static final Field CONSOLEUARTDEVICE = Field.create("CONSOLEUARTDEVICE", 1196, FieldType.INT);
public static final Field ALTERNATORPIDMIN = Field.create("ALTERNATORPIDMIN", 1200, FieldType.FLOAT);
public static final Field ALTERNATORPIDMAX = Field.create("ALTERNATORPIDMAX", 1204, FieldType.FLOAT);
public static final Field ALTERNATORPIDMIN = Field.create("ALTERNATORPIDMIN", 1200, FieldType.INT);
public static final Field ALTERNATORPIDMAX = Field.create("ALTERNATORPIDMAX", 1202, FieldType.INT);
public static final Field UNUSEDHERE = Field.create("UNUSEDHERE", 1204, FieldType.INT);
public static final Field NB2RATIOFROM = Field.create("NB2RATIOFROM", 1208, FieldType.FLOAT);
public static final Field NB2RATIOTO = Field.create("NB2RATIOTO", 1212, FieldType.FLOAT);
public static final Field TRIGGERERRORPIN = Field.create("TRIGGERERRORPIN", 1216, FieldType.INT, brain_pin_e);
@ -1673,8 +1679,9 @@ public class Fields {
public static final Field TIMING_OFFSET_CYLINDER10 = Field.create("TIMING_OFFSET_CYLINDER10", 2812, FieldType.INT);
public static final Field TIMING_OFFSET_CYLINDER11 = Field.create("TIMING_OFFSET_CYLINDER11", 2816, FieldType.INT);
public static final Field TIMING_OFFSET_CYLINDER12 = Field.create("TIMING_OFFSET_CYLINDER12", 2820, FieldType.INT);
public static final Field AUX1PIDMIN = Field.create("AUX1PIDMIN", 2824, FieldType.FLOAT);
public static final Field AUX1PIDMAX = Field.create("AUX1PIDMAX", 2828, FieldType.FLOAT);
public static final Field AUX1PIDMIN = Field.create("AUX1PIDMIN", 2824, FieldType.INT);
public static final Field AUX1PIDMAX = Field.create("AUX1PIDMAX", 2826, FieldType.INT);
public static final Field UNUSEDTHERE = Field.create("UNUSEDTHERE", 2828, FieldType.INT);
public static final Field SDCARDSPIDEVICE = Field.create("SDCARDSPIDEVICE", 2832, FieldType.INT);
public static final Field SPI3SCKMODE = Field.create("SPI3SCKMODE", 2836, FieldType.INT, pin_mode_e);
public static final Field SPI3MOSIMODE = Field.create("SPI3MOSIMODE", 2840, FieldType.INT, pin_mode_e);
@ -1684,6 +1691,9 @@ public class Fields {
public static final Field SPI1MISOMODE = Field.create("SPI1MISOMODE", 2856, FieldType.INT, pin_mode_e);
public static final Field BRAKEPEDALPIN = Field.create("BRAKEPEDALPIN", 2860, FieldType.INT, brain_pin_e);
public static final Field BRAKEPEDALPINMODE = Field.create("BRAKEPEDALPINMODE", 2864, FieldType.INT);
public static final Field IDLEVALVEPIDMIN = Field.create("IDLEVALVEPIDMIN", 2868, FieldType.INT);
public static final Field IDLEVALVEPIDMAX = Field.create("IDLEVALVEPIDMAX", 2870, FieldType.INT);
public static final Field IDLEPIDACTIVATIONTIME = Field.create("IDLEPIDACTIVATIONTIME", 2872, FieldType.FLOAT);
public static final Field LE_FORMULAS1 = Field.create("LE_FORMULAS1", 3048, FieldType.INT);
public static final Field LE_FORMULAS2 = Field.create("LE_FORMULAS2", 3248, FieldType.INT);
public static final Field LE_FORMULAS3 = Field.create("LE_FORMULAS3", 3448, FieldType.INT);