Merge pull request #26 from fprime-community/up/v3.5.0-ptrs

Updating pointers
fprime-community · Nov 8, 2024 · 545f507 · 545f507
2 parents c3b53ff + d0962dc
commit 545f507
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/.github/workflows/baremetal_ci_teensy.yml b/.github/workflows/baremetal_ci_teensy.yml
@@ -4,7 +4,7 @@ on: [push]
 
 env:
   run_job_select: "fsw-gds"
-  build_binary: ${{ github.workspace }}/build-artifacts/teensy41/BaremetalReference/bin/BaremetalReference.hex
+  build_binary: ${{ github.workspace }}/build-artifacts/teensy41/BaremetalReference/bin/BaremetalReference.elf.hex
   gds_args: --comm-adapter uart --uart-device /dev/ttyACM0
   dict_path: ${{ github.workspace }}/build-artifacts/teensy41/BaremetalReference/dict/BaremetalReferenceTopologyAppDictionary.xml
   test_path: BaremetalReference/test/int/baremetal_ref_integration_test.py
@@ -31,17 +31,12 @@ jobs:
         run: |
              python3 -m venv ./fprime-venv
              . ./fprime-venv/bin/activate
-             pip3 install -r ${{ inputs.fprime_location }}./fprime/requirements.txt
+             pip3 install -r ${{ inputs.fprime_location }}./lib/fprime/requirements.txt
       - name: "Platform Specific Requirements Install"
         run: |
-             mkdir -p ~/.local/bin
-             curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=~/.local/bin sh
-             cd ~/.local/bin
-             git clone https://github.com/SterlingPeet/arduino-cli-cmake-wrapper.git
-             cd arduino-cli-cmake-wrapper
-             git checkout update/refactor
-             pip3 install .
-             export PATH=~/.local/bin:$PATH
+             . ./fprime-venv/bin/activate
+             curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=$VIRTUAL_ENV/bin sh
+             pip install arduino-cli-cmake-wrapper==0.2.0a1
              cd ${{ github.workspace }}
              arduino-cli config init
              arduino-cli config add board_manager.additional_urls https://www.pjrc.com/teensy/package_teensy_index.json

diff --git a/lib/fprime-arduino b/lib/fprime-arduino
diff --git a/lib/fprime-baremetal b/lib/fprime-baremetal
+1 −1		Arduino/Drv/HardwareRateDriver/CMakeLists.txt
+2 −2		Arduino/Drv/HardwareRateDriver/HardwareRateDriver.hpp
+1 −1		Arduino/Drv/HardwareRateDriver/HardwareRateDriverAvr.cpp
+1 −1		Arduino/Svc/ArduinoTime/ArduinoTime.cpp
+1 −0		Arduino/Svc/LifeLed/LifeLed.cpp
+2 −0		cmake/platform/FprimeArduino.hpp
+0 −1		cmake/toolchain/featherrp2040.cmake
+5 −2		cmake/toolchain/support/arduino-support.cmake
+46 −58		src/baremetal/size/__main__.py
+11 −10		src/baremetal/size/print_cli.py