From 19392dd16d12c264eadfba974680aca8098962f4 Mon Sep 17 00:00:00 2001 From: Geeoon Chung Date: Thu, 23 May 2024 18:29:09 -0700 Subject: [PATCH 1/4] Updated README with new camera names --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f16f5d6..21dc745 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,9 @@ The simulator is able to simulate the motors with the following names: ## Cameras The simulator is able to simulate the cameras with the following names: -- front -- rear -- upperArm +- mast +- hand +- wrist ## Additional Hardware Devices The simulator is also able to simulate the following hardware devices: @@ -131,7 +131,7 @@ Sent from the rover server to instruct the simulator to begin providing a camera ``` ### Parameters -- `camera` - the name of the camera +- `camera` - the name of the camera: `mast|hand|wrist` - `fps` - the frames per second of the stream - `width` - the width of the stream in pixels - `height` - the height of the stream in pixels @@ -150,7 +150,7 @@ Sent from the rover server to instruct the simulator to stop providing a camera ``` ### Parameters -- `camera` - the name of the camera +- `camera` - the name of the camera: `mast|hand|wrist` ## Camera Stream Report ### Description @@ -166,7 +166,7 @@ Sent from the simulator to inform the rover server of a single frame of a camera ``` ### Parameters -- `camera` - the name of the camera +- `camera` - the name of the camera: `mast|hand|wrist` - `data` - the frame in JPG format encoded as a base-64 string ## Rover True Pose Report @@ -231,4 +231,4 @@ Sent from the simulator to inform the rover server of the orientation provided b - `x` - The x-component of the orientation - `y` - The y-component of the orientation - `z` - The z-component of the orientation -- `w` - The w-component of the orientation \ No newline at end of file +- `w` - The w-component of the orientation From 53a7c40cef425269506080cae4b7665bae7c4107 Mon Sep 17 00:00:00 2001 From: Geeoon Chung Date: Thu, 23 May 2024 18:34:41 -0700 Subject: [PATCH 2/4] Changed camera names --- Assets/Scenes/Simulator.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/Simulator.unity b/Assets/Scenes/Simulator.unity index e98473c..4a60da4 100644 --- a/Assets/Scenes/Simulator.unity +++ b/Assets/Scenes/Simulator.unity @@ -1591,7 +1591,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c82dca69731416449ee97f7492e49c3, type: 3} m_Name: m_EditorClassIdentifier: - _cameraName: rear + _cameraName: wrist --- !u!20 &1141722569 Camera: m_ObjectHideFlags: 0 @@ -2314,7 +2314,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c82dca69731416449ee97f7492e49c3, type: 3} m_Name: m_EditorClassIdentifier: - _cameraName: upperArm + _cameraName: hand --- !u!20 &1647191664 Camera: m_ObjectHideFlags: 0 From 188af2dd4575e011e488c26a797131d8bc970a09 Mon Sep 17 00:00:00 2001 From: Geeoon Chung Date: Wed, 17 Jul 2024 23:32:36 -0700 Subject: [PATCH 3/4] Fixed wrong camera name --- Assets/Scenes/Simulator.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scenes/Simulator.unity b/Assets/Scenes/Simulator.unity index 4a60da4..1f35359 100644 --- a/Assets/Scenes/Simulator.unity +++ b/Assets/Scenes/Simulator.unity @@ -2314,7 +2314,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c82dca69731416449ee97f7492e49c3, type: 3} m_Name: m_EditorClassIdentifier: - _cameraName: hand + _cameraName: mast --- !u!20 &1647191664 Camera: m_ObjectHideFlags: 0 From 20d0beceddbc3153ba86b11b1bcce94d5eb379fe Mon Sep 17 00:00:00 2001 From: Geeoon Chung Date: Wed, 17 Jul 2024 23:33:12 -0700 Subject: [PATCH 4/4] Renamed front to hand --- Assets/Scenes/Simulator.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scenes/Simulator.unity b/Assets/Scenes/Simulator.unity index 1f35359..975f038 100644 --- a/Assets/Scenes/Simulator.unity +++ b/Assets/Scenes/Simulator.unity @@ -1679,7 +1679,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c82dca69731416449ee97f7492e49c3, type: 3} m_Name: m_EditorClassIdentifier: - _cameraName: front + _cameraName: hand --- !u!20 &1161797000 Camera: m_ObjectHideFlags: 0