diff --git a/User/EEPROM b/User/EEPROM
deleted file mode 160000
index 266bec8..0000000
--- a/User/EEPROM
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 266bec869b05bd5adab651ea18b4247f0a54507a
diff --git a/User/EEPROM/eeprom.c b/User/EEPROM/eeprom.c
new file mode 100755
index 0000000..031047f
--- /dev/null
+++ b/User/EEPROM/eeprom.c
@@ -0,0 +1,71 @@
+#include "stm32f1xx_hal.h"
+#include "EEPROM/eeprom.h"
+/*
+ * Debug option
+ */
+#if 0
+//Enable debug
+#include <cstdio>
+#define DBG(x, ...) std::printf("[eeprom: DBG]"x"\r\n", ##__VA_ARGS__);
+#define WARN(x, ...) std::printf("[eeprom: WARN]"x"\r\n", ##__VA_ARGS__);
+#define ERR(x, ...) std::printf("[eeprom: ERR]"x"\r\n", ##__VA_ARGS__);
+#else
+//Disable debug
+#define DBG(x, ...)
+#define WARN(x, ...)
+#define ERR(x, ...)
+#endif
+
+/*
+ * Must call this first to enable writing
+ */
+void enableEEPROMWriting() {
+    HAL_StatusTypeDef status = HAL_FLASH_Unlock();
+    FLASH_PageErase(EEPROM_START_ADDRESS); // required to re-write
+    CLEAR_BIT(FLASH->CR, FLASH_CR_PER); // Bug fix: bit PER has been set in Flash_PageErase(), must clear it here
+}
+
+void disableEEPROMWriting() {
+    HAL_FLASH_Lock();
+}
+
+/*
+ * Writing functions
+ * Must call enableEEPROMWriting() first
+ */
+HAL_StatusTypeDef writeEEPROMHalfWord(uint32_t address, uint16_t data) {
+    HAL_StatusTypeDef status;
+    address = address + EEPROM_START_ADDRESS;
+
+    status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, address, data);
+
+    return status;
+}
+
+HAL_StatusTypeDef writeEEPROMWord(uint32_t address, uint32_t data) {
+    HAL_StatusTypeDef status;
+    address = address + EEPROM_START_ADDRESS;
+
+    status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, address, data);
+
+    return status;
+}
+
+/*
+ * Reading functions
+ */
+uint16_t readEEPROMHalfWord(uint32_t address) {
+    uint16_t val = 0;
+    address = address + EEPROM_START_ADDRESS;
+    val = *(__IO uint16_t*)address;
+    
+    return val;
+}
+
+uint32_t readEEPROMWord(uint32_t address) {
+    uint32_t val = 0;
+    address = address + EEPROM_START_ADDRESS;
+    val = *(__IO uint32_t*)address;
+    
+    return val;
+}
diff --git a/User/EEPROM/eeprom.h b/User/EEPROM/eeprom.h
new file mode 100755
index 0000000..db86616
--- /dev/null
+++ b/User/EEPROM/eeprom.h
@@ -0,0 +1,19 @@
+#ifndef __EEPROM_FLASH_H
+#define __EEPROM_FLASH_H
+
+
+//#define EEPROM_START_ADDRESS   ((uint32_t)0x08019000) // EEPROM emulation start address: after 100KByte of used Flash memory
+#define EEPROM_START_ADDRESS   ((uint32_t)0x0801C000) // EEPROM emulation start address: after 112KByte of used Flash memory
+
+void enableEEPROMWriting(); // Unlock and keep PER cleared
+void disableEEPROMWriting(); // Lock
+
+// Write functions
+HAL_StatusTypeDef writeEEPROMHalfWord(uint32_t address, uint16_t data);
+HAL_StatusTypeDef writeEEPROMWord(uint32_t address, uint32_t data);
+
+// Read functions
+uint16_t readEEPROMHalfWord(uint32_t address);
+uint32_t readEEPROMWord(uint32_t address);
+
+#endif