Skip to content

Commit

Permalink
refactor: spelling correction
Browse files Browse the repository at this point in the history
  • Loading branch information
Hallfred committed Sep 24, 2024
1 parent 8497150 commit b01102a
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This repo contains software for operating UUVs, developed by students at NTNU. T
## Documentation
* TODO: Drivers and hardware specifics for each drone will be added to the wiki. Link them here.
* TODO: How to adapt the software stack to new hardware.
* A collection of master thesis written by Vortex members:
* A collection of master theses written by Vortex members:
* [Manta v1: A Deliberative Agent Software Architecture for Autonomous Underwater Vehicles](https://github.com/vortexntnu/Vortex-AUV/blob/documentation/top-level_readme/docs/master_theses/Kristoffer%20Solberg%20(2020).pdf)
* [A real-time DVL and pressure sensor AINS comparison study between EKF, ESKF and NLO for Manta-2020](https://github.com/vortexntnu/Vortex-AUV/blob/documentation/top-level_readme/docs/master_theses/Oyvind%20Denvik%20(2020).pdf)
* [Sonar EKF-SLAM and mapping inanstructured underwater environment](https://github.com/vortexntnu/Vortex-AUV/blob/documentation/top-level_readme/docs/master_theses/Ambj%C3%B8rn%20Waldum%20(2020).pdf)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ def __init__(self):
# Initialize Subscribers ----------
# Start listening to Hydrophone data
self.subscriber_hydrophone1 = self.create_subscription(Int32MultiArray, "/acoustics/hydrophone1", self.hydrophone1_callback, 5)
self.hydropone1_data = array.array("i", [0] * hydrophone_data_size)
self.hydrophone1_data = array.array("i", [0] * hydrophone_data_size)

self.subscriber_hydrophone2 = self.create_subscription(Int32MultiArray, "/acoustics/hydrophone2", self.hydrophone2_callback, 5)
self.hydropone2_data = array.array("i", [0] * hydrophone_data_size)
self.hydrophone2_data = array.array("i", [0] * hydrophone_data_size)

self.subscriber_hydrophone3 = self.create_subscription(Int32MultiArray, "/acoustics/hydrophone3", self.hydrophone3_callback, 5)
self.hydropone3_data = array.array("i", [0] * hydrophone_data_size)
self.hydrophone3_data = array.array("i", [0] * hydrophone_data_size)

self.subscriber_hydrophone4 = self.create_subscription(Int32MultiArray, "/acoustics/hydrophone4", self.hydrophone4_callback, 5)
self.hydropone4_data = array.array("i", [0] * hydrophone_data_size)
self.hydrophone4_data = array.array("i", [0] * hydrophone_data_size)

self.subscriber_hydrophone5 = self.create_subscription(Int32MultiArray, "/acoustics/hydrophone5", self.hydrophone5_callback, 5)
self.hydropone5_data = array.array("i", [0] * hydrophone_data_size)
self.hydrophone5_data = array.array("i", [0] * hydrophone_data_size)

# Start listening to DSP (Digital Signal Processing) data
self.subscriber_filter_response = self.create_subscription(
Expand Down Expand Up @@ -106,7 +106,7 @@ def hydrophone1_callback(self, msg):
Args:
msg (Int32MultiArray): Message containing hydrophone1 data.
"""
self.hydropone1_data = msg.data
self.hydrophone1_data = msg.data

def hydrophone2_callback(self, msg):
"""
Expand All @@ -115,7 +115,7 @@ def hydrophone2_callback(self, msg):
Args:
msg (Int32MultiArray): Message containing hydrophone2 data.
"""
self.hydropone2_data = msg.data
self.hydrophone2_data = msg.data

def hydrophone3_callback(self, msg):
"""
Expand All @@ -124,7 +124,7 @@ def hydrophone3_callback(self, msg):
Args:
msg (Int32MultiArray): Message containing hydrophone3 data.
"""
self.hydropone3_data = msg.data
self.hydrophone3_data = msg.data

def hydrophone4_callback(self, msg):
"""
Expand All @@ -133,7 +133,7 @@ def hydrophone4_callback(self, msg):
Args:
msg (Int32MultiArray): Message containing hydrophone4 data.
"""
self.hydropone4_data = msg.data
self.hydrophone4_data = msg.data

def hydrophone5_callback(self, msg):
"""
Expand All @@ -142,7 +142,7 @@ def hydrophone5_callback(self, msg):
Args:
msg (Int32MultiArray): Message containing hydrophone5 data.
"""
self.hydropone5_data = msg.data
self.hydrophone5_data = msg.data

def filter_response_callback(self, msg):
"""
Expand Down Expand Up @@ -197,11 +197,11 @@ def logger(self):
This method is called periodically based on the data logging rate.
"""
self.acoustics_data_record.log_data_to_csv_file(
hydrophone1=self.hydropone1_data,
hydrophone2=self.hydropone2_data,
hydrophone3=self.hydropone3_data,
hydrophone4=self.hydropone4_data,
hydrophone5=self.hydropone5_data,
hydrophone1=self.hydrophone1_data,
hydrophone2=self.hydrophone2_data,
hydrophone3=self.hydrophone3_data,
hydrophone4=self.hydrophone4_data,
hydrophone5=self.hydrophone5_data,
filter_response=self.filter_response_data,
fft=self.fft_data,
peaks=self.peaks_data,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def __init__(self) -> None:

TeensyCommunicationUDP.init_communication(frequencies_of_interest)

self.get_logger().info("Sucsefully connected to Acoustics PCB MCU :D")
self.get_logger().info("Successfully connected to Acoustics PCB MCU :D")

def data_update(self) -> None:
"""
Expand Down
4 changes: 2 additions & 2 deletions auv_setup/config/robots/orca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
temperature_warning_rate: 0.1 # Warnings/second in case something goes bad you have a warning, Recommended: 0.1

blackbox:
data_logging_rate: 5.0 # [logings/second], Recommended: 5.0 logings per second
data_logging_rate: 5.0 # [loggings/second], Recommended: 5.0 loggings per second

acoustics:
frequencies_of_interest: # MUST be 20 elements [FREQUENCY [Hz], FREQUENCY_VARIANCE [Hz]...] Recommended: Frequency 1 000 - 50 000 Hz, Variance 1 000 - 10 000 Hz
Expand All @@ -77,7 +77,7 @@
0, 0,
0, 0,
0, 0]
data_logging_rate: 1.0 # [logings/second], Recommended: 1.0 logings per second
data_logging_rate: 1.0 # [loggings/second], Recommended: 1.0 loggings per second



2 changes: 1 addition & 1 deletion mission/blackbox/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<package format="3">
<name>blackbox</name>
<version>1.0.0</version>
<description>Logs all ROS2 data and other internal statuses to a data file for use in analyzing data latern</description>
<description>Logs all ROS2 data and other internal statuses to a data file for use in analyzing data later</description>
<maintainer email="[email protected]">vortex</maintainer>
<license>MIT</license>

Expand Down

0 comments on commit b01102a

Please sign in to comment.