Added User Setting Flash module files

Author: JasonStoyanov

prj.conf

@@ -107,4 +107,7 @@ CONFIG_NORDIC_QSPI_NOR=n
 CONFIG_NFCT_PINS_AS_GPIOS=y
 
 CONFIG_BOARD_ENABLE_DCDC_NET=y
-CONFIG_BOARD_ENABLE_DCDC_APP=y
+CONFIG_BOARD_ENABLE_DCDC_APP=y
+
+CONFIG_NVS=y
+CONFIG_MPU_ALLOW_FLASH_WRITE=y

src/main.c

@@ -144,6 +144,7 @@ static void button_event_handler(enum button_evt evt)
 	}
 }
 
+
 /*Note: The app main() function is called by the Zephyr main thread, after the kernel has benn initialized.*/
 void main(void)
 {
@@ -188,6 +189,11 @@ void main(void)
 	}
 	#endif
 
+
+	//TODO: Retrieve from flash the beacon ID and set it
+	usf_init();
+	usf_load();
+
 	ble_beacon_init();
 
 	//Initialize the battery measurement

src/usf.c

@@ -0,0 +1,80 @@
+//User Setting in Flash (USF) module
+//This module is used to store the user settings in flash memory
+//The user settings are: the beacon ID 
+//The beacon ID is a 1-byte value that is used to identify the beacon
+//The beacon ID is stored in flash memory and is loaded at startup
+//The beacon ID is written to flash memory when the user changes it
+//The beacon ID is used in the advertising data
+
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/sensor.h>
+
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/fs/nvs.h>
+#include "usf.h"
+
+static struct nvs_fs fs;
+
+#define NVS_PARTITION		    storage_partition
+#define NVS_PARTITION_DEVICE	FIXED_PARTITION_DEVICE(NVS_PARTITION)
+#define NVS_PARTITION_OFFSET	FIXED_PARTITION_OFFSET(NVS_PARTITION)
+
+#define BEACONID_ID 1
+//#define KEY_ID 2
+
+int usf_init(void) {
+    int rc = 0;
+
+    struct flash_pages_info info;
+    /* define the nvs file system by settings with:
+	 *	sector_size equal to the pagesize,
+	 *	3 sectors
+	 *	starting at NVS_PARTITION_OFFSET
+	 */
+	fs.flash_device = NVS_PARTITION_DEVICE;
+	if (!device_is_ready(fs.flash_device)) {
+		printk("Flash device %s is not ready\n", fs.flash_device->name);
+		return 0;
+	}
+	fs.offset = NVS_PARTITION_OFFSET;
+	rc = flash_get_page_info_by_offs(fs.flash_device, fs.offset, &info);
+	if (rc) {
+		printk("Unable to get page info\n");
+		return 0;
+	}
+	fs.sector_size = info.size;
+	fs.sector_count = 3U;
+
+	rc = nvs_mount(&fs);
+	if (rc) {
+		printk("Flash Init failed\n");
+		return 0;
+	}
+}
+
+//Load the user settings from flash
+int usf_load(void)
+{
+	int ret;
+    uint8_t beacon_id;
+
+	ret = nvs_read(&fs, BEACONID_ID, &beacon_id, sizeof(beacon_id));
+	if (ret > 0) { /* item was found, show it */
+		printk("Id: %d, Address: %s\n", BEACONID_ID, beacon_id);
+        //TODO: load the read value into the beacon ID array from the adv data in main.c
+	} else   {/* item was not found*/
+		printk("Id: %d, not found\n", BEACONID_ID);
+        //TODO: Set the default value for the beacon ID outside this function
+	}
+
+}
+
+int usf_write_beacon_id(uint8_t value) {
+
+    (void)nvs_write(&fs, BEACONID_ID, &value,sizeof(value));
+
+}
+

src/usf.h

@@ -0,0 +1,8 @@
+#ifndef USF_H_
+#define USF_H_
+
+int usf_init(void);
+int usf_load(void);
+int usf_write_beacon_id(uint8_t value);
+
+#endif /* USF_H_ */