diff --git a/RELEASES.md b/RELEASES.md index 3e407c0698..741ec98b51 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,8 @@ +Version 0.4.7.1 (2018-06-18) +========================== + * Fix Acura ILX steer faults + * Fix bug in mock car + Version 0.4.7 (2018-06-15) ========================== * New model! diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index b2b68bc33d..a5bc06b056 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -8,7 +8,7 @@ from selfdrive.config import Conversions as CV from selfdrive.controls.lib.drive_helpers import create_event, EventTypes as ET, get_events from selfdrive.controls.lib.vehicle_model import VehicleModel from selfdrive.car.honda.carstate import CarState, get_can_parser -from selfdrive.car.honda.values import CruiseButtons, CM, BP, AH, CAR +from selfdrive.car.honda.values import CruiseButtons, CM, BP, AH, CAR, HONDA_BOSCH from selfdrive.controls.lib.planner import A_ACC_MAX try: @@ -143,7 +143,7 @@ class CarInterface(object): ret.carName = "honda" ret.carFingerprint = candidate - if 0x1ef in fingerprint: + if candidate in HONDA_BOSCH: ret.safetyModel = car.CarParams.SafetyModels.hondaBosch ret.enableCamera = True ret.radarOffCan = True diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py index 8d8bd3b33f..95b156e5bc 100644 --- a/selfdrive/car/honda/values.py +++ b/selfdrive/car/honda/values.py @@ -106,3 +106,5 @@ DBC = { CAR.PILOT: dbc_dict('honda_pilot_touring_2017_can_generated', 'acura_ilx_2016_nidec'), CAR.RIDGELINE: dbc_dict('honda_ridgeline_black_edition_2017_can_generated', 'acura_ilx_2016_nidec'), } + +HONDA_BOSCH = [CAR.ACCORD, CAR.CIVIC_HATCH, CAR.CRV_5G] diff --git a/selfdrive/car/mock/radar_interface.py b/selfdrive/car/mock/radar_interface.py index 7a5c66722a..ec042d1794 100755 --- a/selfdrive/car/mock/radar_interface.py +++ b/selfdrive/car/mock/radar_interface.py @@ -4,7 +4,7 @@ import time class RadarInterface(object): - def __init__(self): + def __init__(self, CP): # radar self.pts = {} self.delay = 0.1 @@ -17,7 +17,7 @@ class RadarInterface(object): return ret if __name__ == "__main__": - RI = RadarInterface() + RI = RadarInterface(None) while 1: ret = RI.update() print(chr(27) + "[2J") diff --git a/selfdrive/common/version.h b/selfdrive/common/version.h index 26eb53448b..4c7e47de8c 100644 --- a/selfdrive/common/version.h +++ b/selfdrive/common/version.h @@ -1 +1 @@ -#define COMMA_VERSION "0.4.7-release" +#define COMMA_VERSION "0.4.7.1-release" diff --git a/selfdrive/controls/lib/alertmanager.py b/selfdrive/controls/lib/alertmanager.py index de4873ed96..319e717cd4 100644 --- a/selfdrive/controls/lib/alertmanager.py +++ b/selfdrive/controls/lib/alertmanager.py @@ -249,7 +249,7 @@ class AlertManager(object): "modelCommIssue": Alert( "TAKE CONTROL IMMEDIATELY", - "Model Error: Restart the Car", + "Model Error: Check Internet Connection", AlertStatus.critical, AlertSize.full, Priority.HIGH, "steerRequired", "chimeRepeated", 1., 3., 4.), @@ -377,7 +377,7 @@ class AlertManager(object): "modelCommIssueNoEntry": Alert( "openpilot Unavailable", - "Model Error: Restart the Car", + "Model Error: Check Internet Connection", AlertStatus.normal, AlertSize.mid, Priority.LOW, None, "chimeDouble", .4, 2., 3.), diff --git a/selfdrive/loggerd/loggerd b/selfdrive/loggerd/loggerd index a34449a595..81aeb2ff3c 100755 Binary files a/selfdrive/loggerd/loggerd and b/selfdrive/loggerd/loggerd differ diff --git a/selfdrive/sensord/gpsd b/selfdrive/sensord/gpsd index ba030423d2..8b02b0fc48 100755 Binary files a/selfdrive/sensord/gpsd and b/selfdrive/sensord/gpsd differ diff --git a/selfdrive/sensord/sensord b/selfdrive/sensord/sensord index 873d0055f5..6109f5d935 100755 Binary files a/selfdrive/sensord/sensord and b/selfdrive/sensord/sensord differ diff --git a/selfdrive/visiond/visiond b/selfdrive/visiond/visiond index 2fdec6e53f..980f082b6c 100755 Binary files a/selfdrive/visiond/visiond and b/selfdrive/visiond/visiond differ