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 2016-07-02 16:03:00 -04:00
parent 5db2d4d5a5
commit 1b00bc9053
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/algo/aux_pid.cpp
View File

@ -76,13 +76,13 @@ void initAuxPid(Logging *sharedLogger) {
return;
}
if (boardConfiguration->fsioPins[0] == GPIO_UNASSIGNED) {
if (engineConfiguration->auxPidPins[0] == GPIO_UNASSIGNED) {
return;
}
startSimplePwmExt(&auxPid1, "Aux PID", boardConfiguration->fsioPins[0],
startSimplePwmExt(&auxPid1, "Aux PID", engineConfiguration->auxPidPins[0],
&auxPid1Pin,
boardConfiguration->fsioFrequency[0], 0.1, applyPinState);
engineConfiguration->auxPidFrequency[0], 0.1, applyPinState);
}
#endif

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 Sat Jul 02 13:50:20 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 02 13:56:26 EDT 2016
// begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1667,7 +1667,11 @@ typedef struct {
/**
* offset 2472
*/
int unused[144];
int alternatorPwmFrequency;
/**
* offset 2476
*/
int unused[143];
/** total size 3048*/
} engine_configuration_s;
@ -1882,4 +1886,4 @@ typedef struct {
#endif
// end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 02 13:50:20 EDT 2016
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 02 13:56:26 EDT 2016

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

@ -856,7 +856,8 @@
#define auxPidFrequency2_offset 2466
#define auxPidFrequency3_offset 2468
#define auxPidFrequency4_offset 2470
#define unused_offset 2472
#define alternatorPwmFrequency_offset 2472
#define unused_offset 2476
#define le_formulas1_offset 3048
#define le_formulas2_offset 3248
#define le_formulas3_offset 3448

3
firmware/integration/rusefi_config.txt
View File

@ -708,7 +708,8 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300,
float tChargeMaxRpmMaxTps;
brain_pin_e[AUX_PID_COUNT iterate] auxPidPins;
fsio_pwm_freq_t[AUX_PID_COUNT iterate] auxPidFrequency;
int[144] unused;
int alternatorPwmFrequency;;"Hz", 1, 0, 0, 3000.0, 0
int[143] unused;
end_struct

9
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 Jul 02 13:50:20 EDT 2016
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jul 02 13:56:26 EDT 2016
pageSize = 16376
page = 1
@ -591,7 +591,8 @@ page = 1
auxPidFrequency2 = scalar, U16, 2466, "Hz", 1, 0, 0, 3000, 0
auxPidFrequency3 = scalar, U16, 2468, "Hz", 1, 0, 0, 3000, 0
auxPidFrequency4 = scalar, U16, 2470, "Hz", 1, 0, 0, 3000, 0
;skipping unused offset 2472
alternatorPwmFrequency = scalar, S32, 2472, "Hz", 1, 0, 0, 3000.0, 0
;skipping unused offset 2476
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
@ -1654,8 +1655,8 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
dialog = auxPidDialog, "Aux PID"
field = "Enabled", activateAuxPid1
field = "FSIO pin #1", fsioPins1
field = "PWM Frequency", fsioFrequency1
field = "FSIO pin #1", auxPidPins1
field = "PWM Frequency", auxPidFrequency1
field = "verbose", isVerboseAuxPid
field = "#target based on FSIO map#1"
field = "control period", auxPid1DT, {activateAuxPid1 == 1}