From 8f7a5635f2bf8fe21e35619def6a6e4d810fb894 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 30 May 2015 00:05:45 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/algo/engine_configuration.cpp | 2 ++ .../algo/engine_configuration_generated_structures.h | 12 ++++++++---- firmware/controllers/algo/rusefi_generated.h | 5 +++-- firmware/controllers/engine_controller.cpp | 1 + firmware/controllers/flash_main.h | 2 +- firmware/hw_layer/adc_inputs.cpp | 1 + firmware/integration/rusefi_config.txt | 5 +++-- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.ini | 7 ++++--- java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../ui/src/com/rusefi/ui/RecentCommands.java | 3 +++ 11 files changed, 28 insertions(+), 14 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 0cc9c5c2d7..3fe46af1a0 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -357,6 +357,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->map.sensor.hwChannel = EFI_ADC_4; engineConfiguration->baroSensor.hwChannel = EFI_ADC_NONE; + engineConfiguration->pedalPositionChannel = EFI_ADC_NONE; + engineConfiguration->specs.firingOrder = FO_1_THEN_3_THEN_4_THEN2; engineConfiguration->crankingInjectionMode = IM_SIMULTANEOUS; engineConfiguration->injectionMode = IM_SEQUENTIAL; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 7aa81c708d..2c0f5e0cb6 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -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 #include "rusefi_types.h" typedef struct { @@ -945,7 +945,11 @@ typedef struct { /** * offset 572 */ - int unused11; + int16_t pedalPositionMin; + /** + * offset 574 + */ + int16_t pedalPositionMax; /** * offset 576 */ @@ -962,7 +966,7 @@ typedef struct { /** * offset 604 */ - int unused123; + adc_channel_e pedalPositionChannel; /** * @see hasBaroSensor * offset 608 @@ -1394,4 +1398,4 @@ typedef struct { } persistent_config_s; // 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 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index f923ca2fe8..de25422488 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -180,7 +180,8 @@ #define hip9011SpiDevice_offset_hex 234 #define globalFuelCorrection_offset 568 #define globalFuelCorrection_offset_hex 238 -#define unused11_offset 572 +#define pedalPositionMin_offset 572 +#define pedalPositionMax_offset 574 #define unused12_offset 576 #define unused12_offset_hex 240 #define mafAdcChannel_offset 580 @@ -196,7 +197,7 @@ #define afr_v2_offset_hex 254 #define afr_value2_offset 600 #define afr_value2_offset_hex 258 -#define unused123_offset 604 +#define pedalPositionChannel_offset 604 #define baroSensor_offset 608 #define baroSensor_offset_hex 260 #define baroSensor_valueAt0_offset 608 diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index 96eac2c61e..de356446b8 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -323,6 +323,7 @@ static void printAnalogChannelInfo(const char *name, adc_channel_e hwChannel) { static void printAnalogInfo(void) { printAnalogChannelInfo("hip9011", EFI_ADC_10); printAnalogChannelInfo("TPS", engineConfiguration->tpsAdcChannel); + printAnalogChannelInfo("pPS", engineConfiguration->pedalPositionChannel); printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel); if (engineConfiguration->hasIatSensor) { printAnalogChannelInfo("IAT", engineConfiguration->iat.adcChannel); diff --git a/firmware/controllers/flash_main.h b/firmware/controllers/flash_main.h index 1c3b130678..9620e4ba25 100644 --- a/firmware/controllers/flash_main.h +++ b/firmware/controllers/flash_main.h @@ -11,7 +11,7 @@ #include "engine.h" -#define FLASH_DATA_VERSION 8201 +#define FLASH_DATA_VERSION 8220 void readFromFlash(void); void initFlash(Logging *sharedLogger, Engine *engine); diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 08649c571c..63bf5097cc 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -491,6 +491,7 @@ static void configureInputs(void) { addChannel("MAF", engineConfiguration->mafAdcChannel, ADC_FAST); addChannel("hip", engineConfiguration->hipOutputChannel, ADC_FAST); + addChannel("pPS", engineConfiguration->pedalPositionChannel, ADC_SLOW); addChannel("VBatt", engineConfiguration->vbattAdcChannel, ADC_SLOW); addChannel("Vref", engineConfiguration->vRefAdcChannel, ADC_SLOW); addChannel("CLT", engineConfiguration->clt.adcChannel, ADC_SLOW); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 3e753403b6..33a0774f38 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -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 - int unused11; +int16_t pedalPositionMin; +int16_t pedalPositionMax; int unused12; adc_channel_e mafAdcChannel; @@ -290,7 +291,7 @@ end_struct afr_sensor_s afr;@see hasAfrSensor -int unused123; +adc_channel_e pedalPositionChannel; air_pressure_sensor_config_s baroSensor;@see hasBaroSensor diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 19f7489c70..b45a9c68bb 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -291,5 +291,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20150528; + return 2015059; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index e4edc5fd61..f4636abfda 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; 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 page = 1 @@ -136,7 +136,8 @@ page = 1 trigger_customUseRiseEdge = bits, U32, 560, [0:0], "false", "true" hip9011SpiDevice = bits,U32, 564, [0:1], "Off", "SPI1", "SPI2", "SPI3" 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 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" @@ -144,7 +145,7 @@ page = 1 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_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_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" diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 84c8016c86..c355a98757 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see com.rusefi.StartupFrame */ public class Launcher { - public static final int CONSOLE_VERSION = 20150523; + public static final int CONSOLE_VERSION = 20150529; public static final boolean SHOW_STIMULATOR = false; private static final String TAB_INDEX = "main_tab"; protected static final String PORT_KEY = "port"; diff --git a/java_console/ui/src/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/com/rusefi/ui/RecentCommands.java index baae25fcb3..45db31604a 100644 --- a/java_console/ui/src/com/rusefi/ui/RecentCommands.java +++ b/java_console/ui/src/com/rusefi/ui/RecentCommands.java @@ -33,6 +33,7 @@ public class RecentCommands { private static final String FUELINFO = "fuelinfo"; private static final String TEMPINFO = "tempinfo"; private static final String HIPINFO = "hipinfo"; + private static final String FSIOINFO = "fsioinfo"; private final static Map COMMAND_ICONS = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); @@ -50,6 +51,7 @@ public class RecentCommands { COMMAND_ICONS.put(FUELINFO, infoIcon); COMMAND_ICONS.put(TEMPINFO, infoIcon); COMMAND_ICONS.put(HIPINFO, infoIcon); + COMMAND_ICONS.put(FSIOINFO, infoIcon); } private final JPanel content = new JPanel(new GridLayout(NUMBER_OF_COMMANDS + 1, 1)); @@ -115,6 +117,7 @@ public class RecentCommands { add(FUELINFO); add(TEMPINFO); add(HIPINFO); + add(FSIOINFO); } public void add(String command) {