Skip to content

Commit aa74a94

Browse files
committed
Updated to Unity 2020.3.25f1 and reduced GPS update rate
1 parent 84cfe78 commit aa74a94

File tree

8 files changed

+16
-24
lines changed

8 files changed

+16
-24
lines changed

Assets/Levels/IGVC 2022.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ MonoBehaviour:
1313
m_Name: IGVC 2022
1414
m_EditorClassIdentifier:
1515
levelName: IGVC 2022
16-
levelId: 5
16+
levelId: 4

Assets/Levels/Lane Maze.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ MonoBehaviour:
1313
m_Name: Lane Maze
1414
m_EditorClassIdentifier:
1515
levelName: Lane Maze
16-
levelId: 4
16+
levelId: 3

Assets/ROSSharp Modules/GPSPublisher.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ public class GPSPublisher : UnityPublisher<Gps>
1313
public float lat0Pos = 35.194881f;
1414
public float lon0Pos = -97.438621f;
1515

16+
public float pubPeriod = 1.0f;
17+
private float nextPub = 0.0f;
18+
1619
protected override void Start()
1720
{
1821
base.Start();
@@ -36,10 +39,13 @@ public float getRandNormal(float mean, float stdDev)
3639

3740
void FixedUpdate()
3841
{
39-
Vector3 pos = tf.position;
40-
message.latitude = (pos.z + getRandNormal(0, latNoiseStdDev)) / 110944.12 + lat0Pos;
41-
message.longitude = (pos.x + getRandNormal(0, lonNoiseStdDev)) / 91071.17 + lon0Pos;
42-
Publish(message);
42+
if (Time.time > nextPub) {
43+
nextPub = Time.time + pubPeriod;
44+
Vector3 pos = tf.position;
45+
message.latitude = (pos.z + getRandNormal(0, latNoiseStdDev)) / 110944.12 + lat0Pos;
46+
message.longitude = (pos.x + getRandNormal(0, lonNoiseStdDev)) / 91071.17 + lon0Pos;
47+
Publish(message);
48+
}
4349
}
4450
}
4551
}

Assets/Scenes/Menu.unity

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2559,14 +2559,11 @@ MonoBehaviour:
25592559
- {fileID: 11400000, guid: 131184c045fde904a881be9109c3bd19, type: 2}
25602560
- {fileID: 11400000, guid: c2411721f85370247a3d41fbb8f7cf78, type: 2}
25612561
- {fileID: 11400000, guid: d86587b471cabf042b28b90a088721ae, type: 2}
2562-
- {fileID: 11400000, guid: 55cf02cc4436c14479446a1cdb55bf13, type: 2}
25632562
togglesGroup: {fileID: 2062170973}
25642563
togglesParent: {fileID: 1817359497}
25652564
robots:
25662565
- {fileID: 11400000, guid: 1c9d8ddca65c9b2438d2a62b52700910, type: 2}
25672566
- {fileID: 11400000, guid: 1d1195ee9028cdb4cab1c37cd7e325a8, type: 2}
2568-
- {fileID: 11400000, guid: 2398f1b0e5f31f24eb9ace0fa90d71b8, type: 2}
2569-
- {fileID: 11400000, guid: c07e59656dc503c4cb7e233388bd37ac, type: 2}
25702567
robotsGroup: {fileID: 454510292}
25712568
robotsParent: {fileID: 521857490}
25722569
optionPrefab: {fileID: 6973146870124429646, guid: 5cdb71824857bbd4fb97f7257d35f70e,

Packages/manifest.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "1.11.2",
43
"com.unity.ext.nunit": "1.0.6",
54
"com.unity.ide.rider": "2.0.7",
6-
"com.unity.ide.visualstudio": "2.0.11",
5+
"com.unity.ide.visualstudio": "2.0.12",
76
"com.unity.ide.vscode": "1.2.4",
87
"com.unity.test-framework": "1.1.29",
98
"com.unity.textmeshpro": "3.0.6",

Packages/packages-lock.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": {
4-
"version": "1.11.2",
5-
"depth": 0,
6-
"source": "registry",
7-
"dependencies": {},
8-
"url": "https://packages.unity.com"
9-
},
103
"com.unity.ext.nunit": {
114
"version": "1.0.6",
125
"depth": 0,
@@ -24,7 +17,7 @@
2417
"url": "https://packages.unity.com"
2518
},
2619
"com.unity.ide.visualstudio": {
27-
"version": "2.0.11",
20+
"version": "2.0.12",
2821
"depth": 0,
2922
"source": "registry",
3023
"dependencies": {

ProjectSettings/EditorBuildSettings.asset

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ EditorBuildSettings:
1414
- enabled: 1
1515
path: Assets/Scenes/Empty_World.unity
1616
guid: a8c0ffda51a8bcc4daa084b044117bd9
17-
- enabled: 1
18-
path: Assets/Scenes/NRC_Land.unity
19-
guid: 93ff5cf7b2427cd4cbc86d09b60fddb7
2017
- enabled: 1
2118
path: Assets/Scenes/Lane_Maze.unity
2219
guid: 174bd6999884e864bb2aa51fb30a9f53

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.20f1
2-
m_EditorVersionWithRevision: 2020.3.20f1 (41c4e627c95f)
1+
m_EditorVersion: 2020.3.25f1
2+
m_EditorVersionWithRevision: 2020.3.25f1 (9b9180224418)

0 commit comments

Comments
 (0)