rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-04-04 14:07:21 -05:00
parent 78db72f531
commit fb23402407
12 changed files with 122 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/engines/bmw_e34.cpp
View File

@ -73,8 +73,8 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) {
bc->triggerErrorPin = GPIO_UNASSIGNED;
engineConfiguration->clutchUpPin = GPIOD_3;
engineConfiguration->clutchUpPinMode = PI_PULLUP;
boardConfiguration->clutchUpPin = GPIOD_3;
boardConfiguration->clutchUpPinMode = PI_PULLUP;
boardConfiguration->fuelPumpPin = GPIOD_4;

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

@ -205,7 +205,7 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F) {
/**
* Speed Sensor
*/
engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
boardConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
engineConfiguration->hasVehicleSpeedSensor = true;
/**
* Other

6
firmware/config/engines/dodge_neon.cpp
View File

@ -365,8 +365,8 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
// boardConfiguration->clutchDownPin = GPIOC_12;
boardConfiguration->clutchDownPinMode = PI_PULLUP;
engineConfiguration->clutchUpPin = GPIOD_3;
engineConfiguration->clutchUpPinMode = PI_PULLUP;
boardConfiguration->clutchUpPin = GPIOD_3;
boardConfiguration->clutchUpPinMode = PI_PULLUP;
// alt GPIOC_12
@ -379,7 +379,7 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
setFsioExt(engineConfiguration, 0, GPIOE_5, "0 fsio_setting", 400);
#endif
engineConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
boardConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
engineConfiguration->hasVehicleSpeedSensor = true;
engineConfiguration->fanOnTemperature = 85;

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

@ -420,8 +420,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
}
for (int i = 0; i < LE_COMMAND_COUNT; i++) {
boardConfiguration->fsioPins[i] = GPIO_UNASSIGNED;
boardConfiguration->le_formulas[i][0] = 0;
engineConfiguration->fsioInputs[i] = GPIO_UNASSIGNED;
engineConfiguration->le_formulas[i][0] = 0;
boardConfiguration->fsioInputs[i] = GPIO_UNASSIGNED;
engineConfiguration->fsioInputModes[i] = PI_DEFAULT;
}
for (int i = 0; i < JOYSTICK_PIN_COUNT; i++) {
@ -474,8 +474,8 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->clutchDownPin = GPIO_UNASSIGNED;
boardConfiguration->clutchDownPinMode = PI_PULLUP;
engineConfiguration->clutchUpPin = GPIO_UNASSIGNED;
engineConfiguration->clutchUpPinMode = PI_PULLUP;
boardConfiguration->clutchUpPin = GPIO_UNASSIGNED;
boardConfiguration->clutchUpPinMode = PI_PULLUP;
boardConfiguration->triggerSimulatorPins[0] = GPIOD_1;
boardConfiguration->triggerSimulatorPins[1] = GPIOD_2;
@ -518,7 +518,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
boardConfiguration->logicAnalyzerPins[1] = GPIO_UNASSIGNED; // GPIOE_5 is a popular option (if available)
boardConfiguration->logicAnalyzerPins[2] = GPIO_UNASSIGNED;
boardConfiguration->logicAnalyzerPins[3] = GPIO_UNASSIGNED;
engineConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
boardConfiguration->vehicleSpeedSensorInputPin = GPIO_UNASSIGNED;
engineConfiguration->vehicleSpeedCoef = 100;
boardConfiguration->logicAnalyzerMode[0] = false;

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

@ -1,4 +1,4 @@
// this section was generated by config_definition.jar on Sat Apr 04 10:01:54 EDT 2015
// this section was generated by config_definition.jar on Sat Apr 04 14:18:42 EDT 2015
// begin
#include "rusefi_types.h"
typedef struct {
@ -612,12 +612,25 @@ typedef struct {
/**
* offset 792
*/
int unusedbs[3];
brain_pin_e vehicleSpeedSensorInputPin;
/**
* Some vehicles have a switch to indicate that clutch pedal is all the way up
* offset 796
*/
brain_pin_e clutchUpPin;
/**
* offset 800
*/
pin_input_mode_e clutchUpPinMode;
/**
* offset 804
*/
le_formula_t le_formulas[LE_COMMAND_COUNT];
/** total size 4004*/
brain_pin_e fsioInputs[LE_COMMAND_COUNT];
/**
* offset 868
*/
int unusedbs;
/** total size 872*/
} board_configuration_s;
typedef struct {
@ -789,7 +802,7 @@ typedef struct {
/**
* offset 716
*/
brain_pin_e vehicleSpeedSensorInputPin;
int ususedBla;
/**
* This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h
* offset 720
@ -899,195 +912,190 @@ typedef struct {
* offset 872
*/
board_configuration_s bc;
/**
* offset 1744
*/
le_formula_t le_formulas[LE_COMMAND_COUNT];
/**
* @see isMapAveragingEnabled
offset 4876 bit 0 */
offset 4944 bit 0 */
bool_t hasMapSensor : 1;
/**
offset 4876 bit 1 */
offset 4944 bit 1 */
bool_t hasIatSensor : 1;
/**
offset 4876 bit 2 */
offset 4944 bit 2 */
bool_t hasBaroSensor : 1;
/**
offset 4876 bit 3 */
offset 4944 bit 3 */
bool_t hasAfrSensor : 1;
/**
offset 4876 bit 4 */
offset 4944 bit 4 */
bool_t useConstantDwellDuringCranking : 1;
/**
offset 4876 bit 5 */
offset 4944 bit 5 */
bool_t isDigitalChartEnabled : 1;
/**
offset 4876 bit 6 */
offset 4944 bit 6 */
bool_t isCanEnabled : 1;
/**
offset 4876 bit 7 */
offset 4944 bit 7 */
bool_t hasCltSensor : 1;
/**
offset 4876 bit 8 */
offset 4944 bit 8 */
bool_t canReadEnabled : 1;
/**
offset 4876 bit 9 */
offset 4944 bit 9 */
bool_t canWriteEnabled : 1;
/**
offset 4876 bit 10 */
offset 4944 bit 10 */
bool_t hasVehicleSpeedSensor : 1;
/**
offset 4876 bit 11 */
offset 4944 bit 11 */
bool_t isJoystickEnabled : 1;
/**
offset 4876 bit 12 */
offset 4944 bit 12 */
bool_t isGpsEnabled : 1;
/**
offset 4876 bit 13 */
offset 4944 bit 13 */
bool_t isAlternatorControlEnabled : 1;
/**
offset 4876 bit 14 */
offset 4944 bit 14 */
bool_t hasMafSensor : 1;
/**
offset 4876 bit 15 */
offset 4944 bit 15 */
bool_t hasTpsSensor : 1;
/**
* offset 4880
* offset 4948
*/
adc_channel_e hipOutputChannel;
/**
* offset 4884
* offset 4952
*/
idle_mode_e idleMode;
/**
offset 4888 bit 0 */
offset 4956 bit 0 */
bool_t isInjectionEnabled : 1;
/**
offset 4888 bit 1 */
offset 4956 bit 1 */
bool_t isIgnitionEnabled : 1;
/**
offset 4888 bit 2 */
offset 4956 bit 2 */
bool_t isCylinderCleanupEnabled : 1;
/**
offset 4888 bit 3 */
offset 4956 bit 3 */
bool_t secondTriggerChannelEnabled : 1;
/**
offset 4888 bit 4 */
offset 4956 bit 4 */
bool_t needSecondTriggerInputDeprecated : 1;
/**
offset 4888 bit 5 */
offset 4956 bit 5 */
bool_t isMapAveragingEnabled : 1;
/**
offset 4888 bit 6 */
offset 4956 bit 6 */
bool_t isMilEnabled : 1;
/**
offset 4888 bit 7 */
offset 4956 bit 7 */
bool_t isFuelPumpEnabled : 1;
/**
offset 4888 bit 8 */
offset 4956 bit 8 */
bool_t isTunerStudioEnabled : 1;
/**
offset 4888 bit 9 */
offset 4956 bit 9 */
bool_t isWaveAnalyzerEnabled : 1;
/**
offset 4888 bit 10 */
offset 4956 bit 10 */
bool_t isIdleThreadEnabled : 1;
/**
offset 4888 bit 11 */
offset 4956 bit 11 */
bool_t isPrintTriggerSynchDetails : 1;
/**
* Usually if we have no trigger events that means engine is stopped
* Unless we are troubleshooting and spinning the engine by hand - this case a longer
* delay is needed
offset 4888 bit 12 */
offset 4956 bit 12 */
bool_t isManualSpinningMode : 1;
/**
offset 4888 bit 13 */
offset 4956 bit 13 */
bool_t twoWireBatch : 1;
/**
* offset 4892
*/
uint32_t digitalChartSize;
/**
* offset 4896
*/
float crankingFuelCoef[CRANKING_CURVE_SIZE];
/**
* offset 4928
*/
float crankingFuelBins[CRANKING_CURVE_SIZE];
/**
* offset 4960
*/
uint32_t digitalChartSize;
/**
* offset 4964
*/
float crankingFuelCoef[CRANKING_CURVE_SIZE];
/**
* offset 4996
*/
float crankingFuelBins[CRANKING_CURVE_SIZE];
/**
* offset 5028
*/
float crankingCycleCoef[CRANKING_CURVE_SIZE];
/**
* offset 4992
* offset 5060
*/
float crankingCycleBins[CRANKING_CURVE_SIZE];
/**
* offset 5024
* offset 5092
*/
float ignitionDwellForCrankingMs;
/**
* offset 5028
* offset 5096
*/
int targetIdleRpm;
/**
* A/C button input handled as analog input
* offset 5032
* offset 5100
*/
adc_channel_e acSwitchAdc;
/**
* offset 5036
* offset 5104
*/
int ignMathCalculateAtIndex;
/**
* offset 5040
* offset 5108
*/
int16_t acCutoffLowRpm;
/**
* offset 5042
* offset 5110
*/
int16_t acCutoffHighRpm;
/**
* offset 5044
* offset 5112
*/
int16_t acIdleRpmBump;
/**
* offset 5046
* offset 5114
*/
int16_t unusedShort;
/**
* offset 5048
* offset 5116
*/
adc_channel_e vRefAdcChannel;
/**
* offset 5052
* offset 5120
*/
float knockDetectionWindowStart;
/**
* offset 5056
* offset 5124
*/
float knockDetectionWindowEnd;
/**
* Cylinder diameter, in mm.
* offset 5060
* offset 5128
*/
float cylinderBore;
/**
* Some vehicles have a switch to indicate that clutch pedal is all the way up
* offset 5064
* offset 5132
*/
brain_pin_e clutchUpPin;
int unusedCP;
/**
* offset 5068
*/
pin_input_mode_e clutchUpPinMode;
/**
* offset 5072
* offset 5136
*/
float hipThreshold;
/**
* offset 5076
*/
brain_pin_e fsioInputs[LE_COMMAND_COUNT];
/**
* offset 5140
*/
@ -1235,4 +1243,4 @@ typedef struct {
} engine_configuration_s;
// end
// this section was generated by config_definition.jar on Sat Apr 04 10:01:54 EDT 2015
// this section was generated by config_definition.jar on Sat Apr 04 14:18:42 EDT 2015

10
firmware/controllers/core/fsio_impl.cpp
View File

@ -123,7 +123,7 @@ void setFsioExt(engine_configuration_s *engineConfiguration, int index, brain_pi
if (len >= LE_COMMAND_LENGTH) {
return;
}
strcpy(boardConfiguration->le_formulas[index], exp);
strcpy(engineConfiguration->le_formulas[index], exp);
boardConfiguration->fsioFrequency[index] = freq;
}
@ -137,7 +137,7 @@ void applyFsioConfiguration(DECLARE_ENGINE_PARAMETER_F) {
brain_pin_e brainPin = boardConfiguration->fsioPins[i];
if (brainPin != GPIO_UNASSIGNED) {
const char *formula = boardConfiguration->le_formulas[i];
const char *formula = engineConfiguration->le_formulas[i];
LEElement *logic = userPool.parseExpression(formula);
if (logic == NULL) {
warning(OBD_PCM_Processor_Fault, "parsing [%s]", formula);
@ -248,7 +248,7 @@ static void showFsioInfo(void) {
showFsio("alt", alternatorLogic);
for (int i = 0; i < LE_COMMAND_COUNT; i++) {
char * exp = boardConfiguration->le_formulas[i];
char * exp = engineConfiguration->le_formulas[i];
if (exp[0] != 0) {
/**
* in case of FSIO user interface indexes are starting with 0, the argument for that
@ -305,7 +305,7 @@ static void setUserOutput(const char *indexStr, const char *quotedLine, Engine *
}
scheduleMsg(logger, "setting user out #%d to [%s]", index + 1, l);
strcpy(engine->engineConfiguration->bc.le_formulas[index], l);
strcpy(engine->engineConfiguration->le_formulas[index], l);
// this would apply the changes
applyFsioConfiguration(PASS_ENGINE_PARAMETER_F);
showFsioInfo();
@ -390,7 +390,7 @@ void initFsioImpl(Logging *sharedLogger, Engine *engine) {
}
for (int i = 0; i < LE_COMMAND_COUNT; i++) {
brain_pin_e inputPin = engineConfiguration->fsioInputs[i];
brain_pin_e inputPin = boardConfiguration->fsioInputs[i];
if (inputPin != GPIO_UNASSIGNED) {
mySetPadMode2("FSIO input", inputPin, getInputMode(engineConfiguration->fsioInputModes[i]));

2
firmware/controllers/flash_main.h
View File

@ -12,7 +12,7 @@
#include "engine_configuration.h"
#include "engine.h"
#define FLASH_DATA_VERSION 7610
#define FLASH_DATA_VERSION 7612
void readFromFlash(void);
void initFlash(Logging *sharedLogger, Engine *engine);

12
firmware/controllers/idle_thread.cpp
View File

@ -112,9 +112,9 @@ static msg_t ivThread(int param) {
engine->clutchDownState = palReadPad(getHwPort(boardConfiguration->clutchDownPin),
getHwPin(boardConfiguration->clutchDownPin));
}
if (engineConfiguration->clutchUpPin != GPIO_UNASSIGNED) {
engine->clutchUpState = palReadPad(getHwPort(engineConfiguration->clutchUpPin),
getHwPin(engineConfiguration->clutchUpPin));
if (boardConfiguration->clutchUpPin != GPIO_UNASSIGNED) {
engine->clutchUpState = palReadPad(getHwPort(boardConfiguration->clutchUpPin),
getHwPin(boardConfiguration->clutchUpPin));
}
if (engineConfiguration->idleMode != IM_AUTO)
@ -174,9 +174,9 @@ void startIdleThread(Logging*sharedLogger, Engine *engine) {
mySetPadMode2("clutch down switch", boardConfiguration->clutchDownPin,
getInputMode(boardConfiguration->clutchDownPinMode));
if (engineConfiguration->clutchUpPin != GPIO_UNASSIGNED)
mySetPadMode2("clutch up switch", engineConfiguration->clutchUpPin,
getInputMode(engineConfiguration->clutchUpPinMode));
if (boardConfiguration->clutchUpPin != GPIO_UNASSIGNED)
mySetPadMode2("clutch up switch", boardConfiguration->clutchUpPin,
getInputMode(boardConfiguration->clutchUpPinMode));
addConsoleAction("idleinfo", showIdleInfo);
addConsoleActionI("set_idle_rpm", setIdleRpmAction);

2
firmware/controllers/settings.cpp
View File

@ -254,7 +254,7 @@ void printConfiguration(engine_configuration_s *engineConfiguration) {
boolToString(engineConfiguration->isManualSpinningMode),
boolToString(engineConfiguration->isCylinderCleanupEnabled));
scheduleMsg(&logger, "clutchUp@%s: %s", hwPortname(engineConfiguration->clutchUpPin),
scheduleMsg(&logger, "clutchUp@%s: %s", hwPortname(boardConfiguration->clutchUpPin),
boolToString(engine->clutchUpState));
scheduleMsg(&logger, "clutchDown@%s: %s", hwPortname(boardConfiguration->clutchDownPin),
boolToString(engine->clutchDownState));

6
firmware/hw_layer/vehicle_speed.cpp
View File

@ -44,7 +44,7 @@ static void vsAnaWidthCallback(void) {
static void speedInfo(void) {
scheduleMsg(logger, "VSS@%s c=%f eventCounter=%d speed=%f",
hwPortname(engineConfiguration->vehicleSpeedSensorInputPin),
hwPortname(boardConfiguration->vehicleSpeedSensorInputPin),
engineConfiguration->vehicleSpeedCoef,
vssCounter,
getVehicleSpeed());
@ -52,9 +52,9 @@ static void speedInfo(void) {
void initVehicleSpeed(Logging *l) {
logger = l;
if (engineConfiguration->vehicleSpeedSensorInputPin == GPIO_UNASSIGNED)
if (boardConfiguration->vehicleSpeedSensorInputPin == GPIO_UNASSIGNED)
return;
initWaveAnalyzerDriver(&vehicleSpeedInput, engineConfiguration->vehicleSpeedSensorInputPin);
initWaveAnalyzerDriver(&vehicleSpeedInput, boardConfiguration->vehicleSpeedSensorInputPin);
startInputDriver(&vehicleSpeedInput, true);
vehicleSpeedInput.widthListeners.registerCallback((VoidInt) vsAnaWidthCallback, NULL);

18
firmware/integration/rusefi_config.txt
View File

@ -175,7 +175,7 @@ float vbattDividerCoeff;;"coef", 1, 0, 0.01, 20.0, 2
float fanOnTemperature;Cooling fan turn-on temperature threshold, in Celsuis;"*C", 1, 0, 0, 1000.0, 2
float fanOffTemperature;Cooling fan turn-off temperature threshold, in Celsuis;"*C", 1, 0, 0, 1000.0, 2
brain_pin_e vehicleSpeedSensorInputPin;
int ususedBla;
float vehicleSpeedCoef;This coefficient translates vehicle speed input frequency (in Hz) into vehicle speed, km/h
custom can_nbc_e 4 bits, U32, @OFFSET@, [0:1], "BMW", "FIAT", "VAG" , "INVALID"
@ -399,14 +399,20 @@ custom analog_chart_e 4 bits, S32, @OFFSET@, [0:1], "none", "trigger", "MAP", "I
analog_chart_e analogChartMode;
maf_sensor_type_e mafSensorType;
int[3] unusedbs;
brain_pin_e vehicleSpeedSensorInputPin;
brain_pin_e clutchUpPin;Some vehicles have a switch to indicate that clutch pedal is all the way up
pin_input_mode_e clutchUpPinMode;
brain_pin_e[LE_COMMAND_COUNT iterate] fsioInputs;
int unusedbs;
custom le_formula_t 200 array, U08, @OFFSET@, [200],"char", 1, 0, 0.0, 3.0, 2
le_formula_t[LE_COMMAND_COUNT iterate] le_formulas;
end_struct
custom le_formula_t 200 array, U08, @OFFSET@, [200],"char", 1, 0, 0.0, 3.0, 2
board_configuration_s bc;
le_formula_t[LE_COMMAND_COUNT iterate] le_formulas;
bit hasMapSensor;@see isMapAveragingEnabled
bit hasIatSensor
bit hasBaroSensor
@ -475,10 +481,8 @@ bit hasMapSensor;@see isMapAveragingEnabled
float cylinderBore;Cylinder diameter, in mm.
brain_pin_e clutchUpPin;Some vehicles have a switch to indicate that clutch pedal is all the way up
pin_input_mode_e clutchUpPinMode;
int unusedCP;
float hipThreshold;
brain_pin_e[LE_COMMAND_COUNT iterate] fsioInputs;
custom pin_input_mode_e 4 scalar, F32, @OFFSET@, "ms", 1, 0, 0, 200, 1
pin_input_mode_e[LE_COMMAND_COUNT iterate] fsioInputModes;

2
java_console/autotest/src/com/rusefi/TestingUtils.java
View File

@ -95,7 +95,7 @@ public class TestingUtils {
System.out.println("f " + revolutionLog.getCrankAngleByTime(ud.downTime));
System.out.println("t " + revolutionLog.getCrankAngleByTime(ud.upTime));
}
assertCloseEnough(msg + "width for " + key, actualWidth, widthRatio, expectedWidth);
assertCloseEnough(msg + " width for " + key, actualWidth, widthRatio, expectedWidth);
}
}