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

auto-sync

This commit is contained in:
rusEfi 2017-01-28 20:03:19 -05:00
parent fb7871cdca
commit c7bda05980
8 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -111,7 +111,7 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->alternatorControl.dFactor = 0;
engineConfiguration->alternatorDT = 10;
// set_idle_position 35
// set idle_position 35
boardConfiguration->manIdlePosition = 35;

11
firmware/controllers/algo/engine_configuration.cpp
View File

@ -254,6 +254,15 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) {
boardConfiguration->joystickCPin = GPIO_UNASSIGNED;
boardConfiguration->joystickDPin = GPIO_UNASSIGNED;
boardConfiguration->idle.stepperDirectionPin = GPIO_UNASSIGNED;
boardConfiguration->idle.stepperStepPin = GPIO_UNASSIGNED;
engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED;
boardConfiguration->idle.stepperDirectionPin = GPIO_UNASSIGNED;
boardConfiguration->idle.stepperStepPin = GPIO_UNASSIGNED;
engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED;
engineConfiguration->stepperEnablePinMode = OM_DEFAULT;
activeConfiguration->dizzySparkOutputPin = GPIO_UNASSIGNED;
boardConfiguration->acRelayPin = GPIO_UNASSIGNED;
@ -665,7 +674,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->useOnlyRisingEdgeForTrigger = false;
boardConfiguration->idle.solenoidFrequency = 200;
// set_idle_position 50
// set idle_position 50
boardConfiguration->manIdlePosition = 50;
engineConfiguration->targetIdleRpm = 1200;
// engineConfiguration->idleMode = IM_AUTO;

10
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 Thu Jan 26 12:50:23 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jan 28 19:06:26 EST 2017
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1819,7 +1819,11 @@ typedef struct {
/**
* offset 2764
*/
int unused[71];
pin_mode_e stepperEnablePinMode;
/**
* offset 2768
*/
int unused[70];
/** total size 3048*/
} engine_configuration_s;
@ -2034,4 +2038,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 26 12:50:23 EST 2017
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jan 28 19:06:26 EST 2017

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

@ -928,7 +928,8 @@
#define fuelClosedLoopPid_offset_offset 2752
#define fuelClosedLoopAfrLowThreshold_offset 2756
#define fuelClosedLoopAfrHighThreshold_offset 2760
#define unused_offset 2764
#define stepperEnablePinMode_offset 2764
#define unused_offset 2768
#define le_formulas1_offset 3048
#define le_formulas2_offset 3248
#define le_formulas3_offset 3448

3
firmware/integration/rusefi_config.txt
View File

@ -773,7 +773,8 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
pid_s fuelClosedLoopPid;
float fuelClosedLoopAfrLowThreshold;;"ratio", 1, 0, 0, 100, 1
float fuelClosedLoopAfrHighThreshold;;"ratio", 1, 0, 0, 100, 1
int[71] unused;
pin_mode_e stepperEnablePinMode;
int[70] unused;
end_struct

27
firmware/tunerstudio/rusefi.ini
View File

@ -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 Sat Jan 28 18:08:48 EST 2017
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jan 28 19:06:26 EST 2017
pageSize = 16376
page = 1
@ -654,7 +654,8 @@ page = 1
fuelClosedLoopPid_offset = scalar, F32, 2752, "value", 1, 0, 0, 1000, 3
fuelClosedLoopAfrLowThreshold = scalar, F32, 2756, "ratio", 1, 0, 0, 100, 1
fuelClosedLoopAfrHighThreshold = scalar, F32, 2760, "ratio", 1, 0, 0, 100, 1
;skipping unused offset 2764
stepperEnablePinMode = bits, U32, 2764, [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 2768
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
@ -1779,6 +1780,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Idle Stepper Step", idle_stepperStepPin, useStepperIdle
field = "Idle Stepper Dir", idle_stepperDirectionPin, useStepperIdle
field = "Idle Stepper Enable", stepperEnablePin, useStepperIdle
field = "Idle Stepper Enable mode", stepperEnablePinMode, useStepperIdle
field = "Stepper reaction time", idleStepperReactionTime, useStepperIdle
field = "Stepper total steps", idleStepperTotalSteps, useStepperIdle
@ -1851,15 +1853,18 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
dialog = spiFunction, "SPI settings"
field = "!ECU reboot needed to apply these settings"
field = "SPI1 MOSI", spi1mosiPin
field = "SPI1 MISO", spi1misoPin
field = "SPI1 SCK", spi1sckPin
field = "SPI2 MOSI", spi2mosiPin
field = "SPI2 MISO", spi2misoPin
field = "SPI2 SCK", spi2sckPin
field = "SPI3 MOSI", spi3mosiPin
field = "SPI3 MISO", spi3misoPin
field = "SPI3 SCK", spi3sckPin
field = "SPI1 enable", is_enabled_spi_1
field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1}
field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1}
field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1}
field = "SPI2 enable", is_enabled_spi_2
field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1}
field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1}
field = "SPI2 SCK", spi2sckPin, {is_enabled_spi_2 == 1}
field = "SPI3 enable", is_enabled_spi_3
field = "SPI3 MOSI", spi3mosiPin, {is_enabled_spi_3 == 1}
field = "SPI3 MISO", spi3misoPin, {is_enabled_spi_3 == 1}
field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1}
dialog = fuelClosedLoopDialog, "Fuel closed-loop correction"
field = "Enabled", fuelClosedLoopCorrectionEnabled

22
firmware/tunerstudio/rusefi.input
View File

@ -1714,6 +1714,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Idle Stepper Step", idle_stepperStepPin, useStepperIdle
field = "Idle Stepper Dir", idle_stepperDirectionPin, useStepperIdle
field = "Idle Stepper Enable", stepperEnablePin, useStepperIdle
field = "Idle Stepper Enable mode", stepperEnablePinMode, useStepperIdle
field = "Stepper reaction time", idleStepperReactionTime, useStepperIdle
field = "Stepper total steps", idleStepperTotalSteps, useStepperIdle
@ -1786,15 +1787,18 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
dialog = spiFunction, "SPI settings"
field = "!ECU reboot needed to apply these settings"
field = "SPI1 MOSI", spi1mosiPin
field = "SPI1 MISO", spi1misoPin
field = "SPI1 SCK", spi1sckPin
field = "SPI2 MOSI", spi2mosiPin
field = "SPI2 MISO", spi2misoPin
field = "SPI2 SCK", spi2sckPin
field = "SPI3 MOSI", spi3mosiPin
field = "SPI3 MISO", spi3misoPin
field = "SPI3 SCK", spi3sckPin
field = "SPI1 enable", is_enabled_spi_1
field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1}
field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1}
field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1}
field = "SPI2 enable", is_enabled_spi_2
field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1}
field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1}
field = "SPI2 SCK", spi2sckPin, {is_enabled_spi_2 == 1}
field = "SPI3 enable", is_enabled_spi_3
field = "SPI3 MOSI", spi3mosiPin, {is_enabled_spi_3 == 1}
field = "SPI3 MISO", spi3misoPin, {is_enabled_spi_3 == 1}
field = "SPI3 SCK", spi3sckPin, {is_enabled_spi_3 == 1}
dialog = fuelClosedLoopDialog, "Fuel closed-loop correction"
field = "Enabled", fuelClosedLoopCorrectionEnabled

6
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 Thu Jan 26 22:30:47 EST 2017
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jan 28 19:06:26 EST 2017
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -932,7 +932,8 @@ public class Fields {
public static final int fuelClosedLoopPid_offset_offset = 2752;
public static final int fuelClosedLoopAfrLowThreshold_offset = 2756;
public static final int fuelClosedLoopAfrHighThreshold_offset = 2760;
public static final int unused_offset = 2764;
public static final int stepperEnablePinMode_offset = 2764;
public static final int unused_offset = 2768;
public static final int le_formulas1_offset = 3048;
public static final int le_formulas2_offset = 3248;
public static final int le_formulas3_offset = 3448;
@ -1603,6 +1604,7 @@ public class Fields {
public static final Field FUELCLOSEDLOOPPID_OFFSET = Field.create("FUELCLOSEDLOOPPID_OFFSET", 2752, FieldType.FLOAT);
public static final Field FUELCLOSEDLOOPAFRLOWTHRESHOLD = Field.create("FUELCLOSEDLOOPAFRLOWTHRESHOLD", 2756, FieldType.FLOAT);
public static final Field FUELCLOSEDLOOPAFRHIGHTHRESHOLD = Field.create("FUELCLOSEDLOOPAFRHIGHTHRESHOLD", 2760, FieldType.FLOAT);
public static final Field STEPPERENABLEPINMODE = Field.create("STEPPERENABLEPINMODE", 2764, 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);