Skip to content

Commit 93e73ea

Browse files
virtualdvirtuald
authored
Merge pull request #207 from pjreiniger/copybara_allwpilib_to_mostrobotpy
[copybara] Import changes from allwpilib mirror
2 parents 2dd7429 + 7facd29 commit 93e73ea

File tree

401 files changed

+4359
-4033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

401 files changed

+4359
-4033
lines changed

‎.github/workflows/dist.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
matrix:
128128
os:
129129
- "ubuntu-24.04"
130-
- "macos-13" # x86_64
130+
- "macos-15-intel" # x86_64
131131
- "macos-14" # arm64
132132
- "windows-2022"
133133
python_version:

‎rdev.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ wrapper = "2027.0.0a3"
2222

2323
[params]
2424

25-
wpilib_bin_version = "2027.0.0-alpha-3"
26-
wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/release-2027"
25+
wpilib_bin_version = "2027.0.0-alpha-3-144-g59edbdd"
26+
wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development-2027"
2727
# wpilib_bin_url = "https://frcmaven.wpi.edu/artifactory/development-2027"
2828

2929
# Don't update these maven artifacts

‎subprojects/pyntcore/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
pyntcore
22
========
33

4-
Python pybind11 wrappers around the C++ ntcore library.
4+
Python pybind11 wrappers around the C++ ntcore library.

‎subprojects/pyntcore/ntcore/src/NetworkTable.cpp.inl‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cls_NetworkTable
22
.def("getValue", [](const NetworkTable &self, std::string_view key, py::object defaultValue) -> py::object {
3-
nt::NetworkTableEntry entry;
3+
wpi::nt::NetworkTableEntry entry;
44
{
55
py::gil_scoped_release release;
66
entry = self.GetEntry(key);
@@ -9,48 +9,48 @@ cls_NetworkTable
99
}, py::arg("key"), py::arg("value"))
1010

1111
// double overload must come before boolean version
12-
.def("putValue", [](nt::NetworkTable *self, std::string_view key, double value) {
13-
return self->PutValue(key, nt::Value::MakeDouble(value));
12+
.def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, double value) {
13+
return self->PutValue(key, wpi::nt::Value::MakeDouble(value));
1414
}, py::arg("key"), py::arg("value"), release_gil())
15-
.def("putValue", [](nt::NetworkTable *self, std::string_view key, bool value) {
16-
return self->PutValue(key, nt::Value::MakeBoolean(value));
15+
.def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, bool value) {
16+
return self->PutValue(key, wpi::nt::Value::MakeBoolean(value));
1717
}, py::arg("key"), py::arg("value"), release_gil())
18-
.def("putValue", [](nt::NetworkTable *self, std::string_view key, py::bytes value) {
19-
auto v = nt::Value::MakeRaw(value.cast<std::span<const uint8_t>>());
18+
.def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, py::bytes value) {
19+
auto v = wpi::nt::Value::MakeRaw(value.cast<std::span<const uint8_t>>());
2020
py::gil_scoped_release release;
2121
return self->PutValue(key, v);
2222
}, py::arg("key"), py::arg("value"))
23-
.def("putValue", [](nt::NetworkTable *self, std::string_view key, std::string value) {
24-
return self->PutValue(key, nt::Value::MakeString(std::move(value)));
23+
.def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, std::string value) {
24+
return self->PutValue(key, wpi::nt::Value::MakeString(std::move(value)));
2525
}, py::arg("key"), py::arg("value"), release_gil())
26-
.def("putValue", [](nt::NetworkTable *self, std::string_view key, py::sequence value) {
26+
.def("putValue", [](wpi::nt::NetworkTable *self, std::string_view key, py::sequence value) {
2727
auto v = pyntcore::py2ntvalue(value);
2828
py::gil_scoped_release release;
2929
return self->PutValue(key, v);
3030
}, py::arg("key"), py::arg("value"))
3131

3232
// double overload must come before boolean version
33-
.def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, double value) {
34-
return self->SetDefaultValue(key, nt::Value::MakeDouble(value));
33+
.def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, double value) {
34+
return self->SetDefaultValue(key, wpi::nt::Value::MakeDouble(value));
3535
}, py::arg("key"), py::arg("value"), release_gil())
36-
.def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, bool value) {
37-
return self->SetDefaultValue(key, nt::Value::MakeBoolean(value));
36+
.def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, bool value) {
37+
return self->SetDefaultValue(key, wpi::nt::Value::MakeBoolean(value));
3838
}, py::arg("key"), py::arg("value"), release_gil())
39-
.def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, py::bytes value) {
40-
auto v = nt::Value::MakeRaw(value.cast<std::span<const uint8_t>>());
39+
.def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, py::bytes value) {
40+
auto v = wpi::nt::Value::MakeRaw(value.cast<std::span<const uint8_t>>());
4141
py::gil_scoped_release release;
4242
return self->SetDefaultValue(key, v);
4343
}, py::arg("key"), py::arg("value"))
44-
.def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, std::string value) {
45-
return self->SetDefaultValue(key, nt::Value::MakeString(std::move(value)));
44+
.def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, std::string value) {
45+
return self->SetDefaultValue(key, wpi::nt::Value::MakeString(std::move(value)));
4646
}, py::arg("key"), py::arg("value"), release_gil())
47-
.def("setDefaultValue", [](nt::NetworkTable *self, std::string_view key, py::sequence value) {
47+
.def("setDefaultValue", [](wpi::nt::NetworkTable *self, std::string_view key, py::sequence value) {
4848
auto v = pyntcore::py2ntvalue(value);
4949
py::gil_scoped_release release;
5050
return self->SetDefaultValue(key, v);
5151
}, py::arg("key"), py::arg("value"))
5252

53-
.def("__contains__", [](const nt::NetworkTable &self, std::string_view key) -> bool {
53+
.def("__contains__", [](const wpi::nt::NetworkTable &self, std::string_view key) -> bool {
5454
return self.ContainsKey(key);
5555
}, release_gil())
5656
;

‎subprojects/pyntcore/ntcore/src/NetworkTableEntry.cpp.inl‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cls_NetworkTableEntry
2-
.def_property_readonly("value", [](const nt::NetworkTableEntry &self) {
3-
nt::Value v;
2+
.def_property_readonly("value", [](const wpi::nt::NetworkTableEntry &self) {
3+
wpi::nt::Value v;
44
{
55
py::gil_scoped_release release;
66
v = self.GetValue();
@@ -9,40 +9,40 @@ cls_NetworkTableEntry
99
})
1010

1111
// double overload must come before boolean version
12-
.def("setValue", [](nt::NetworkTableEntry *self, double value) {
13-
return self->SetValue(nt::Value::MakeDouble(value));
12+
.def("setValue", [](wpi::nt::NetworkTableEntry *self, double value) {
13+
return self->SetValue(wpi::nt::Value::MakeDouble(value));
1414
}, py::arg("value"), release_gil())
15-
.def("setValue", [](nt::NetworkTableEntry *self, bool value) {
16-
return self->SetValue(nt::Value::MakeBoolean(value));
15+
.def("setValue", [](wpi::nt::NetworkTableEntry *self, bool value) {
16+
return self->SetValue(wpi::nt::Value::MakeBoolean(value));
1717
}, py::arg("value"), release_gil())
18-
.def("setValue", [](nt::NetworkTableEntry *self, py::bytes value) {
19-
auto v = nt::Value::MakeRaw(value.cast<std::span<const uint8_t>>());
18+
.def("setValue", [](wpi::nt::NetworkTableEntry *self, py::bytes value) {
19+
auto v = wpi::nt::Value::MakeRaw(value.cast<std::span<const uint8_t>>());
2020
py::gil_scoped_release release;
2121
return self->SetValue(v);
2222
}, py::arg("value"))
23-
.def("setValue", [](nt::NetworkTableEntry *self, std::string value) {
24-
return self->SetValue(nt::Value::MakeString(value));
23+
.def("setValue", [](wpi::nt::NetworkTableEntry *self, std::string value) {
24+
return self->SetValue(wpi::nt::Value::MakeString(value));
2525
}, py::arg("value"), release_gil())
26-
.def("setValue", [](nt::NetworkTableEntry *self, py::sequence value) {
26+
.def("setValue", [](wpi::nt::NetworkTableEntry *self, py::sequence value) {
2727
return self->SetValue(pyntcore::py2ntvalue(value));
2828
}, py::arg("value"))
2929

3030
// double overload must come before boolean version
31-
.def("setDefaultValue", [](nt::NetworkTableEntry *self, double value) {
32-
return self->SetDefaultValue(nt::Value::MakeDouble(value));
31+
.def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, double value) {
32+
return self->SetDefaultValue(wpi::nt::Value::MakeDouble(value));
3333
}, py::arg("value"), release_gil())
34-
.def("setDefaultValue", [](nt::NetworkTableEntry *self, bool value) {
35-
return self->SetDefaultValue(nt::Value::MakeBoolean(value));
34+
.def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, bool value) {
35+
return self->SetDefaultValue(wpi::nt::Value::MakeBoolean(value));
3636
}, py::arg("value"), release_gil())
37-
.def("setDefaultValue", [](nt::NetworkTableEntry *self, py::bytes value) {
38-
auto v = nt::Value::MakeRaw(value.cast<std::span<const uint8_t>>());
37+
.def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, py::bytes value) {
38+
auto v = wpi::nt::Value::MakeRaw(value.cast<std::span<const uint8_t>>());
3939
py::gil_scoped_release release;
4040
return self->SetDefaultValue(v);
4141
}, py::arg("value"))
42-
.def("setDefaultValue", [](nt::NetworkTableEntry *self, std::string value) {
43-
return self->SetDefaultValue(nt::Value::MakeString(value));
42+
.def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, std::string value) {
43+
return self->SetDefaultValue(wpi::nt::Value::MakeString(value));
4444
}, py::arg("value"), release_gil())
45-
.def("setDefaultValue", [](nt::NetworkTableEntry *self, py::sequence value) {
45+
.def("setDefaultValue", [](wpi::nt::NetworkTableEntry *self, py::sequence value) {
4646
return self->SetDefaultValue(pyntcore::py2ntvalue(value));
4747
}, py::arg("value"))
4848
;

‎subprojects/pyntcore/ntcore/src/nt_instance.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <semiwrap.h>
22
#include "nt_instance.h"
3-
#include "ntcore_cpp.h"
3+
#include "wpi/nt/ntcore_cpp.hpp"
44

55
#include <set>
66

@@ -9,24 +9,24 @@ static std::set<NT_Inst> g_known_instances;
99

1010
namespace pyntcore {
1111

12-
void onInstanceStart(nt::NetworkTableInstance *instance) {
12+
void onInstanceStart(wpi::nt::NetworkTableInstance *instance) {
1313
g_known_instances.emplace(instance->GetHandle());
1414

1515
py::module::import("ntcore._logutil")
1616
.attr("NtLogForwarder").attr("onInstanceStart")(instance);
1717
}
1818

19-
void onInstancePreReset(nt::NetworkTableInstance *instance) {
19+
void onInstancePreReset(wpi::nt::NetworkTableInstance *instance) {
2020
py::module::import("ntcore._logutil")
2121
.attr("NtLogForwarder").attr("onInstanceDestroy")(instance);
2222
}
2323

24-
void onInstancePostReset(nt::NetworkTableInstance *instance) {
24+
void onInstancePostReset(wpi::nt::NetworkTableInstance *instance) {
2525
py::module::import("ntcore.util")
2626
.attr("_NtProperty").attr("onInstancePostReset")(instance);
2727
}
2828

29-
void onInstanceDestroy(nt::NetworkTableInstance *instance) {
29+
void onInstanceDestroy(wpi::nt::NetworkTableInstance *instance) {
3030
py::module::import("ntcore._logutil")
3131
.attr("NtLogForwarder").attr("onInstanceDestroy")(instance);
3232
py::module::import("ntcore.util")
@@ -43,12 +43,12 @@ void resetAllInstances()
4343
known_instances.swap(g_known_instances);
4444

4545
// always reset the default instance
46-
known_instances.emplace(nt::GetDefaultInstance());
46+
known_instances.emplace(wpi::nt::GetDefaultInstance());
4747

4848
py::gil_scoped_release unlock;
4949

5050
for (auto &inst: known_instances) {
51-
nt::ResetInstance(inst);
51+
wpi::nt::ResetInstance(inst);
5252
}
5353
}
5454

‎subprojects/pyntcore/ntcore/src/nt_instance.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

22
#pragma once
33

4-
#include <ntcore.h>
5-
#include <networktables/NetworkTableInstance.h>
4+
#include "wpi/nt/ntcore.h"
5+
#include "wpi/nt/NetworkTableInstance.hpp"
66

77
namespace pyntcore {
88

9-
void onInstanceStart(nt::NetworkTableInstance *instance);
10-
void onInstancePreReset(nt::NetworkTableInstance *instance);
11-
void onInstancePostReset(nt::NetworkTableInstance *instance);
12-
void onInstanceDestroy(nt::NetworkTableInstance *instance);
9+
void onInstanceStart(wpi::nt::NetworkTableInstance *instance);
10+
void onInstancePreReset(wpi::nt::NetworkTableInstance *instance);
11+
void onInstancePostReset(wpi::nt::NetworkTableInstance *instance);
12+
void onInstanceDestroy(wpi::nt::NetworkTableInstance *instance);
1313

1414
void resetAllInstances();
1515

‎subprojects/pyntcore/ntcore/src/py2value.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const char * nttype2str(NT_Type type) {
4141
}
4242

4343

44-
py::object ntvalue2py(const nt::Value &ntvalue) {
44+
py::object ntvalue2py(const wpi::nt::Value &ntvalue) {
4545
auto &v = ntvalue.value();
4646
switch (v.type) {
4747
case NT_BOOLEAN:
@@ -109,17 +109,17 @@ py::object ntvalue2py(const nt::Value &ntvalue) {
109109
}
110110
}
111111

112-
nt::Value py2ntvalue(py::handle h) {
112+
wpi::nt::Value py2ntvalue(py::handle h) {
113113
if (py::isinstance<py::bool_>(h)) {
114-
return nt::Value::MakeBoolean(h.cast<bool>());
114+
return wpi::nt::Value::MakeBoolean(h.cast<bool>());
115115
} else if (py::isinstance<py::float_>(h)) {
116-
return nt::Value::MakeDouble(h.cast<double>());
116+
return wpi::nt::Value::MakeDouble(h.cast<double>());
117117
} else if (py::isinstance<py::int_>(h)) {
118-
return nt::Value::MakeInteger(h.cast<int64_t>());
118+
return wpi::nt::Value::MakeInteger(h.cast<int64_t>());
119119
} else if (py::isinstance<py::str>(h)) {
120-
return nt::Value::MakeString(h.cast<std::string>());
120+
return wpi::nt::Value::MakeString(h.cast<std::string>());
121121
} else if (py::isinstance<py::bytes>(h)) {
122-
return nt::Value::MakeRaw(h.cast<std::span<const uint8_t>>());
122+
return wpi::nt::Value::MakeRaw(h.cast<std::span<const uint8_t>>());
123123
} else if (py::isinstance<py::none>(h)) {
124124
throw py::value_error("Cannot put None into NetworkTable");
125125
}
@@ -132,45 +132,45 @@ nt::Value py2ntvalue(py::handle h) {
132132
auto i1 = seq[0];
133133
if (py::isinstance<py::bool_>(i1)) {
134134
auto v = h.cast<std::vector<int>>();
135-
return nt::Value::MakeBooleanArray(v);
135+
return wpi::nt::Value::MakeBooleanArray(v);
136136
} else if (py::isinstance<py::float_>(i1)) {
137137
auto v = h.cast<std::vector<double>>();
138-
return nt::Value::MakeDoubleArray(v);
138+
return wpi::nt::Value::MakeDoubleArray(v);
139139
} else if (py::isinstance<py::int_>(i1)) {
140140
auto v = h.cast<std::vector<int64_t>>();
141-
return nt::Value::MakeIntegerArray(v);
141+
return wpi::nt::Value::MakeIntegerArray(v);
142142
} else if (py::isinstance<py::str>(i1)) {
143143
auto v = h.cast<std::vector<std::string>>();
144-
return nt::Value::MakeStringArray(v);
144+
return wpi::nt::Value::MakeStringArray(v);
145145
} else {
146146
throw py::value_error("Can only put bool/int/float/str/bytes or lists/tuples of them");
147147
}
148148
}
149149

150-
py::function valueFactoryByType(nt::NetworkTableType type) {
150+
py::function valueFactoryByType(wpi::nt::NetworkTableType type) {
151151
py::object PyNtValue = py::module::import("ntcore").attr("Value");
152152
switch (type) {
153-
case nt::NetworkTableType::kBoolean:
153+
case wpi::nt::NetworkTableType::kBoolean:
154154
return PyNtValue.attr("makeBoolean");
155-
case nt::NetworkTableType::kDouble:
155+
case wpi::nt::NetworkTableType::kDouble:
156156
return PyNtValue.attr("makeDouble");
157-
case nt::NetworkTableType::kString:
157+
case wpi::nt::NetworkTableType::kString:
158158
return PyNtValue.attr("makeString");
159-
case nt::NetworkTableType::kRaw:
159+
case wpi::nt::NetworkTableType::kRaw:
160160
return PyNtValue.attr("makeRaw");
161-
case nt::NetworkTableType::kBooleanArray:
161+
case wpi::nt::NetworkTableType::kBooleanArray:
162162
return PyNtValue.attr("makeBooleanArray");
163-
case nt::NetworkTableType::kDoubleArray:
163+
case wpi::nt::NetworkTableType::kDoubleArray:
164164
return PyNtValue.attr("makeDoubleArray");
165-
case nt::NetworkTableType::kStringArray:
165+
case wpi::nt::NetworkTableType::kStringArray:
166166
return PyNtValue.attr("makeStringArray");
167-
case nt::NetworkTableType::kInteger:
167+
case wpi::nt::NetworkTableType::kInteger:
168168
return PyNtValue.attr("makeInteger");
169-
case nt::NetworkTableType::kFloat:
169+
case wpi::nt::NetworkTableType::kFloat:
170170
return PyNtValue.attr("makeFloat");
171-
case nt::NetworkTableType::kIntegerArray:
171+
case wpi::nt::NetworkTableType::kIntegerArray:
172172
return PyNtValue.attr("makeIntegerArray");
173-
case nt::NetworkTableType::kFloatArray:
173+
case wpi::nt::NetworkTableType::kFloatArray:
174174
return PyNtValue.attr("makeFloatArray");
175175
default:
176176
throw py::type_error("empty nt value");

‎subprojects/pyntcore/ntcore/src/py2value.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11

22
#include <semiwrap.h>
3-
#include <networktables/NetworkTableValue.h>
4-
#include <networktables/NetworkTableType.h>
3+
#include "wpi/nt/NetworkTableValue.hpp"
4+
#include "wpi/nt/NetworkTableType.hpp"
55
#include <fmt/format.h>
66

77
namespace pyntcore {
88

99
const char * nttype2str(NT_Type type);
1010

11-
py::object ntvalue2py(const nt::Value &ntvalue);
11+
py::object ntvalue2py(const wpi::nt::Value &ntvalue);
1212

13-
nt::Value py2ntvalue(py::handle h);
13+
wpi::nt::Value py2ntvalue(py::handle h);
1414

15-
py::function valueFactoryByType(nt::NetworkTableType type);
15+
py::function valueFactoryByType(wpi::nt::NetworkTableType type);
1616

17-
inline void ensure_value_is(NT_Type expected, nt::Value *v) {
17+
inline void ensure_value_is(NT_Type expected, wpi::nt::Value *v) {
1818
if (v->type() != expected) {
1919
throw py::value_error(fmt::format(
2020
"Value type is {}, not {}", nttype2str(v->type()), nttype2str(expected)

0 commit comments

Comments
 (0)