Merge pull request #146 from aws-deepracer-community/dev

Version 5.0.8
aws-deepracer-community · Nov 6, 2022 · 8bfce60 · 8bfce60
2 parents 24dff09 + e3acff3
commit 8bfce60
Show file tree

Hide file tree

Showing 23 changed files with 91 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ Version 5 is the current development version for 2022, and it is receiving both
 | 5.0.5      | August Track  |  `5.0.5-cpu-avx` `5.0.5-cpu-gl-avx`  | `5.0.5-cpu-avx2` `5.0.5-cpu-gl-avx2` | `5.0.5-gpu` `5.0.5-gpu-gl` |
 | 5.0.6      | September Track  |  `5.0.6-cpu-avx` `5.0.6-cpu-gl-avx`  | `5.0.6-cpu-avx2` `5.0.6-cpu-gl-avx2` | `5.0.6-gpu` `5.0.6-gpu-gl` |
 | 5.0.7      | October & Reinvent 2022 Tracks  |  `5.0.7-cpu-avx` `5.0.7-cpu-gl-avx`  | `5.0.7-cpu-avx2` `5.0.7-cpu-gl-avx2` | `5.0.7-gpu` `5.0.7-gpu-gl` |
+| 5.0.8      | Updates to Reinvent 2022 Tracks  |  `5.0.8-cpu-avx` `5.0.8-cpu-gl-avx`  | `5.0.8-cpu-avx2` `5.0.8-cpu-gl-avx2` | `5.0.8-gpu` `5.0.8-gpu-gl` |
 
 ### Version 4
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.0.7
+5.0.8
diff --git a/bundle/deepracer_msgs/share/gennodejs/ros/deepracer_msgs/srv/_index.js b/bundle/deepracer_msgs/share/gennodejs/ros/deepracer_msgs/srv/_index.js
@@ -1,42 +1,42 @@
 
 "use strict";
 
-let SetVisualColors = require('./SetVisualColors.js')
-let SetVisualPoses = require('./SetVisualPoses.js')
-let GetModelStates = require('./GetModelStates.js')
-let SetVisualMesh = require('./SetVisualMesh.js')
-let SetVisualVisibles = require('./SetVisualVisibles.js')
+let GetVisualNames = require('./GetVisualNames.js')
 let GetLinkStates = require('./GetLinkStates.js')
-let GetVisual = require('./GetVisual.js')
+let SetVisualVisible = require('./SetVisualVisible.js')
+let SetVisualPoses = require('./SetVisualPoses.js')
+let SetVisualPose = require('./SetVisualPose.js')
+let SetVisualColors = require('./SetVisualColors.js')
+let SetVisualColor = require('./SetVisualColor.js')
 let SetLinkStates = require('./SetLinkStates.js')
-let GetVisuals = require('./GetVisuals.js')
+let GetLightNames = require('./GetLightNames.js')
 let SetVisualTransparencies = require('./SetVisualTransparencies.js')
-let GetVisualNames = require('./GetVisualNames.js')
-let SetVisualTransparency = require('./SetVisualTransparency.js')
-let SetVisualPose = require('./SetVisualPose.js')
+let GetVisual = require('./GetVisual.js')
+let SetVisualMesh = require('./SetVisualMesh.js')
+let SetVisualVisibles = require('./SetVisualVisibles.js')
 let SetModelStates = require('./SetModelStates.js')
-let SetVisualVisible = require('./SetVisualVisible.js')
+let GetModelStates = require('./GetModelStates.js')
+let GetVisuals = require('./GetVisuals.js')
 let SetVisualMeshes = require('./SetVisualMeshes.js')
-let GetLightNames = require('./GetLightNames.js')
-let SetVisualColor = require('./SetVisualColor.js')
+let SetVisualTransparency = require('./SetVisualTransparency.js')
 
 module.exports = {
-  SetVisualColors: SetVisualColors,
-  SetVisualPoses: SetVisualPoses,
-  GetModelStates: GetModelStates,
-  SetVisualMesh: SetVisualMesh,
-  SetVisualVisibles: SetVisualVisibles,
+  GetVisualNames: GetVisualNames,
   GetLinkStates: GetLinkStates,
-  GetVisual: GetVisual,
+  SetVisualVisible: SetVisualVisible,
+  SetVisualPoses: SetVisualPoses,
+  SetVisualPose: SetVisualPose,
+  SetVisualColors: SetVisualColors,
+  SetVisualColor: SetVisualColor,
   SetLinkStates: SetLinkStates,
-  GetVisuals: GetVisuals,
+  GetLightNames: GetLightNames,
   SetVisualTransparencies: SetVisualTransparencies,
-  GetVisualNames: GetVisualNames,
-  SetVisualTransparency: SetVisualTransparency,
-  SetVisualPose: SetVisualPose,
+  GetVisual: GetVisual,
+  SetVisualMesh: SetVisualMesh,
+  SetVisualVisibles: SetVisualVisibles,
   SetModelStates: SetModelStates,
-  SetVisualVisible: SetVisualVisible,
+  GetModelStates: GetModelStates,
+  GetVisuals: GetVisuals,
   SetVisualMeshes: SetVisualMeshes,
-  GetLightNames: GetLightNames,
-  SetVisualColor: SetVisualColor,
+  SetVisualTransparency: SetVisualTransparency,
 };
diff --git a/...share/deepracer_simulation_environment/meshes/2022_reinvent_champ/2022_reinvent_champ.dae b/...share/deepracer_simulation_environment/meshes/2022_reinvent_champ/2022_reinvent_champ.dae
diff --git a/...racer_simulation_environment/meshes/2022_reinvent_champ/2022_reinvent_champ_collision.dae b/...racer_simulation_environment/meshes/2022_reinvent_champ/2022_reinvent_champ_collision.dae
@@ -6,8 +6,8 @@
       <comments />
       <source_data>2022_reinvent_champ</source_data>
     </contributor>
-    <created>2022-09-06T11:47:51.588456</created>
-    <modified>2022-09-06T11:47:51.588483</modified>
+    <created>2022-10-04T13:39:41.506031</created>
+    <modified>2022-10-04T13:39:41.506057</modified>
     <unit meter="1" name="meter" />
     <up_axis>Z_UP</up_axis>
   </asset>
@@ -68,7 +68,7 @@
     <geometry id="fieldmesh0" name="fieldShape-mesh">
       <mesh>
         <source id="field-verts">
-          <float_array count="12" id="field-verts-array">-5.419414 -5.41314 0 5.410254 -5.41314 0 -5.419414 5.416142 0 5.410254 5.416142 0</float_array>
+          <float_array count="12" id="field-verts-array">-5.164676 -5.160285 0 5.162652 -5.160285 0 -5.164676 5.164024 0 5.162652 5.164024 0</float_array>
           <technique_common>
             <accessor count="4" source="#field-verts-array" stride="3">
               <param name="X" type="float" />
@@ -88,7 +88,7 @@
           </technique_common>
         </source>
         <source id="field-texcoords">
-          <float_array count="8" id="field-texcoords-array">-5.419414 -5.41314 5.410254 -5.41314 -5.419414 5.416142 5.410254 5.416142</float_array>
+          <float_array count="8" id="field-texcoords-array">-5.164676 -5.160285 5.162652 -5.160285 -5.164676 5.164024 5.162652 5.164024</float_array>
           <technique_common>
             <accessor count="4" source="#field-texcoords-array" stride="2">
               <param name="S" type="float" />

diff --git a/...simulation_environment/meshes/deepracer_box_obstacle/textures/Left_Material.jpg b/...simulation_environment/meshes/deepracer_box_obstacle/textures/Left_Material.jpg
diff --git a/...imulation_environment/meshes/deepracer_box_obstacle/textures/Right_Material.jpg b/...imulation_environment/meshes/deepracer_box_obstacle/textures/Right_Material.jpg
diff --git a/...n_environment/share/deepracer_simulation_environment/models/amazon_box_obstacle/model.sdf b/...n_environment/share/deepracer_simulation_environment/models/amazon_box_obstacle/model.sdf
@@ -24,6 +24,13 @@
             <uri>model://meshes/amazon_box_obstacle/amazon_box_obstacle.dae</uri>
           </mesh>
         </geometry>
+        <surface>
+        <contact>
+          <!-- Make sure the collision between botcar and any of the obstacles is not considered -->
+          <!-- https://classic.gazebosim.org/tutorials?tut=collide_bitmask&cat=physics -->
+          <collide_bitmask>0x7FFF</collide_bitmask>
+        </contact>
+        </surface>
       </collision>
       <pose frame="">0 0 0 0 0 0</pose>
 

diff --git a/...mulation_environment/share/deepracer_simulation_environment/models/box_obstacle/model.sdf b/...mulation_environment/share/deepracer_simulation_environment/models/box_obstacle/model.sdf
@@ -22,6 +22,13 @@
             <size>0.4 0.3 0.25</size>
           </box>
         </geometry>
+        <surface>
+        <contact>
+          <!-- Make sure the collision between botcar and any of the obstacles is not considered -->
+          <!-- https://classic.gazebosim.org/tutorials?tut=collide_bitmask&cat=physics -->
+          <collide_bitmask>0x7FFF</collide_bitmask>
+        </contact>
+        </surface>
       </collision>
 
       <visual name="visual_box">

diff --git a/...nvironment/share/deepracer_simulation_environment/models/deepracer_box_obstacle/model.sdf b/...nvironment/share/deepracer_simulation_environment/models/deepracer_box_obstacle/model.sdf
@@ -20,18 +20,25 @@
         <pose frame="">0 0 0 0 0 0</pose>
         <geometry>
           <mesh>
-            <scale>0.4 0.3 0.25</scale>
+            <scale>0.36 0.265 0.24</scale>
             <uri>model://meshes/deepracer_box_obstacle/deepracer_box_obstacle.dae</uri>
           </mesh>
         </geometry>
+        <surface>
+        <contact>
+          <!-- Make sure the collision between botcar and any of the obstacles is not considered -->
+          <!-- https://classic.gazebosim.org/tutorials?tut=collide_bitmask&cat=physics -->
+          <collide_bitmask>0x7FFF</collide_bitmask>
+        </contact>
+        </surface>
       </collision>
       <pose frame="">0 0 0 0 0 0</pose>
 
       <visual name="visual_box">
         <pose frame="">0 0 0 0 0 0</pose>
         <geometry>
           <mesh>
-            <scale>0.4 0.3 0.25</scale>
+            <scale>0.36 0.265 0.24</scale>
             <uri>model://meshes/deepracer_box_obstacle/deepracer_box_obstacle.dae</uri>
           </mesh>
         </geometry>

diff --git a/...ulation_environment/share/deepracer_simulation_environment/routes/2022_reinvent_champ.npy b/...ulation_environment/share/deepracer_simulation_environment/routes/2022_reinvent_champ.npy
diff --git a/...hare/deepracer_simulation_environment/track_iconography/2022_reinvent_champ.png b/...hare/deepracer_simulation_environment/track_iconography/2022_reinvent_champ.png
diff --git a/...nt/track_iconography/2022_reinvent_champ_virtual_event/track_layer_01_green.png b/...nt/track_iconography/2022_reinvent_champ_virtual_event/track_layer_01_green.png
diff --git a/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_01_purple.png b/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_01_purple.png
diff --git a/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_01_yellow.png b/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_01_yellow.png
diff --git a/...nt/track_iconography/2022_reinvent_champ_virtual_event/track_layer_02_green.png b/...nt/track_iconography/2022_reinvent_champ_virtual_event/track_layer_02_green.png
diff --git a/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_02_purple.png b/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_02_purple.png
diff --git a/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_02_yellow.png b/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_02_yellow.png
diff --git a/...nt/track_iconography/2022_reinvent_champ_virtual_event/track_layer_03_green.png b/...nt/track_iconography/2022_reinvent_champ_virtual_event/track_layer_03_green.png
diff --git a/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_03_purple.png b/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_03_purple.png
diff --git a/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_03_yellow.png b/...t/track_iconography/2022_reinvent_champ_virtual_event/track_layer_03_yellow.png
diff --git a/...simulation_environment/share/gennodejs/ros/deepracer_simulation_environment/srv/_index.js b/...simulation_environment/share/gennodejs/ros/deepracer_simulation_environment/srv/_index.js
@@ -1,12 +1,12 @@
 
 "use strict";
 
+let VideoMetricsSrv = require('./VideoMetricsSrv.js')
 let VirtualEventVideoEditSrv = require('./VirtualEventVideoEditSrv.js')
 let TopCamDataSrv = require('./TopCamDataSrv.js')
-let VideoMetricsSrv = require('./VideoMetricsSrv.js')
 
 module.exports = {
+  VideoMetricsSrv: VideoMetricsSrv,
   VirtualEventVideoEditSrv: VirtualEventVideoEditSrv,
   TopCamDataSrv: TopCamDataSrv,
-  VideoMetricsSrv: VideoMetricsSrv,
 };
diff --git a/utils/extract-and-diff.sh b/utils/extract-and-diff.sh
@@ -2,8 +2,8 @@
 cd bundle-src
 aws s3 cp s3://deepracer-melodic-managed-resources-us-east-1/deepracer-simapp.tar.gz .
 tar xvf deepracer-simapp.tar.gz bundle.tar
-CUR_DATE="2022-okt-01"
-PREV_DATE="2022-sep-02"
+CUR_DATE="2022-okt-23"
+PREV_DATE="2022-okt-01"
 mkdir "bundle-$CUR_DATE" && cd "bundle-$CUR_DATE"
 tar xvf ../bundle.tar opt/install
 find . -name __pycache__ | xargs rm -rf
@@ -17,6 +17,6 @@ cd bundle
 patch -p 3 < ../bundle-src/compare-$CUR_DATE.diff
 cd ..
 # Track binaries
-cp -r bundle-src/bundle-$CUR_DATE/opt/install/deepracer_simulation_environment/share/deepracer_simulation_environment/track_iconography/2022_sep* bundle/deepracer_simulation_environment/share/deepracer_simulation_environment/track_iconography/
-cp -r bundle-src/bundle-$CUR_DATE/opt/install/deepracer_simulation_environment/share/deepracer_simulation_environment/meshes/2022_sep* bundle/deepracer_simulation_environment/share/deepracer_simulation_environment/meshes
-cp -r bundle-src/bundle-$CUR_DATE/opt/install/deepracer_simulation_environment/share/deepracer_simulation_environment/routes/2022_sep* bundle/deepracer_simulation_environment/share/deepracer_simulation_environment/routes
+# cp -r bundle-src/bundle-$CUR_DATE/opt/install/deepracer_simulation_environment/share/deepracer_simulation_environment/track_iconography/2022_sep* bundle/deepracer_simulation_environment/share/deepracer_simulation_environment/track_iconography/
+# cp -r bundle-src/bundle-$CUR_DATE/opt/install/deepracer_simulation_environment/share/deepracer_simulation_environment/meshes/2022_sep* bundle/deepracer_simulation_environment/share/deepracer_simulation_environment/meshes
+# cp -r bundle-src/bundle-$CUR_DATE/opt/install/deepracer_simulation_environment/share/deepracer_simulation_environment/routes/2022_sep* bundle/deepracer_simulation_environment/share/deepracer_simulation_environment/routes