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

auto-sync

This commit is contained in:
rusEfi 2015-05-30 00:05:45 -04:00
parent 0608bd77af
commit 8f7a5635f2
11 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/engine_configuration.cpp
View File

@ -357,6 +357,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE; engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE;
engineConfiguration->pedalPositionChannel = EFI_ADC_NONE;
engineConfiguration->specs.firingOrder = FO_1_THEN_3_THEN_4_THEN2; engineConfiguration->specs.firingOrder = FO_1_THEN_3_THEN_4_THEN2;
engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS;
engineConfiguration->injectionMode = IM_SEQUENTIAL; engineConfiguration->injectionMode = IM_SEQUENTIAL;

12
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Fri May 29 18:47:53 EDT 2015 // this section was generated by config_definition.jar on Fri May 29 23:04:33 EDT 2015
// begin // begin
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
@ -945,7 +945,11 @@ typedef struct {
/** /**
* offset 572 * offset 572
*/ */
int unused11; int16_t pedalPositionMin;
/**
* offset 574
*/
int16_t pedalPositionMax;
/** /**
* offset 576 * offset 576
*/ */
@ -962,7 +966,7 @@ typedef struct {
/** /**
* offset 604 * offset 604
*/ */
int unused123; adc_channel_e pedalPositionChannel;
/** /**
* @see hasBaroSensor * @see hasBaroSensor
* offset 608 * offset 608
@ -1394,4 +1398,4 @@ typedef struct {
} persistent_config_s; } persistent_config_s;
// end // end
// this section was generated by config_definition.jar on Fri May 29 18:47:53 EDT 2015 // this section was generated by config_definition.jar on Fri May 29 23:04:33 EDT 2015

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

@ -180,7 +180,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 unused11_offset 572 #define pedalPositionMin_offset 572
#define pedalPositionMax_offset 574
#define unused12_offset 576 #define unused12_offset 576
#define unused12_offset_hex 240 #define unused12_offset_hex 240
#define mafAdcChannel_offset 580 #define mafAdcChannel_offset 580
@ -196,7 +197,7 @@
#define afr_v2_offset_hex 254 #define afr_v2_offset_hex 254
#define afr_value2_offset 600 #define afr_value2_offset 600
#define afr_value2_offset_hex 258 #define afr_value2_offset_hex 258
#define unused123_offset 604 #define pedalPositionChannel_offset 604
#define baroSensor_offset 608 #define baroSensor_offset 608
#define baroSensor_offset_hex 260 #define baroSensor_offset_hex 260
#define baroSensor_valueAt0_offset 608 #define baroSensor_valueAt0_offset 608

1
firmware/controllers/engine_controller.cpp
View File

@ -323,6 +323,7 @@ static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) {
static void printAnalogInfo(void) { static void printAnalogInfo(void) {
printAnalogChannelInfo("hip9011", EFI_ADC_10); printAnalogChannelInfo("hip9011", EFI_ADC_10);
printAnalogChannelInfo("TPS", engineConfiguration->tpsAdcChannel); printAnalogChannelInfo("TPS", engineConfiguration->tpsAdcChannel);
printAnalogChannelInfo("pPS", engineConfiguration->pedalPositionChannel);
printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel); printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel);
if (engineConfiguration->hasIatSensor) { if (engineConfiguration->hasIatSensor) {
printAnalogChannelInfo("IAT", engineConfiguration->iat.adcChannel); printAnalogChannelInfo("IAT", engineConfiguration->iat.adcChannel);

2
firmware/controllers/flash_main.h
View File

@ -11,7 +11,7 @@
#include "engine.h" #include "engine.h"
#define FLASH_DATA_VERSION 8201 #define FLASH_DATA_VERSION 8220
void readFromFlash(void); void readFromFlash(void);
void initFlash(Logging *sharedLogger, Engine *engine); void initFlash(Logging *sharedLogger, Engine *engine);

1
firmware/hw_layer/adc_inputs.cpp
View File

@ -491,6 +491,7 @@ static void configureInputs(void) {
addChannel("MAF", engineConfiguration->mafAdcChannel, ADC_FAST); addChannel("MAF", engineConfiguration->mafAdcChannel, ADC_FAST);
addChannel("hip", engineConfiguration->hipOutputChannel, ADC_FAST); addChannel("hip", engineConfiguration->hipOutputChannel, ADC_FAST);
addChannel("pPS", engineConfiguration->pedalPositionChannel, ADC_SLOW);
addChannel("VBatt", engineConfiguration->vbattAdcChannel, ADC_SLOW); addChannel("VBatt", engineConfiguration->vbattAdcChannel, ADC_SLOW);
addChannel("Vref", engineConfiguration->vRefAdcChannel, ADC_SLOW); addChannel("Vref", engineConfiguration->vRefAdcChannel, ADC_SLOW);
addChannel("CLT", engineConfiguration->clt.adcChannel, ADC_SLOW); addChannel("CLT", engineConfiguration->clt.adcChannel, ADC_SLOW);

5
firmware/integration/rusefi_config.txt
View File

@ -275,7 +275,8 @@ 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 unused11; int16_t pedalPositionMin;
int16_t pedalPositionMax;
int unused12; int unused12;
adc_channel_e mafAdcChannel; adc_channel_e mafAdcChannel;
@ -290,7 +291,7 @@ end_struct
afr_sensor_s afr;@see hasAfrSensor afr_sensor_s afr;@see hasAfrSensor
int unused123; adc_channel_e pedalPositionChannel;
air_pressure_sensor_config_s baroSensor;@see hasBaroSensor air_pressure_sensor_config_s baroSensor;@see hasBaroSensor

2
firmware/rusefi.cpp
View File

@ -291,5 +291,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20150528; return 2015059;
} }

7
firmware/tunerstudio/rusefi.ini
View File

@ -41,7 +41,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 by ConfigDefinition.jar on Fri May 29 18:47:54 EDT 2015 ; this section was generated by ConfigDefinition.jar on Fri May 29 23:04:37 EDT 2015
pageSize = 15288 pageSize = 15288
page = 1 page = 1
@ -136,7 +136,8 @@ page = 1
trigger_customUseRiseEdge = bits, U32, 560, [0:0], "false", "true" trigger_customUseRiseEdge = 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 unused11 offset 572 ;skipping pedalPositionMin offset 572
;skipping pedalPositionMax offset 574
;skipping unused12 offset 576 ;skipping unused12 offset 576
mafAdcChannel = bits, U32, 580, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" mafAdcChannel = bits, U32, 580, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5"
afr_hwChannel = bits, U32, 584, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" afr_hwChannel = bits, U32, 584, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5"
@ -144,7 +145,7 @@ page = 1
afr_value1 = scalar, F32, 592, "AFR", 1, 0.0, 0, 1000.0, 2 afr_value1 = scalar, F32, 592, "AFR", 1, 0.0, 0, 1000.0, 2
afr_v2 = scalar, F32, 596, "volts", 1, 0.0, 0, 10.0, 2 afr_v2 = scalar, F32, 596, "volts", 1, 0.0, 0, 10.0, 2
afr_value2 = scalar, F32, 600, "AFR", 1, 0.0, 0, 1000.0, 2 afr_value2 = scalar, F32, 600, "AFR", 1, 0.0, 0, 1000.0, 2
;skipping unused123 offset 604 pedalPositionChannel = bits, U32, 604, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5"
baroSensor_valueAt0 = scalar, F32, 608, "kpa", 1, 0, 0, 450, 2 baroSensor_valueAt0 = scalar, F32, 608, "kpa", 1, 0, 0, 450, 2
baroSensor_valueAt5 = scalar, F32, 612, "kpa", 1, 0, 0, 450, 2 baroSensor_valueAt5 = scalar, F32, 612, "kpa", 1, 0, 0, 450, 2
baroSensor_type = bits, U32, 616, [0:2] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "INVALID", "INVALID" baroSensor_type = bits, U32, 616, [0:2] "Custom", "DENSO183", "MPX4250", "HONDA3BAR", "NEON_2003", "22012AA090", "INVALID", "INVALID"

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see com.rusefi.StartupFrame * @see com.rusefi.StartupFrame
*/ */
public class Launcher { public class Launcher {
public static final int CONSOLE_VERSION = 20150523; public static final int CONSOLE_VERSION = 20150529;
public static final boolean SHOW_STIMULATOR = false; public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab"; private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port"; protected static final String PORT_KEY = "port";

3
java_console/ui/src/com/rusefi/ui/RecentCommands.java
View File

@ -33,6 +33,7 @@ public class RecentCommands {
private static final String FUELINFO = "fuelinfo"; private static final String FUELINFO = "fuelinfo";
private static final String TEMPINFO = "tempinfo"; private static final String TEMPINFO = "tempinfo";
private static final String HIPINFO = "hipinfo"; private static final String HIPINFO = "hipinfo";
private static final String FSIOINFO = "fsioinfo";
private final static Map<String, Icon> COMMAND_ICONS = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); private final static Map<String, Icon> COMMAND_ICONS = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
@ -50,6 +51,7 @@ public class RecentCommands {
COMMAND_ICONS.put(FUELINFO, infoIcon); COMMAND_ICONS.put(FUELINFO, infoIcon);
COMMAND_ICONS.put(TEMPINFO, infoIcon); COMMAND_ICONS.put(TEMPINFO, infoIcon);
COMMAND_ICONS.put(HIPINFO, infoIcon); COMMAND_ICONS.put(HIPINFO, infoIcon);
COMMAND_ICONS.put(FSIOINFO, infoIcon);
} }
private final JPanel content = new JPanel(new GridLayout(NUMBER_OF_COMMANDS + 1, 1)); private final JPanel content = new JPanel(new GridLayout(NUMBER_OF_COMMANDS + 1, 1));
@ -115,6 +117,7 @@ public class RecentCommands {
add(FUELINFO); add(FUELINFO);
add(TEMPINFO); add(TEMPINFO);
add(HIPINFO); add(HIPINFO);
add(FSIOINFO);
} }
public void add(String command) { public void add(String command) {