Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remote Transceiver GlobalPath to Iridium - #269 #464

Draft
wants to merge 57 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
2e3de00
rebasing updates transmit globalpath
hsn200406 Mar 9, 2024
6e4c042
update2mar09
hsn200406 Mar 9, 2024
3ed3db3
update3
hsn200406 Mar 9, 2024
9fdab53
update4
hsn200406 Mar 9, 2024
fba81b6
git_mar16
hsn200406 Mar 16, 2024
d391487
2024-03-30, 1:41 pm
hsn200406 Mar 30, 2024
fcbab93
specs added
vaibhavambastha Mar 23, 2024
395597f
working on testing POST
vaibhavambastha Mar 30, 2024
373b840
added specs
vaibhavambastha Mar 30, 2024
5a01d06
header file modified
vaibhavambastha Mar 30, 2024
379b01f
progress test POST
vaibhavambastha Mar 30, 2024
571f1a6
2024-03-30, 2:31 pm
hsn200406 Mar 30, 2024
66ec240
need to do createPostBody for global path
vaibhavambastha Mar 30, 2024
94705db
stuck on json
vaibhavambastha May 25, 2024
6dc19df
original test remote transceiver
vaibhavambastha Jun 8, 2024
a8a684a
Revert "specs added"
vaibhavambastha Jun 8, 2024
481875c
Merge remote-tracking branch 'refs/remotes/origin/transmit_globalpath…
vaibhavambastha Jun 8, 2024
13de662
testing
vaibhavambastha Jun 8, 2024
9e18a58
test classes made
vaibhavambastha Jun 15, 2024
d738e8a
format of global path post body
vaibhavambastha Jun 29, 2024
ad59d2f
changes to post global path (thread)
hsn200406 Jun 29, 2024
c8a5e19
setting global waypoints from .data
vaibhavambastha Jun 29, 2024
e90faa6
changes to post global path
hsn200406 Jun 29, 2024
c94e094
testmate executable working
vaibhavambastha Jun 29, 2024
823dc92
Posting Http request via API reference Rockblock
hsn200406 Jul 7, 2024
0556a6a
updated curl timeout
vaibhavambastha Jul 13, 2024
4621bf0
remote transceiver rockblock fix
hsn200406 Jul 20, 2024
17940dd
Done storeIridumResponse
vaibhavambastha Jul 20, 2024
144e584
Completed verifyDBWrite for iridium response
vaibhavambastha Aug 3, 2024
168a0e9
addition of http response body function
hsn200406 Aug 10, 2024
a560e87
Storing iridium response in database
vaibhavambastha Aug 10, 2024
0c7e500
Finished verifying iridium response
vaibhavambastha Aug 10, 2024
1b76978
Merge branch 'main' into transmit_globalpath
vaibhavambastha Aug 10, 2024
f16a32c
Fix mkTimestamp syntax
vaibhavambastha Sep 14, 2024
ce71764
verifyDBWrite_GlobalPath added back
vaibhavambastha Sep 14, 2024
7751b42
Commited scripts and src
vaibhavambastha Sep 14, 2024
fad666d
Remote transciever with expected response
hsn200406 Oct 19, 2024
9f845ad
db done but converstion for pt node not working
vaibhavambastha Oct 19, 2024
edf67a7
test to verify iridium response in db passing
vaibhavambastha Oct 19, 2024
9b51cba
Fixed function parameters for storing iridium response in the database
hsn200406 Nov 2, 2024
125c778
update parameters
vaibhavambastha Nov 2, 2024
9d46001
Simulator dimension mismatches & fluid generation config (#435)
eomielan Sep 23, 2024
f51866f
Land Data Generator Script (#434)
SPDonaghy Sep 25, 2024
0763857
production db setup (#437)
JordanChen123 Sep 26, 2024
004d4d3
Implemented power mode frame and ROS callbacks send data to CAN (#428)
lross03 Sep 28, 2024
a2a0330
Resolve sensor and ROS message naming conflict (#441)
kristatraboulay Oct 19, 2024
362f819
Resolve simulator unit test warnings (#446)
eomielan Oct 26, 2024
ff40318
Global Path Bug (#448)
FireBoyAJ24 Oct 27, 2024
f879895
refactor test rockblock web server to take in both data and error cod…
samdai01 Oct 31, 2024
c672778
added pybind11 to dockerfile
SPDonaghy Nov 1, 2024
952ef9f
testing remote transsceiver with local host
hsn200406 Nov 2, 2024
420fead
remote transciever changes for testing local host
hsn200406 Nov 2, 2024
e23217a
writing global path data to tmp file
vaibhavambastha Nov 16, 2024
9ae8d6c
iridium res verified in db
vaibhavambastha Nov 16, 2024
806f293
tested for multiple global path reqs passed
vaibhavambastha Nov 30, 2024
a9bef97
merge main into user/remote_trans branch
vaibhavambastha Nov 30, 2024
fa49c78
comments documentation done
vaibhavambastha Nov 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ class FluidGenerator:
"""This class provides functionality to generate velocity vectors representing fluid movements.

Attributes:
`generator` (VectorGenerator): The vector generator used to generate 2D fluid velocities.
`generator` (VectorGenerator): The vector generator used to generate 3D fluid velocities.
`velocity` (NDArray): The most recently generated fluid velocity vector, expressed in
meters per second (m/s). It is expected to be a 3D vector.
"""

def __init__(self, generator: VectorGenerator):
self.__generator = generator
self.__velocity = np.array(self.__generator.next())
assert self.__velocity.shape == (2,)
assert self.__velocity.shape == (3,)

def next(self) -> NDArray:
"""Generates the next velocity vector for the fluid simulation.
Expand Down
38 changes: 19 additions & 19 deletions src/boat_simulator/tests/unit/nodes/physics_engine/test_fluids.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ class TestFluidGenerator:
@pytest.mark.parametrize(
"vector",
[
(np.array([1, 0])),
(np.array([0, 1])),
(np.array([1, 0])),
(np.array([1, 0, 1])),
(np.array([0, 1, 0])),
(np.array([1, 0, 0])),
],
)
def test_velocity_constant(self, vector):
Expand All @@ -26,10 +26,10 @@ def test_velocity_constant(self, vector):
@pytest.mark.parametrize(
"mean, cov",
[
(np.array([1, 2]), np.array([[2, 1], [1, 2]])),
(np.array([4, 5]), np.array([[3, 1], [1, 3]])),
(np.array([100, 50]), np.array([[10, 5], [5, 10]])),
(np.array([120, 130]), np.array([[10, 5], [5, 10]])),
(np.array([1, 2, 0]), np.array([[2, 1, 1], [1, 2, 0.9], [1, 0.9, 1]])),
(np.array([4, 5, 3]), np.array([[3, 1, 1], [1, 3, 1], [1, 1, 2]])),
(np.array([100, 50, 20]), np.array([[10, 5, 5], [5, 10, 4.5], [5, 4.5, 5]])),
(np.array([120, 130, 40]), np.array([[10, 5, 1], [5, 10, 2], [1, 2, 5]])),
],
)
def test_velocity_random(self, mean, cov):
Expand All @@ -42,12 +42,12 @@ def test_velocity_random(self, mean, cov):
@pytest.mark.parametrize(
"vector",
[
(np.array([1, 0])),
(np.array([0, 1])),
(np.array([-1, 0])),
(np.array([0, -1])),
(np.array([1, 1])),
(np.array([-1, -1])),
(np.array([1, 0, 1])),
(np.array([0, 1, 0])),
(np.array([-1, 0, 1])),
(np.array([0, -1, 0])),
(np.array([1, 1, 1])),
(np.array([-1, -1, -1])),
],
)
def test_speed(self, vector):
Expand All @@ -60,12 +60,12 @@ def test_speed(self, vector):
@pytest.mark.parametrize(
"vector, expected_direction",
[
(np.array([1, 0]), 0),
(np.array([0, 1]), 90),
(np.array([-1, 0]), -180),
(np.array([0, -1]), -90),
(np.array([1, 1]), 45),
(np.array([-1, -1]), -135),
(np.array([1, 0, 1]), 0),
(np.array([0, 1, -3]), 90),
(np.array([-1, 0, -1]), -180),
(np.array([0, -1, 0]), -90),
(np.array([1, 1, 4]), 45),
(np.array([-1, -1, 6]), -135),
],
)
def test_direction(self, vector, expected_direction):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"codemodel","version":2},{"kind":"toolchains","version":1},{"kind":"cmakeFiles","version":1}]}
Loading
Loading