Implementation of coroutine-based file system wrapper over LittleFS

.github/workflows/build.yml

@@ -4,9 +4,9 @@ name: CI
 # events but only for the master branch
 on:
   push:
-    branches: [ master,dev/develop,dev/migration_gcc_desktop_build]
+    branches: [master, dev/develop, dev/littlefs_impl]
   pull_request:
-    branches: [ master,dev/develop]
+    branches: [master, dev/develop]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -18,105 +18,103 @@ jobs:
       buildDir: '${{ github.workspace }}\build'
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
-      with:
-        submodules: 'true'
-
-    - name: Setup python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.8'
-
-    - name: Install conan
-      uses:  BSFishy/pip-action@v1
-      with:
-        packages: |
-          conan
-
-    #Install the latest cmake
-    - name : Get the latest CMake version
-      uses: lukka/get-cmake@latest
-
-    - name: Run build for MSVC compiler
-      run: |
-        cmake -G"Visual Studio 16 2019" -Ax64 -S"${{ github.workspace }}/Firmware/" -B"${{ env.buildDir }}" -DPACKAGE_TESTS=ON -DTARGET_PLATFORM:STRING="FIRMWARE_SIMULATOR" -DCMAKE_BUILD_TYPE=Release
-        cd ${{ env.buildDir }}
-        cmake --build . --config Release
-    - name : Run firmware testing
-      run: |
-        cd ${{ env.buildDir }}/Release
-        .\FirmwareTesting.exe
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+        with:
+          submodules: "true"
+
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.8"
+
+      - name: Install conan
+        uses: BSFishy/pip-action@v1
+        with:
+          packages: |
+            conan
+
+      #Install the latest cmake
+      - name: Get the latest CMake version
+        uses: lukka/get-cmake@latest
+
+      - name: Run build for MSVC compiler
+        run: |
+          cmake -G"Visual Studio 17 2022" -Ax64 -S"${{ github.workspace }}/Firmware/" -B"${{ env.buildDir }}" -DPACKAGE_TESTS=ON -DTARGET_PLATFORM:STRING="FIRMWARE_SIMULATOR" -DCMAKE_BUILD_TYPE=Release
+          cd ${{ env.buildDir }}
+          cmake --build . --config Release
+      - name: Run firmware testing
+        run: |
+          cd ${{ env.buildDir }}/Release
+          .\FirmwareTesting.exe
   build-arm:
-
     runs-on: ubuntu-latest
 
     steps:
-
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
-      with:
-        submodules: 'true'
-
-    #Install the latest cmake
-    - name : Get the latest CMake version
-      uses: lukka/get-cmake@latest
-
-    # - name: Get the latest arm-none-eabi-gcc
-    #   uses: fiam/arm-none-eabi-gcc@v1
-    #   with:
-    #     release: '10-2020-q2'
-    #     directory: ${{ github.workspace }}/toolchain
-    - name: Cache GCC toolchain
-      id: cache-gcc-toolchain
-      uses: actions/cache@v2
-      with:
-        path: ${{ github.workspace }}/gcc_toolchain_10_3
-        key: ${{runner.os}}-toolchain-v10_3
-
-    - name: Get the latest arm-gcc-none-eabi-gcc
-      uses: wei/wget@v1
-      if: steps.cache-gcc-toolchain.outputs.cache-hit != 'true'
-      id: download-arm-gcc
-      with:
-        args: 'https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.07/gcc-arm-none-eabi-10.3-2021.07-x86_64-linux.tar.bz2'
-
-    - name: Unpack arm-gcc-compiler
-      if: steps.cache-gcc-toolchain.outputs.cache-hit != 'true'
-      run: |
-        mkdir gcc_toolchain_10_3
-        tar -xjf gcc-arm-none-eabi-10.3-2021.07-x86_64-linux.tar.bz2 --directory ${{ github.workspace }}/gcc_toolchain_10_3
-
-    - name: Cache NordicSDK
-      id: cache-nordic-sdk
-      uses: actions/cache@v2
-      with:
-        path: ${{ github.workspace }}/Nrf52SDKv16_0
-        key: ${{runner.os}}-nordic-sdk-v16-0
-
-    - name: Get NRF52 16.0 SDK
-      uses: wei/wget@v1
-      id: download-nrf52sdk
-      if: steps.cache-nordic-sdk.outputs.cache-hit != 'true'
-      with:
-        args: 'https://www.nordicsemi.com/-/media/Software-and-other-downloads/SDKs/nRF5/Binaries/nRF5SDK160098a08e2.zip'
-
-    - name: Unpack NordicSDK
-      if: steps.cache-nordic-sdk.outputs.cache-hit != 'true'
-      run: |
-        mkdir Nrf52SDKv16_0
-        unzip nRF5SDK160098a08e2.zip -d Nrf52SDKv16_0
-        mv Nrf52SDKv16_0/components/boards/pca10040.h Nrf52SDKv16_0/components/boards/pca10040_1.h
-
-    - name: Run CMakeLists generation for GCC compiler
-      uses: lukka/run-cmake@v2
-      with:
-        cmakeGenerator: Ninja
-        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
-        cmakeListsTxtPath: ${{ github.workspace }}/Firmware/CMakeLists.txt
-        cmakeBuildType: Debug
-        cmakeAppendedArgs : '-DTARGET_PLATFORM:STRING="ARM_CORTEX" -DEXECUTE_MCU_FLASHING=OFF -DCMAKE_BUILD_TYPE:STRING=Debug -DREDUCE_LVGL_BINARY_SIZE=ON -DPACKAGE_TESTS=OFF -DNRF5_SDK_PATH=${{ github.workspace }}/Nrf52SDKv16_0 -DARM_NONE_EABI_TOOLCHAIN_PATH:PATH=${{ github.workspace }}/gcc_toolchain_10_3/gcc-arm-none-eabi-10.3-2021.07'
-        buildWithCMake: true
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+        with:
+          submodules: "true"
+
+      #Install the latest cmake
+      - name: Get the latest CMake version
+        uses: lukka/get-cmake@latest
+
+      # - name: Get the latest arm-none-eabi-gcc
+      #   uses: fiam/arm-none-eabi-gcc@v1
+      #   with:
+      #     release: '10-2020-q2'
+      #     directory: ${{ github.workspace }}/toolchain
+      - name: Cache GCC toolchain
+        id: cache-gcc-toolchain
+        uses: actions/cache@v2
+        with:
+          path: ${{ github.workspace }}/gcc_toolchain_11_2
+          key: ${{runner.os}}-toolchain-v11_2
+
+      - name: Get the latest arm-gcc-none-eabi-gcc
+        uses: wei/wget@v1
+        if: steps.cache-gcc-toolchain.outputs.cache-hit != 'true'
+        id: download-arm-gcc
+        with:
+          args: "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz"
+
+      - name: Unpack arm-gcc-compiler
+        if: steps.cache-gcc-toolchain.outputs.cache-hit != 'true'
+        run: |
+          mkdir gcc_toolchain_11_2
+          tar -xJf gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz --directory ${{ github.workspace }}/gcc_toolchain_11_2
+
+      - name: Cache NordicSDK
+        id: cache-nordic-sdk
+        uses: actions/cache@v2
+        with:
+          path: ${{ github.workspace }}/Nrf52SDKv16_0
+          key: ${{runner.os}}-nordic-sdk-v16-0
+
+      - name: Get NRF52 16.0 SDK
+        uses: wei/wget@v1
+        id: download-nrf52sdk
+        if: steps.cache-nordic-sdk.outputs.cache-hit != 'true'
+        with:
+          args: "https://www.nordicsemi.com/-/media/Software-and-other-downloads/SDKs/nRF5/Binaries/nRF5SDK160098a08e2.zip"
+
+      - name: Unpack NordicSDK
+        if: steps.cache-nordic-sdk.outputs.cache-hit != 'true'
+        run: |
+          mkdir Nrf52SDKv16_0
+          unzip nRF5SDK160098a08e2.zip -d Nrf52SDKv16_0
+          mv Nrf52SDKv16_0/components/boards/pca10040.h Nrf52SDKv16_0/components/boards/pca10040_1.h
+
+      - name: Run CMakeLists generation for GCC compiler
+        uses: lukka/run-cmake@v2
+        with:
+          cmakeGenerator: Ninja
+          cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+          cmakeListsTxtPath: ${{ github.workspace }}/Firmware/CMakeLists.txt
+          cmakeBuildType: Debug
+          cmakeAppendedArgs: '-DTARGET_PLATFORM:STRING="ARM_CORTEX" -DEXECUTE_MCU_FLASHING=OFF -DCMAKE_BUILD_TYPE:STRING=Debug -DREDUCE_LVGL_BINARY_SIZE=ON -DPACKAGE_TESTS=OFF -DNRF5_SDK_PATH=${{ github.workspace }}/Nrf52SDKv16_0 -DARM_NONE_EABI_TOOLCHAIN_PATH:PATH=${{ github.workspace }}/gcc_toolchain_11_2/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi'
+          buildWithCMake: true
 
     # # Runs a set of commands using the runners shell
     # - name: Run a multi-line script
@@ -126,51 +124,50 @@ jobs:
   build-linux-desktop-simulator:
     runs-on: ubuntu-latest
     env:
-      buildDir: '${{ github.workspace }}/build'
+      buildDir: "${{ github.workspace }}/build"
     steps:
-
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v2
-      with:
-        submodules: 'true'
-
-    - name: Setup python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.8'
-
-    - name: Install conan
-      uses:  BSFishy/pip-action@v1
-      with:
-        packages: |
-          conan
-
-    - name: Intall system required packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libegl-dev
-    #Install the latest cmake
-    - name : Get the latest CMake version
-      uses: lukka/get-cmake@latest
-
-    - name: Set up GCC 11
-      uses: egor-tensin/setup-gcc@v1
-      with:
-        version: 11
-        platform: x64
-
-    - name: Run CMakeLists generation for GCC compiler
-      uses: lukka/run-cmake@v2
-      with:
-        cmakeGenerator: Unix Makefiles
-        cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
-        cmakeListsTxtPath: ${{ github.workspace }}/Firmware/CMakeLists.txt
-        cmakeBuildType: Debug
-        cmakeAppendedArgs : '-DTARGET_PLATFORM:STRING="FIRMWARE_SIMULATOR" -DCMAKE_BUILD_TYPE:STRING=Debug -DREDUCE_LVGL_BINARY_SIZE=OFF -DPACKAGE_TESTS=ON -DENABLE_SANITIZE_BUILD=ON'
-        buildDirectory: ${{ env.buildDir }}
-        buildWithCMake: true
-
-    - name : Run firmware testing
-      run: |
-        cd ${{ env.buildDir }}
-        ./FirmwareTesting
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+        with:
+          submodules: "true"
+
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.8"
+
+      - name: Install conan
+        uses: BSFishy/pip-action@v1
+        with:
+          packages: |
+            conan
+
+      - name: Intall system required packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libegl-dev
+      #Install the latest cmake
+      - name: Get the latest CMake version
+        uses: lukka/get-cmake@latest
+
+      - name: Set up GCC 11
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 11
+          platform: x64
+
+      - name: Run CMakeLists generation for GCC compiler
+        uses: lukka/run-cmake@v2
+        with:
+          cmakeGenerator: Unix Makefiles
+          cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+          cmakeListsTxtPath: ${{ github.workspace }}/Firmware/CMakeLists.txt
+          cmakeBuildType: Debug
+          cmakeAppendedArgs: '-DTARGET_PLATFORM:STRING="FIRMWARE_SIMULATOR" -DCMAKE_BUILD_TYPE:STRING=Debug -DREDUCE_LVGL_BINARY_SIZE=OFF -DPACKAGE_TESTS=ON -DENABLE_SANITIZE_BUILD=ON'
+          buildDirectory: ${{ env.buildDir }}
+          buildWithCMake: true
+
+      - name: Run firmware testing
+        run: |
+          cd ${{ env.buildDir }}
+          ./FirmwareTesting

.gitignore

@@ -32,6 +32,8 @@ _deps
 build/
 out/
 build_simulator/
-
+Firmware/build_firmware
 #ignore vs temp folders
-.vs/
+.vs/
+#Ignore kicad backups
+*.sch-bak

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "Schematic/KiCadLibrariesRoot"]
 	path = Schematic/KiCadLibrariesRoot
 	url = https://github.com/ValentiWorkLearning/KiCadLibrariesRoot.git
+[submodule "Firmware/3rdparty/littlefs_lib/littlefs"]
+	path = Firmware/3rdparty/littlefs_lib/littlefs
+	url = https://github.com/ValentiWorkLearning/littlefs.git

Firmware/3rdparty/CMakeLists.txt

@@ -5,13 +5,14 @@ if( ${TARGET_PLATFORM} STREQUAL "FIRMWARE_SIMULATOR" )
 	set(CMAKE_CXX_STANDARD 20)
 	#add_subdirectory( cppcoro_lib )
 elseif( ${TARGET_PLATFORM} STREQUAL "ARM_CORTEX" )
-	set(CMAKE_CXX_STANDARD 17)
+	set(CMAKE_CXX_STANDARD 20)
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set( 3RD_PARTY_DIR CACHE STRING ${CMAKE_CURRENT_SOURCE_DIR} )# Libs root path
-add_subdirectory( etl )
-add_subdirectory( fmt )
+add_subdirectory(etl)
+add_subdirectory(fmt)
+add_subdirectory(littlefs_lib)
 
 target_compile_definitions(fmt
 	PUBLIC
@@ -20,4 +21,4 @@ target_compile_definitions(fmt
 	FMT_USE_DOUBLE=0
 	FMT_USE_LONG_DOUBLE=0
 	FMT_REDUCE_INT_INSTANTIATIONS=0
-)
+)

Firmware/3rdparty/littlefs_lib/CMakeLists.txt

@@ -0,0 +1,43 @@
+cmake_minimum_required(VERSION 3.14)
+
+add_library(littlefs)
+
+target_sources(littlefs PRIVATE
+	littlefs/lfs.cpp
+	littlefs/lfs_util.cpp
+ "lfs_util_desktop.h")
+
+target_include_directories(littlefs PUBLIC littlefs
+)
+
+target_link_libraries(littlefs PUBLIC UtilsLibrary )
+
+target_compile_definitions(littlefs PUBLIC LFS_YES_TRACE )
+
+target_link_options(
+    littlefs
+    PUBLIC
+    ${CPU_FLAGS}
+)
+
+target_compile_options(
+    littlefs
+    PUBLIC
+    ${COMMON_FLAGS}
+)
+
+target_compile_options(
+    littlefs
+    PUBLIC
+    $<$<CXX_COMPILER_ID:GNU>:-Os>
+)
+
+target_include_directories(littlefs PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+if( ${TARGET_PLATFORM} STREQUAL "ARM_CORTEX" )
+    target_precompile_headers(littlefs PRIVATE ${CMAKE_CURRENT_LIST_DIR}/lfs_util_segger.h)
+    target_link_libraries(littlefs PRIVATE NordicSDK::Common)
+elseif( ${TARGET_PLATFORM} STREQUAL "FIRMWARE_SIMULATOR")
+    target_precompile_headers(littlefs PRIVATE ${CMAKE_CURRENT_LIST_DIR}/lfs_util_desktop.h)
+    target_link_libraries(littlefs PUBLIC logger_service)
+endif()