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

#784

This commit is contained in:
rusefi 2019-05-25 13:47:09 -04:00
parent 01e481db31
commit e1337793cc
6 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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 Sat May 11 13:38:32 EDT 2019 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 13:41:46 EDT 2019
// begin // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -2212,9 +2212,14 @@ typedef struct {
*/ */
pin_output_mode_e stepperEnablePinMode; pin_output_mode_e stepperEnablePinMode;
/** /**
* ResetB
* offset 2630 * offset 2630
*/ */
uint8_t unuseSpi3[2]; brain_pin_e mc33816_rstb;
/**
* offset 2631
*/
brain_pin_e mc33816_driven;
/** /**
* offset 2632 * offset 2632
*/ */
@ -2739,4 +2744,4 @@ typedef struct {
#endif #endif
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 11 13:38:32 EDT 2019 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 13:41:46 EDT 2019

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

@ -1408,6 +1408,10 @@
#define maxKnockSubDeg_offset_hex 228 #define maxKnockSubDeg_offset_hex 228
#define mc33816_cs_offset 3131 #define mc33816_cs_offset 3131
#define mc33816_cs_offset_hex c3b #define mc33816_cs_offset_hex c3b
#define mc33816_driven_offset 2631
#define mc33816_driven_offset_hex a47
#define mc33816_rstb_offset 2630
#define mc33816_rstb_offset_hex a46
#define mc33816spiDevice_offset 4025 #define mc33816spiDevice_offset 4025
#define mc33816spiDevice_offset_hex fb9 #define mc33816spiDevice_offset_hex fb9
#define mc33972_cs_offset 678 #define mc33972_cs_offset 678
@ -1804,8 +1808,6 @@
#define unusedt_offset_hex 247 #define unusedt_offset_hex 247
#define unuseduartPadding1_offset 809 #define unuseduartPadding1_offset 809
#define unuseduartPadding1_offset_hex 329 #define unuseduartPadding1_offset_hex 329
#define unuseSpi3_offset 2630
#define unuseSpi3_offset_hex a46
#define unusuedsw_offset 1489 #define unusuedsw_offset 1489
#define unusuedsw_offset_hex 5d1 #define unusuedsw_offset_hex 5d1
#define unusuedvref_offset 1505 #define unusuedvref_offset 1505

3
firmware/integration/rusefi_config.txt
View File

@ -948,7 +948,8 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
pin_mode_e spi3MisoMode; pin_mode_e spi3MisoMode;
pin_output_mode_e stepperEnablePinMode; pin_output_mode_e stepperEnablePinMode;
uint8_t[2] unuseSpi3; brain_pin_e mc33816_rstb;ResetB
brain_pin_e mc33816_driven
brain_pin_e brakePedalPin brain_pin_e brakePedalPin
adc_channel_e cj125ua;lambda input adc_channel_e cj125ua;lambda input

7
firmware/tunerstudio/rusefi.ini
View File

@ -72,7 +72,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 13:35:29 EDT 2019 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 13:42:47 EDT 2019
pageSize = 20000 pageSize = 20000
page = 1 page = 1
@ -761,7 +761,8 @@ page = 1
spi3MosiMode = bits, U08, 2627, [0:6], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN" spi3MosiMode = bits, U08, 2627, [0:6], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"
spi3MisoMode = bits, U08, 2628, [0:6], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN" spi3MisoMode = bits, U08, 2628, [0:6], "default", "INVALID", "INVALID", "INVALID", "opendrain", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLUP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PULLDOWN"
stepperEnablePinMode = bits, U08, 2629, [0:1], "default", "default inverted", "open collector", "open collector inverted" stepperEnablePinMode = bits, U08, 2629, [0:1], "default", "default inverted", "open collector", "open collector inverted"
;no TS info - skipping unuseSpi3 offset 2630 mc33816_rstb = bits, U08, 2630, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
mc33816_driven = bits, U08, 2631, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
brakePedalPin = bits, U08, 2632, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" brakePedalPin = bits, U08, 2632, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
cj125ua = bits, U08, 2633, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" cj125ua = bits, U08, 2633, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
cj125ur = bits, U08, 2634, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" cj125ur = bits, U08, 2634, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID"
@ -2470,6 +2471,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = allPins1_1 dialog = allPins1_1
field = mc33816_cs, mc33816_cs field = mc33816_cs, mc33816_cs
field = mc33816_rstb, mc33816_rstb
field = mc33816_driven, mc33816_driven
field = mc33816spiDevice, mc33816spiDevice field = mc33816spiDevice, mc33816spiDevice
field = "Warning Led", warningLedPin field = "Warning Led", warningLedPin
field = "Fatal Error Led", fatalErrorPin field = "Fatal Error Led", fatalErrorPin

2
firmware/tunerstudio/rusefi.input
View File

@ -1539,6 +1539,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
dialog = allPins1_1 dialog = allPins1_1
field = mc33816_cs, mc33816_cs field = mc33816_cs, mc33816_cs
field = mc33816_rstb, mc33816_rstb
field = mc33816_driven, mc33816_driven
field = mc33816spiDevice, mc33816spiDevice field = mc33816spiDevice, mc33816spiDevice
field = "Warning Led", warningLedPin field = "Warning Led", warningLedPin
field = "Fatal Error Led", fatalErrorPin field = "Fatal Error Led", fatalErrorPin

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

@ -1,6 +1,6 @@
package com.rusefi.config; package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 11 13:38:32 EDT 2019 // this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat May 25 13:42:47 EDT 2019
public class Fields { public class Fields {
public static final int accelerometerSpiDevice_offset = 2736; public static final int accelerometerSpiDevice_offset = 2736;
public static final int acCutoffHighRpm_offset = 1498; public static final int acCutoffHighRpm_offset = 1498;
@ -920,6 +920,8 @@ public class Fields {
public static final int maxKnockSubDeg_offset = 552; public static final int maxKnockSubDeg_offset = 552;
public static final int maxKnockSubDeg_offset_hex = 228; public static final int maxKnockSubDeg_offset_hex = 228;
public static final int mc33816_cs_offset = 3131; public static final int mc33816_cs_offset = 3131;
public static final int mc33816_driven_offset = 2631;
public static final int mc33816_rstb_offset = 2630;
public static final int mc33816spiDevice_offset = 4025; public static final int mc33816spiDevice_offset = 4025;
public static final int mc33972_cs_offset = 678; public static final int mc33972_cs_offset = 678;
public static final int mc33972_csPinMode_offset = 679; public static final int mc33972_csPinMode_offset = 679;
@ -1159,7 +1161,6 @@ public class Fields {
public static final int unusedt_offset_hex = 247; public static final int unusedt_offset_hex = 247;
public static final int unuseduartPadding1_offset = 809; public static final int unuseduartPadding1_offset = 809;
public static final int unuseduartPadding1_offset_hex = 329; public static final int unuseduartPadding1_offset_hex = 329;
public static final int unuseSpi3_offset = 2630;
public static final int unusuedsw_offset = 1489; public static final int unusuedsw_offset = 1489;
public static final int unusuedvref_offset = 1505; public static final int unusuedvref_offset = 1505;
public static final int useAdvanceCorrectionsForCranking_offset = 1476; public static final int useAdvanceCorrectionsForCranking_offset = 1476;
@ -1888,6 +1889,8 @@ public class Fields {
public static final Field SPI3MOSIMODE = Field.create("SPI3MOSIMODE", 2627, FieldType.INT8, pin_mode_e); public static final Field SPI3MOSIMODE = Field.create("SPI3MOSIMODE", 2627, FieldType.INT8, pin_mode_e);
public static final Field SPI3MISOMODE = Field.create("SPI3MISOMODE", 2628, FieldType.INT8, pin_mode_e); public static final Field SPI3MISOMODE = Field.create("SPI3MISOMODE", 2628, FieldType.INT8, pin_mode_e);
public static final Field STEPPERENABLEPINMODE = Field.create("STEPPERENABLEPINMODE", 2629, FieldType.INT8, pin_output_mode_e); public static final Field STEPPERENABLEPINMODE = Field.create("STEPPERENABLEPINMODE", 2629, FieldType.INT8, pin_output_mode_e);
public static final Field MC33816_RSTB = Field.create("MC33816_RSTB", 2630, FieldType.INT8, brain_pin_e);
public static final Field MC33816_DRIVEN = Field.create("MC33816_DRIVEN", 2631, FieldType.INT8, brain_pin_e);
public static final Field BRAKEPEDALPIN = Field.create("BRAKEPEDALPIN", 2632, FieldType.INT8, brain_pin_e); public static final Field BRAKEPEDALPIN = Field.create("BRAKEPEDALPIN", 2632, FieldType.INT8, brain_pin_e);
public static final Field CJ125UA = Field.create("CJ125UA", 2633, FieldType.INT8, adc_channel_e); public static final Field CJ125UA = Field.create("CJ125UA", 2633, FieldType.INT8, adc_channel_e);
public static final Field CJ125UR = Field.create("CJ125UR", 2634, FieldType.INT8, adc_channel_e); public static final Field CJ125UR = Field.create("CJ125UR", 2634, FieldType.INT8, adc_channel_e);