proteus F7 QC build is broken #5242
This commit is contained in:
parent
aff465d73d
commit
f3279c108e
|
@ -1,8 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE"
|
||||
|
||||
export EXTRA_PARAMS="-DHW_CHECK_SD=TRUE"
|
||||
export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE"
|
||||
|
||||
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD
|
||||
|
||||
|
|
|
@ -152,7 +152,7 @@ static void wipeStrings() {
|
|||
void onBurnRequest() {
|
||||
wipeStrings();
|
||||
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("burn");
|
||||
}
|
||||
|
||||
// Weak link a stub so that every board doesn't have to implement this function
|
||||
|
@ -165,9 +165,9 @@ __attribute__((weak)) void boardOnConfigurationChange(engine_configuration_s* /*
|
|||
* this method is NOT currently invoked on ECU start - actual user input has to happen!
|
||||
* See preCalculate which is invoked BOTH on start and configuration change
|
||||
*/
|
||||
void incrementGlobalConfigurationVersion() {
|
||||
void incrementGlobalConfigurationVersion(const char * msg) {
|
||||
if (!hasRememberedConfiguration) {
|
||||
firmwareError(OBD_PCM_Processor_Fault, "too early to invoke incrementGlobalConfigurationVersion");
|
||||
firmwareError(OBD_PCM_Processor_Fault, "too early to invoke incrementGlobalConfigurationVersion %s", msg);
|
||||
}
|
||||
engine->globalConfigurationVersion++;
|
||||
#if EFI_DEFAILED_LOGGING
|
||||
|
|
|
@ -40,7 +40,7 @@ void setDefaultBasePins();
|
|||
void setDefaultSdCardParameters();
|
||||
|
||||
void onBurnRequest();
|
||||
void incrementGlobalConfigurationVersion();
|
||||
void incrementGlobalConfigurationVersion(const char * msg = "undef");
|
||||
|
||||
void commonFrankensoAnalogInputs();
|
||||
void setFrankenso0_1_joystick();
|
||||
|
|
|
@ -305,7 +305,7 @@ static void setBit(const char *offsetStr, const char *bitStr, const char *valueS
|
|||
* this response is part of rusEfi console API
|
||||
*/
|
||||
efiPrintf("bit%s%d/%d is %d", CONSOLE_DATA_PROTOCOL_TAG, offset, bit, value);
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("setBit");
|
||||
}
|
||||
|
||||
static void setShort(const int offset, const int value) {
|
||||
|
@ -314,7 +314,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("setShort");
|
||||
}
|
||||
|
||||
static void setByte(const int offset, const int value) {
|
||||
|
@ -323,7 +323,7 @@ static void setByte(const int offset, const int value) {
|
|||
uint8_t *ptr = (uint8_t *) (&((char *) engineConfiguration)[offset]);
|
||||
*ptr = (uint8_t) value;
|
||||
getByte(offset);
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("setByte");
|
||||
}
|
||||
|
||||
static void getBit(int offset, int bit) {
|
||||
|
@ -354,7 +354,7 @@ static void setInt(const int offset, const int value) {
|
|||
int *ptr = (int *) (&((char *) engineConfiguration)[offset]);
|
||||
*ptr = value;
|
||||
getInt(offset);
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("setInt");
|
||||
}
|
||||
|
||||
static void getFloat(int offset) {
|
||||
|
@ -384,7 +384,7 @@ static void setFloat(const char *offsetStr, const char *valueStr) {
|
|||
float *ptr = (float *) (&((char *) engineConfiguration)[offset]);
|
||||
*ptr = value;
|
||||
getFloat(offset);
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("setFloat");
|
||||
}
|
||||
|
||||
static void initConfigActions() {
|
||||
|
|
|
@ -838,7 +838,7 @@ void configureRusefiLuaHooks(lua_State* l) {
|
|||
auto incrementVersion = lua_toboolean(l, 3);
|
||||
setConfigValueByName(propertyName, value);
|
||||
if (incrementVersion) {
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("lua");
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
|
|
|
@ -1149,7 +1149,7 @@ void setEngineType(int value) {
|
|||
writeToFlashNow();
|
||||
#endif // EFI_INTERNAL_FLASH
|
||||
}
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("engineType");
|
||||
#if ! EFI_UNIT_TEST
|
||||
doPrintConfiguration();
|
||||
#endif // ! EFI_UNIT_TEST
|
||||
|
|
|
@ -177,7 +177,7 @@ void enableTriggerStimulator(bool incGlobalConfiguration) {
|
|||
engine->triggerCentral.directSelfStimulation = true;
|
||||
engine->rpmCalculator.Register();
|
||||
if (incGlobalConfiguration) {
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("trgSim");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -186,14 +186,14 @@ void enableTriggerStimulator(bool incGlobalConfiguration) {
|
|||
void enableExternalTriggerStimulator() {
|
||||
startSimulatedTriggerSignal();
|
||||
engine->triggerCentral.directSelfStimulation = false;
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("extTrg");
|
||||
}
|
||||
|
||||
void disableTriggerStimulator() {
|
||||
engine->triggerCentral.directSelfStimulation = false;
|
||||
triggerEmulatorSignal.stop();
|
||||
hasInitTriggerEmulator = false;
|
||||
incrementGlobalConfigurationVersion();
|
||||
incrementGlobalConfigurationVersion("disTrg");
|
||||
}
|
||||
|
||||
void onConfigurationChangeRpmEmulatorCallback(engine_configuration_s *previousConfiguration) {
|
||||
|
|
Loading…
Reference in New Issue