Skip to content

Commit 208c927

Browse files
adrianchan787pre-commit-ci-lite[bot]williamckha
authored
Removed ProtoRadio Listener/Sender functionality (UBC-Thunderbots#3505)
* Removed ProtoRadio Receivers/Senders * fixed accidental radio references in network * [pre-commit.ci lite] apply automatic fixes * Remove irrelevant docstring comment about radio --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Co-authored-by: williamckha <williamha@outlook.com>
1 parent 204ae9d commit 208c927

16 files changed

Lines changed: 2 additions & 290 deletions

src/software/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ pybind_library(
9696
"//software/geom:vector",
9797
"//software/geom/algorithms",
9898
"//software/math:math_functions",
99-
"//software/networking/radio:threaded_proto_radio_sender",
10099
"//software/networking/udp:threaded_proto_udp_listener",
101100
"//software/networking/udp:threaded_proto_udp_sender",
102101
"//software/uart:boost_uart_communication",

src/software/embedded/services/network/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ cc_library(
99
"//proto:tbots_cc_proto",
1010
"//shared:robot_constants",
1111
"//software/logger:network_logger",
12-
"//software/networking/radio:threaded_proto_radio_listener",
1312
"//software/networking/udp:threaded_proto_udp_listener",
1413
"//software/networking/udp:threaded_proto_udp_sender",
1514
"//software/time:duration",

src/software/embedded/services/network/network.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ NetworkService::NetworkService(const RobotId& robot_id, const std::string& ip_ad
4848
{
4949
LOG(FATAL) << "Failed to get IP addresses associated with " << interface;
5050
}
51-
52-
radio_listener_primitive_set =
53-
std::make_unique<ThreadedProtoRadioListener<TbotsProto::Primitive>>(
54-
[&](TbotsProto::Primitive primitive) { primitiveCallback(primitive); });
5551
}
5652

5753
void NetworkService::onFullSystemIpNotification(

src/software/embedded/services/network/network.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "shared/constants.h"
1111
#include "shared/robot_constants.h"
1212
#include "software/embedded/services/network/proto_tracker.h"
13-
#include "software/networking/radio/threaded_proto_radio_listener.hpp"
1413
#include "software/networking/udp/threaded_proto_udp_listener.hpp"
1514
#include "software/networking/udp/threaded_proto_udp_sender.hpp"
1615
#include "software/time/duration.h"
@@ -137,8 +136,6 @@ class NetworkService
137136
robot_to_fullsystem_ip_sender;
138137
std::unique_ptr<ThreadedProtoUdpListener<TbotsProto::Primitive>>
139138
udp_listener_primitive;
140-
std::unique_ptr<ThreadedProtoRadioListener<TbotsProto::Primitive>>
141-
radio_listener_primitive_set;
142139
std::shared_ptr<ThreadedProtoUdpSender<TbotsProto::RobotLog>> robot_log_sender;
143140

144141
// The network interface to listen and send messages on

src/software/field_tests/field_test_fixture.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,6 @@ def load_command_line_arguments():
293293
help="Which channel to communicate over",
294294
)
295295

296-
parser.add_argument(
297-
"--enable_radio",
298-
action="store_true",
299-
default=False,
300-
help="Whether to use radio (True) or Wi-Fi (False) for sending primitives to robots",
301-
)
302-
303296
parser.add_argument(
304297
"--estop_baudrate",
305298
action="store",

src/software/networking/radio/BUILD

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/software/networking/radio/proto_radio_listener.hpp

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/software/networking/radio/radio_sender.cpp

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/software/networking/radio/radio_sender.h

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/software/networking/radio/threaded_proto_radio_listener.hpp

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)