From 45a60578ce292ee2f3bf3db8209d4e79dd9f26bd Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 11 Apr 2017 19:16:48 -0400 Subject: [PATCH] sdCardSpiDevice --- .../algo/engine_configuration_generated_structures.h | 10 +++++++--- firmware/controllers/algo/rusefi_generated.h | 6 ++++-- firmware/integration/rusefi_config.txt | 3 ++- firmware/tunerstudio/rusefi.input | 1 + java_console/models/src/com/rusefi/config/Fields.java | 6 ++++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 1ab0ebba09..c643ce5941 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 Mon Apr 10 14:24:47 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Apr 11 19:08:53 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1850,7 +1850,11 @@ typedef struct { /** * offset 2832 */ - int unused[54]; + spi_device_e sdCardSpiDevice; + /** + * offset 2836 + */ + int unused[53]; /** total size 3048*/ } engine_configuration_s; @@ -2065,4 +2069,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Apr 10 14:24:47 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Apr 11 19:08:53 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 7cdf23aa03..c668a0ebb3 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1365,8 +1365,10 @@ #define aux1PidMin_offset_hex b08 #define aux1PidMax_offset 2828 #define aux1PidMax_offset_hex b0c -#define unused_offset 2832 -#define unused_offset_hex b10 +#define sdCardSpiDevice_offset 2832 +#define sdCardSpiDevice_offset_hex b10 +#define unused_offset 2836 +#define unused_offset_hex b14 #define le_formulas1_offset 3048 #define le_formulas1_offset_hex be8 #define le_formulas2_offset 3248 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 840b54beb9..2e3824673b 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -794,7 +794,8 @@ int16_t etbFreq;;"Hz", 1, 0, 0, 500, 10 float aux1PidMin;;"v", 1, 0, 0, 3000.0, 3 float aux1PidMax;;"v", 1, 0, 0, 3000.0, 3 - int[54] unused; +spi_device_e sdCardSpiDevice; + int[53] unused; end_struct diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 8364415ba0..c963cc2c73 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1387,6 +1387,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" dialog = sdCard, "SD Card Logger" field = "SdCard", isSdCardEnabled field = "CS Pin", sdCardCsPin + field = "SPI", sdCardSpiDevice field = "log format", logFormat field = "Mass Storage", storageMode diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index ea79ecfc9c..ba11dbfeab 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 Apr 10 14:24:47 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Apr 11 19:08:53 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -950,7 +950,8 @@ public class Fields { 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 unused_offset = 2832; + public static final int sdCardSpiDevice_offset = 2832; + public static final int unused_offset = 2836; public static final int le_formulas1_offset = 3048; public static final int le_formulas2_offset = 3248; public static final int le_formulas3_offset = 3448; @@ -1643,6 +1644,7 @@ public class Fields { 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 SDCARDSPIDEVICE = Field.create("SDCARDSPIDEVICE", 2832, FieldType.INT); 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);