🔖 (v1.2.0): Merge branch 'release/1.2.0'

* release/1.2.0: (130 commits) 🐛 (supersimon): Move increment before last round check 🔖 (release): Bump to v1.2.0 👷 (sonarcloud): Update sonar-scanner to v4.7.0.2747 👷 (actions): Update actions/cache to v3 ✨ (RobotKit): Link BLE and FileReception to get SHA256 ✨ (BLEKit): Interface - Add onDataRequested method 👷 (setup): Remove actions/setup-python 🐛 (ActivityKit): Add missing #include <optional> to SuperSimon ⬆️ (boost): Bump boost::sml to v1.1.6 ✨ (os): Add activity - ShapeRecognition ✨ (ActivityKit): Add new activity - ShapeRecognition ✨ (os): Add activity - SuperSimon ✨ (ActivityKit): Add new activity - SuperSimon ✨ (os): Add activity - FlashNumberCounting ✨ (ActivityKit): Add new activity - FlashNumberCounting ✨ (os): Add activity - LedNumberCounting ✨ (ActivityKit): Add new activity - LedNumberCounting ✨ (os): Add activity - FoodRecognition ✨ (ActivityKit): Add new activity - FoodRecognition ✨ (os): Add activity - EmotionRecognition ...
leka · Oct 2, 2022 · 7e5bda9 · 7e5bda9
2 parents e79f8d3 + 512b191
commit 7e5bda9
Show file tree

Hide file tree

Showing 184 changed files with 9,266 additions and 1,271 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -56,7 +56,7 @@ runs:
 
     - name: Cache ARM GCC Toolchain
       id: cache_arm_toolchain
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ env.RUNNER_HOME }}/gcc-arm-none-eabi
         key: ${{ runner.os }}-global_cache-arm_toolchain-${{ hashFiles('config/toolchain_gcc_arm_none_eabi_url') }}
@@ -93,12 +93,12 @@ runs:
     - name: Install tools
       shell: bash
       run: |
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends ninja-build ccache lcov gcovr
+        sudo apt-fast update
+        sudo apt-fast install -y --no-install-recommends ninja-build ccache lcov gcovr
 
     - name: Cache ccache
       id: global_cache-ccache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{ env.CCACHE_DIR}}
         key: ${{ runner.os }}-${{ inputs.ccache_name }}-ccache-${{ env.CACHE_NOW_TIME }}
@@ -109,21 +109,16 @@ runs:
     # Mark: - Python/pip
     #
 
-    - name: Setup Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: "3.x"
-
     - name: Cache pip dependencies
       id: global_cache-pip_dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: |
           ${{ env.RUNNER_HOME }}/.cache/pip
           ${{ env.pythonLocation }}
-        key: ${{ runner.os }}-global_cache-pip_dependencies-${{ env.pythonLocation }}-${{ hashFiles('config/mbed_version') }}
+        key: ${{ runner.os }}-global_cache-pip_dependencies-${{ hashFiles('config/mbed_version') }}
         restore-keys: |
-          ${{ runner.os }}-global_cache-pip_dependencies-${{ env.pythonLocation }}-
+          ${{ runner.os }}-global_cache-pip_dependencies-
 
     - name: Install pip packages
       shell: bash

diff --git a/.github/actions/setup/setup_env.sh b/.github/actions/setup/setup_env.sh
@@ -76,7 +76,7 @@ echo "ARM_TOOLCHAIN_URL=$ARM_TOOLCHAIN_URL" >> $GITHUB_ENV
 # MARK: - SonarCloud
 #
 
-SONARCLOUD_CLI_URL="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip"
+SONARCLOUD_CLI_URL="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747.zip"
 SONARCLOUD_CLI_FILENAME="sonar-scanner-cli-*.zip"
 SONARCLOUD_CLI_EXTRACT_DIRECTORY="sonar-scanner-*"
 

diff --git a/.github/workflows/ci-build_targets.yml b/.github/workflows/ci-build_targets.yml
@@ -20,7 +20,7 @@ jobs:
 
   build_target:
     name: target
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false

diff --git a/.github/workflows/ci-code_analysis-clang_tidy.yml b/.github/workflows/ci-code_analysis-clang_tidy.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   run:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       #
@@ -28,18 +28,6 @@ jobs:
       - name: Setup CI
         uses: ./.github/actions/setup
 
-      #
-      # Mark: - Install clang-tidy
-      #
-
-      - name: Install clang-tidy 13
-        run: |
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"
-          sudo apt update -y
-          sudo apt install -y --no-install-recommends clang-tidy-13
-          clang-tidy-13 --version
-
       #
       # Mark: - Config
       #

diff --git a/.github/workflows/ci-code_analysis-compare_base_head.yml b/.github/workflows/ci-code_analysis-compare_base_head.yml
@@ -15,7 +15,7 @@ jobs:
 
   build_base_ref:
     name: build base_ref w/ debug
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -75,7 +75,7 @@ jobs:
 
   build_head_ref:
     name: build head_ref w/ debug
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -134,7 +134,7 @@ jobs:
 
   compare_base_head_files:
     name: Compare base/head files
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [build_base_ref, build_head_ref]
 
     strategy:

diff --git a/.github/workflows/ci-code_analysis-sanitizers.yml b/.github/workflows/ci-code_analysis-sanitizers.yml
@@ -16,7 +16,7 @@ on:
 jobs:
   run_sanitizers:
     name: Build & run
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false

diff --git a/.github/workflows/ci-code_analysis-sonarcloud.yml b/.github/workflows/ci-code_analysis-sonarcloud.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   run:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       #
@@ -51,7 +51,7 @@ jobs:
 
       - name: Cache sonarcloud cache
         id: global_cache-sonarcloud
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ env.SONARCLOUD_CACHE_DIR}}
           key: ${{ runner.os }}-global_cache-sonarcloud-${{ github.event.number }}-${{ env.CACHE_NOW_TIME }}

diff --git a/.github/workflows/ci-create_release.yml b/.github/workflows/ci-create_release.yml
@@ -16,7 +16,7 @@ on:
 jobs:
   bootloader_os_firmware:
     name: Bootloader + OS = Firmware
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       #
@@ -41,7 +41,7 @@ jobs:
 
       - name: Build firmware, os, bootloader
         run: |
-          ./tools/firmware/build_firmware.sh -r
+          make firmware
 
       #
       # Mark: - Upload
@@ -53,4 +53,5 @@ jobs:
           name: bootloader_os_firmware
           retention-days: 7
           path: |
-            _release/firmware.bin
+            _release/firmware.hex
+            _release/application-signed.bin
diff --git a/.github/workflows/ci-linters.yml b/.github/workflows/ci-linters.yml
@@ -7,22 +7,14 @@ on: push
 jobs:
   clang_format:
     name: clang-format
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           fetch-depth: 2
 
-      - name: Install clang-format 14
-        run: |
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main"
-          sudo apt update -y
-          sudo apt install -y --no-install-recommends clang-format-14
-          clang-format-14 --version
-
       - name: Run clang-format
         run: |
           python3 tools/run-clang-format.py --clang-format-executable=clang-format-14 -r --extension=h,hpp,c,cpp --color=always --style=file ./app ./drivers ./libs ./spikes ./tests
diff --git a/.github/workflows/ci-unit_tests.yml b/.github/workflows/ci-unit_tests.yml
@@ -16,7 +16,7 @@ on:
 jobs:
   run_unit_tests:
     name: Build & run
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false

diff --git a/.github/workflows/tools-cleanup_artifacts.yml b/.github/workflows/tools-cleanup_artifacts.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   delete-artifacts:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: kolpav/purge-artifacts-action@v1
         with:

diff --git a/.github/workflows/tools-projects_status_labeler.yml b/.github/workflows/tools-projects_status_labeler.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   triage:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Auto card labeler
         uses: technote-space/auto-card-labeler@v2

diff --git a/Makefile b/Makefile
@@ -15,15 +15,16 @@ MCUBOOT_DIR       := $(ROOT_DIR)/extern/mcuboot
 # MARK: - Arguments
 #
 
-PORT            ?= /dev/tty.usbmodem14303
-MBED_GIT_URL    ?= $(shell cat $(ROOT_DIR)/config/mbed_git_url)
-MBED_BRANCH     ?= $(shell cat $(ROOT_DIR)/config/mbed_version)
-MBED_VERSION    ?= $(shell cat $(ROOT_DIR)/config/mbed_version)
-MCUBOOT_GIT_URL ?= $(shell cat $(ROOT_DIR)/config/mcuboot_git_url)
-MCUBOOT_VERSION ?= $(shell cat $(ROOT_DIR)/config/mcuboot_version)
-BAUDRATE        ?= 115200
-BUILD_TYPE      ?= Release
-TARGET_BOARD    ?= LEKA_V1_2_DEV
+PORT             ?= /dev/tty.usbmodem14303
+MBED_GIT_URL     ?= $(shell cat $(ROOT_DIR)/config/mbed_git_url)
+MBED_BRANCH      ?= $(shell cat $(ROOT_DIR)/config/mbed_version)
+MBED_VERSION     ?= $(shell cat $(ROOT_DIR)/config/mbed_version)
+MCUBOOT_GIT_URL  ?= $(shell cat $(ROOT_DIR)/config/mcuboot_git_url)
+MCUBOOT_VERSION  ?= $(shell cat $(ROOT_DIR)/config/mcuboot_version)
+BAUDRATE         ?= 115200
+BUILD_TYPE       ?= Release
+TARGET_BOARD     ?= LEKA_V1_2_DEV
+FIRMWARE_VERSION ?= $(shell cat $(ROOT_DIR)/config/os_version)
 
 #
 # MARK: - Options
@@ -56,8 +57,8 @@ CMAKE_TOOLS_CONFIG_DIR := $(CMAKE_TOOLS_BUILD_DIR)/cmake_config
 # MARK: - Coverage exclusions
 #
 
-EXCLUDE_FROM_GCOVR_COVERAGE = -e '.*Xcode.*' -e '.*_build.*' -e '.*extern.*' -e '.*tests/unit.*' -e '.*tests/mocks.*' -e '.*_test.*\..*' -e '.*include/boost.*' -e '.*include/interface.*' -e '.*CoreSTM32Hal.*'
-EXCLUDE_FROM_LCOV_COVERAGE  =     '*Xcode*'      '*_build*'      '*extern*'      '*tests/unit*'      '*tests/mocks*'      '*_test*.*'        '*include/boost*'      '*include/interface*'      '*CoreSTM32Hal*'
+EXCLUDE_FROM_GCOVR_COVERAGE = -e '.*Xcode.*' -e '.*_build.*' -e '.*extern.*' -e '.*tests/unit.*' -e '.*tests/mocks.*' -e '.*_test.*\..*' -e '.*include/boost.*' -e '.*include/semver.*' -e '.*include/interface.*' -e '.*CoreSTM32Hal.*'
+EXCLUDE_FROM_LCOV_COVERAGE  =     '*Xcode*'      '*_build*'      '*extern*'      '*tests/unit*'      '*tests/mocks*'      '*_test*.*'        '*include/boost*'      '*include/semver*'      '*include/interface*'      '*CoreSTM32Hal*'
 
 #
 # MARK: - .bin path
@@ -97,6 +98,10 @@ tests_functional:
 	@echo "🏗️  Building functional tests ⚗️"
 	cmake --build $(TARGET_BUILD_DIR) -t tests_functional
 
+firmware:
+	python3 tools/check_version.py ./config/os_version
+	./tools/firmware/build_firmware.sh -r -v $(FIRMWARE_VERSION)
+
 #
 # MARK: - Config targets
 #

diff --git a/app/bootloader/main.cpp b/app/bootloader/main.cpp
@@ -102,7 +102,7 @@ namespace factory_reset {
 
 	}	// namespace internal
 
-	auto firmwarekit = FirmwareKit(internal::flash);
+	auto firmwarekit = FirmwareKit(internal::flash, FirmwareKit::DEFAULT_CONFIG);
 
 	void initializeExternalFlash()
 	{

diff --git a/app/os/CMakeLists.txt b/app/os/CMakeLists.txt
@@ -35,6 +35,7 @@ target_link_libraries(LekaOS
 	CoreBufferedSerial
 	CoreRFIDReader
 	RFIDKit
+	ActivityKit
 )
 
 target_link_custom_leka_targets(LekaOS)