From b2f6c8d86e776135ca94fdc83942350862e2b6c6 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 9 May 2017 18:59:54 -0400 Subject: [PATCH] flexibility for andreika --- firmware/controllers/algo/rusefi_generated.h | 10 ++++++++-- firmware/tunerstudio/rusefi.ini | 10 ++++++++-- firmware/tunerstudio/rusefi.input | 3 +++ java_console/models/src/com/rusefi/config/Fields.java | 10 ++++++++-- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index c45f006f28..4f8db48c31 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1367,8 +1367,14 @@ #define aux1PidMax_offset_hex b0c #define sdCardSpiDevice_offset 2832 #define sdCardSpiDevice_offset_hex b10 -#define unused_offset 2836 -#define unused_offset_hex b14 +#define spi3SckMode_offset 2836 +#define spi3SckMode_offset_hex b14 +#define spi3MosiMode_offset 2840 +#define spi3MosiMode_offset_hex b18 +#define spi3MisoMode_offset 2844 +#define spi3MisoMode_offset_hex b1c +#define unused_offset 2848 +#define unused_offset_hex b20 #define le_formulas1_offset 3048 #define le_formulas1_offset_hex be8 #define le_formulas2_offset 3248 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index b002dc2b0a..440731ea34 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,7 +45,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 Sat May 06 20:23:49 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 09 18:57:46 EDT 2017 pageSize = 16376 page = 1 @@ -675,7 +675,10 @@ page = 1 aux1PidMin = scalar, F32, 2824, "v", 1, 0, 0, 3000.0, 3 aux1PidMax = scalar, F32, 2828, "v", 1, 0, 0, 3000.0, 3 sdCardSpiDevice = bits,U32, 2832, [0:1], "Off", "SPI1", "SPI2", "SPI3" -;skipping unused offset 2836 + spi3SckMode = bits, U32, 2836, [0:5], "default", "INVALID", "INVALID", "INVALID", "opendrain", "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", "PULLUP", "mode33", "mode34", "mode35" + spi3MosiMode = bits, U32, 2840, [0:5], "default", "INVALID", "INVALID", "INVALID", "opendrain", "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", "PULLUP", "mode33", "mode34", "mode35" + spi3MisoMode = bits, U32, 2844, [0:5], "default", "INVALID", "INVALID", "INVALID", "opendrain", "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", "PULLUP", "mode33", "mode34", "mode35" +;skipping unused offset 2848 le_formulas1 = array, U08, 3048, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas2 = array, U08, 3248, [200],"char", 1, 0, 0.0, 3.0, 2 le_formulas3 = array, U08, 3448, [200],"char", 1, 0, 0.0, 3.0, 2 @@ -1980,6 +1983,9 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "SPI2sck", spi2SckMode, {isHip9011Enabled == 1} field = "SPI2mosi", spi2MosiMode, {isHip9011Enabled == 1} field = "SPI2miso", spi2MisoMode, {isHip9011Enabled == 1} + field = "SPI3sck", spi3SckMode, {isHip9011Enabled == 1} + field = "SPI3mosi", spi3MosiMode, {isHip9011Enabled == 1} + field = "SPI3miso", spi3MisoMode, {isHip9011Enabled == 1} panel = knockThresholdCurve ; Engine->cj125 Settings diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 0c03845ffc..d98e6a9e30 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1248,6 +1248,9 @@ cmd_call_from_pit = "w\x00\x20\x34\x56" field = "SPI2sck", spi2SckMode, {isHip9011Enabled == 1} field = "SPI2mosi", spi2MosiMode, {isHip9011Enabled == 1} field = "SPI2miso", spi2MisoMode, {isHip9011Enabled == 1} + field = "SPI3sck", spi3SckMode, {isHip9011Enabled == 1} + field = "SPI3mosi", spi3MosiMode, {isHip9011Enabled == 1} + field = "SPI3miso", spi3MisoMode, {isHip9011Enabled == 1} 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 20068b4547..555f0fe682 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 Thu Apr 13 23:29:50 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 09 18:57:46 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -951,7 +951,10 @@ public class Fields { public static final int aux1PidMin_offset = 2824; public static final int aux1PidMax_offset = 2828; public static final int sdCardSpiDevice_offset = 2832; - public static final int unused_offset = 2836; + public static final int spi3SckMode_offset = 2836; + public static final int spi3MosiMode_offset = 2840; + public static final int spi3MisoMode_offset = 2844; + public static final int unused_offset = 2848; public static final int le_formulas1_offset = 3048; public static final int le_formulas2_offset = 3248; public static final int le_formulas3_offset = 3448; @@ -1660,6 +1663,9 @@ public class Fields { 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 SPI3SCKMODE = Field.create("SPI3SCKMODE", 2836, FieldType.INT, pin_mode_e); + public static final Field SPI3MOSIMODE = Field.create("SPI3MOSIMODE", 2840, FieldType.INT, pin_mode_e); + public static final Field SPI3MISOMODE = Field.create("SPI3MISOMODE", 2844, FieldType.INT, pin_mode_e); 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);