aleks/flix
1
0
Fork 0
mirror of https://github.com/okalachev/flix.git synced 2026-06-28 14:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove core installation when running the sim

Browse Source 
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:
Oleg Kalachev
2026-06-10 18:10:42 +03:00
parent 52b74afba6
commit 8e2ffd7c69
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -1
View File
@@ -4,7 +4,8 @@ build/
tools/log/ tools/log/
tools/dist/ tools/dist/
*.egg-info/ *.egg-info/
.dependencies .core
.libs
.vscode/* .vscode/*
!.vscode/settings.json !.vscode/settings.json
!.vscode/c_cpp_properties.json !.vscode/c_cpp_properties.json
Makefile
+14 -9
View File
@@ -1,7 +1,9 @@
BOARD = esp32:esp32:d1_mini32:DebugLevel=error 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*)) 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 arduino-cli compile --fqbn $(BOARD) flix
upload: build upload: build
@@ -13,15 +15,18 @@ erase:
monitor: monitor:
arduino-cli monitor -p "$(PORT)" -c baudrate=115200 arduino-cli monitor -p "$(PORT)" -c baudrate=115200
dependencies .dependencies: core .core:
arduino-cli core update-index --config-file arduino-cli.yaml 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 --config-file arduino-cli.yaml 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 update-index
arduino-cli lib install "FlixPeriph" arduino-cli lib install "FlixPeriph"
arduino-cli lib install "MAVLink"@2.0.25 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 compile --fqbn $(BOARD) tools/espnow-proxy
arduino-cli upload --fqbn $(BOARD) -p "$(PORT)" 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 mkdir -p gazebo/build
cd gazebo/build && cmake .. cd gazebo/build && cmake ..
build_simulator: .dependencies gazebo/build build_simulator: .libs gazebo/build
make -C gazebo/build make -C gazebo/build
simulator: build_simulator simulator: build_simulator
@@ -44,6 +49,6 @@ plot:
plotjuggler -d $(shell ls -t tools/log/*.csv | head -n1) plotjuggler -d $(shell ls -t tools/log/*.csv | head -n1)
clean: 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
arduino-cli.yaml
-5
View File
@@ -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