From 6cb5cce5c1c551655430d1b916f1851781c9e995 Mon Sep 17 00:00:00 2001 From: haitomatic Date: Fri, 27 Oct 2023 04:49:03 +0000 Subject: [PATCH] packaging: gz sim sitl change px4 branch to main --- packaging/Dockerfile.sitl_gzsim | 2 +- src/drivers/rover_interface/RoverInterface.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/Dockerfile.sitl_gzsim b/packaging/Dockerfile.sitl_gzsim index 4f4d2de396fc..f0944e534919 100644 --- a/packaging/Dockerfile.sitl_gzsim +++ b/packaging/Dockerfile.sitl_gzsim @@ -44,7 +44,7 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y \ fastddsgen # Checkout the px4 version and build it -RUN git clone -b rebase_sitl_fixes https://github.com/tiiuae/px4-firmware +RUN git clone https://github.com/tiiuae/px4-firmware RUN python3 -m pip install -r px4-firmware/Tools/setup/requirements.txt COPY build_px4_sitl_gzsim.sh ./build.sh RUN ./build.sh diff --git a/src/drivers/rover_interface/RoverInterface.cpp b/src/drivers/rover_interface/RoverInterface.cpp index 8b11c1af43de..bfa8d128db09 100644 --- a/src/drivers/rover_interface/RoverInterface.cpp +++ b/src/drivers/rover_interface/RoverInterface.cpp @@ -11,7 +11,7 @@ RoverInterface::RoverInterface(uint8_t rover_type, uint32_t bitrate, float vehic ScheduledWorkItem(MODULE_NAME, px4::wq_configurations::rover_interface), _rover_type(rover_type), _bitrate(bitrate), - _vehicle_speed_max(vehicle_speed_max) + _vehicle_speed_max(vehicle_speed_max) { pthread_mutex_init(&_node_mutex, nullptr); }