mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

Make safety controller use config overrides from backup ram

Browse Source
This commit is contained in:
Mario Hüttel
2020-11-29 19:59:58 +01:00
parent 687c72bde7
commit 0b1d872ed0
3 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stm-firmware/safety/safety-memory.c
View File

@@ -489,7 +489,7 @@ static uint32_t convert_config_override_to_word(const struct config_override *co
} else if (conf_override->type == SAFETY_MEMORY_CONFIG_OVERRIDE_PERSISTANCE) {
data |= 0xBB00008EUL;
data |= ((uint32_t)conf_override->entry.persistance_override.flag) << 16;
data |= ((uint32_t)conf_override->entry.persistance_override.persistance) << 8;
data |= ((uint32_t)(conf_override->entry.persistance_override.persistance ? 1UL : 0UL)) << 8;
}
return data;
@@ -599,7 +599,7 @@ int safety_memory_get_config_override(uint32_t idx, struct config_override *conf
/* persistance override */
config_override->type = SAFETY_MEMORY_CONFIG_OVERRIDE_PERSISTANCE;
config_override->entry.persistance_override.flag = (data & 0xFF0000UL) >> 16;
config_override->entry.persistance_override.persistance = (data & 0xFF00UL) >> 8;
config_override->entry.persistance_override.persistance = ((data & 0xFF00UL) >> 8) ? true : false;
break;
default:
return -2;