Merge branch 'master' of https://code.electrolab.fr/Flax/solderstationmk2_sw

# Conflicts:
#	SolderStationMk2_NucleoSTM32L011K4/.settings/language.settings.xml

SolderStationMk2_NucleoSTM32L011K4/Core/Inc/eeprom.h

+/*
+ * eeprom.h
+ *
+ *  Created on: Apr 25, 2023
+ *      Author: Flax
+ */
+
+#ifndef INC_EEPROM_H_
+#define INC_EEPROM_H_
+
+#include "stdlib.h"
+
+// Intrinsic MCU characteristics
+#define cNVMeepromBaseAddr				((uint32_t)0x08080000)
+#define cNVMeepromLastAddr				((uint32_t)0x080801FF)
+#define cNVMeepromSizeFull				(0x200)
+#define cNVMeepromEraseSize				(0x4) // Erase granularity - 4B - 32bits
+
+// Architecture
+#define cNVMeepromPageSize				(0x20)
+#define cNVMeepromPageNumber			(16U)
+#define cNVMeepromPageAddr(nb)			(cNVMeepromBaseAddr + (nb * cNVMeepromPageSize))
+
+// Individual pages addresses
+#define cNVMeepromPage0Addr				cNVMeepromBaseAddr
+#define cNVMeepromPage1Addr				(cNVMeepromPage0Addr + cNVMeepromPageSize)
+#define cNVMeepromPage2Addr				(cNVMeepromPage1Addr + cNVMeepromPageSize)
+#define cNVMeepromPage3Addr				(cNVMeepromPage2Addr + cNVMeepromPageSize)
+#define cNVMeepromPage4Addr				(cNVMeepromPage3Addr + cNVMeepromPageSize)
+#define cNVMeepromPage5Addr				(cNVMeepromPage4Addr + cNVMeepromPageSize)
+#define cNVMeepromPage6Addr				(cNVMeepromPage5Addr + cNVMeepromPageSize)
+#define cNVMeepromPage7Addr				(cNVMeepromPage6Addr + cNVMeepromPageSize)
+#define cNVMeepromPage8Addr				(cNVMeepromPage7Addr + cNVMeepromPageSize)
+#define cNVMeepromPage9Addr				(cNVMeepromPage8Addr + cNVMeepromPageSize)
+#define cNVMeepromPage10Addr			(cNVMeepromPage9Addr + cNVMeepromPageSize)
+#define cNVMeepromPage11Addr			(cNVMeepromPage10Addr + cNVMeepromPageSize)
+#define cNVMeepromPage12Addr			(cNVMeepromPage11Addr + cNVMeepromPageSize)
+#define cNVMeepromPage13Addr			(cNVMeepromPage12Addr + cNVMeepromPageSize)
+#define cNVMeepromPage14Addr			(cNVMeepromPage13Addr + cNVMeepromPageSize)
+#define cNVMeepromPage15Addr			(cNVMeepromPage14Addr + cNVMeepromPageSize)
+
+#endif /* INC_EEPROM_H_ */

SolderStationMk2_NucleoSTM32L011K4/Core/Inc/nvfix.h

+/*
+ * nvfix.h
+ *
+ *  Created on: Apr 25, 2023
+ *      Author: Flax
+ */
+
+#ifndef INC_NVFIX_H_
+#define INC_NVFIX_H_
+
+// ===========================
+// Shared functions prototypes
+// ===========================
+
+extern void NVFInit (void);
+extern void NVFStart (void);
+extern void NVFStop (void);
+extern void NVFCyclicTask (void);
+extern void NVFSave (void);
+
+#endif /* INC_NVFIX_H_ */

SolderStationMk2_NucleoSTM32L011K4/Core/Inc/nvm.h

+/*
+ * nvm.h
+ *
+ *  Created on: Apr 25, 2023
+ *      Author: Flax
+ */
+
+#ifndef INC_NVM_H_
+#define INC_NVM_H_
+
+// ===============
+// Shared includes
+// ===============
+#include "stdlib.h"
+#include "eeprom.h"
+
+// ================
+// Shared constants
+// ================
+
+
+
+// ===========================
+// Shared functions prototypes
+// ===========================
+
+extern void NVMInit (void);
+extern void NVMStart (void);
+extern void NVMStop (void);
+extern void NVMCyclicTask (void);
+extern void NVMSave (void);
+
+#endif /* INC_NVM_H_ */

SolderStationMk2_NucleoSTM32L011K4/Core/Inc/nvrol.h

+/*
+ * nvrol.h
+ *
+ *  Created on: Apr 25, 2023
+ *      Author: Flax
+ */
+
+#ifndef INC_NVROL_H_
+#define INC_NVROL_H_
+
+// ===========================
+// Shared functions prototypes
+// ===========================
+
+extern void NVRInit (void);
+extern void NVRStart (void);
+extern void NVRStop (void);
+extern void NVRCyclicTask (void);
+extern void NVRSave (void);
+
+#endif /* INC_NVROL_H_ */

SolderStationMk2_NucleoSTM32L011K4/Core/Src/nvfix.c

+/*
+ * nvfix.c
+ *
+ *  Created on: Apr 25, 2023
+ *      Author: Flax
+ */
+
+// ==============
+// Local includes
+// ==============
+#include "eeprom.h"
+#include "register.h"
+#include "nvfix.h"
+
+// ===============
+// Local constants
+// ===============
+
+// NVFix
+#define cNVFPageSize					cNVMeepromPageSize
+#define cNVFPageNumber					(2U)
+
+#define cNVFPage0FirstAddr				cNVMeepromPage0Addr
+#define cNVFPage0LastAddr				(cNVFPage0FirstAddr + cNVMeepromSizeFull - 1U)
+#define cNVFPage1FirstAddr				cNVMeepromPage15Addr
+#define cNVFPage1LastAddr				(cNVFPage1FirstAddr + cNVMeepromSizeFull - 1U)
+
+// ============================
+// Shared functions definitions
+// ============================
+void NVFInit (void)
+{
+
+}
+
+void NVFStart (void)
+{
+
+}
+
+void NVFStop (void)
+{
+
+}
+
+void NVFCyclicTask (void)
+{
+
+}
+
+void NVFSave (void)
+{
+
+}

SolderStationMk2_NucleoSTM32L011K4/Core/Src/nvm.c

+/*
+ * nvm.c
+ *
+ *  Created on: Apr 25, 2023
+ *      Author: Flax
+ */
+
+// ==============
+// Local includes
+// ==============
+#include "nvm.h"
+#include "register.h"
+#include "nvfix.h"
+#include "nvrol.h"
+
+// ===============
+// Local constants
+// ===============
+
+// ============================
+// Shared functions definitions
+// ============================
+void NVMInit (void)
+{
+	NVFInit();
+	NVRInit();
+}
+
+void NVMStart (void)
+{
+	NVFStart();
+	NVRStart();
+}
+
+void NVMStop (void)
+{
+	NVFStop();
+	NVRStop();
+}
+
+void NVMCyclicTask (void)
+{
+	NVFCyclicTask();
+	NVRCyclicTask();
+}
+
+void NVMSave (void)
+{
+	NVFsave();
+	NVRSave();
+}

SolderStationMk2_NucleoSTM32L011K4/Core/Src/nvrol.c

+/*
+ * nvrol.c
+ *
+ *  Created on: Apr 25, 2023
+ *      Author: Flax
+ */
+
+// ==============
+// Local includes
+// ==============
+#include "eeprom.h"
+#include "register.h"
+#include "nvrol.h"
+
+// ===============
+// Local constants
+// ===============
+
+// NVRol
+#define cNVRPageSize					cNVMeepromPageSize
+#define cNVRPageNumber					(14U)
+
+#define cNVRFirstPageAddr				cNVMeepromPage1Addr
+#define cNVRPageAddr(nb)				(cNVRFirstPageAddr + (nb * cNVRPageSize))
+
+// ============================
+// Shared functions definitions
+// ============================
+void NVRInit (void)
+{
+
+}
+
+void NVRStart (void)
+{
+
+}
+
+void NVRStop (void)
+{
+
+}
+
+void NVRCyclicTask (void)
+{
+
+}
+
+void NVRSave (void)
+{
+
+}

SolderStationMk2_NucleoSTM32L011K4/Core/Src/save.c

@@ -10,6 +10,7 @@
 // ==============
 // Local includes
 // ==============
+#include "nvm.h"
 
 // ===============
 // Local constants
@@ -29,17 +30,17 @@
 
 void SAVInit (void)
 {
-
+	NVMInit();
 }
 
 void SAVStart (void)
 {
-
+	NVMStart();
 }
 
 void SAVStop (void)
 {
-
+	NVMStop();
 }
 
 void SAVCyclicTask (void)

SolderStationMk2_NucleoSTM32L011K4/Core/Src/temperatureRegulation.c

@@ -71,8 +71,6 @@ void REGStop (void)
 
 void REGCyclicTask (void)
 {
-	uint8_t cnt_u8;
-
 	// Read ADC input
 	RegTempMeasBuffer_U16A[1] = mREGAdcReadValue();