Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: unitreerobotics/z1_controller
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: HorizonRoboticsInternal/z1_controller
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 26, 2024

  1. Set communication mode to UDP

    @QuantuMope
    QuantuMope committed Aug 26, 2024
    Copy the full SHA
    4cc4f96 View commit details

Commits on Sep 13, 2024

  1. Remove catkin findPackage call

    @QuantuMope
    QuantuMope committed Sep 13, 2024
    Copy the full SHA
    9407d5e View commit details

  2. Fix deprecated boost bind include

    @QuantuMope
    QuantuMope committed Sep 13, 2024
    Copy the full SHA
    838173e View commit details
Showing with 6 additions and 5 deletions.
  1. +5 −4 CMakeLists.txt
  2. +1 −1 include/common/utilities/loop.h
9 changes: 5 additions & 4 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.0)
project(z1_controller LANGUAGES CXX)
set(PACKAGE_NAME z1_controller)
set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O3 -std=c++14 -pthread")
set(COMMUNICATION UDP)

find_package(Boost REQUIRED)
find_package(Eigen3 REQUIRED)
@@ -17,7 +18,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
add_executable(z1_ctrl main.cpp)
target_link_libraries(z1_ctrl libZ1_${CMAKE_HOST_SYSTEM_PROCESSOR}.so)

find_package(catkin)
if(${catkin_FOUND})
add_subdirectory(sim)
endif()
#find_package(catkin)
#if(${catkin_FOUND})
# add_subdirectory(sim)
#endif()
2 changes: 1 addition & 1 deletion include/common/utilities/loop.h
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/function.hpp>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
#include "common/utilities/timer.h"