bump wpiformat

Author: samfreund

.github/workflows/lint-format.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           python-version: 3.13
       - name: Install wpiformat
-        run: pip3 install wpiformat==2025.33
+        run: pip3 install wpiformat==2025.69
       - name: Run
         run: wpiformat
       - name: Check output

.styleguide .wpiformat.styleguide renamed to .wpiformat

@@ -50,20 +50,20 @@ set(OPENCV_TYPE "")
 
 # Download opencv, and save the path
 include(FetchContent)
-fetchcontent_declare(
+FetchContent_Declare(
     opencv_lib
     URL
         https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/thirdparty/${OPENCV_YEAR}/opencv/opencv-cpp/${OPENCV_VERSION}/opencv-cpp-${OPENCV_VERSION}-${OPENCV_ARCH}${OPENCV_TYPE}.zip
 )
-fetchcontent_makeavailable(opencv_lib)
+FetchContent_MakeAvailable(opencv_lib)
 
 # download OpenCV headers
-fetchcontent_declare(
+FetchContent_Declare(
     opencv_header
     URL
         https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/thirdparty/${OPENCV_YEAR}/opencv/opencv-cpp/${OPENCV_VERSION}/opencv-cpp-${OPENCV_VERSION}-headers.zip
 )
-fetchcontent_makeavailable(opencv_header)
+FetchContent_MakeAvailable(opencv_header)
 
 # This probably doesn't work great with shared libraries, but I don't care about those right now
 file(

.styleguide-license .wpiformat-license.styleguide-license renamed to .wpiformat-license

@@ -20,8 +20,8 @@
 
 /* Header for class org_photonvision_rknn_RknnJNI */
 
-#ifndef RKNN_JNI_SRC_MAIN_NATIVE_CPP_RKNN_JNI_H_
-#define RKNN_JNI_SRC_MAIN_NATIVE_CPP_RKNN_JNI_H_
+#ifndef RKNN_JNI__
+#define RKNN_JNI__
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -68,4 +68,4 @@ Java_org_photonvision_rknn_RknnJNI_isQuantized(JNIEnv *, jclass, jlong);
 #ifdef __cplusplus
 } // extern "C"
 #endif
-#endif // RKNN_JNI_SRC_MAIN_NATIVE_CPP_RKNN_JNI_H_
+#endif // RKNN_JNI__

CMakeLists.txt

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_MODEL_ZOO_COMMON_H_
-#define RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_MODEL_ZOO_COMMON_H_
+#ifndef RKNN_JNI__
+#define RKNN_JNI__
 
 /**
  * @brief Image pixel format
@@ -56,4 +56,4 @@ typedef struct {
   int bottom;
 } image_rect_t;
 
-#endif // RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_MODEL_ZOO_COMMON_H_
+#endif // RKNN_JNI__

src/main/native/cpp/rknn_jni.h

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_PREPROCESS_H_
-#define RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_PREPROCESS_H_
+#ifndef RKNN_JNI__
+#define RKNN_JNI__
 
 #include <cstdio>
 
@@ -33,4 +33,4 @@ void letterbox(const cv::Mat &image, cv::Mat &padded_image, BOX_RECT &pads,
 int resize_rga(rga_buffer_t &src, rga_buffer_t &dst, const cv::Mat &image,
                cv::Mat &resized_image, const cv::Size &target_size);
 
-#endif // RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_PREPROCESS_H_
+#endif // RKNN_JNI__

src/main/native/include/model_zoo/common.h

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_RGA_FUNC_H_
-#define RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_RGA_FUNC_H_
+#ifndef RKNN_JNI__
+#define RKNN_JNI__
 
 #include <dlfcn.h>
 
@@ -50,4 +50,4 @@ int RGA_deinit(rga_context *rga_ctx);
 #ifdef __cplusplus
 } // extern "C"
 #endif
-#endif // RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_RGA_FUNC_H_
+#endif // RKNN_JNI__

src/main/native/include/preprocess.h

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_YOLOV5_POSTPROCESS_V5_H_
-#define RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_YOLOV5_POSTPROCESS_V5_H_
+#ifndef RKNN_JNI__
+#define RKNN_JNI__
 
 #include <stdint.h>
 
@@ -55,4 +55,4 @@ int post_process_v5(int8_t *input0, int8_t *input1, int8_t *input2,
                     std::vector<float> &qnt_scales,
                     detect_result_group_t *group, int numClasses);
 
-#endif // RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_YOLOV5_POSTPROCESS_V5_H_
+#endif // RKNN_JNI__

src/main/native/include/rga_func.h

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_YOLOV8_11_POSTPROCESS_V8_11_H_
-#define RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_YOLOV8_11_POSTPROCESS_V8_11_H_
+#ifndef RKNN_JNI__
+#define RKNN_JNI__
 
 #include <stdint.h>
 
@@ -44,4 +44,4 @@ int post_process_v8_11(cv::Size modelSize, rknn_output *outputs,
                        std::vector<rknn_tensor_attr> &output_attrs,
                        bool is_quant, int n_outputs);
 
-#endif // RKNN_JNI_SRC_MAIN_NATIVE_INCLUDE_YOLOV8_11_POSTPROCESS_V8_11_H_
+#endif // RKNN_JNI__