diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ce67b3..81a8e6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,8 +13,6 @@ jobs: - uses: actions/checkout@v3 - name: Install Arduino CLI uses: arduino/setup-arduino-cli@v1.1.1 - - name: Install dependencies - run: make dependencies - name: Build firmware run: make @@ -24,8 +22,6 @@ jobs: - uses: actions/checkout@v3 - name: Install Arduino CLI run: brew install arduino-cli - - name: Install dependencies - run: make dependencies - name: Build firmware run: make @@ -37,8 +33,6 @@ jobs: run: choco install arduino-cli - name: Install Make run: choco install make - - name: Install dependencies - run: make dependencies - name: Build firmware run: make diff --git a/.gitignore b/.gitignore index 3a23131..0ee1924 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.elf gazebo/build/ tools/log/ +.dependencies diff --git a/Makefile b/Makefile index 3ee9214..6d19bbd 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ BOARD = esp32:esp32:d1_mini32 PORT := $(wildcard /dev/serial/by-id/usb-Silicon_Labs_CP2104_USB_to_UART_Bridge_Controller_* /dev/serial/by-id/usb-1a86_USB_Single_Serial_* /dev/cu.usbserial-*) PORT := $(strip $(PORT)) -build: +build: .dependencies # arduino-cli compile --fqbn $(BOARD) --build-path $(SKETCH)/build --build-cache-path $(SKETCH)/cache $(SKETCH) arduino-cli compile --fqbn $(BOARD) $(SKETCH) @@ -13,11 +13,12 @@ upload: build monitor: arduino-cli monitor -p "$(PORT)" -c baudrate=115200 -dependencies: +dependencies .dependencies: arduino-cli core update-index --config-file arduino-cli.yaml arduino-cli core install esp32:esp32@2.0.7 --config-file arduino-cli.yaml arduino-cli lib install "Bolder Flight Systems SBUS"@1.0.1 arduino-cli lib install --git-url https://github.com/okalachev/MPU9250.git --config-file arduino-cli.yaml + touch .dependencies gazebo/build cmake: gazebo/CMakeLists.txt mkdir -p gazebo/build