mirror of
https://github.com/okalachev/flix.git
synced 2026-06-27 21:46:38 +00:00
Remove core installation when running the sim
Split `dependencies` target to `core` and `libs` targets. Move additional urls declaration and connection timeout from arduino-cli.yaml to Makefile for simplicity and transparency. Update ESP32 core url. Remove arduino-cli.yaml.
This commit is contained in:
+2
-1
@@ -4,7 +4,8 @@ build/
|
||||
tools/log/
|
||||
tools/dist/
|
||||
*.egg-info/
|
||||
.dependencies
|
||||
.core
|
||||
.libs
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/c_cpp_properties.json
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
BOARD = esp32:esp32:d1_mini32:DebugLevel=error
|
||||
PORT := $(strip $(wildcard /dev/serial/by-id/usb-Silicon_Labs_CP21* /dev/serial/by-id/usb-1a86_USB_Single_Serial_* /dev/cu.usbserial-* /dev/cu.usbmodem*))
|
||||
|
||||
build: .dependencies
|
||||
export ARDUINO_NETWORK_CONNECTION_TIMEOUT := 1h
|
||||
|
||||
build: .core .libs
|
||||
arduino-cli compile --fqbn $(BOARD) flix
|
||||
|
||||
upload: build
|
||||
@@ -13,15 +15,18 @@ erase:
|
||||
monitor:
|
||||
arduino-cli monitor -p "$(PORT)" -c baudrate=115200
|
||||
|
||||
dependencies .dependencies:
|
||||
arduino-cli core update-index --config-file arduino-cli.yaml
|
||||
arduino-cli core install esp32:esp32@3.3.10 --config-file arduino-cli.yaml
|
||||
core .core:
|
||||
arduino-cli core update-index --additional-urls https://espressif.github.io/arduino-esp32/package_esp32_index.json
|
||||
arduino-cli core install esp32:esp32@3.3.10 --additional-urls https://espressif.github.io/arduino-esp32/package_esp32_index.json
|
||||
touch .core
|
||||
|
||||
libs .libs:
|
||||
arduino-cli lib update-index
|
||||
arduino-cli lib install "FlixPeriph"
|
||||
arduino-cli lib install "MAVLink"@2.0.25
|
||||
touch .dependencies
|
||||
touch .libs
|
||||
|
||||
upload_proxy: .dependencies
|
||||
upload_proxy: .core .libs
|
||||
arduino-cli compile --fqbn $(BOARD) tools/espnow-proxy
|
||||
arduino-cli upload --fqbn $(BOARD) -p "$(PORT)" tools/espnow-proxy
|
||||
|
||||
@@ -29,7 +34,7 @@ gazebo/build cmake: gazebo/CMakeLists.txt
|
||||
mkdir -p gazebo/build
|
||||
cd gazebo/build && cmake ..
|
||||
|
||||
build_simulator: .dependencies gazebo/build
|
||||
build_simulator: .libs gazebo/build
|
||||
make -C gazebo/build
|
||||
|
||||
simulator: build_simulator
|
||||
@@ -44,6 +49,6 @@ plot:
|
||||
plotjuggler -d $(shell ls -t tools/log/*.csv | head -n1)
|
||||
|
||||
clean:
|
||||
rm -rf gazebo/build flix/build flix/cache .dependencies
|
||||
rm -rf gazebo/build flix/build flix/cache .core .libs
|
||||
|
||||
.PHONY: build upload monitor dependencies cmake build_simulator simulator log clean
|
||||
.PHONY: build upload monitor core libs cmake build_simulator simulator log clean
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
board_manager:
|
||||
additional_urls:
|
||||
- https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
|
||||
network:
|
||||
connection_timeout: 1h
|
||||
Reference in New Issue
Block a user