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

flexibility for andreika

This commit is contained in:
rusefi 2017-05-09 19:05:47 -04:00
parent b2f6c8d86e
commit 44b5bfe0db
7 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 09 18:55:49 EDT 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 09 19:04:57 EDT 2017
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1867,7 +1867,19 @@ typedef struct {
/**
* offset 2848
*/
int unused[50];
pin_mode_e spi1SckMode;
/**
* offset 2852
*/
pin_mode_e spi1MosiMode;
/**
* offset 2856
*/
pin_mode_e spi1MisoMode;
/**
* offset 2860
*/
int unused[47];
/** total size 3048*/
} engine_configuration_s;
@ -2082,4 +2094,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 09 18:55:49 EDT 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 09 19:04:57 EDT 2017

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

@ -1373,8 +1373,14 @@
#define spi3MosiMode_offset_hex b18
#define spi3MisoMode_offset 2844
#define spi3MisoMode_offset_hex b1c
#define unused_offset 2848
#define unused_offset_hex b20
#define spi1SckMode_offset 2848
#define spi1SckMode_offset_hex b20
#define spi1MosiMode_offset 2852
#define spi1MosiMode_offset_hex b24
#define spi1MisoMode_offset 2856
#define spi1MisoMode_offset_hex b28
#define unused_offset 2860
#define unused_offset_hex b2c
#define le_formulas1_offset 3048
#define le_formulas1_offset_hex be8
#define le_formulas2_offset 3248

12
firmware/hw_layer/stm32f4/mpu_util.cpp
View File

@ -277,9 +277,9 @@ void turnOnSpi(spi_device_e device) {
initSpiModule(&SPID1, getSckPin(device),
getMisoPin(device),
getMosiPin(device),
0,
0,
0);
engineConfiguration->spi1SckMode,
engineConfiguration->spi1MosiMode,
engineConfiguration->spi1MisoMode);
#endif /* STM32_SPI_USE_SPI1 */
}
if (device == SPI_DEVICE_2) {
@ -299,9 +299,9 @@ void turnOnSpi(spi_device_e device) {
initSpiModule(&SPID3, getSckPin(device),
getMisoPin(device),
getMosiPin(device),
0,
0,
0);
engineConfiguration->spi3SckMode,
engineConfiguration->spi3MosiMode,
engineConfiguration->spi3MisoMode);
#endif /* STM32_SPI_USE_SPI3 */
}
}

5
firmware/integration/rusefi_config.txt
View File

@ -798,7 +798,10 @@ spi_device_e sdCardSpiDevice;
pin_mode_e spi3SckMode;
pin_mode_e spi3MosiMode;
pin_mode_e spi3MisoMode;
int[50] unused;
pin_mode_e spi1SckMode;
pin_mode_e spi1MosiMode;
pin_mode_e spi1MisoMode;
int[47] unused;
end_struct

10
firmware/tunerstudio/rusefi.ini
View File

@ -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 Tue May 09 18:57:46 EDT 2017
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 09 19:04:57 EDT 2017
pageSize = 16376
page = 1
@ -678,7 +678,10 @@ page = 1
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
spi1SckMode = bits, U32, 2848, [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"
spi1MosiMode = bits, U32, 2852, [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"
spi1MisoMode = bits, U32, 2856, [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 2860
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 = "prescaler & SDO", hip9011PrescalerAndSDO, {isHip9011Enabled == 1}
field = "Band Freq override", knockBandCustom, {isHip9011Enabled == 1}
field = "SPI device", hip9011SpiDevice, {isHip9011Enabled == 1}
field = "SPI1sck", spi1SckMode, {isHip9011Enabled == 1}
field = "SPI1mosi", spi1MosiMode, {isHip9011Enabled == 1}
field = "SPI1miso", spi1MisoMode, {isHip9011Enabled == 1}
field = "SPI2sck", spi2SckMode, {isHip9011Enabled == 1}
field = "SPI2mosi", spi2MosiMode, {isHip9011Enabled == 1}
field = "SPI2miso", spi2MisoMode, {isHip9011Enabled == 1}

3
firmware/tunerstudio/rusefi.input
View File

@ -1245,6 +1245,9 @@ cmd_call_from_pit = "w\x00\x20\x34\x56"
field = "prescaler & SDO", hip9011PrescalerAndSDO, {isHip9011Enabled == 1}
field = "Band Freq override", knockBandCustom, {isHip9011Enabled == 1}
field = "SPI device", hip9011SpiDevice, {isHip9011Enabled == 1}
field = "SPI1sck", spi1SckMode, {isHip9011Enabled == 1}
field = "SPI1mosi", spi1MosiMode, {isHip9011Enabled == 1}
field = "SPI1miso", spi1MisoMode, {isHip9011Enabled == 1}
field = "SPI2sck", spi2SckMode, {isHip9011Enabled == 1}
field = "SPI2mosi", spi2MosiMode, {isHip9011Enabled == 1}
field = "SPI2miso", spi2MisoMode, {isHip9011Enabled == 1}

10
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 09 18:57:46 EDT 2017
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 09 19:04:57 EDT 2017
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -954,7 +954,10 @@ public class Fields {
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 spi1SckMode_offset = 2848;
public static final int spi1MosiMode_offset = 2852;
public static final int spi1MisoMode_offset = 2856;
public static final int unused_offset = 2860;
public static final int le_formulas1_offset = 3048;
public static final int le_formulas2_offset = 3248;
public static final int le_formulas3_offset = 3448;
@ -1666,6 +1669,9 @@ public class Fields {
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 SPI1SCKMODE = Field.create("SPI1SCKMODE", 2848, FieldType.INT, pin_mode_e);
public static final Field SPI1MOSIMODE = Field.create("SPI1MOSIMODE", 2852, FieldType.INT, pin_mode_e);
public static final Field SPI1MISOMODE = Field.create("SPI1MISOMODE", 2856, 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);