Skip to content

Commit

Permalink
drop unintended changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Alextopher committed Sep 19, 2024
1 parent ee46038 commit 3f1b010
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
1 change: 0 additions & 1 deletion photon-client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ if (!is_demo) {
useSettingsStore().updateGeneralSettingsFromWebsocket(data.settings);
}
if (data.cameraSettings !== undefined) {
console.log("cameras", data.cameraSettings);
useCameraSettingsStore().updateCameraSettingsFromWebsocket(data.cameraSettings);
}
if (data.ntConnectionInfo !== undefined) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* 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.jni;

import java.awt.Color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,11 @@ protected void setPipeParamsImpl() {

// If the desired model couldn't be found, log an error and try to use the default model
if (selectedModel.isEmpty()) {
// logger.error("Model not found: " + settings.model + ". Trying to use default model.");
selectedModel = NeuralNetworkModelManager.getInstance().getDefaultModel();
}

// If the model remains empty, use the NullModel
if (selectedModel.isEmpty()) {
// logger.error("Default Model not found. Using empty NullModel.");
selectedModel = Optional.of(NullModel.getInstance());
}

Expand Down
4 changes: 2 additions & 2 deletions photon-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ run {
}

remotes {
home {
host = '192.168.1.220'
pi {
host = 'photonvision.local'
user = 'pi'
password = 'raspberry'
knownHosts = allowAnyHosts
Expand Down
2 changes: 1 addition & 1 deletion photon-server/src/main/java/org/photonvision/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ public static void main(String[] args) {
ConfigManager.getInstance().load(); // init config manager
ConfigManager.getInstance().requestSave();

logger.info("Loading ML models");
logger.info("Loading ML models...");
var modelManager = NeuralNetworkModelManager.getInstance();
modelManager.extractModels(ConfigManager.getInstance().getModelsDirectory());
modelManager.discoverModels(ConfigManager.getInstance().getModelsDirectory());
Expand Down
16 changes: 1 addition & 15 deletions photon-server/src/main/resources/web/index.html
Original file line number Diff line number Diff line change
@@ -1,15 +1 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="./favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Photon Client</title>
<script type="module" crossorigin src="./assets/index-206c1fe7.js"></script>
<link rel="stylesheet" href="./assets/index-69a5f457.css">
</head>
<body>
<div id="app"></div>

</body>
</html>
<p>UI has not been copied!</p>

0 comments on commit 3f1b010

Please sign in to comment.