expands the NVS for the esp32

The esp32.NVS class in micropython was limited in the data types it supported.
I have expanded this to include unsigned/signed int 8, 16, 32, 64 as well as floats and also strings and buffer objects (memoryview, bytes, bytearray).

Author: kdschlosser

api_drivers/py_api_drivers/frozen/indev/touch_calibration/esp32/touch_cal_data.py

@@ -1,26 +1,26 @@
-import esp32  # NOQA
+import nvs  # NOQA
 
 
 class TouchCalData(object):
 
     def __init__(self, name):
-        self._config = esp32.NVS(name)
+        self._config = nvs.NVS(name)
 
         try:
-            self._left = self._config.get_i32('left')
+            self._left = self._config.get(nvs.TYPE_I32, 'left')
         except OSError:
             self._left = -0x80000000
         try:
-            self._right = self._config.get_i32('right')
+            self._right = self._config.get(nvs.TYPE_I32, 'right')
         except OSError:
             self._right = -0x80000000
 
         try:
-            self._top = self._config.get_i32('top')
+            self._top = self._config.get(nvs.TYPE_I32, 'top')
         except OSError:
             self._top = -0x80000000
         try:
-            self._bottom = self._config.get_i32('bottom')
+            self._bottom = self._config.get(nvs.TYPE_I32, 'bottom')
         except OSError:
             self._bottom = -0x80000000
 
@@ -43,7 +43,7 @@ def left(self, value):
             value = -0x80000000
 
         self._left = value
-        self._config.set_i32('left', value)
+        self._config.set(nvs.TYPE_I32, 'left', value)
         self._is_dirty = True
 
     @property
@@ -59,7 +59,7 @@ def right(self, value):
             value = -0x80000000
 
         self._right = value
-        self._config.set_i32('right', value)
+        self._config.set(nvs.TYPE_I32, 'right', value)
         self._is_dirty = True
 
     @property
@@ -75,7 +75,7 @@ def top(self, value):
             value = -0x80000000
 
         self._top = value
-        self._config.set_i32('top', value)
+        self._config.set(nvs.TYPE_I32, 'top', value)
         self._is_dirty = True
 
     @property
@@ -88,10 +88,10 @@ def bottom(self):
     @bottom.setter
     def bottom(self, value):
         if value is None:
-            value = 0x80000000
+            value = -0x80000000
 
         self._bottom = value
-        self._config.set_i32('bottom', value)
+        self._config.set(nvs.TYPE_I32, 'bottom', value)
         self._is_dirty = True
 
     def reset(self):

esp32_stubs/nvs.pyi

@@ -0,0 +1,34 @@
+from typing import Union, Final, Literal
+from enum import IntEnum
+
+
+
+TYPE_I8: Final[int] = 0x11
+TYPE_U8: Final[int] = 0x01
+TYPE_I16: Final[int] = 0x12
+TYPE_U16: Final[int] = 0x02
+TYPE_I32: Final[int] = 0x14
+TYPE_U32: Final[int] = 0x04
+TYPE_I64: Final[int] = 0x18
+TYPE_U64: Final[int] = 0x08
+TYPE_STR: Final[int] = 0x21
+TYPE_BLOB: Final[int] = 0x42
+TYPE_FLOAT: Final[int] = 0xFE
+
+
+class NVS:
+
+    def __init__(self, name: str, /):
+        ...
+
+    def set(self, type: int, key: str, value: Union[int, float, str, bytes, memoryview, bytearray]) -> None:
+        ...
+
+    def get(self, type: int, key: str) ->  Union[int, float, str, bytes]:
+        ...
+
+    def erase(self, key: str) -> None:
+        ...
+
+    def commit(self) -> None:
+        ...

ext_mod/expanded_nvs_esp32/include/nvs.h

@@ -0,0 +1,21 @@
+
+
+#ifndef __NVS_H__
+    #define __NVS_H__
+
+    #include "py/runtime.h"
+    #include "py/mperrno.h"
+    #include "mphalport.h"
+    #include "nvs_flash.h"
+    #include "nvs.h"
+
+
+    typedef struct _mp_nvs_obj_t {
+        mp_obj_base_t base;
+        nvs_handle_t ns;
+    } mp_nvs_obj_t;
+
+    extern const mp_obj_type_t mp_nvs_type;
+
+#endif
+

ext_mod/expanded_nvs_esp32/micropython.cmake

@@ -0,0 +1,26 @@
+# Create an INTERFACE library for our C module.
+
+
+add_library(usermod_nvs INTERFACE)
+
+set(INCLUDES ${CMAKE_CURRENT_LIST_DIR})
+set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/src/nvs.c)
+
+# gets nvs_flash include paths
+idf_component_get_property(nvs_flash_includes nvs_flash INCLUDE_DIRS)
+idf_component_get_property(nvs_flash_dir nvs_flash COMPONENT_DIR)
+
+# sets the include paths into INCLUDES variable
+if(nvs_flash_includes)
+    list(TRANSFORM nvs_flash_includes PREPEND ${nvs_flash_dir}/)
+    list(APPEND INCLUDES ${nvs_flash_includes})
+endif()
+
+# Add our source files to the lib
+target_sources(usermod_nvs INTERFACE ${SOURCES})
+
+# Add include directories.
+target_include_directories(usermod_nvs INTERFACE ${INCLUDES})
+
+# Link our INTERFACE library to the usermod target.
+target_link_libraries(usermod INTERFACE usermod_nvs)