Hand update source files not updated from the mirror

Author: pjreiniger

subprojects/robotpy-cscore/cscore/src/main.cpp

@@ -1,15 +1,15 @@
 
 #include <semiwrap_init.cscore._cscore.hpp>
 
-#include "cscore_cpp.h"
+#include "wpi/cs/cscore_cpp.hpp"
 
 SEMIWRAP_PYBIND11_MODULE(m) {
     initWrapper(m);
 
     static int unused; // the capsule needs something to reference
     py::capsule cleanup(&unused, [](void *) {
         // don't release gil until after calling this
-        cs::SetDefaultLogger(20 /* WPI_LOG_INFO */);
+        wpi::cs::SetDefaultLogger(20 /* WPI_LOG_INFO */);
 
         // but this MUST release the gil, or deadlock may occur
         py::gil_scoped_release __release;

subprojects/robotpy-cscore/semiwrap/CameraServer.yml

@@ -3,7 +3,7 @@ extra_includes:
 - optional
 
 classes:
-  frc::CameraServer:
+  wpi::CameraServer:
     force_type_casters:
     - std::optional
     attributes:

subprojects/robotpy-cscore/semiwrap/cscore_cpp.yml

@@ -6,7 +6,7 @@ functions:
     overloads:
       CS_Property, CS_Status*:
         ignore: true
-      CS_Property, wpi::SmallVectorImpl<char>&, CS_Status*:
+      CS_Property, wpi::util::SmallVectorImpl<char>&, CS_Status*:
         ignore: true
   GetProperty:
     ignore: true
@@ -24,7 +24,7 @@ functions:
     overloads:
       CS_Property, CS_Status*:
         ignore: true
-      CS_Property, wpi::SmallVectorImpl<char>&, CS_Status*:
+      CS_Property, wpi::util::SmallVectorImpl<char>&, CS_Status*:
         ignore: true
   SetStringProperty:
     ignore: true
@@ -48,13 +48,13 @@ functions:
     overloads:
       CS_Source, CS_Status*:
         ignore: true
-      CS_Source, wpi::SmallVectorImpl<char>&, CS_Status*:
+      CS_Source, wpi::util::SmallVectorImpl<char>&, CS_Status*:
         ignore: true
   GetSourceDescription:
     overloads:
       CS_Source, CS_Status*:
         ignore: true
-      CS_Source, wpi::SmallVectorImpl<char>&, CS_Status*:
+      CS_Source, wpi::util::SmallVectorImpl<char>&, CS_Status*:
         ignore: true
   GetSourceLastFrameTime:
     ignore: true
@@ -82,7 +82,7 @@ functions:
     overloads:
       CS_Source, std::string_view, CS_Status*:
         ignore: true
-      CS_Source, const wpi::json&, CS_Status*:
+      CS_Source, const wpi::util::json&, CS_Status*:
         ignore: true
   GetSourceConfigJson:
     ignore: true
@@ -146,13 +146,13 @@ functions:
     overloads:
       CS_Sink, CS_Status*:
         ignore: true
-      CS_Sink, wpi::SmallVectorImpl<char>&, CS_Status*:
+      CS_Sink, wpi::util::SmallVectorImpl<char>&, CS_Status*:
         ignore: true
   GetSinkDescription:
     overloads:
       CS_Sink, CS_Status*:
         ignore: true
-      CS_Sink, wpi::SmallVectorImpl<char>&, CS_Status*:
+      CS_Sink, wpi::util::SmallVectorImpl<char>&, CS_Status*:
         ignore: true
   GetSinkProperty:
     ignore: true
@@ -166,7 +166,7 @@ functions:
     overloads:
       CS_Sink, std::string_view, CS_Status*:
         ignore: true
-      CS_Sink, const wpi::json&, CS_Status*:
+      CS_Sink, const wpi::util::json&, CS_Status*:
         ignore: true
   GetSinkConfigJson:
     ignore: true
@@ -188,7 +188,7 @@ functions:
     overloads:
       CS_Sink, CS_Status*:
         ignore: true
-      CS_Sink, wpi::SmallVectorImpl<char>&, CS_Status*:
+      CS_Sink, wpi::util::SmallVectorImpl<char>&, CS_Status*:
         ignore: true
   SetSinkEnabled:
     ignore: true
@@ -241,15 +241,15 @@ functions:
   GetNetworkInterfaces:
     ignore: true
 classes:
-  cs::UsbCameraInfo:
+  wpi::cs::UsbCameraInfo:
     attributes:
       dev:
       path:
       name:
       otherPaths:
       vendorId:
       productId:
-  cs::VideoMode:
+  wpi::cs::VideoMode:
     force_no_trampoline: true
     ignored_bases:
     - CS_VideoMode
@@ -268,7 +268,7 @@ classes:
       .def_readwrite("width", &VideoMode::width)
       .def_readwrite("height", &VideoMode::height)
       .def_readwrite("fps", &VideoMode::fps)
-  cs::RawEvent:
+  wpi::cs::RawEvent:
     attributes:
       kind:
         ignore: true

subprojects/robotpy-cscore/semiwrap/cscore_cv.yml

@@ -23,7 +23,7 @@ functions:
   GrabSinkFrameTimeout:
     ignore: true
 classes:
-  cs::CvSource:
+  wpi::cs::CvSource:
     doc: A source for user code to provide OpenCV images as video frames.
     force_no_trampoline: true
     methods:
@@ -34,7 +34,7 @@ classes:
           std::string_view, const VideoMode&:
           std::string_view, VideoMode::PixelFormat, int, int, int:
       PutFrame:
-  cs::CvSink:
+  wpi::cs::CvSink:
     doc: A sink for user code to accept video frames as OpenCV images.
     force_no_trampoline: true
     methods:
@@ -47,14 +47,14 @@ classes:
             ignore: true
       GrabFrame:
         cpp_code: |
-          [](cs::CvSink &self, cv::Mat& image, double timeout) -> std::tuple<uint64_t, cv::Mat> {
+          [](wpi::cs::CvSink &self, cv::Mat& image, double timeout) -> std::tuple<uint64_t, cv::Mat> {
             py::gil_scoped_release unlock;
             auto result = self.GrabFrame(image, timeout);
             return std::make_tuple(result, image);
           }
       GrabFrameNoTimeout:
         cpp_code: |
-          [](cs::CvSink &self, cv::Mat& image) -> std::tuple<uint64_t, cv::Mat> {
+          [](wpi::cs::CvSink &self, cv::Mat& image) -> std::tuple<uint64_t, cv::Mat> {
             py::gil_scoped_release unlock;
             auto result = self.GrabFrameNoTimeout(image);
             return std::make_tuple(result, image);

subprojects/robotpy-cscore/semiwrap/cscore_oo.yml

@@ -1,6 +1,6 @@
 
 classes:
-  cs::VideoProperty:
+  wpi::cs::VideoProperty:
     enums:
       Kind:
     methods:
@@ -20,11 +20,11 @@ classes:
       GetString:
         overloads:
           '[const]':
-          wpi::SmallVectorImpl<char>& [const]:
+          wpi::util::SmallVectorImpl<char>& [const]:
       SetString:
       GetChoices:
       GetLastStatus:
-  cs::VideoSource:
+  wpi::cs::VideoSource:
     enums:
       Kind:
       ConnectionStrategy:
@@ -52,7 +52,7 @@ classes:
       SetConfigJson:
         overloads:
           std::string_view:
-          const wpi::json&:
+          const wpi::util::json&:
       GetConfigJson:
       GetConfigJsonObject:
       GetActualFPS:
@@ -61,7 +61,7 @@ classes:
       GetLastStatus:
       EnumerateSinks:
       EnumerateSources:
-  cs::VideoCamera:
+  wpi::cs::VideoCamera:
     force_no_trampoline: true
     enums:
       WhiteBalance:
@@ -78,7 +78,7 @@ classes:
       SetExposureAuto:
       SetExposureHoldCurrent:
       SetExposureManual:
-  cs::UsbCamera:
+  wpi::cs::UsbCamera:
     force_no_trampoline: true
     methods:
       UsbCamera:
@@ -91,10 +91,10 @@ classes:
       GetPath:
       GetInfo:
       SetConnectVerbose:
-  cs::HttpCamera:
+  wpi::cs::HttpCamera:
     force_no_trampoline: true
     constants:
-    - cs::HttpCamera::HttpCameraKind::kUnknown
+    - wpi::cs::HttpCamera::HttpCameraKind::kUnknown
     enums:
       HttpCameraKind:
     methods:
@@ -113,7 +113,7 @@ classes:
           std::initializer_list<T>:
             ignore: true
       GetUrls:
-  cs::AxisCamera:
+  wpi::cs::AxisCamera:
     force_no_trampoline: true
     methods:
       AxisCamera:
@@ -124,7 +124,7 @@ classes:
           std::string_view, std::span<const std::string>:
           std::string_view, std::initializer_list<T>:
             ignore: true
-  cs::ImageSource:
+  wpi::cs::ImageSource:
     force_no_trampoline: true
     methods:
       NotifyError:
@@ -140,7 +140,7 @@ classes:
           const VideoProperty&, std::initializer_list<T>:
             ignore: true
       ImageSource:
-  cs::VideoSink:
+  wpi::cs::VideoSink:
     enums:
       Kind:
     methods:
@@ -155,15 +155,15 @@ classes:
       SetConfigJson:
         overloads:
           std::string_view:
-          const wpi::json&:
+          const wpi::util::json&:
       GetConfigJson:
       GetConfigJsonObject:
       SetSource:
       GetSource:
       GetSourceProperty:
       GetLastStatus:
       EnumerateSinks:
-  cs::MjpegServer:
+  wpi::cs::MjpegServer:
     force_no_trampoline: true
     methods:
       MjpegServer:
@@ -177,20 +177,20 @@ classes:
       SetFPS:
       SetCompression:
       SetDefaultCompression:
-  cs::ImageSink:
+  wpi::cs::ImageSink:
     force_no_trampoline: true
     methods:
       SetDescription:
       GetError:
       SetEnabled:
       ImageSink:
-  cs::VideoEvent:
+  wpi::cs::VideoEvent:
     force_no_trampoline: true
     methods:
       GetSource:
       GetSink:
       GetProperty:
-  cs::VideoListener:
+  wpi::cs::VideoListener:
     methods:
       VideoListener:
         overloads:

subprojects/robotpy-halsim-gui/halsim_gui/_ext/main.cpp

@@ -1,8 +1,8 @@
 
 #include <semiwrap_init.halsim_gui._ext._halsim_gui_ext.hpp>
 
-#include <HALSimGuiExt.h>
-#include <hal/Extensions.h>
+#include <wpi/halsim/gui/HALSimGuiExt.hpp>
+#include <wpi/hal/Extensions.h>
 
 SEMIWRAP_PYBIND11_MODULE(m) {
 

subprojects/robotpy-wpimath/pyproject.toml

@@ -95,7 +95,9 @@ scan_headers_ignore = [
     "gch/*",
     "sleipnir/*",
     "type_casters/*",
+    "unsupported/*",
     "wpi/units/*",
+    "wpimath/protobuf/*",
 
     "wpi/math/util/MathShared.hpp",