diff --git a/README.md b/README.md index 231a546..ad73d44 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ Northstar is 6328's AprilTag tracking system using OpenCV's ArUco module and NT4. This code is provided for reference, but **we don't have the capacity to assist other teams in using it for custom setups**. Please check out [PhotonVision](https://photonvision.org) or [Limelight](https://limelightvision.io) as community-supported alternatives. -This is a private fork of Northstar, called Cubstar, used by Team 1701 as the software for vision coprocessors. +This is a private fork of Northstar, called CubVision, used by Team 1701 as the software for vision coprocessors. diff --git a/calibration/CalibrationCommandSource.py b/calibration/CalibrationCommandSource.py index fc39ae7..89995ed 100644 --- a/calibration/CalibrationCommandSource.py +++ b/calibration/CalibrationCommandSource.py @@ -19,7 +19,7 @@ class NTCalibrationCommandSource(CalibrationCommandSource): def _init(self, config_store: ConfigStore): if not self._init_complete: nt_table = ntcore.NetworkTableInstance.getDefault().getTable( - "CubStar/" + config_store.local_config.device_id + "/calibration") + "CubVision/" + config_store.local_config.device_id + "/calibration") self._active_entry = nt_table.getBooleanTopic("active").getEntry(False) self._capture_flag_entry = nt_table.getBooleanTopic("capture_flag").getEntry(False) self._active_entry.set(False) diff --git a/config.json b/config.json index 5489f52..394e97d 100644 --- a/config.json +++ b/config.json @@ -1,5 +1,5 @@ { - "device_id": "cubstar", + "device_id": "CubVision", "server_ip": "127.0.0.1", "stream_port": 8000 } \ No newline at end of file diff --git a/config/ConfigSource.py b/config/ConfigSource.py index 0a3b692..6a66e95 100644 --- a/config/ConfigSource.py +++ b/config/ConfigSource.py @@ -53,7 +53,7 @@ def update(self, config_store: ConfigStore) -> None: # Initialize subscribers on first call if not self._init_complete: nt_table = ntcore.NetworkTableInstance.getDefault().getTable( - "CubStar/" + config_store.local_config.device_id + "/config") + "CubVision/" + config_store.local_config.device_id + "/config") self._camera_id_sub = nt_table.getIntegerTopic("camera_id").subscribe(RemoteConfig.camera_id) self._camera_resolution_width_sub = nt_table.getIntegerTopic( "camera_resolution_width").subscribe(RemoteConfig.camera_resolution_width) @@ -68,7 +68,7 @@ def update(self, config_store: ConfigStore) -> None: self._fiducial_size_m_sub = nt_table.getDoubleTopic( "fiducial_size_m").subscribe(RemoteConfig.fiducial_size_m) - global_config_table = ntcore.NetworkTableInstance.getDefault().getTable("CubStar/config") + global_config_table = ntcore.NetworkTableInstance.getDefault().getTable("CubVision/config") self._tag_layout_sub = global_config_table.getStringTopic( "tag_layout").subscribe("") diff --git a/output/OutputPublisher.py b/output/OutputPublisher.py index 2d94028..54f128a 100644 --- a/output/OutputPublisher.py +++ b/output/OutputPublisher.py @@ -24,9 +24,9 @@ def send(self, config_store: ConfigStore, timestamp: float, fiducial_pose_observ # Initialize publishers on first call if not self._init_complete: nt_table = ntcore.NetworkTableInstance.getDefault().getTable( - "CubStar/" + config_store.local_config.device_id + "/output") + "CubVision/" + config_store.local_config.device_id + "/output") nt_table = ntcore.NetworkTableInstance.getDefault().getTable( - "CubStar/" + config_store.local_config.device_id + "/output") + "CubVision/" + config_store.local_config.device_id + "/output") self._observations_pub = nt_table.getRawTopic("observations").publish("ObservationsPacket", ntcore.PubSubOptions(periodic=0, sendAll=True, keepDuplicates=True)) self._demo_observations_pub = nt_table.getRawTopic("demo_observations").publish("FiducialPoseObservation", @@ -91,7 +91,7 @@ def send(self, config_store: ConfigStore, timestamp: float, fiducial_pose_observ # Initialize publishers on first call if not self._init_complete: nt_table = ntcore.NetworkTableInstance.getDefault().getTable( - "CubStar/" + config_store.local_config.device_id + "/output") + "CubVision/" + config_store.local_config.device_id + "/output") self._observations_pub = nt_table.getDoubleArrayTopic("observations").publish( ntcore.PubSubOptions(periodic=0, sendAll=True, keepDuplicates=True)) self._demo_observations_pub = nt_table.getDoubleArrayTopic("demo_observations").publish( diff --git a/output/StreamServer.py b/output/StreamServer.py index 7503f63..433f4da 100644 --- a/output/StreamServer.py +++ b/output/StreamServer.py @@ -35,7 +35,7 @@ class StreamingHandler(BaseHTTPRequestHandler): HTML = """
-