mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-22 01:11:42 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -60,9 +60,9 @@ constexpr mrc::ControlFlags ToControlWord(uint32_t Word) {
|
||||
|
||||
} // namespace
|
||||
|
||||
std::optional<mrc::ControlData> wpi::Protobuf<mrc::ControlData>::Unpack(
|
||||
std::optional<mrc::ControlData> wpi::util::Protobuf<mrc::ControlData>::Unpack(
|
||||
InputStream& Stream) {
|
||||
wpi::UnpackCallback<mrc::Joystick, MRC_MAX_NUM_JOYSTICKS> JoystickCb;
|
||||
wpi::util::UnpackCallback<mrc::Joystick, MRC_MAX_NUM_JOYSTICKS> JoystickCb;
|
||||
|
||||
mrc_proto_ProtobufControlData Msg{
|
||||
.ControlWord = 0,
|
||||
@@ -91,10 +91,10 @@ std::optional<mrc::ControlData> wpi::Protobuf<mrc::ControlData>::Unpack(
|
||||
return ControlData;
|
||||
}
|
||||
|
||||
bool wpi::Protobuf<mrc::ControlData>::Pack(OutputStream& Stream,
|
||||
bool wpi::util::Protobuf<mrc::ControlData>::Pack(OutputStream& Stream,
|
||||
const mrc::ControlData& Value) {
|
||||
std::span<const mrc::Joystick> Sticks = Value.Joysticks();
|
||||
wpi::PackCallback Joysticks{Sticks};
|
||||
wpi::util::PackCallback Joysticks{Sticks};
|
||||
|
||||
mrc_proto_ProtobufControlData Msg{
|
||||
.ControlWord = FromControlWord(Value.ControlWord),
|
||||
@@ -106,9 +106,9 @@ bool wpi::Protobuf<mrc::ControlData>::Pack(OutputStream& Stream,
|
||||
return Stream.Encode(Msg);
|
||||
}
|
||||
|
||||
std::optional<mrc::Joystick> wpi::Protobuf<mrc::Joystick>::Unpack(
|
||||
std::optional<mrc::Joystick> wpi::util::Protobuf<mrc::Joystick>::Unpack(
|
||||
InputStream& Stream) {
|
||||
wpi::UnpackCallback<int16_t, MRC_MAX_NUM_AXES> AxesCb;
|
||||
wpi::util::UnpackCallback<int16_t, MRC_MAX_NUM_AXES> AxesCb;
|
||||
|
||||
mrc_proto_ProtobufJoystickData Msg{
|
||||
.AvailableButtons = 0,
|
||||
@@ -148,9 +148,9 @@ std::optional<mrc::Joystick> wpi::Protobuf<mrc::Joystick>::Unpack(
|
||||
return Joystick;
|
||||
}
|
||||
|
||||
bool wpi::Protobuf<mrc::Joystick>::Pack(OutputStream& Stream,
|
||||
bool wpi::util::Protobuf<mrc::Joystick>::Pack(OutputStream& Stream,
|
||||
const mrc::Joystick& Value) {
|
||||
wpi::PackCallback AxesCb{Value.Axes.Axes()};
|
||||
wpi::util::PackCallback AxesCb{Value.Axes.Axes()};
|
||||
|
||||
uint32_t PovsStore = 0;
|
||||
for (int i = static_cast<int>(Value.Povs.GetCount()) - 1; i >= 0; i--) {
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
#include "wpi/hal/proto/ErrorInfo.h"
|
||||
#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
|
||||
|
||||
std::optional<mrc::ErrorInfo> wpi::Protobuf<mrc::ErrorInfo>::Unpack(
|
||||
std::optional<mrc::ErrorInfo> wpi::util::Protobuf<mrc::ErrorInfo>::Unpack(
|
||||
InputStream& Stream) {
|
||||
wpi::UnpackCallback<std::string> DetailsCb;
|
||||
wpi::UnpackCallback<std::string> LocationCb;
|
||||
wpi::UnpackCallback<std::string> CallStackCb;
|
||||
wpi::util::UnpackCallback<std::string> DetailsCb;
|
||||
wpi::util::UnpackCallback<std::string> LocationCb;
|
||||
wpi::util::UnpackCallback<std::string> CallStackCb;
|
||||
|
||||
mrc_proto_ProtobufErrorInfo Msg{
|
||||
.IsError = false,
|
||||
@@ -49,14 +49,14 @@ std::optional<mrc::ErrorInfo> wpi::Protobuf<mrc::ErrorInfo>::Unpack(
|
||||
return ToRet;
|
||||
}
|
||||
|
||||
bool wpi::Protobuf<mrc::ErrorInfo>::Pack(OutputStream& Stream,
|
||||
bool wpi::util::Protobuf<mrc::ErrorInfo>::Pack(OutputStream& Stream,
|
||||
const mrc::ErrorInfo& Value) {
|
||||
std::string_view DetailsView = Value.GetDetails();
|
||||
std::string_view LocationView = Value.GetLocation();
|
||||
std::string_view CallStackView = Value.GetCallStack();
|
||||
wpi::PackCallback DetailsCb{&DetailsView};
|
||||
wpi::PackCallback LocationCb{&LocationView};
|
||||
wpi::PackCallback CallStackCb{&CallStackView};
|
||||
wpi::util::PackCallback DetailsCb{&DetailsView};
|
||||
wpi::util::PackCallback LocationCb{&LocationView};
|
||||
wpi::util::PackCallback CallStackCb{&CallStackView};
|
||||
|
||||
mrc_proto_ProtobufErrorInfo Msg{
|
||||
.IsError = Value.IsError,
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
|
||||
|
||||
std::optional<mrc::JoystickDescriptor>
|
||||
wpi::Protobuf<mrc::JoystickDescriptor>::Unpack(InputStream& Stream) {
|
||||
wpi::UnpackCallback<std::string> JoystickNameCb;
|
||||
wpi::UnpackCallback<uint8_t, MRC_MAX_NUM_AXES> AxisTypesCb;
|
||||
wpi::util::Protobuf<mrc::JoystickDescriptor>::Unpack(InputStream& Stream) {
|
||||
wpi::util::UnpackCallback<std::string> JoystickNameCb;
|
||||
wpi::util::UnpackCallback<uint8_t, MRC_MAX_NUM_AXES> AxisTypesCb;
|
||||
|
||||
mrc_proto_ProtobufJoystickDescriptor Msg;
|
||||
Msg.JoystickName = JoystickNameCb.Callback();
|
||||
@@ -47,13 +47,13 @@ wpi::Protobuf<mrc::JoystickDescriptor>::Unpack(InputStream& Stream) {
|
||||
return OutputData;
|
||||
}
|
||||
|
||||
bool wpi::Protobuf<mrc::JoystickDescriptor>::Pack(
|
||||
bool wpi::util::Protobuf<mrc::JoystickDescriptor>::Pack(
|
||||
OutputStream& Stream, const mrc::JoystickDescriptor& Value) {
|
||||
std::string_view JoystickName = Value.GetName();
|
||||
wpi::PackCallback JoystickNameCb{&JoystickName};
|
||||
wpi::util::PackCallback JoystickNameCb{&JoystickName};
|
||||
|
||||
std::span<const uint8_t> AxisTypes = Value.AxesTypes();
|
||||
wpi::PackCallback AxisTypesCb{AxisTypes};
|
||||
wpi::util::PackCallback AxisTypesCb{AxisTypes};
|
||||
|
||||
mrc_proto_ProtobufJoystickDescriptor Msg{
|
||||
.JoystickName = JoystickNameCb.Callback(),
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
|
||||
|
||||
std::optional<mrc::JoystickRumbleData>
|
||||
wpi::Protobuf<mrc::JoystickRumbleData>::Unpack(InputStream& Stream) {
|
||||
wpi::UnpackCallback<uint16_t, MRC_MAX_NUM_RUMBLE> RumbleCb;
|
||||
wpi::util::Protobuf<mrc::JoystickRumbleData>::Unpack(InputStream& Stream) {
|
||||
wpi::util::UnpackCallback<uint16_t, MRC_MAX_NUM_RUMBLE> RumbleCb;
|
||||
|
||||
mrc_proto_ProtobufJoystickRumbleData Msg{
|
||||
.Value = RumbleCb.Callback(),
|
||||
@@ -29,9 +29,9 @@ wpi::Protobuf<mrc::JoystickRumbleData>::Unpack(InputStream& Stream) {
|
||||
return Rumble;
|
||||
}
|
||||
|
||||
bool wpi::Protobuf<mrc::JoystickRumbleData>::Pack(
|
||||
bool wpi::util::Protobuf<mrc::JoystickRumbleData>::Pack(
|
||||
OutputStream& Stream, const mrc::JoystickRumbleData& Value) {
|
||||
wpi::PackCallback RumbleCb{Value.Rumbles()};
|
||||
wpi::util::PackCallback RumbleCb{Value.Rumbles()};
|
||||
|
||||
mrc_proto_ProtobufJoystickRumbleData Msg{
|
||||
.Value = RumbleCb.Callback(),
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
#include "wpi/hal/proto/MatchInfo.h"
|
||||
#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
|
||||
|
||||
std::optional<mrc::MatchInfo> wpi::Protobuf<mrc::MatchInfo>::Unpack(
|
||||
std::optional<mrc::MatchInfo> wpi::util::Protobuf<mrc::MatchInfo>::Unpack(
|
||||
InputStream& Stream) {
|
||||
wpi::UnpackCallback<std::string> NameCb;
|
||||
wpi::util::UnpackCallback<std::string> NameCb;
|
||||
|
||||
mrc_proto_ProtobufMatchInfo Msg;
|
||||
Msg.EventName = NameCb.Callback();
|
||||
@@ -35,10 +35,10 @@ std::optional<mrc::MatchInfo> wpi::Protobuf<mrc::MatchInfo>::Unpack(
|
||||
return OutputData;
|
||||
}
|
||||
|
||||
bool wpi::Protobuf<mrc::MatchInfo>::Pack(OutputStream& Stream,
|
||||
bool wpi::util::Protobuf<mrc::MatchInfo>::Pack(OutputStream& Stream,
|
||||
const mrc::MatchInfo& Value) {
|
||||
std::string_view EventNameStr = Value.GetEventName();
|
||||
wpi::PackCallback EventName{&EventNameStr};
|
||||
wpi::util::PackCallback EventName{&EventNameStr};
|
||||
|
||||
mrc_proto_ProtobufMatchInfo Msg{
|
||||
.EventName = EventName.Callback(),
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
#include "wpi/hal/proto/OpMode.h"
|
||||
#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
|
||||
|
||||
std::optional<mrc::OpMode> wpi::Protobuf<mrc::OpMode>::Unpack(
|
||||
std::optional<mrc::OpMode> wpi::util::Protobuf<mrc::OpMode>::Unpack(
|
||||
InputStream& Stream) {
|
||||
wpi::UnpackCallback<std::string> NameCb;
|
||||
wpi::util::UnpackCallback<std::string> NameCb;
|
||||
|
||||
mrc_proto_ProtobufOpMode Msg;
|
||||
Msg.Name = NameCb.Callback();
|
||||
@@ -34,10 +34,10 @@ std::optional<mrc::OpMode> wpi::Protobuf<mrc::OpMode>::Unpack(
|
||||
return OutputData;
|
||||
}
|
||||
|
||||
bool wpi::Protobuf<mrc::OpMode>::Pack(OutputStream& Stream,
|
||||
bool wpi::util::Protobuf<mrc::OpMode>::Pack(OutputStream& Stream,
|
||||
const mrc::OpMode& Value) {
|
||||
std::string_view EventNameStr = Value.GetName();
|
||||
wpi::PackCallback EventName{&EventNameStr};
|
||||
wpi::util::PackCallback EventName{&EventNameStr};
|
||||
|
||||
mrc_proto_ProtobufOpMode Msg{
|
||||
.Hash = Value.Hash.ToValue(),
|
||||
@@ -48,8 +48,8 @@ bool wpi::Protobuf<mrc::OpMode>::Pack(OutputStream& Stream,
|
||||
}
|
||||
|
||||
std::optional<std::vector<mrc::OpMode>>
|
||||
wpi::Protobuf<std::vector<mrc::OpMode>>::Unpack(InputStream& Stream) {
|
||||
wpi::StdVectorUnpackCallback<mrc::OpMode> ModesCb;
|
||||
wpi::util::Protobuf<std::vector<mrc::OpMode>>::Unpack(InputStream& Stream) {
|
||||
wpi::util::StdVectorUnpackCallback<mrc::OpMode> ModesCb;
|
||||
ModesCb.SetLimits(DecodeLimits::Add);
|
||||
|
||||
mrc_proto_ProtobufAvailableOpModes Msg;
|
||||
@@ -62,10 +62,10 @@ wpi::Protobuf<std::vector<mrc::OpMode>>::Unpack(InputStream& Stream) {
|
||||
return ModesCb.Vec();
|
||||
}
|
||||
|
||||
bool wpi::Protobuf<std::vector<mrc::OpMode>>::Pack(
|
||||
bool wpi::util::Protobuf<std::vector<mrc::OpMode>>::Pack(
|
||||
OutputStream& Stream, const std::vector<mrc::OpMode>& Value) {
|
||||
std::span<const mrc::OpMode> ModesSpan = Value;
|
||||
wpi::PackCallback Modes{ModesSpan};
|
||||
wpi::util::PackCallback Modes{ModesSpan};
|
||||
|
||||
mrc_proto_ProtobufAvailableOpModes Msg{
|
||||
.Modes = Modes.Callback(),
|
||||
|
||||
Reference in New Issue
Block a user