Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-19 00:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow file uploads of any size and better report active cameras in PhotonCamera error print (#1298)

Browse Source 
Previously reported itself which was confusing. New print:

```
Error at org.photonvision.PhotonCamera.verifyVersion(PhotonCamera.java:378): Found the following PhotonVision cameras active on NetworkTables:
 ==> HD_Pro_Webcam_C920
 ==> Arducam_OV9281_USB_Camera
```
This commit is contained in:
Matt
2024-05-10 14:58:18 -04:00
committed by GitHub
parent 1708376df8
commit 713fad6f6b
6 changed files with 76 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
photon-server/src/main/java/org/photonvision/server/RequestHandler.java
View File

@@ -349,12 +349,12 @@ public class RequestHandler {
public static void onGeneralSettingsRequest(Context ctx) {
NetworkConfig config;
try {
config = kObjectMapper.readValue(ctx.body(), NetworkConfig.class);
config = kObjectMapper.readValue(ctx.bodyInputStream(), NetworkConfig.class);
ctx.status(200);
ctx.result("Successfully saved general settings");
logger.info("Successfully saved general settings");
} catch (JsonProcessingException e) {
} catch (IOException e) {
// If the settings can't be parsed, use the default network settings
config = new NetworkConfig();
@@ -381,7 +381,7 @@ public class RequestHandler {
public static void onCameraSettingsRequest(Context ctx) {
try {
var data = kObjectMapper.readTree(ctx.body());
var data = kObjectMapper.readTree(ctx.bodyInputStream());
int index = data.get("index").asInt();
var settings =
@@ -451,7 +451,7 @@ public class RequestHandler {
int index;
try {
index = kObjectMapper.readTree(ctx.body()).get("index").asInt();
index = kObjectMapper.readTree(ctx.bodyInputStream()).get("index").asInt();
var calData = VisionModuleManager.getInstance().getModule(index).endCalibration();
if (calData == null) {
@@ -482,7 +482,7 @@ public class RequestHandler {
}
public static void onCalibDBCalibrationImportRequest(Context ctx) {
var data = ctx.body();
var data = ctx.bodyInputStream();
try {
var actualObj = kObjectMapper.readTree(data);
@@ -503,7 +503,7 @@ public class RequestHandler {
ctx.status(200);
ctx.result("Calibration imported successfully from CalibDB data!");
logger.info("Calibration imported successfully from CalibDB data!");
} catch (JsonProcessingException e) {
} catch (IOException e) {
ctx.status(400);
ctx.result(
"The Provided CalibDB data is malformed and cannot be parsed for the required fields.");
@@ -515,7 +515,7 @@ public class RequestHandler {
public static void onDataCalibrationImportRequest(Context ctx) {
try {
var data = kObjectMapper.readTree(ctx.body());
var data = kObjectMapper.readTree(ctx.bodyInputStream());
int cameraIndex = data.get("cameraIndex").asInt();
var coeffs =
@@ -557,7 +557,7 @@ public class RequestHandler {
public static void onCameraNicknameChangeRequest(Context ctx) {
try {
var data = kObjectMapper.readTree(ctx.body());
var data = kObjectMapper.readTree(ctx.bodyInputStream());
String name = data.get("name").asText();
int idx = data.get("cameraIndex").asInt();