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

UI 3d mode, ConfigManager bugfixes (#103)

Browse Source 
* stupid bugs I guess idk where else to put this commit

* Run spotless

* Fix config file loading

Splits load into own method

* Run spotless
This commit is contained in:
Matt
2020-08-26 10:03:56 -07:00
committed by GitHub
parent fea72e18bf
commit 9f0e89ea29
13 changed files with 105 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@ import org.photonvision.common.logging.LogGroup;
import org.photonvision.common.logging.Logger;
import org.photonvision.common.networking.NetworkManager;
import org.photonvision.vision.processes.VisionModuleManager;
import org.photonvision.vision.target.TargetModel;
public class RequestHandler {
private static final Logger logger = new Logger(RequestHandler.class, LogGroup.WebServer);
@@ -149,4 +150,23 @@ public class RequestHandler {
ctx.status(200);
System.exit(0);
}
public static void uploadPnpModel(Context ctx) {
UITargetData data;
try {
data = kObjectMapper.readValue(ctx.body(), UITargetData.class);
} catch (JsonProcessingException e) {
e.printStackTrace();
ctx.status(500);
return;
}
VisionModuleManager.getInstance().getModule(data.index).setTargetModel(data.targetModel);
ctx.status(200);
}
public static class UITargetData {
public int index;
public TargetModel targetModel;
}
}

1
photon-server/src/main/java/org/photonvision/server/Server.java
View File

@@ -79,6 +79,7 @@ public class Server {
app.post("/api/settings/endCalibration", RequestHandler::onCalibrationEnd);
app.post("/api/restartDevice", RequestHandler::restartDevice);
app.post("api/restartProgram", RequestHandler::restartProgram);
app.post("api/vision/pnpModel", RequestHandler::uploadPnpModel);
app.start(port);
}