aleks/flix
1
0
Fork 0
mirror of https://github.com/okalachev/flix.git synced 2025-07-29 12:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanups

Browse Source
This commit is contained in:
Oleg Kalachev 2023-11-11 06:15:20 +03:00
parent 8dad0a0918
commit 70eae3e556
3 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,4 +1,3 @@
SRC := $(wildcard flix/*.ino flix/*.cpp flix/*.hpp)
BOARD = esp32:esp32:d1_mini32 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 := $(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)) PORT := $(strip $(PORT))
@ -31,10 +30,10 @@ simulator: build_simulator
GAZEBO_PLUGIN_PATH=$$GAZEBO_PLUGIN_PATH:${CURDIR}/gazebo/build \ GAZEBO_PLUGIN_PATH=$$GAZEBO_PLUGIN_PATH:${CURDIR}/gazebo/build \
gazebo --verbose ${CURDIR}/gazebo/flix.world gazebo --verbose ${CURDIR}/gazebo/flix.world
grab_log: log:
PORT=$(PORT) tools/grab_log.py PORT=$(PORT) tools/grab_log.py
clean: clean:
rm -rf gazebo/build flix/build flix/cache .dependencies rm -rf gazebo/build flix/build flix/cache .dependencies
.PHONY: build upload monitor dependencies cmake build_simulator simulator grab_log clean .PHONY: build upload monitor dependencies cmake build_simulator simulator log clean

2
flix/vector.h
View File

@ -32,7 +32,7 @@ public:
z /= n; z /= n;
} }
Vector operator * (float b) Vector operator * (const float b) const
{ {
return Vector(x * b, y * b, z * b); return Vector(x * b, y * b, z * b);
} }

2
gazebo/models/floor/floor.sdf
View File

@ -1,4 +1,4 @@
<?xml version="1.0" ?> <?xml version="1.0"?>
<sdf version="1.5"> <sdf version="1.5">
<model name="floor"> <model name="floor">
<static>true</static> <static>true</static>