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

auto-sync

This commit is contained in:
rusEfi 2016-09-14 23:03:47 -04:00
parent b8a3391bc2
commit 22882d9ab1
8 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio.cpp
View File

@ -387,7 +387,7 @@ void requestBurn(void) {
#if EFI_INTERNAL_FLASH || defined(__DOXYGEN__)
setNeedToWriteConfiguration();
#endif
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void sendResponseCode(ts_response_format_e mode, ts_channel_s *tsChannel, const uint8_t responseCode) {

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

@ -138,7 +138,7 @@ int getGlobalConfigurationVersion(void) {
* this is the top-level method which should be called in case of any changes to engine configuration
* online tuning of most values in the maps does not count as configuration change, but 'Burn' command does
*/
void incrementGlobalConfigurationVersion(void) {
void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_F) {
globalConfigurationVersion++;
#if EFI_PROD_CODE || defined(__DOXYGEN__)
applyNewHardwareSettings();

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

@ -54,7 +54,7 @@ void setConstantDwell(floatms_t dwellMs DECLARE_ENGINE_PARAMETER_S);
void printFloatArray(const char *prefix, float array[], int size);
void rememberCurrentConfiguration(void);
void incrementGlobalConfigurationVersion(void);
void incrementGlobalConfigurationVersion(DECLARE_ENGINE_PARAMETER_F);
int getGlobalConfigurationVersion(void);
void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration);

6
firmware/controllers/engine_controller.cpp
View File

@ -390,7 +390,7 @@ static void setBit(const char *offsetStr, const char *bitStr, const char *valueS
* this response is part of dev console API
*/
scheduleMsg(&logger, "bit @%d/%d is %d", offset, bit, value);
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void setShort(const int offset, const int value) {
@ -399,7 +399,7 @@ static void setShort(const int offset, const int value) {
uint16_t *ptr = (uint16_t *) (&((char *) engineConfiguration)[offset]);
*ptr = (uint16_t) value;
getShort(offset);
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void getBit(int offset, int bit) {
@ -430,7 +430,7 @@ static void setInt(const int offset, const int value) {
int *ptr = (int *) (&((char *) engineConfiguration)[offset]);
*ptr = value;
getInt(offset);
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void getFloat(int offset) {

48
firmware/controllers/settings.cpp
View File

@ -297,13 +297,13 @@ static void doPrintConfiguration(Engine *engine) {
static void setFixedModeTiming(int value) {
engineConfiguration->fixedModeTiming = value;
doPrintConfiguration(engine);
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void setTimingMode(int value) {
engineConfiguration->timingMode = (timing_mode_e) value;
doPrintConfiguration(engine);
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
void setEngineType(int value) {
@ -318,7 +318,7 @@ void setEngineType(int value) {
writeToFlashNow();
// scheduleReset();
#endif /* EFI_PROD_CODE */
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
doPrintConfiguration(engine);
}
@ -344,13 +344,13 @@ static void setIdlePinMode(int value) {
static void setInjectionOffset(float value) {
engineConfiguration->extraInjectionOffset = value;
doPrintConfiguration(engine);
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void setIgnitionOffset(float value) {
engineConfiguration->ignitionOffset = value;
doPrintConfiguration(engine);
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void setFuelPumpPinMode(int value) {
@ -471,31 +471,31 @@ static void setGlobalTriggerAngleOffset(float value) {
return;
}
engineConfiguration->globalTriggerAngleOffset = value;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
doPrintConfiguration(engine);
}
static void setCrankingTimingAngle(float value) {
engineConfiguration->crankingTimingAngle = value;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
doPrintConfiguration(engine);
}
static void setCrankingInjectionMode(int value) {
engineConfiguration->crankingInjectionMode = (injection_mode_e) value;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
doPrintConfiguration(engine);
}
static void setInjectionMode(int value) {
engineConfiguration->injectionMode = (injection_mode_e) value;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
doPrintConfiguration(engine);
}
static void setIgnitionMode(int value) {
engineConfiguration->ignitionMode = (ignition_mode_e) value;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
doPrintConfiguration(engine);
}
@ -513,7 +513,7 @@ static void setIndividualCoilsIgnition(void) {
static void setTriggerType(int value) {
engineConfiguration->trigger.type = (trigger_type_e) value;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
doPrintConfiguration(engine);
}
@ -522,13 +522,13 @@ static void setToothedWheel(int total, int skipped DECLARE_ENGINE_PARAMETER_S) {
scheduleMsg(&logger, "toothed: total=%d/skipped=%d", total, skipped);
setToothedWheelConfiguration(&engine->triggerShape, total, skipped, engineConfiguration->operationMode);
// initializeTriggerShape(&logger, engineConfiguration, engineConfiguration2);
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
doPrintConfiguration(engine);
}
static void setCrankingChargeAngle(float value) {
engineConfiguration->crankingChargeAngle = value;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
doPrintConfiguration(engine);
}
@ -618,7 +618,7 @@ static void setIgnitionPin(const char *indexStr, const char *pinName) {
}
scheduleMsg(&logger, "setting ignition pin[%d] to %s please save&restart", index, hwPortname(pin));
boardConfiguration->ignitionPins[index] = pin;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void setIndividualPin(const char *pinName, brain_pin_e *targetPin, const char *name) {
@ -629,7 +629,7 @@ static void setIndividualPin(const char *pinName, brain_pin_e *targetPin, const
}
scheduleMsg(&logger, "setting %s pin to %s please save&restart", name, hwPortname(pin));
*targetPin = pin;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
// set_idle_pin none
@ -665,7 +665,7 @@ static void setInjectionPin(const char *indexStr, const char *pinName) {
}
scheduleMsg(&logger, "setting injection pin[%d] to %s please save&restart", index, hwPortname(pin));
boardConfiguration->injectionPins[index] = pin;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void setTriggerInputPin(const char *indexStr, const char *pinName) {
@ -680,7 +680,7 @@ static void setTriggerInputPin(const char *indexStr, const char *pinName) {
}
scheduleMsg(&logger, "setting trigger pin[%d] to %s please save&restart", index, hwPortname(pin));
boardConfiguration->triggerInputPins[index] = pin;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void setTriggerSimulatorMode(const char *indexStr, const char *modeCode) {
@ -706,7 +706,7 @@ static void setEgtCSPin(const char *indexStr, const char *pinName, board_configu
}
scheduleMsg(&logger, "setting EGT CS pin[%d] to %s please save&restart", index, hwPortname(pin));
boardConfiguration->max31855_cs[index] = pin;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
static void setTriggerSimulatorPin(const char *indexStr, const char *pinName) {
@ -720,7 +720,7 @@ static void setTriggerSimulatorPin(const char *indexStr, const char *pinName) {
}
scheduleMsg(&logger, "setting trigger simulator pin[%d] to %s please save&restart", index, hwPortname(pin));
boardConfiguration->triggerSimulatorPins[index] = pin;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
#if HAL_USE_ADC || defined(__DOXYGEN__)
@ -748,7 +748,7 @@ static void setAnalogInputPin(const char *sensorStr, const char *pinName) {
engineConfiguration->tpsAdcChannel = channel;
scheduleMsg(&logger, "setting TPS to %s/%d", pinName, channel);
}
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}
#endif
@ -838,16 +838,16 @@ static void enableOrDisable(const char *param, bool isEnabled) {
boardConfiguration->useStepperIdle = isEnabled;
} else if (strEqualCaseInsensitive(param, "trigger_only_front")) {
engineConfiguration->useOnlyRisingEdgeForTrigger = isEnabled;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
} else if (strEqualCaseInsensitive(param, "use_only_first_channel")) {
engineConfiguration->trigger.useOnlyFirstChannel = isEnabled;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
} else if (strEqualCaseInsensitive(param, "two_wire_batch_injection")) {
engineConfiguration->twoWireBatchInjection = isEnabled;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
} else if (strEqualCaseInsensitive(param, "two_wire_wasted_spark")) {
engineConfiguration->twoWireBatchIgnition = isEnabled;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
} else if (strEqualCaseInsensitive(param, "joystick")) {
engineConfiguration->isJoystickEnabled = isEnabled;
} else if (strEqualCaseInsensitive(param, "HIP9011")) {

4
firmware/svnversion.h
View File

@ -1,5 +1,5 @@
// This file was generated by Version2Header
// Wed Sep 14 19:24:06 EDT 2016
// Wed Sep 14 22:27:38 EDT 2016
#ifndef VCS_VERSION
#define VCS_VERSION "10611"
#define VCS_VERSION "10613"
#endif

2
unit_tests/engine_test_helper.cpp
View File

@ -101,5 +101,5 @@ void EngineTestHelper::applyTriggerShape() {
engine->triggerShape.initializeTriggerShape(NULL PASS_ENGINE_PARAMETER);
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
}

2
unit_tests/test_trigger_decoder.cpp
View File

@ -624,7 +624,7 @@ static void setTestBug299(EngineTestHelper *eth) {
assertEqualsM("CLT", 70, engine->engineState.clt);
engineConfiguration->trigger.type = TT_ONE;
incrementGlobalConfigurationVersion();
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_F);
eth->applyTriggerShape();