From 3f1b0103e0510a04491f47aa98f1c4bbbeac3fb6 Mon Sep 17 00:00:00 2001 From: Alextopher Date: Thu, 19 Sep 2024 03:11:16 -0400 Subject: [PATCH] drop unintended changes --- photon-client/src/App.vue | 1 - .../photonvision/jni/RknnObjectDetector.java | 17 +++++++++++++++++ .../pipeline/ObjectDetectionPipeline.java | 2 -- photon-server/build.gradle | 4 ++-- .../src/main/java/org/photonvision/Main.java | 2 +- photon-server/src/main/resources/web/index.html | 16 +--------------- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/photon-client/src/App.vue b/photon-client/src/App.vue index d98300bd7f..518ad39833 100644 --- a/photon-client/src/App.vue +++ b/photon-client/src/App.vue @@ -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) { diff --git a/photon-core/src/main/java/org/photonvision/jni/RknnObjectDetector.java b/photon-core/src/main/java/org/photonvision/jni/RknnObjectDetector.java index b11699074a..34d09eb04a 100644 --- a/photon-core/src/main/java/org/photonvision/jni/RknnObjectDetector.java +++ b/photon-core/src/main/java/org/photonvision/jni/RknnObjectDetector.java @@ -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 . + */ + package org.photonvision.jni; import java.awt.Color; diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/ObjectDetectionPipeline.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/ObjectDetectionPipeline.java index 9489fae259..684fdd0247 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipeline/ObjectDetectionPipeline.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipeline/ObjectDetectionPipeline.java @@ -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()); } diff --git a/photon-server/build.gradle b/photon-server/build.gradle index d84b1111bd..7c8c2ba078 100644 --- a/photon-server/build.gradle +++ b/photon-server/build.gradle @@ -62,8 +62,8 @@ run { } remotes { - home { - host = '192.168.1.220' + pi { + host = 'photonvision.local' user = 'pi' password = 'raspberry' knownHosts = allowAnyHosts diff --git a/photon-server/src/main/java/org/photonvision/Main.java b/photon-server/src/main/java/org/photonvision/Main.java index 889be73dbe..4330cefc00 100644 --- a/photon-server/src/main/java/org/photonvision/Main.java +++ b/photon-server/src/main/java/org/photonvision/Main.java @@ -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()); diff --git a/photon-server/src/main/resources/web/index.html b/photon-server/src/main/resources/web/index.html index 3d1379c9fb..988f55e6a3 100644 --- a/photon-server/src/main/resources/web/index.html +++ b/photon-server/src/main/resources/web/index.html @@ -1,15 +1 @@ - - - - - - - Photon Client - - - - -
- - - +

UI has not been copied!