From 82a0f3d567cf4c5fffa8a0e505853769ddf9c281 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 29 Dec 2023 14:13:54 -0600 Subject: [PATCH] who tf has a screen that can only show 80 character rows now --- photon-lib/py/photonlibpy/photonCamera.py | 39 ++++++++------- .../main/native/cpp/photon/PhotonCamera.cpp | 47 ++++++++++--------- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/photon-lib/py/photonlibpy/photonCamera.py b/photon-lib/py/photonlibpy/photonCamera.py index db68c790ff..ff4f5dffa2 100644 --- a/photon-lib/py/photonlibpy/photonCamera.py +++ b/photon-lib/py/photonlibpy/photonCamera.py @@ -167,23 +167,28 @@ def _versionCheck(self) -> None: if len(versionString) > 0 and versionString != PHOTONVISION_VERSION: # Verified version mismatch - wpilib.reportWarning(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>") - wpilib.reportWarning(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>") - wpilib.reportWarning(">>> ____ _________ ____ ________ ___________ __ ") - wpilib.reportWarning(">>> / __ \\/ ____/ | / __ \\ /_ __/ / / / _/ ___/ / / ") - wpilib.reportWarning(">>> / /_/ / __/ / /| | / / / / / / / /_/ // / \\__ \\ / / ") - wpilib.reportWarning(">>> / _, _/ /___/ ___ |/ /_/ / / / / __ // / ___/ / /_/ ") - wpilib.reportWarning(">>>/_/ |_/_____/_/ |_/_____/ /_/ /_/ /_/___//____/ (_) ") - wpilib.reportWarning(">>> ") - wpilib.reportWarning(">>> You are running an incompatible version ") - wpilib.reportWarning(">>> of PhotonVision on your coprocessor! ") - wpilib.reportWarning(">>> ") - wpilib.reportWarning(">>> This is neither tested nor supported. ") - wpilib.reportWarning(">>> You MUST update either PhotonVision, PhotonLib, or both. ") - wpilib.reportWarning(">>> ") - wpilib.reportWarning(">>> Your code will now crash. We hope your day gets better. ") - wpilib.reportWarning(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>") - wpilib.reportWarning(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>") + bfw = "" + bfw += ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" + bfw += ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" + bfw += ">>> ____ _________ ____ ________ ___________ __ \n" + bfw += ">>> / __ \\/ ____/ | / __ \\ /_ __/ / / / _/ ___/ / / \n" + bfw += ">>> / /_/ / __/ / /| | / / / / / / / /_/ // / \\__ \\ / / \n" + bfw += ">>> / _, _/ /___/ ___ |/ /_/ / / / / __ // / ___/ / /_/ \n" + bfw += ">>>/_/ |_/_____/_/ |_/_____/ /_/ /_/ /_/___//____/ (_) \n" + bfw += ">>> \n" + bfw += ">>> You are running an incompatible version \n" + bfw += ">>> of PhotonVision on your coprocessor! \n" + bfw += ">>> \n" + bfw += ">>> This is neither tested nor supported. \n" + bfw += ">>> You MUST update either PhotonVision, PhotonLib, or both. \n" + bfw += ">>> \n" + bfw += ">>> Your code will now crash. We hope your day gets better. \n" + bfw += ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" + bfw += ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" + + wpilib.reportWarning("\n\n\n\n") + wpilib.reportWarning(bfw) + wpilib.reportWarning("\n\n") errText = f"Photon version {PHOTONLIB_VERSION} does not match coprocessor version {versionString}. Please install photonlibpy version {PHOTONLIB_VERSION}." wpilib.reportError(errText, True) diff --git a/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp b/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp index 5c1e2a8dbb..2eb7aeb8e6 100644 --- a/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp +++ b/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp @@ -200,32 +200,33 @@ void PhotonCamera::VerifyVersion() { cameraNameOutString); } } else if (!VersionMatches(versionString)) { - - FRC_ReportError(frc::warn::Warning,"\n\n\n\n"); - FRC_ReportError(frc::warn::Warning,">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); - FRC_ReportError(frc::warn::Warning,">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); - FRC_ReportError(frc::warn::Warning,">>> ____ _________ ____ ________ ___________ __ "); - FRC_ReportError(frc::warn::Warning,">>> / __ \\/ ____/ | / __ \\ /_ __/ / / / _/ ___/ / / "); - FRC_ReportError(frc::warn::Warning,">>> / /_/ / __/ / /| | / / / / / / / /_/ // / \\__ \\ / / "); - FRC_ReportError(frc::warn::Warning,">>> / _, _/ /___/ ___ |/ /_/ / / / / __ // / ___/ / /_/ "); - FRC_ReportError(frc::warn::Warning,">>>/_/ |_/_____/_/ |_/_____/ /_/ /_/ /_/___//____/ (_) "); - FRC_ReportError(frc::warn::Warning,">>> "); - FRC_ReportError(frc::warn::Warning,">>> You are running an incompatible version "); - FRC_ReportError(frc::warn::Warning,">>> of PhotonVision on your coprocessor! "); - FRC_ReportError(frc::warn::Warning,">>> "); - FRC_ReportError(frc::warn::Warning,">>> This is neither tested nor supported. "); - FRC_ReportError(frc::warn::Warning,">>> You MUST update either PhotonVision, PhotonLib, or both. "); - FRC_ReportError(frc::warn::Warning,">>> "); - FRC_ReportError(frc::warn::Warning,">>> Your code will now crash. We hope your day gets better. "); - FRC_ReportError(frc::warn::Warning,">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); - FRC_ReportError(frc::warn::Warning,">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); - FRC_ReportError(frc::warn::Warning,"\n\n"); + std::string bfw = ""; + bfw += ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"; + bfw += ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"; + bfw += ">>> ____ _________ ____ ________ ___________ __ \n"; + bfw += ">>> / __ \\/ ____/ | / __ \\ /_ __/ / / / _/ ___/ / /\n"; + bfw += ">>> / /_/ / __/ / /| | / / / / / / / /_/ // / \\__ \\ / / \n"; + bfw += ">>> / _, _/ /___/ ___ |/ /_/ / / / / __ // / ___/ / /_/ \n"; + bfw += ">>>/_/ |_/_____/_/ |_/_____/ /_/ /_/ /_/___//____/ (_) \n"; + bfw += ">>> \n"; + bfw += ">>> You are running an incompatible version \n"; + bfw += ">>> of PhotonVision on your coprocessor! \n"; + bfw += ">>> \n"; + bfw += ">>> This is neither tested nor supported. \n"; + bfw += ">>> You MUST update either PhotonVision, PhotonLib, or both. \n"; + bfw += ">>> \n"; + bfw += ">>> Your code will now crash. We hope your day gets better. \n"; + bfw += ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"; + bfw += ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n"; + + FRC_ReportError(frc::warn::Warning, "\n\n\n\n"); + FRC_ReportError(frc::warn::Warning, bfw); + FRC_ReportError(frc::warn::Warning, "\n\n"); FRC_ReportError(frc::err::Error, "Photon version {} does not match coprocessor version {}!", PhotonVersion::versionString, versionString); - throw std::runtime_error( "PhotonVision Coprocessor and PhotonLib Version Mismatch!" ); - - + throw std::runtime_error( + "PhotonVision Coprocessor and PhotonLib Version Mismatch!"); } }