Update Workflows and Cmakelists.txt

Author: gab-k

.github/workflows/build_sw.yml

@@ -26,17 +26,28 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: install build packages
-      run: sudo apt-get update && sudo apt-get install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
+      run: sudo apt-get update && sudo apt-get install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi g++ libstdc++-arm-none-eabi-newlib build-essential
 
-    - name: Get sdk and add PICO_SDK_PATH
+    - name: Get SDK and add PICO_SDK_PATH
       run: cd /tmp && git clone https://github.com/raspberrypi/pico-sdk.git && echo "PICO_SDK_PATH=/tmp/pico-sdk" >> $GITHUB_ENV
+     
+    - name: Init submodules to get tinyUSB stack
+      run: git submodule update --init
+      
+    - name: Configure and run CMake Rev0.3
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/Software/build-Rev-0_3 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-0_3
+
+    - name: Build Rev0.3
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/Software/build-Rev-0_3 --config ${{env.BUILD_TYPE}}
 
-    - name: Configure CMake
+    - name: Configure and run CMake Rev1.0
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/Software/build -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B ${{github.workspace}}/Software/build-Rev-1_0 -S ${{github.workspace}}/Software -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPICO_BOARD=RP2040-Decoder-board-Rev-1_0
 
-    - name: Build
+    - name: Build Rev1.0
       # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/Software/build --config ${{env.BUILD_TYPE}}
-    
+      run: cmake --build ${{github.workspace}}/Software/build-Rev-1_0 --config ${{env.BUILD_TYPE}}

.github/workflows/prerelease.yml

@@ -21,10 +21,13 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: install build packages
-      run: sudo apt-get update && sudo apt-get install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
+      run: sudo apt-get update && sudo apt-get install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi g++ libstdc++-arm-none-eabi-newlib build-essential
 
     - name: Get sdk and add PICO_SDK_PATH
       run: cd /tmp && git clone https://github.com/raspberrypi/pico-sdk.git && echo "PICO_SDK_PATH=/tmp/pico-sdk" >> $GITHUB_ENV
+     
+    - name: Init submodules to get tinyUSB stack
+      run: git submodule update --init
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

.github/workflows/release.yml

@@ -22,11 +22,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: install build packages
-      run: sudo apt-get update && sudo apt-get install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
+      run: sudo apt-get update && sudo apt-get install cmake gcc-arm-none-eabi libnewlib-arm-none-eabi g++ libstdc++-arm-none-eabi-newlib build-essential
 
     - name: Get sdk and add PICO_SDK_PATH
       run: cd /tmp && git clone https://github.com/raspberrypi/pico-sdk.git && echo "PICO_SDK_PATH=/tmp/pico-sdk" >> $GITHUB_ENV
-    
+
+    - name: Init submodules to get tinyUSB stack
+      run: git submodule update --init
+      
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type

Software/CMakeLists.txt

@@ -27,7 +27,8 @@ set(PICO_BOARD_HEADER_DIRS ${CMAKE_SOURCE_DIR})
 # Board type selection:
 #
 # Please select RP2040-Decoder-board-Rev-1_0 for Rev >= 1.0 or RP2040-Decoder-board-Rev-0_3 for Rev <= 0.3
-set(PICO_BOARD RP2040-Decoder-board-Rev-1_0)
+# running cmake with -DPICO_BOARD=RP2040-Decoder-board-Rev-X_Y explicitly from command line overrides this setting
+set(PICO_BOARD RP2040-Decoder-board-Rev-1_0 CACHE STRING "Board type")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
 include(pico_sdk_import.cmake)