Skip to content

backport #25 to humble #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Apr 9, 2026
Merged

backport #25 to humble #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55ea92c
fix build with asio 1.36
nim65s Apr 1, 2026
042b788
CMake: require 3.10
nim65s Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net_ft_description/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.10)
project(net_ft_description)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Expand Down
2 changes: 1 addition & 1 deletion net_ft_diagnostic_broadcaster/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.10)
project(net_ft_diagnostic_broadcaster)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Expand Down
2 changes: 1 addition & 1 deletion net_ft_driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.10)
project(net_ft_driver)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
Expand Down
2 changes: 1 addition & 1 deletion net_ft_driver/include/net_ft_driver/interfaces/net_ft_interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class NetFTInterface

void unpack(uint8_t* buffer);

asio::io_service io_service_;
asio::io_context io_context_;
asio::ip::udp::socket socket_;

std::string ip_address_;
Expand Down
4 changes: 2 additions & 2 deletions net_ft_driver/src/interfaces/net_ft_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ constexpr uint32_t kStartStreaming = 0x0002;
namespace net_ft_driver
{
NetFTInterface::NetFTInterface(const std::string& ip_address, int max_sampling_freq)
: socket_(io_service_)
: socket_(io_context_)
, ip_address_(ip_address)
, force_scale_(1.0)
, torque_scale_(1.0)
Expand All @@ -65,7 +65,7 @@ NetFTInterface::NetFTInterface(const std::string& ip_address, int max_sampling_f
, status_(0)
, ft_values_({ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 })
{
asio::ip::udp::endpoint endpoint(asio::ip::address_v4::from_string(ip_address), kPort);
asio::ip::udp::endpoint endpoint(asio::ip::make_address(ip_address), kPort);
socket_.open(asio::ip::udp::v4());
socket_.connect(endpoint);

Expand Down
Loading