FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-12-17 09:02:59 -05:00
parent 68957c7a70
commit 4f36805664
18 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ void setCamaro4(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->map.sensor.hwChannel = EFI_ADC_0; // PA0
engineConfiguration->mafAdcChannel = EFI_ADC_NONE;
engineConfiguration->hasMafSensor = false;
engineConfiguration->tpsAdcChannel = EFI_ADC_2;
@ -51,7 +51,7 @@ void setCamaro4(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->vbattAdcChannel = EFI_ADC_14;
engineConfiguration->afr.hwChannel = EFI_ADC_13;
engineConfiguration->hasMafSensor = false;
boardConfiguration->injectionPins[0] = GPIOE_6;
boardConfiguration->injectionPins[1] = GPIOE_5;

1
firmware/config/engines/ford_festiva.cpp
View File

@ -120,7 +120,6 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->hasBaroSensor = false;
engineConfiguration->hasMapSensor = true;
boardConfiguration->isFastAdcEnabled = true;
engineConfiguration->map.sensor.type = MT_DENSO183;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;

1
firmware/config/engines/ford_fiesta.cpp
View File

@ -26,7 +26,6 @@ void setFordFiestaDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->ignitionMode = IM_WASTED_SPARK;
engineConfiguration->specs.firingOrder = FO_1_3_4_2;
engineConfiguration->hasMafSensor = true;
engineConfiguration->afr.hwChannel = EFI_ADC_NONE;
engineConfiguration->mafAdcChannel = EFI_ADC_14;
// engineConfiguration->mafAdcChannel = EFI_ADC_NONE; this would kill functional tests

1
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -92,7 +92,6 @@ static const fuel_table_t mafBased16FuelTable = {
void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) {
setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_F);
engineConfiguration->hasMapSensor = true;
// Frankenso analog #6 pin 3R, W56 (5th lower row pin from the end) top <> W45 bottom jumper, not OEM
engineConfiguration->map.sensor.hwChannel = EFI_ADC_7;
engineConfiguration->map.sensor.type = MT_CUSTOM;

2
firmware/console/status_loop.cpp
View File

@ -195,7 +195,7 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorF(log, fileFormat, "mafr", "kg/hr", getRealMaf(PASS_ENGINE_PARAMETER_F), 2);
}
#if EFI_ANALOG_SENSORS || defined(__DOXYGEN__)
if (engineConfiguration->hasMapSensor) {
if (engineConfiguration->map.sensor.hwChannel != EFI_ADC_NONE) {
reportSensorF(log, fileFormat, "MAP", "kPa", getMap(), 2);
// reportSensorF(log, fileFormat, "map_r", "V", getRawMap(), 2);
}

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

@ -86,7 +86,7 @@ static msg_t auxPidThread(int param) {
if (engineConfiguration->debugMode == AUX_PID_1) {
tsOutputChannels.debugFloatField1 = pwm;
auxPid.postState(&tsOutputChannels);
tsOutputChannels.debugIntField3 = 10 * targetValue;
tsOutputChannels.debugIntField3 = (int)(10 * targetValue);
}
auxPidPwm[0].setSimplePwmDutyCycle(pwm / 100);

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

@ -635,7 +635,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->baroSensor.highValue = 500;
engineConfiguration->hasMapSensor = true;
engineConfiguration->hasMafSensor = true;
engineConfiguration->hasTpsSensor = true;
engineConfiguration->hasAfrSensor = true;
engineConfiguration->hasBaroSensor = false;

2
firmware/controllers/algo/obd_error_codes.h
View File

@ -143,7 +143,7 @@ typedef enum {
//P0117 Engine Coolant Temperature Circuit Low Input
//P0118 Engine Coolant Temperature Circuit High Input
//P0119 Engine Coolant Temperature Circuit Intermittent
//P0120 Throttle Position Sensor/Switch A Circuit Malfunction
OBD_Throttle_Position_Sensor_Circuit_Malfunction = 120,
//P0121 Throttle Position Sensor/Switch A Circuit Range/Performance Problem
//P0122 Throttle Position Sensor/Switch A Circuit Low Input
//P0123 Throttle Position Sensor/Switch A Circuit High Input

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

@ -615,21 +615,21 @@
#define fsioDigitalInputs15_offset 1476
#define fsioDigitalInputs16_offset 1480
#define frequencyReportingMapInputPin_offset 1484
#define hasMapSensor_offset 1488
#define hasIatSensor_offset 1488
#define unusedBit__4_offset 1488
#define unusedBit__1_offset 1488
#define hasBaroSensor_offset 1488
#define hasAfrSensor_offset 1488
#define useConstantDwellDuringCranking_offset 1488
#define isEngineChartEnabled_offset 1488
#define isCanEnabled_offset 1488
#define hasCltSensor_offset 1488
#define unusedBit__2_offset 1488
#define canReadEnabled_offset 1488
#define canWriteEnabled_offset 1488
#define hasVehicleSpeedSensor_offset 1488
#define isJoystickEnabled_offset 1488
#define isGpsEnabled_offset 1488
#define isAlternatorControlEnabled_offset 1488
#define hasMafSensor_offset 1488
#define unusedBit__3_offset 1488
#define hasTpsSensor_offset 1488
#define cutFuelOnHardLimit_offset 1488
#define cutSparkOnHardLimit_offset 1488

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

@ -281,7 +281,7 @@ static void setPinState(const char * msg, OutputPin *pin, LEElement *element, En
if (element == NULL) {
warning(CUSTOM_OBD_11, "invalid expression for %s", msg);
} else {
int value = calc.getValue2(pin->getLogicValue(), element, engine);
int value = (int)calc.getValue2(pin->getLogicValue(), element, engine);
if (pin->isInitialized() && value != pin->getLogicValue()) {
if (isRunningBenchTest()) {
return; // let's not mess with bench testing
@ -398,7 +398,7 @@ static void showFsioInfo(void) {
*/
static void setFsioSetting(float indexF, float value) {
#if EFI_PROD_CODE || EFI_SIMULATOR
int index = indexF;
int index = (int)indexF;
if (index < 0 || index >= LE_COMMAND_COUNT) {
scheduleMsg(logger, "invalid FSIO index: %d", index);
return;

4
firmware/controllers/engine_controller.cpp
View File

@ -312,8 +312,10 @@ static void printAnalogInfo(void) {
printAnalogChannelInfo("fuel gauge", engineConfiguration->fuelLevelSensor);
printAnalogChannelInfo("TPS", engineConfiguration->tpsAdcChannel);
printAnalogChannelInfo("pPS", engineConfiguration->pedalPositionChannel);
if (engineConfiguration->clt.adcChannel != EFI_ADC_NONE) {
printAnalogChannelInfo("CLT", engineConfiguration->clt.adcChannel);
if (engineConfiguration->hasIatSensor) {
}
if (engineConfiguration->iat.adcChannel != EFI_ADC_NONE) {
printAnalogChannelInfo("IAT", engineConfiguration->iat.adcChannel);
}
if (hasMafSensor()) {

2
firmware/controllers/sensors/maf.cpp
View File

@ -14,7 +14,7 @@ float getMaf(DECLARE_ENGINE_PARAMETER_F) {
}
bool hasMafSensor(DECLARE_ENGINE_PARAMETER_F) {
return engineConfiguration->hasMafSensor && engineConfiguration->mafAdcChannel != EFI_ADC_NONE;
return engineConfiguration->mafAdcChannel != EFI_ADC_NONE;
}
/**

2
firmware/controllers/sensors/thermistors.cpp
View File

@ -183,9 +183,7 @@ float getIntakeAirTemperature(DECLARE_ENGINE_PARAMETER_F) {
float temperature = getTemperatureC(&engineConfiguration->iat, &engine->engineState.iatCurve);
if (!isValidIntakeAirTemperature(temperature)) {
efiAssert(engineConfiguration!=NULL, "NULL engineConfiguration", NAN);
if (engineConfiguration->hasIatSensor) {
warning(OBD_Intake_Air_Temperature_Circuit_Malfunction, "unrealistic IAT %f", temperature);
}
return LIMPING_MODE_IAT_TEMPERATURE;
}
return temperature;

1
firmware/controllers/system/event_queue.cpp
View File

@ -94,7 +94,6 @@ bool EventQueue::insertTask(const bool monitorReuse, const char *prefix, schedul
* @return Get the timestamp of the soonest pending action, skipping all the actions in the past
*/
efitime_t EventQueue::getNextEventTime(efitime_t nowX) {
efitime_t nextTimeUs = EMPTY_QUEUE;
if (head != NULL) {
if (head->momentX <= nowX) {

2
firmware/controllers/trigger/rpm_calculator.cpp
View File

@ -220,7 +220,7 @@ void rpmShaftPositionCallback(trigger_event_e ckpSignalType,
if (diffNt == 0) {
rpmState->setRpmValue(NOISY_RPM PASS_ENGINE_PARAMETER);
} else {
int mult = getEngineCycle(engineConfiguration->operationMode) / 360;
int mult = (int)getEngineCycle(engineConfiguration->operationMode) / 360;
int rpm = (int) (60 * US2NT(US_PER_SECOND_LL) * mult / diffNt);
rpmState->setRpmValue(rpm > UNREALISTIC_RPM ? NOISY_RPM : rpm PASS_ENGINE_PARAMETER);
}

2
firmware/hw_layer/adc_inputs.cpp
View File

@ -498,7 +498,7 @@ static void adc_callback_slow(ADCDriver *adcp, adcsample_t *buffer, size_t n) {
// }
// float result = biq[i].getValue(value);
slowAdc.values.adc_data[i] = result;
slowAdc.values.adc_data[i] = (int)result;
}
slowAdcCounter++;
}

1
firmware/tunerstudio/rusefi.input
View File

@ -1795,7 +1795,6 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "!ECU reboot needed to apply these settings"
field = "TPS ADC input", tpsAdcChannel
field = "!todo: move MAF channel to maf curve dialog"
field = "MAF enabled", hasMafSensor
field = "MAF ADC input", mafAdcChannel
field = "Baro ADC input", baroSensor_hwChannel
field = "Analog divider", analogInputDividerCoefficient

18
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 Tue Dec 06 22:04:27 EST 2016
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Dec 17 08:49:17 EST 2016
public class Fields {
public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4;
@ -619,21 +619,21 @@ public class Fields {
public static final int fsioDigitalInputs15_offset = 1476;
public static final int fsioDigitalInputs16_offset = 1480;
public static final int frequencyReportingMapInputPin_offset = 1484;
public static final int hasMapSensor_offset = 1488;
public static final int hasIatSensor_offset = 1488;
public static final int unusedBit__4_offset = 1488;
public static final int unusedBit__1_offset = 1488;
public static final int hasBaroSensor_offset = 1488;
public static final int hasAfrSensor_offset = 1488;
public static final int useConstantDwellDuringCranking_offset = 1488;
public static final int isEngineChartEnabled_offset = 1488;
public static final int isCanEnabled_offset = 1488;
public static final int hasCltSensor_offset = 1488;
public static final int unusedBit__2_offset = 1488;
public static final int canReadEnabled_offset = 1488;
public static final int canWriteEnabled_offset = 1488;
public static final int hasVehicleSpeedSensor_offset = 1488;
public static final int isJoystickEnabled_offset = 1488;
public static final int isGpsEnabled_offset = 1488;
public static final int isAlternatorControlEnabled_offset = 1488;
public static final int hasMafSensor_offset = 1488;
public static final int unusedBit__3_offset = 1488;
public static final int hasTpsSensor_offset = 1488;
public static final int cutFuelOnHardLimit_offset = 1488;
public static final int cutSparkOnHardLimit_offset = 1488;
@ -1352,21 +1352,21 @@ public class Fields {
public static final Field FSIODIGITALINPUTS15 = Field.create("FSIODIGITALINPUTS15", 1476, FieldType.INT, brain_pin_e);
public static final Field FSIODIGITALINPUTS16 = Field.create("FSIODIGITALINPUTS16", 1480, FieldType.INT, brain_pin_e);
public static final Field FREQUENCYREPORTINGMAPINPUTPIN = Field.create("FREQUENCYREPORTINGMAPINPUTPIN", 1484, FieldType.INT, brain_input_pin_e);
public static final Field HASMAPSENSOR = Field.create("HASMAPSENSOR", 1488, FieldType.BIT, 0);
public static final Field HASIATSENSOR = Field.create("HASIATSENSOR", 1488, FieldType.BIT, 1);
public static final Field UNUSEDBIT__4 = Field.create("UNUSEDBIT__4", 1488, FieldType.BIT, 0);
public static final Field UNUSEDBIT__1 = Field.create("UNUSEDBIT__1", 1488, FieldType.BIT, 1);
public static final Field HASBAROSENSOR = Field.create("HASBAROSENSOR", 1488, FieldType.BIT, 2);
public static final Field HASAFRSENSOR = Field.create("HASAFRSENSOR", 1488, FieldType.BIT, 3);
public static final Field USECONSTANTDWELLDURINGCRANKING = Field.create("USECONSTANTDWELLDURINGCRANKING", 1488, FieldType.BIT, 4);
public static final Field ISENGINECHARTENABLED = Field.create("ISENGINECHARTENABLED", 1488, FieldType.BIT, 5);
public static final Field ISCANENABLED = Field.create("ISCANENABLED", 1488, FieldType.BIT, 6);
public static final Field HASCLTSENSOR = Field.create("HASCLTSENSOR", 1488, FieldType.BIT, 7);
public static final Field UNUSEDBIT__2 = Field.create("UNUSEDBIT__2", 1488, FieldType.BIT, 7);
public static final Field CANREADENABLED = Field.create("CANREADENABLED", 1488, FieldType.BIT, 8);
public static final Field CANWRITEENABLED = Field.create("CANWRITEENABLED", 1488, FieldType.BIT, 9);
public static final Field HASVEHICLESPEEDSENSOR = Field.create("HASVEHICLESPEEDSENSOR", 1488, FieldType.BIT, 10);
public static final Field ISJOYSTICKENABLED = Field.create("ISJOYSTICKENABLED", 1488, FieldType.BIT, 11);
public static final Field ISGPSENABLED = Field.create("ISGPSENABLED", 1488, FieldType.BIT, 12);
public static final Field ISALTERNATORCONTROLENABLED = Field.create("ISALTERNATORCONTROLENABLED", 1488, FieldType.BIT, 13);
public static final Field HASMAFSENSOR = Field.create("HASMAFSENSOR", 1488, FieldType.BIT, 14);
public static final Field UNUSEDBIT__3 = Field.create("UNUSEDBIT__3", 1488, FieldType.BIT, 14);
public static final Field HASTPSSENSOR = Field.create("HASTPSSENSOR", 1488, FieldType.BIT, 15);
public static final Field CUTFUELONHARDLIMIT = Field.create("CUTFUELONHARDLIMIT", 1488, FieldType.BIT, 16);
public static final Field CUTSPARKONHARDLIMIT = Field.create("CUTSPARKONHARDLIMIT", 1488, FieldType.BIT, 17);