Skip to content

Commit

Permalink
Now with CI data files created on x86 to ensure compatibiity with CI
Browse files Browse the repository at this point in the history
  • Loading branch information
BogGyver committed Apr 27, 2020
1 parent 9f30b15 commit 2843521
Show file tree
Hide file tree
Showing 108 changed files with 12 additions and 163 deletions.
8 changes: 3 additions & 5 deletions Dockerfile.openpilot
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#BB used to be 16.04 but we want to match Jetson with 18.04
FROM ubuntu:18.04
FROM ubuntu:16.04
ENV PYTHONUNBUFFERED 1

RUN apt-get update && apt-get install -y \
Expand Down Expand Up @@ -48,9 +47,8 @@ ENV LC_ALL en_US.UTF-8
RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash

ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
#BB used to be 3.7.3 but we want to match what's on the Jetson used to generate files
RUN pyenv install 3.6.9
RUN pyenv global 3.6.9
RUN pyenv install 3.7.3
RUN pyenv global 3.7.3
RUN pyenv rehash

RUN pip install pipenv==2018.11.26
Expand Down
1 change: 1 addition & 0 deletions common/params.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ class UnknownKeyName(Exception):
"DriverUsbCameraFlip": [TxType.PERSISTENT],
"RoadUsbCameraFx": [TxType.PERSISTENT],
"RoadUsbCameraFlip": [TxType.PERSISTENT],
"TeslaModel": [TxType.PERSISTENT],
}


Expand Down
7 changes: 4 additions & 3 deletions selfdrive/car/tesla/carstate.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from selfdrive.car.interfaces import CarStateBase
import os
import subprocess
from common.params import read_db, write_db
from common.params import Params

def parse_gear_shifter(can_gear_shifter, car_fingerprint):

Expand Down Expand Up @@ -187,6 +187,7 @@ def get_pedal_can_signals(CP):
class CarState(CarStateBase):
def __init__(self, CP):
super().__init__(CP)
self.params = Params()
self.speed_control_enabled = 0
self.CL_MIN_V = 8.9
self.CL_MAX_A = 20.
Expand Down Expand Up @@ -252,7 +253,7 @@ def __init__(self, CP):

# Tesla Model
self.teslaModelDetected = 1
self.teslaModel = read_db('/data/params','TeslaModel')
self.teslaModel = self.params.get('TeslaModel')
if self.teslaModel is not None:
self.teslaModel = self.teslaModel.decode()
if self.teslaModel is None:
Expand Down Expand Up @@ -526,7 +527,7 @@ def update(self, cp, epas_cp, pedal_cp):
if (cp.vl["GTW_carConfig"]['GTW_fourWheelDrive'] == 1):
self.teslaModel = self.teslaModel + "D"
if (self.teslaModelDetected == 0) or (prev_teslaModel != self.teslaModel):
write_db('/data/params','TeslaModel',self.teslaModel)
self.params.put('TeslaModel',self.teslaModel)
self.teslaModelDetected = 1

#Nav Map Data
Expand Down
2 changes: 1 addition & 1 deletion selfdrive/car/tesla/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def get_params(candidate, fingerprint=gen_empty_fingerprint(), has_relay=False,
ret.carName = "tesla"
ret.carFingerprint = candidate

teslaModel = read_db('/data/params','TeslaModel')
teslaModel = read_db('/data/params/d/','TeslaModel')
if teslaModel is not None:
teslaModel = teslaModel.decode()
if teslaModel is None:
Expand Down
2 changes: 1 addition & 1 deletion selfdrive/test/process_replay/ref_commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
84f990ea32ba309442212537929049c512647e35
9f30b15892351d8317a61b8565ac705a32b8b480

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
2 changes: 1 addition & 1 deletion selfdrive/test/process_replay/test_processes.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
INJECT_MODEL = 0

segments = [
("TESLA", "d3126df386f83c4d|2020-04-22--13-17-39--3"), # TESLA.MODELS
("HONDA", "0375fdf7b1ce594d|2019-06-13--08-32-25--3"), # HONDA.ACCORD
("HONDA", "99c94dc769b5d96e|2019-08-03--14-19-59--2"), # HONDA.CIVIC
("TOYOTA", "77611a1fac303767|2020-02-29--13-29-33--3"), # TOYOTA.COROLLA_TSS2
Expand All @@ -26,7 +27,6 @@

# Enable when port is tested and dascamOnly is no longer set
("NISSAN", "fbbfa6af821552b9|2020-03-03--08-09-43--0"), # NISSAN.XTRAIL
("TESLA", "d3126df386f83c4d|2020-04-22--13-17-39--3"), # TESLA.MODELS
]

# ford doesn't need to be tested until a full port is done
Expand Down
1 change: 0 additions & 1 deletion selfdrive/test/test_car_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,6 @@ def get_route_log(route_name):
TOYOTA.CHR,
TOYOTA.CHRH,
TOYOTA.HIGHLANDERH,
#TESLA.MODELS,
]

if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion selfdrive/test/test_fingerprints.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# (addr, len)
CAN_IGNITION_MSGS = {
'gm': [(0x1F1, 8), (0x160, 5)],
#'tesla' : [(0x348, 8)],
'tesla' : [(0x348, 8)],
}

def _get_fingerprints():
Expand Down

0 comments on commit 2843521

Please sign in to comment.