-
Notifications
You must be signed in to change notification settings - Fork 196
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into undistort-pitch-yaw
- Loading branch information
Showing
55 changed files
with
857 additions
and
220 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,5 +23,6 @@ public enum LogGroup { | |
| VisionModule, | ||
| Data, | ||
| General, | ||
| Config | ||
| Config, | ||
| CSCore, | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
photon-core/src/main/java/org/photonvision/common/logging/PvCSCoreLogger.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright (C) Photon Vision. | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package org.photonvision.common.logging; | ||
|
|
||
| import edu.wpi.first.cscore.CameraServerJNI; | ||
| import java.nio.file.Path; | ||
|
|
||
| /** Redirect cscore logs to our logger */ | ||
| public class PvCSCoreLogger { | ||
| private static PvCSCoreLogger INSTANCE; | ||
|
|
||
| public static PvCSCoreLogger getInstance() { | ||
| if (INSTANCE == null) { | ||
| INSTANCE = new PvCSCoreLogger(); | ||
| } | ||
| return INSTANCE; | ||
| } | ||
|
|
||
| private Logger logger; | ||
|
|
||
| private PvCSCoreLogger() { | ||
| CameraServerJNI.setLogger(this::logMsg, 7); | ||
| this.logger = new Logger(getClass(), LogGroup.CSCore); | ||
| } | ||
|
|
||
| private void logMsg(int level, String file, int line, String msg) { | ||
| if (level == 20) { | ||
| logger.info(msg); | ||
| return; | ||
| } | ||
|
|
||
| file = Path.of(file).getFileName().toString(); | ||
|
|
||
| String levelmsg; | ||
| LogLevel pvlevel; | ||
| if (level >= 50) { | ||
| levelmsg = "CRITICAL"; | ||
| pvlevel = LogLevel.ERROR; | ||
| } else if (level >= 40) { | ||
| levelmsg = "ERROR"; | ||
| pvlevel = LogLevel.ERROR; | ||
| } else if (level >= 30) { | ||
| levelmsg = "WARNING"; | ||
| pvlevel = LogLevel.WARN; | ||
| } else if (level >= 20) { | ||
| levelmsg = "INFO"; | ||
| pvlevel = LogLevel.INFO; | ||
| } else { | ||
| levelmsg = "DEBUG"; | ||
| pvlevel = LogLevel.DEBUG; | ||
| } | ||
| logger.log( | ||
| "CS: " + levelmsg + " " + level + ": " + msg + " (" + file + ":" + line + ")", pvlevel); | ||
| } | ||
| } |
Oops, something went wrong.