trim trailing whitespace

old-commit-hash: 818bd8a591
commatwo_master
Adeeb Shihadeh 5 years ago
parent f60d0d8948
commit 0f2dfbfc52
  1. 2
      .github/workflows/test.yaml
  2. 2
      CONTRIBUTING.md
  3. 2
      selfdrive/car/toyota/interface.py
  4. 4
      selfdrive/common/clutil.c
  5. 2
      selfdrive/monitoring/test_monitoring.py
  6. 2
      tools/nui/nui
  7. 4
      tools/sim/README.md
  8. 4
      tools/sim/bridge.py
  9. 2
      tools/sim/start_carla.sh

@ -97,7 +97,7 @@ jobs:
docker login -u wmelching -p ${{ secrets.COMMA_DOCKERHUB_TOKEN}} docker login -u wmelching -p ${{ secrets.COMMA_DOCKERHUB_TOKEN}}
docker tag tmppilotwebcam docker.io/commaai/openpilotwebcamci:latest docker tag tmppilotwebcam docker.io/commaai/openpilotwebcamci:latest
docker push docker.io/commaai/openpilotwebcamci:latest docker push docker.io/commaai/openpilotwebcamci:latest
docker_push: docker_push:
name: docker push name: docker push
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04

@ -28,7 +28,7 @@ Code is automatically checked for style by Github Actions as part of the automat
We've released a [Model Port guide](https://medium.com/@comma_ai/openpilot-port-guide-for-toyota-models-e5467f4b5fe6) for porting to Toyota/Lexus models. We've released a [Model Port guide](https://medium.com/@comma_ai/openpilot-port-guide-for-toyota-models-e5467f4b5fe6) for porting to Toyota/Lexus models.
If you port openpilot to a substantially new car brand, see this more generic [Brand Port guide](https://medium.com/@comma_ai/how-to-write-a-car-port-for-openpilot-7ce0785eda84). You might also be eligible for a bounty. If you port openpilot to a substantially new car brand, see this more generic [Brand Port guide](https://medium.com/@comma_ai/how-to-write-a-car-port-for-openpilot-7ce0785eda84). You might also be eligible for a bounty.
## Pull Requests ## Pull Requests

@ -252,7 +252,7 @@ class CarInterface(CarInterfaceBase):
ret.mass = 4070 * CV.LB_TO_KG + STD_CARGO_KG ret.mass = 4070 * CV.LB_TO_KG + STD_CARGO_KG
ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.6], [0.1]] ret.lateralTuning.pid.kpV, ret.lateralTuning.pid.kiV = [[0.6], [0.1]]
ret.lateralTuning.pid.kf = 0.00006 ret.lateralTuning.pid.kf = 0.00006
elif candidate == CAR.PRIUS_TSS2: elif candidate == CAR.PRIUS_TSS2:
stop_and_go = True stop_and_go = True
ret.safetyParam = 73 ret.safetyParam = 73

@ -39,7 +39,7 @@ void clu_init(void) {
cl_device_id cl_get_device_id(cl_device_type device_type) { cl_device_id cl_get_device_id(cl_device_type device_type) {
bool opencl_platform_found = false; bool opencl_platform_found = false;
cl_device_id device_id = NULL; cl_device_id device_id = NULL;
cl_uint num_platforms = 0; cl_uint num_platforms = 0;
int err = clGetPlatformIDs(0, NULL, &num_platforms); int err = clGetPlatformIDs(0, NULL, &num_platforms);
assert(err == 0); assert(err == 0);
@ -66,7 +66,7 @@ cl_device_id cl_get_device_id(cl_device_type device_type) {
break; break;
} }
free(platform_ids); free(platform_ids);
if (!opencl_platform_found) { if (!opencl_platform_found) {
printf("No valid openCL platform found\n"); printf("No valid openCL platform found\n");
assert(opencl_platform_found); assert(opencl_platform_found);

@ -196,7 +196,7 @@ class TestMonitoring(unittest.TestCase):
self.assertEqual(events_output[int((_redlight_time+0.5)/DT_DMON)].names[0], EventName.promptDriverDistracted) self.assertEqual(events_output[int((_redlight_time+0.5)/DT_DMON)].names[0], EventName.promptDriverDistracted)
# 9. op engaged, model is extremely uncertain. driver first attentive, then distracted # 9. op engaged, model is extremely uncertain. driver first attentive, then distracted
# - should pop a uncertain message first, then slowly into active green/orange, finally back to wheel touch but timer locked by orange # - should pop a uncertain message first, then slowly into active green/orange, finally back to wheel touch but timer locked by orange
def test_one_indecisive_model(self): def test_one_indecisive_model(self):
ds_vector = [msg_ATTENTIVE_UNCERTAIN] * int(_UNCERTAIN_SECONDS_TO_GREEN/DT_DMON) + \ ds_vector = [msg_ATTENTIVE_UNCERTAIN] * int(_UNCERTAIN_SECONDS_TO_GREEN/DT_DMON) + \
[msg_ATTENTIVE] * int(_DISTRACTED_SECONDS_TO_ORANGE/DT_DMON) + \ [msg_ATTENTIVE] * int(_DISTRACTED_SECONDS_TO_ORANGE/DT_DMON) + \

@ -4,7 +4,7 @@ if [ $# -gt 0 ]; then
if [ "$INTERNAL" = 1 ]; then if [ "$INTERNAL" = 1 ]; then
./_nui "$1" ./_nui "$1"
else else
./get_files_comma_api.py $1 ./get_files_comma_api.py $1
if [ -f ./_nui ]; then if [ -f ./_nui ]; then
./_nui use_api ./_nui use_api
elif [ -f _nui.app/Contents/MacOS/_nui ]; then elif [ -f _nui.app/Contents/MacOS/_nui ]; then

@ -11,9 +11,9 @@ First, start the CARLA server.
Then start bridge and openpilot. Then start bridge and openpilot.
``` ```
./start_openpilot_docker.sh ./start_openpilot_docker.sh
``` ```
To engage openpilot press 1 a few times while focused on bridge.py to increase the cruise speed. To engage openpilot press 1 a few times while focused on bridge.py to increase the cruise speed.
## Controls ## Controls
You can control openpilot driving in the simulation with the following keys You can control openpilot driving in the simulation with the following keys

@ -17,7 +17,7 @@ from selfdrive.test.helpers import set_params_enabled
parser = argparse.ArgumentParser(description='Bridge between CARLA and openpilot.') parser = argparse.ArgumentParser(description='Bridge between CARLA and openpilot.')
parser.add_argument('--joystick', action='store_true') parser.add_argument('--joystick', action='store_true')
parser.add_argument('--town', type=str, default='Town04') parser.add_argument('--town', type=str, default='Town04')
parser.add_argument('--spawn_point', dest='num_selected_spawn_point', parser.add_argument('--spawn_point', dest='num_selected_spawn_point',
type=int, default=16) type=int, default=16)
parser.add_argument('--cloudyness', default=0.1, type=float) parser.add_argument('--cloudyness', default=0.1, type=float)
parser.add_argument('--precipitation', default=0.0, type=float) parser.add_argument('--precipitation', default=0.0, type=float)
@ -145,7 +145,7 @@ def go(q):
vehicle_bp = blueprint_library.filter('vehicle.tesla.*')[0] vehicle_bp = blueprint_library.filter('vehicle.tesla.*')[0]
spawn_points = world_map.get_spawn_points() spawn_points = world_map.get_spawn_points()
assert len(spawn_points) > args.num_selected_spawn_point, \ assert len(spawn_points) > args.num_selected_spawn_point, \
f'''No spawn point {args.num_selected_spawn_point}, try a value between 0 and f'''No spawn point {args.num_selected_spawn_point}, try a value between 0 and
{len(spawn_points)} for this town.''' {len(spawn_points)} for this town.'''
spawn_point = spawn_points[args.num_selected_spawn_point] spawn_point = spawn_points[args.num_selected_spawn_point]
vehicle = world.spawn_actor(vehicle_bp, spawn_point) vehicle = world.spawn_actor(vehicle_bp, spawn_point)

@ -16,4 +16,4 @@ if ! $(apt list --installed | grep -q nvidia-container-toolkit); then
fi fi
docker pull carlasim/carla:0.9.7 docker pull carlasim/carla:0.9.7
docker run -it --net=host --gpus all carlasim/carla:0.9.7 docker run -it --net=host --gpus all carlasim/carla:0.9.7

Loading…
Cancel
Save