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

#351

This commit is contained in:
rusefi 2017-06-13 10:40:16 -04:00
parent 3f61be1a3b
commit 9a0378c335
7 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,6 +274,7 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) {
engineConfiguration->cj125ur = EFI_ADC_NONE; engineConfiguration->cj125ur = EFI_ADC_NONE;
boardConfiguration->idle.stepperDirectionPin = GPIO_UNASSIGNED; boardConfiguration->idle.stepperDirectionPin = GPIO_UNASSIGNED;
engineConfiguration->stepperDirectionPinMode = OM_DEFAULT;
boardConfiguration->idle.stepperStepPin = GPIO_UNASSIGNED; boardConfiguration->idle.stepperStepPin = GPIO_UNASSIGNED;
engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED; engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED;
engineConfiguration->stepperEnablePinMode = OM_DEFAULT; engineConfiguration->stepperEnablePinMode = OM_DEFAULT;

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 Mon Jun 12 18:21:38 EDT 2017 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 13 10:18:38 EDT 2017
// begin // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -1547,7 +1547,11 @@ typedef struct {
/** /**
* offset 2020 * offset 2020
*/ */
float unusedetb[2]; pin_output_mode_e stepperDirectionPinMode;
/**
* offset 2024
*/
float unusedetb;
/** /**
* CLT-based target RPM for automatic idle controller * CLT-based target RPM for automatic idle controller
* offset 2028 * offset 2028
@ -2118,4 +2122,4 @@ typedef struct {
#endif #endif
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Jun 12 18:21:38 EDT 2017 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 13 10:18:38 EDT 2017

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

@ -1099,8 +1099,10 @@
#define throttlePedalUpVoltage_offset_hex 7dc #define throttlePedalUpVoltage_offset_hex 7dc
#define throttlePedalWOTVoltage_offset 2016 #define throttlePedalWOTVoltage_offset 2016
#define throttlePedalWOTVoltage_offset_hex 7e0 #define throttlePedalWOTVoltage_offset_hex 7e0
#define unusedetb_offset 2020 #define stepperDirectionPinMode_offset 2020
#define unusedetb_offset_hex 7e4 #define stepperDirectionPinMode_offset_hex 7e4
#define unusedetb_offset 2024
#define unusedetb_offset_hex 7e8
#define cltIdleRpmBins_offset 2028 #define cltIdleRpmBins_offset 2028
#define cltIdleRpmBins_offset_hex 7ec #define cltIdleRpmBins_offset_hex 7ec
#define cltIdleRpm_offset 2092 #define cltIdleRpm_offset 2092

3
firmware/integration/rusefi_config.txt
View File

@ -706,7 +706,8 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@
float throttlePedalUpVoltage;;"voltage", 1, 0, -6, 6, 2 float throttlePedalUpVoltage;;"voltage", 1, 0, -6, 6, 2
float throttlePedalWOTVoltage;+Pedal in the floor;"voltage", 1, 0, -6, 6, 2 float throttlePedalWOTVoltage;+Pedal in the floor;"voltage", 1, 0, -6, 6, 2
float[2] unusedetb; pin_output_mode_e stepperDirectionPinMode;
float unusedetb;
float[CLT_CURVE_SIZE] cltIdleRpmBins;CLT-based target RPM for automatic idle controller;"C", 1, 0, -100.0, 250.0, 2 float[CLT_CURVE_SIZE] cltIdleRpmBins;CLT-based target RPM for automatic idle controller;"C", 1, 0, -100.0, 250.0, 2
float[CLT_CURVE_SIZE] cltIdleRpm;;"RPM", 1, 0, 0.0, 400.0, 0 float[CLT_CURVE_SIZE] cltIdleRpm;;"RPM", 1, 0, 0.0, 400.0, 0

2
firmware/rusefi.cpp
View File

@ -260,5 +260,5 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0) if (initBootloader() != 0)
return 123; return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */ #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20170611; return 20170613;
} }

6
firmware/tunerstudio/rusefi.ini
View File

@ -45,7 +45,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 Mon Jun 12 18:21:38 EDT 2017 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Jun 13 10:18:38 EDT 2017
pageSize = 16376 pageSize = 16376
page = 1 page = 1
@ -551,7 +551,8 @@ page = 1
knockNoiseRpmBins = array, F32, 1980, [8], "RPM", 1, 0, 0.0, 18000, 2 knockNoiseRpmBins = array, F32, 1980, [8], "RPM", 1, 0, 0.0, 18000, 2
throttlePedalUpVoltage = scalar, F32, 2012, "voltage", 1, 0, -6, 6, 2 throttlePedalUpVoltage = scalar, F32, 2012, "voltage", 1, 0, -6, 6, 2
throttlePedalWOTVoltage = scalar, F32, 2016, "voltage", 1, 0, -6, 6, 2 throttlePedalWOTVoltage = scalar, F32, 2016, "voltage", 1, 0, -6, 6, 2
;skipping unusedetb offset 2020 stepperDirectionPinMode = bits, U32, 2020, [0:1], "default", "default inverted", "open collector", "open collector inverted"
;skipping unusedetb offset 2024
cltIdleRpmBins = array, F32, 2028, [16], "C", 1, 0, -100.0, 250.0, 2 cltIdleRpmBins = array, F32, 2028, [16], "C", 1, 0, -100.0, 250.0, 2
cltIdleRpm = array, F32, 2092, [16], "RPM", 1, 0, 0.0, 400.0, 0 cltIdleRpm = array, F32, 2092, [16], "RPM", 1, 0, 0.0, 400.0, 0
targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1 targetVBatt = scalar, F32, 2156, "Volts", 1, 0, 0,30, 1
@ -1790,6 +1791,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56"
field = "O2 heater pin", o2heaterPin field = "O2 heater pin", o2heaterPin
field = "Idle Solenoid Pin", idle_solenoidPin field = "Idle Solenoid Pin", idle_solenoidPin
field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Dir", idle_stepperDirectionPin
field = "Idle Stepper Dir Mode", stepperDirectionPinMode
field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Step", idle_stepperStepPin
field = "Idle Stepper Enable", stepperEnablePin field = "Idle Stepper Enable", stepperEnablePin
field = "Idle Stepper Pulse", idleStepperPulseDuration field = "Idle Stepper Pulse", idleStepperPulseDuration

1
firmware/tunerstudio/rusefi.input
View File

@ -1026,6 +1026,7 @@ cmd_call_from_pit = "w\x00\x20\x34\x56"
field = "O2 heater pin", o2heaterPin field = "O2 heater pin", o2heaterPin
field = "Idle Solenoid Pin", idle_solenoidPin field = "Idle Solenoid Pin", idle_solenoidPin
field = "Idle Stepper Dir", idle_stepperDirectionPin field = "Idle Stepper Dir", idle_stepperDirectionPin
field = "Idle Stepper Dir Mode", stepperDirectionPinMode
field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Step", idle_stepperStepPin
field = "Idle Stepper Enable", stepperEnablePin field = "Idle Stepper Enable", stepperEnablePin
field = "Idle Stepper Pulse", idleStepperPulseDuration field = "Idle Stepper Pulse", idleStepperPulseDuration