Skip to content

Commit 180f986

Browse files
authored
Merge pull request #308 from pollen-robotics/306-add-antennas-to-ghost
306 add antennas to ghost
2 parents 2e6af27 + 79e74c8 commit 180f986

File tree

9 files changed

+1949
-3
lines changed

9 files changed

+1949
-3
lines changed

Assets/Resources/GaelleGhostTeleoperationFiles/teleop_record_antennas.txt

Lines changed: 1580 additions & 0 deletions
Large diffs are not rendered by default.

Assets/Resources/GaelleGhostTeleoperationFiles/teleop_record_antennas.txt.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scripts/Robot/RobotCompatibilityCheck.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,15 @@ void Update()
3535
{
3636
if (needUpdate)
3737
{
38-
explanation.text = explanation_str;
3938
transform.ActivateChildren(true);
39+
explanation.text = explanation_str;
4040
resolution.text = resolution_str;
4141
needUpdate = false;
42+
TextCompatibilityModifier modifier = explanation.transform.GetComponent<TextCompatibilityModifier>();
43+
if (modifier != null)
44+
{
45+
modifier.ModifyCompatibilityText();
46+
}
4247
}
4348
}
4449

Assets/Scripts/UI/TextCompatibilityModifier.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,10 @@ public void ChangeText(string stringToChange)
4040
newText = stringToChange.Replace(robotVersion, robot_api);
4141
needUpdate = true;
4242
}
43+
44+
public void ModifyCompatibilityText()
45+
{
46+
ChangeText(textToChange.text);
47+
}
4348
}
4449
}

Assets/Scripts/WebRTC/DataMessageManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected virtual void Start()
4242
webRTCController = WebRTCManager.Instance.gstreamerPlugin;
4343
}
4444

45-
protected void Update()
45+
protected virtual void Update()
4646
{
4747
if (commands.Commands.Count != 0)
4848
{

Assets/UnitTests/Scenes/Test_GaelleGhost/Test_GaelleGhostBaseScene.unity

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ MonoBehaviour:
226226
LeftGripperTextFile: {fileID: 4900000, guid: af345d390b8f32a4daa68b24fd9028da, type: 3}
227227
NeckTextFile: {fileID: 4900000, guid: 1a8fdfbce4b94004f8ddb58c98b74f6e, type: 3}
228228
MobileBaseTextFile: {fileID: 4900000, guid: 14f6124286bd4d4479d073aae1189800, type: 3}
229+
AntennasTextFile: {fileID: 4900000, guid: 4e5cffb88eca71341855a14a3237a546, type: 3}
229230
--- !u!4 &679389687
230231
Transform:
231232
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)