Merge pull request ApolloAuto#3 from guardstrikelab/migration_from_co…

…deup migrate code changes from codeup master branch
TroyeFun · Nov 9, 2022 · eee343e · eee343e
2 parents aa0c5eb + a9023c9
commit eee343e
Show file tree

Hide file tree

Showing 83 changed files with 169,791 additions and 8,317 deletions.
diff --git a/docker/build/installers/install_minimal_environment.sh b/docker/build/installers/install_minimal_environment.sh
@@ -116,7 +116,9 @@ if [[ "${MY_GEO}" == "cn" ]]; then
     pip3_install -i "$PYPI_MIRROR" pip -U
     python3 -m pip config set global.index-url "$PYPI_MIRROR"
 else
-    pip3_install pip -U
+    PYPI_MIRROR="https://pypi.tuna.tsinghua.edu.cn/simple"
+    pip3_install -i "$PYPI_MIRROR" pip -U
+    python3 -m pip config set global.index-url "$PYPI_MIRROR"
 fi
 
 pip3_install -U setuptools

diff --git a/modules/common/data/global_flagfile.txt b/modules/common/data/global_flagfile.txt
@@ -18,3 +18,52 @@
 --use_cyber_time=true
 
 --map_dir=/apollo/modules/map/data/san_mateo
+
+--map_dir=/apollo/modules/map/data/sunnyvale_with_two_offices
+
+--map_dir=/apollo/modules/map/data/demo
+
+--map_dir=/apollo/modules/map/data/borregas_ave
+
+--map_dir=/apollo/modules/map/data/sunnyvale_big_loop
+
+
+--map_dir=/apollo/modules/map/data/carla_town01 
+
+--map_dir=/apollo/modules/map/data/carla_town02
+
+--map_dir=/apollo/modules/map/data/carla_town03
+
+--map_dir=/apollo/modules/map/data/carla_town04
+
+--map_dir=/apollo/modules/map/data/carla_town05
+
+
+
+--map_dir=/apollo/modules/map/data/carla_town01
+
+--map_dir=/apollo/modules/map/data/carla_town02
+
+--map_dir=/apollo/modules/map/data/carla_town01
+
+--map_dir=/apollo/modules/map/data/carla_town02
+
+--map_dir=/apollo/modules/map/data/carla_town01
+
+--map_dir=/apollo/modules/map/data/carla_town03
+
+--map_dir=/apollo/modules/map/data/carla_town04
+
+--map_dir=/apollo/modules/map/data/carla_town01
+
+--map_dir=/apollo/modules/map/data/carla_town04
+
+--map_dir=/apollo/modules/map/data/carla_town05
+
+--map_dir=/apollo/modules/map/data/carla_town04
+
+--map_dir=/apollo/modules/map/data/carla_town01
+
+--map_dir=/apollo/modules/map/data/carla_town02
+
+--map_dir=/apollo/modules/map/data/carla_town01
diff --git a/modules/common/data/vehicle_param.pb.txt b/modules/common/data/vehicle_param.pb.txt
@@ -1,7 +1,7 @@
 vehicle_param {
   brand: LINCOLN_MKZ
   vehicle_id {
-      other_unique_id: "mkz7"
+      other_unique_id: "mkz"
   }
   front_edge_to_center: 3.89
   back_edge_to_center: 1.043
@@ -15,34 +15,11 @@ vehicle_param {
   max_acceleration: 2.0
   max_deceleration: -6.0
   max_steer_angle: 8.20304748437
-  max_steer_angle_rate: 8.55211
+  max_steer_angle_rate: 6.98131700798
   steer_ratio: 16
   wheel_base: 2.8448
   wheel_rolling_radius: 0.335
   max_abs_speed_when_stopped: 0.2
   brake_deadzone: 14.5
-  throttle_deadzone: 15.4
-  steering_latency_param
-  {
-      dead_time: 0.1
-      rise_time: 0.17
-      peak_time: 0.0
-      settling_time: 0.0
-  }
-
-  throttle_latency_param
-  {
-      dead_time: 0.03
-      rise_time: 0.0
-      peak_time: 0.0
-      settling_time: 0.0
-  }
-
-  brake_latency_param
-  {
-      dead_time: 0.0
-      rise_time: 0.0
-      peak_time: 0.0
-      settling_time: 0.0
-  }
+  throttle_deadzone: 15.7
 }