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

Safety: Fix different spelling mistakes for persistence

Browse Source
This commit is contained in:
Mario Hüttel
2021-03-18 22:50:13 +01:00
parent b560a91673
commit dca696cd6a
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -488,8 +488,8 @@ static uint32_t convert_config_override_to_word(const struct config_override *co
data |= ((uint32_t)conf_override->entry.weight_override.weight) << 8;
} else if (conf_override->type == SAFETY_MEMORY_CONFIG_OVERRIDE_PERSISTENCE) {
data |= 0xBB00008EUL;
data |= ((uint32_t)conf_override->entry.persistance_override.flag) << 16;
data |= ((uint32_t)(conf_override->entry.persistance_override.persistance ? 1UL : 0UL)) << 8;
data |= ((uint32_t)conf_override->entry.persistence_override.flag) << 16;
data |= ((uint32_t)(conf_override->entry.persistence_override.persistence ? 1UL : 0UL)) << 8;
}
return data;
@@ -596,10 +596,10 @@ int safety_memory_get_config_override(uint32_t idx, struct config_override *conf
config_override->entry.weight_override.weight = (data & 0xFF00UL) >> 8;
break;
case 0x8E:
/* persistance override */
/* persistence override */
config_override->type = SAFETY_MEMORY_CONFIG_OVERRIDE_PERSISTENCE;
config_override->entry.persistance_override.flag = (data & 0xFF0000UL) >> 16;
config_override->entry.persistance_override.persistance = ((data & 0xFF00UL) >> 8) ? true : false;
config_override->entry.persistence_override.flag = (data & 0xFF0000UL) >> 16;
config_override->entry.persistence_override.persistence = ((data & 0xFF00UL) >> 8) ? true : false;
break;
default:
return -2;