Merge branch 'dev' into feature/28-profile-parser

2021-03-18 22:50:28 +01:00
parent 93ff4959a2 dca696cd6a
commit e3e4a6d926
3 changed files with 13 additions and 13 deletions
--- a/stm-firmware/include/reflow-controller/safety/safety-memory.h
+++ b/stm-firmware/include/reflow-controller/safety/safety-memory.h
@@ -144,8 +144,8 @@ struct config_override {
 		} weight_override;
 		struct {
 			uint8_t flag;
-			bool persistance;
-		} persistance_override;
+			bool persistence;
+		} persistence_override;
 	} entry;
 };