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

#490

This commit is contained in:
rusefi 2017-11-19 11:05:57 -05:00
parent 63ac17de19
commit a66f592ea3
6 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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 Nov 19 10:16:10 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 11:03:59 EST 2017
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -674,7 +674,7 @@ typedef struct {
*/
spi_device_e max31855spiDevice;
/**
* todo: mor comments
* todo: more comments
* offset 444
*/
brain_pin_e fsioOutputPins[FSIO_COMMAND_COUNT];
@ -1709,7 +1709,11 @@ typedef struct {
/**
* offset 2248
*/
float unusedwarmupAfrPid[4];
brain_pin_e auxValves[AUX_DIGITAL_VALVE_COUNT];
/**
* offset 2256
*/
float unusedwarmupAfrPid[2];
/**
* CLT-based target AFR for PID-based control
* offset 2264
@ -2196,4 +2200,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 10:16:10 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 11:03:59 EST 2017

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

@ -1162,8 +1162,12 @@
#define slowAdcAlpha_offset_hex 8c0
#define debugMode_offset 2244
#define debugMode_offset_hex 8c4
#define unusedwarmupAfrPid_offset 2248
#define unusedwarmupAfrPid_offset_hex 8c8
#define auxValves1_offset 2248
#define auxValves1_offset_hex 8c8
#define auxValves2_offset 2252
#define auxValves2_offset_hex 8cc
#define unusedwarmupAfrPid_offset 2256
#define unusedwarmupAfrPid_offset_hex 8d0
#define warmupTargetAfrBins_offset 2264
#define warmupTargetAfrBins_offset_hex 8d8
#define warmupTargetAfr_offset 2280

5
firmware/integration/rusefi_config.txt
View File

@ -535,7 +535,7 @@ bit is_enabled_spi_2
spi_device_e max31855spiDevice;
brain_pin_e[FSIO_COMMAND_COUNT iterate] fsioOutputPins;todo: mor comments
brain_pin_e[FSIO_COMMAND_COUNT iterate] fsioOutputPins;todo: more comments
pin_output_mode_e[FSIO_COMMAND_COUNT iterate] gpioPinModes;
custom uart_device_e 4 bits,U32, @OFFSET@, [0:1], "Off", "UART1", "UART2", "UART3"
@ -761,7 +761,8 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@
float tpsDecelEnleanmentMultiplier;;"coeff", 1, 0, 0, 200, 3
float slowAdcAlpha;+ExpAverage alpha coefficient;"coeff", 1, 0, 0, 200, 3
debug_mode_e debugMode;set debug_mode X
float[4] unusedwarmupAfrPid;
brain_pin_e[AUX_DIGITAL_VALVE_COUNT iterate] auxValves
float[2] unusedwarmupAfrPid;
float[WARMUP_TARGET_AFR_SIZE] warmupTargetAfrBins;CLT-based target AFR for PID-based control;"C", 1, 0, -100.0, 250.0, 2
float[WARMUP_TARGET_AFR_SIZE] warmupTargetAfr;;"AFR", 1, 0, 0.0, 20.0, 2

8
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 Sun Nov 19 10:16:10 EST 2017
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 11:03:59 EST 2017
pageSize = 16376
page = 1
@ -599,7 +599,9 @@ page = 1
tpsDecelEnleanmentMultiplier = scalar, F32, 2236, "coeff", 1, 0, 0, 200, 3
slowAdcAlpha = scalar, F32, 2240, "coeff", 1, 0, 0, 200, 3
debugMode = bits, U32, 2244, [0:4], "Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25"
;skipping unusedwarmupAfrPid offset 2248
auxValves1 = bits, U32, 2248, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
auxValves2 = bits, U32, 2252, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
;skipping unusedwarmupAfrPid offset 2256
warmupTargetAfrBins = array, F32, 2264, [4], "C", 1, 0, -100.0, 250.0, 2
warmupTargetAfr = array, F32, 2280, [4], "AFR", 1, 0, 0.0, 20.0, 2
warmupAfrThreshold = scalar, F32, 2296, "tempterature", 1, 0, 0, 200, 3
@ -2551,6 +2553,8 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
field = "output #14", fsioOutputPins14
field = "output #15", fsioOutputPins15
field = "output #16", fsioOutputPins16
field = "aux valve #1", auxValves1
field = "aux valve #2", auxValves2
field = ""
field = ""

34
firmware/tunerstudio/rusefi.input
View File

@ -1757,22 +1757,24 @@ cmd_stop_engine = "w\x00\x99\x00\x00"
; Flex Logic
dialog = fsioIO, "Outputs"
field = "output #1", fsioPins1
field = "output #2", fsioPins2
field = "output #3", fsioPins3
field = "output #4", fsioPins4
field = "output #5", fsioPins5
field = "output #6", fsioPins6
field = "output #7", fsioPins7
field = "output #8", fsioPins8
field = "output #9", fsioPins9
field = "output #10", fsioPins10
field = "output #11", fsioPins11
field = "output #12", fsioPins12
field = "output #13", fsioPins13
field = "output #14", fsioPins14
field = "output #15", fsioPins15
field = "output #16", fsioPins16
field = "output #1", fsioOutputPins1
field = "output #2", fsioOutputPins2
field = "output #3", fsioOutputPins3
field = "output #4", fsioOutputPins4
field = "output #5", fsioOutputPins5
field = "output #6", fsioOutputPins6
field = "output #7", fsioOutputPins7
field = "output #8", fsioOutputPins8
field = "output #9", fsioOutputPins9
field = "output #10", fsioOutputPins10
field = "output #11", fsioOutputPins11
field = "output #12", fsioOutputPins12
field = "output #13", fsioOutputPins13
field = "output #14", fsioOutputPins14
field = "output #15", fsioOutputPins15
field = "output #16", fsioOutputPins16
field = "aux valve #1", auxValves1
field = "aux valve #2", auxValves2
field = ""
field = ""

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 Sun Nov 19 10:16:10 EST 2017
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 19 11:03:59 EST 2017
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int BLOCKING_FACTOR = 400;
@ -842,7 +842,9 @@ public class Fields {
public static final int tpsDecelEnleanmentMultiplier_offset = 2236;
public static final int slowAdcAlpha_offset = 2240;
public static final int debugMode_offset = 2244;
public static final int unusedwarmupAfrPid_offset = 2248;
public static final int auxValves1_offset = 2248;
public static final int auxValves2_offset = 2252;
public static final int unusedwarmupAfrPid_offset = 2256;
public static final int warmupTargetAfrBins_offset = 2264;
public static final int warmupTargetAfr_offset = 2280;
public static final int warmupAfrThreshold_offset = 2296;
@ -1654,6 +1656,8 @@ public class Fields {
public static final Field SLOWADCALPHA = Field.create("SLOWADCALPHA", 2240, FieldType.FLOAT);
public static final String[] debug_mode_e = {"Alternator_PID", "TPS accel enrich", "Warmup PID", "IDLE", "EL accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT PID", "Cranking", "Timing", "Closed-loop fuel corr", "VSS", "SD card", "sr5", "Knock", "Trigger Sync", "Electronic Throttle", "Executor", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25"};
public static final Field DEBUGMODE = Field.create("DEBUGMODE", 2244, FieldType.INT, debug_mode_e);
public static final Field AUXVALVES1 = Field.create("AUXVALVES1", 2248, FieldType.INT, brain_pin_e);
public static final Field AUXVALVES2 = Field.create("AUXVALVES2", 2252, FieldType.INT, brain_pin_e);
public static final Field WARMUPAFRTHRESHOLD = Field.create("WARMUPAFRTHRESHOLD", 2296, FieldType.FLOAT);
public static final Field BOOSTCUTPRESSURE = Field.create("BOOSTCUTPRESSURE", 2300, FieldType.FLOAT);
public static final Field DIZZYSPARKOUTPUTPIN = Field.create("DIZZYSPARKOUTPUTPIN", 2368, FieldType.INT, brain_pin_e);