Update My Fork

.github/no-response.yml

@@ -0,0 +1,12 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 3
+# Label requiring a response
+responseRequiredLabel: Missing Information
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because the information we asked
+  to be provided when opening it was not supplied by the original author.
+  With only the information that is currently in the issue, we don't have
+  enough information to take action.

.github/workflows/ci.yml

@@ -9,11 +9,12 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
         matrix:
-          start: [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100]
-          count: [10]
+          id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 
     steps:
       - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get -y install ninja-build
       - name: Setup environment
         run: |
           # This is the hash of the commit for the PR
@@ -25,44 +26,27 @@ jobs:
           # why we try github.event.pull_request.head.sha first
           COMMIT_ID=${COMMIT_ID:-${{ github.sha }}}
           BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID})
-          echo "::set-env name=TARGETS::$(./src/utils/build-targets.sh -n -s ${{ matrix.start }} -c ${{ matrix.count }})"
+          VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/^[ \t]+|[ \t\)]+$/, "", $2); print $2 }')
           echo "::set-env name=BUILD_SUFFIX::${BUILD_SUFFIX}"
-          echo "::set-env name=BUILD_NAME::inav-$(make print_version)-${BUILD_SUFFIX}"
-          echo "::set-env name=IS_LAST_JOB::$([ $(expr ${{ strategy.job-index }} + 1) = ${{ strategy.job-total }} ] && echo yes)"
-      - name: Ensure all targets will be tested
-        if: ${{ env.IS_LAST_JOB }}
-        run: |
-          UNTESTED=$(./src/utils/build-targets.sh -n -s $(expr ${{ matrix.start }} + ${{ matrix.count }}) -c 10000)
-          if ! [ -z "${UNTESTED}" ]; then
-            echo "Untested targets: ${UNTESTED}" >&2
-            exit 1
-          fi
+          echo "::set-env name=BUILD_NAME::inav-${VERSION}-${BUILD_SUFFIX}"
       - uses: actions/cache@v1
         with:
           path: downloads
-          key: ${{ runner.os }}-downloads-${{ hashFiles('Makefile') }}-${{ hashFiles('**/make/*.mk')}}
-      - name: Install ARM toolchain
-        run: make arm_sdk_install
-      - name: Build targets (${{ matrix.start }})
-        if: ${{ env.TARGETS }}
-        run: ./src/utils/build-targets.sh -s ${{ matrix.start }} -c ${{ matrix.count }} -S ${{ env.BUILD_SUFFIX }}
+          key: ${{ runner.os }}-downloads-${{ hashFiles('CMakeLists.txt') }}-${{ hashFiles('**/cmake/*')}}
+      - name: Build targets (${{ matrix.id }})
+        run: mkdir -p build && cd build && cmake -DWARNINGS_AS_ERRORS=ON -DCI_JOB_INDEX=${{ matrix.id }} -DCI_JOB_COUNT=${{ strategy.job-total }} -DBUILD_SUFFIX=${{ env.BUILD_SUFFIX }} -G Ninja .. && ninja ci
       - name: Upload artifacts
-        if: ${{ env.TARGETS }}
         uses: actions/upload-artifact@v2-preview
         with:
           name: ${{ env.BUILD_NAME }}.zip
-          path: ./obj/dist/*.hex
+          path: ./build/*.hex
 
   test:
     needs: [build]
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/cache@v1
-        with:
-          path: downloads
-          key: ${{ runner.os }}-downloads-${{ hashFiles('Makefile') }}-${{ hashFiles('**/make/*.mk')}}
-      - name: Install ARM toolchain
-        run: make arm_sdk_install
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get -y install ninja-build
       - name: Run Tests
-        run: make test
+        run: mkdir -p build && cd build && cmake -DTOOLCHAIN=none -G Ninja .. && ninja check

.gitignore

@@ -8,14 +8,16 @@
 .project
 .settings
 .cproject
+__pycache__
 startup_stm32f10x_md_gcc.s
 .vagrant/
 .vscode/
 cov-int*
-obj/
-patches/
-tools/
-downloads/
+/build/
+/obj/
+/patches/
+/tools/
+/downloads/
 
 # script-generated files
 docs/Manual.pdf

AUTHORS

@@ -37,6 +37,7 @@ Hyon Lim
 James Harrison
 Jan Staal
 Jeremy Waters
+Joe Hermaszewski
 Joe Poser
 Joel Fuster
 Johannes Kasberger

CMakeLists.txt

@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 3.13...3.18)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+set(MAIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+set(MAIN_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib")
+set(MAIN_UTILS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/utils")
+set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/main")
+set(SVD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dev/svd")
+set(DOWNLOADS_DIR "${MAIN_DIR}/downloads")
+set(TOOLS_DIR "${MAIN_DIR}/tools")
+
+set(TOOLCHAIN_OPTIONS none arm-none-eabi)
+set(TOOLCHAIN "arm-none-eabi" CACHE STRING "Toolchain to use. Available: ${TOOLCHAIN_OPTIONS}")
+set_property(CACHE TOOLCHAIN PROPERTY STRINGS ${TOOLCHAIN_OPTIONS})
+if("" STREQUAL TOOLCHAIN)
+    set(TOOLCHAIN none)
+endif()
+if (NOT ${TOOLCHAIN} IN_LIST TOOLCHAIN_OPTIONS)
+    message(FATAL_ERROR "Invalid toolchain ${TOOLCHAIN}. Valid options are: ${TOOLCHAIN_OPTIONS}")
+endif()
+
+option(COMPILER_VERSION_CHECK "Ensure the compiler matches the expected version" ON)
+
+if(TOOLCHAIN STREQUAL none)
+    add_subdirectory(src/test)
+else()
+    set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/${TOOLCHAIN}.cmake")
+    include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/${TOOLCHAIN}-checks.cmake")
+endif()
+
+project(INAV VERSION 2.6.0)
+
+enable_language(ASM)
+
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_EXTENSIONS ON)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_EXTENSIONS ON)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_program(RUBY_EXECUTABLE ruby)
+if (NOT RUBY_EXECUTABLE)
+    message(FATAL_ERROR "Could not find ruby")
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+    set(IS_RELEASE_BUILD ON)
+endif()
+
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+string(SUBSTRING ${GIT_SHA1} 0 8 GIT_REV)
+
+set(FIRMWARE_VERSION ${PROJECT_VERSION})
+
+option(WARNINGS_AS_ERRORS "Make all warnings into errors")
+message("-- toolchain: ${TOOLCHAIN}, WARNINGS_AS_ERRORS: ${WARNINGS_AS_ERRORS}")
+
+include(settings)
+include(openocd)
+include(svd)
+include(main)
+include(stm32)
+
+add_subdirectory(src)
+
+collect_targets()
+
+message("-- Build type: ${CMAKE_BUILD_TYPE}")
+include(ci)