diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 80451645e2..08eed9212f 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 automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 23:36:11 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 26 12:50:23 EST 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1408,15 +1408,15 @@ typedef struct { /** * offset 1740 */ - int spi2SckMode; + pin_mode_e spi2SckMode; /** * offset 1744 */ - int spi2MosiMode; + pin_mode_e spi2MosiMode; /** * offset 1748 */ - int spi2MisoMode; + pin_mode_e spi2MisoMode; /** * Cranking fuel correction coefficient based on TPS * offset 1752 @@ -2034,4 +2034,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Jan 22 23:36:11 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 26 12:50:23 EST 2017 diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h index e4351d57e3..9f17f392b5 100644 --- a/firmware/controllers/algo/rusefi_types.h +++ b/firmware/controllers/algo/rusefi_types.h @@ -22,6 +22,8 @@ typedef unsigned int time_t; // time in seconds typedef time_t efitimesec_t; +typedef int pin_mode_e; + /** * integer time in milliseconds * 32 bit 4B / 1000 = 4M seconds = 1111.11 hours = 46 days. diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 12feae1362..6c4ace5109 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -657,9 +657,13 @@ float[BARO_CORR_SIZE] baroCorrPressureBins;;"kPa", 1, 0, 0.0, 200, float[BARO_CORR_SIZE] baroCorrRpmBins;;"RPM", 1, 0, 0.0, 18000, 2 baro_corr_table_t baroCorrTable; - int spi2SckMode; - int spi2MosiMode; - int spi2MisoMode; + + #define pin_mode_e_enum "default", "INVALID", "INVALID", "INVALID", "mode4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "mode32", "mode33", "mode34", "mode35" +custom pin_mode_e 4 bits, U32, @OFFSET@, [0:3], @@pin_mode_e_enum@@ + + pin_mode_e spi2SckMode; + pin_mode_e spi2MosiMode; + pin_mode_e spi2MisoMode; float[CRANKING_CURVE_SIZE] crankingTpsCoef;Cranking fuel correction coefficient based on TPS;"%", 1, 0, 0.0, 700.0, 2 float[CRANKING_CURVE_SIZE] crankingTpsBins;;"%", 1, 0, 0.0, 100.0, 2 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 8e01c62a6c..576536bb8f 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,7 +42,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 Mon Jan 23 20:02:38 EST 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 26 13:13:15 EST 2017 pageSize = 16376 page = 1 @@ -498,9 +498,9 @@ page = 1 baroCorrPressureBins = array, F32, 1644, [4], "kPa", 1, 0, 0.0, 200, 2 baroCorrRpmBins = array, F32, 1660, [4], "RPM", 1, 0, 0.0, 18000, 2 baroCorrTable = array, F32, 1676, [4x4],"%", 1, 0, 0, 999.0, 2 -;skipping spi2SckMode offset 1740 -;skipping spi2MosiMode offset 1744 -;skipping spi2MisoMode offset 1748 + spi2SckMode = bits, U32, 1740, [0:3], "default", "INVALID", "INVALID", "INVALID", "mode4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "mode32", "mode33", "mode34", "mode35" + spi2MosiMode = bits, U32, 1744, [0:3], "default", "INVALID", "INVALID", "INVALID", "mode4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "mode32", "mode33", "mode34", "mode35" + spi2MisoMode = bits, U32, 1748, [0:3], "default", "INVALID", "INVALID", "INVALID", "mode4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "mode32", "mode33", "mode34", "mode35" crankingTpsCoef = array, F32, 1752, [8], "%", 1, 0, 0.0, 700.0, 2 crankingTpsBins = array, F32, 1784, [8], "%", 1, 0, 0.0, 100.0, 2 tachPulseDuractionMs = scalar, F32, 1816, "ms", 1, 0, 0.0, 100.0, 2 @@ -1835,6 +1835,9 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "prescaler & SDO", hip9011PrescalerAndSDO field = "Band Freq override", knockBandCustom field = "SPI device", hip9011SpiDevice + field = "SPI2sck", spi2SckMode + field = "SPI2mosi", spi2MosiMode + field = "SPI2miso", spi2MisoMode panel = knockThresholdCurve ; Engine->cj125 Settings diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 3b23ec21b8..95e69c0dd4 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1770,6 +1770,9 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "prescaler & SDO", hip9011PrescalerAndSDO field = "Band Freq override", knockBandCustom field = "SPI device", hip9011SpiDevice + field = "SPI2sck", spi2SckMode + field = "SPI2mosi", spi2MosiMode + field = "SPI2miso", spi2MisoMode panel = knockThresholdCurve ; Engine->cj125 Settings diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index c4fb8742fb..34fe5849a4 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jan 23 20:02:38 EST 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 26 13:13:15 EST 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -1457,9 +1457,10 @@ public class Fields { public static final Field NOACCELAFTERHARDLIMITPERIODSECS = Field.create("NOACCELAFTERHARDLIMITPERIODSECS", 1636, FieldType.FLOAT); public static final Field MAPAVERAGINGSCHEDULINGATINDEX = Field.create("MAPAVERAGINGSCHEDULINGATINDEX", 1640, FieldType.INT); public static final Field BAROCORRTABLE = Field.create("BAROCORRTABLE", 1676, FieldType.INT); - public static final Field SPI2SCKMODE = Field.create("SPI2SCKMODE", 1740, FieldType.INT); - public static final Field SPI2MOSIMODE = Field.create("SPI2MOSIMODE", 1744, FieldType.INT); - public static final Field SPI2MISOMODE = Field.create("SPI2MISOMODE", 1748, FieldType.INT); + public static final String[] pin_mode_e = {"default", "INVALID", "INVALID", "INVALID", "mode4", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "mode12", "mode13", "mode14", "mode15", "mode16", "mode17", "mode18", "mode19", "mode20", "mode21", "mode22", "mode23", "mode24", "mode25", "mode26", "mode27", "mode28", "mode29", "mode30", "mode31", "mode32", "mode33", "mode34", "mode35"}; + public static final Field SPI2SCKMODE = Field.create("SPI2SCKMODE", 1740, FieldType.INT, pin_mode_e); + public static final Field SPI2MOSIMODE = Field.create("SPI2MOSIMODE", 1744, FieldType.INT, pin_mode_e); + public static final Field SPI2MISOMODE = Field.create("SPI2MISOMODE", 1748, FieldType.INT, pin_mode_e); public static final Field TACHPULSEDURACTIONMS = Field.create("TACHPULSEDURACTIONMS", 1816, FieldType.FLOAT); public static final Field TACHPULSETRIGGERINDEX = Field.create("TACHPULSETRIGGERINDEX", 1820, FieldType.INT); public static final Field SUCKEDOFFCOEF = Field.create("SUCKEDOFFCOEF", 1824, FieldType.FLOAT);