diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py index 959b392e1..25ea32cb8 100644 --- a/selfdrive/car/honda/values.py +++ b/selfdrive/car/honda/values.py @@ -79,8 +79,8 @@ FINGERPRINTS = { 57: 3, 148: 8, 228: 5, 304: 8, 330: 8, 344: 8, 380: 8, 399: 7, 401: 8, 420: 8, 427: 3, 428: 8, 432: 7, 450: 8, 464: 8, 470: 2, 476: 7, 487: 4, 490: 8, 493: 5, 506: 8, 512: 6, 513: 6, 545: 6, 597: 8, 662: 4, 773: 7, 777: 8, 780: 8, 795: 8, 800: 8, 804: 8, 806: 8, 808: 8, 829: 5, 862: 8, 884: 8, 891: 8, 892: 8, 927: 8, 929: 8, 985: 3, 1024: 5, 1027: 5, 1029: 8, 1036: 8, 1039: 8, 1108: 8, 1302: 8, 1322: 5, 1361: 5, 1365: 5, 1424: 5, 1633: 8, }], CAR.CIVIC_BOSCH: [{ - # 2017 Civic Hatchback EX and 2019 Civic Sedan Touring Canadian - 57: 3, 148: 8, 228: 5, 304: 8, 330: 8, 344: 8, 380: 8, 399: 7, 401: 8, 420: 8, 427: 3, 428: 8, 432: 7, 441: 5, 450: 8, 464: 8, 470: 2, 476: 7, 477: 8, 479: 8, 490: 8, 493: 5, 495: 8, 506: 8, 545: 6, 597: 8, 662: 4, 773: 7, 777: 8, 780: 8, 795: 8, 800: 8, 804: 8, 806: 8, 808: 8, 829: 5, 862: 8, 884: 8, 891: 8, 892: 8, 927: 8, 929: 8, 985: 3, 1024: 5, 1027: 5, 1029: 8, 1036: 8, 1039: 8, 1108: 8, 1302: 8, 1322: 5, 1361: 5, 1365: 5, 1424: 5, 1600: 5, 1601: 8, 1633: 8, + # 2017 Civic Hatchback EX, 2019 Civic Sedan Touring Canadian, and 2018 Civic Hatchback Executive Premium 1.0L CVT European + 57: 3, 148: 8, 228: 5, 304: 8, 330: 8, 344: 8, 380: 8, 399: 7, 401: 8, 420: 8, 427: 3, 428: 8, 432: 7, 441: 5, 450: 8, 460: 3, 464: 8, 470: 2, 476: 7, 477: 8, 479: 8, 490: 8, 493: 5, 495: 8, 506: 8, 545: 6, 597: 8, 662: 4, 773: 7, 777: 8, 780: 8, 795: 8, 800: 8, 804: 8, 806: 8, 808: 8, 829: 5, 862: 8, 884: 8, 891: 8, 892: 8, 927: 8, 929: 8, 985: 3, 1024: 5, 1027: 5, 1029: 8, 1036: 8, 1039: 8, 1108: 8, 1302: 8, 1322: 5, 1361: 5, 1365: 5, 1424: 5, 1600: 5, 1601: 8, 1625: 5, 1629: 5, 1633: 8, }], CAR.CRV: [{ 57: 3, 145: 8, 316: 8, 340: 8, 342: 6, 344: 8, 380: 8, 398: 3, 399: 6, 401: 8, 404: 4, 420: 8, 422: 8, 426: 8, 432: 7, 464: 8, 474: 5, 476: 4, 487: 4, 490: 8, 493: 3, 506: 8, 507: 1, 512: 6, 513: 6, 542: 7, 545: 4, 597: 8, 660: 8, 661: 4, 773: 7, 777: 8, 780: 8, 800: 8, 804: 8, 808: 8, 829: 5, 882: 2, 884: 7, 888: 8, 891: 8, 892: 8, 923: 2, 929: 8, 983: 8, 985: 3, 1024: 5, 1027: 5, 1029: 8, 1033: 5, 1036: 8, 1039: 8, 1057: 5, 1064: 7, 1108: 8, 1125: 8, 1296: 8, 1365: 5, 1424: 5, 1600: 5, 1601: 8, diff --git a/selfdrive/controls/lib/curvature_learner.py b/selfdrive/controls/lib/curvature_learner.py deleted file mode 100644 index 22f71b65f..000000000 --- a/selfdrive/controls/lib/curvature_learner.py +++ /dev/null @@ -1,64 +0,0 @@ -from numpy import clip -import pickle -import csv -import os - -# HOW TO -# import this module to where you want to use it, such as from ```selfdrive.controls.lib.curvature_learner import CurvatureLearner``` -# create the object ```self.curvature_offset = CurvatureLearner(debug=False)``` -# call the update method ```self.curvature_offset.update(angle_steers - angle_offset, self.LP.d_poly)``` -# The learned curvature offsets will save and load automatically -# If you still need help, check out how I have it implemented in the devel_curvaturefactorlearner branch -# by Zorrobyte -# version 4 - -class CurvatureLearner: - def __init__(self, debug=False): - self.offset = 0. - self.learning_rate = 12000 - self.frame = 0 - self.debug = debug - try: - self.learned_offsets = pickle.load(open("/data/curvaturev4.p", "rb")) - except (OSError, IOError): - self.learned_offsets = { - "center": 0., - "inner": 0., - "outer": 0. - } - pickle.dump(self.learned_offsets, open("/data/curvaturev4.p", "wb")) - os.chmod("/data/curvaturev4.p", 0o777) - - def update(self, angle_steers=0., d_poly=None, v_ego=0.): - if angle_steers > 0.1: - if abs(angle_steers) < 2.: - self.learned_offsets["center"] -= d_poly[3] / self.learning_rate - self.offset = self.learned_offsets["center"] - elif 2. < abs(angle_steers) < 5.: - self.learned_offsets["inner"] -= d_poly[3] / self.learning_rate - self.offset = self.learned_offsets["inner"] - elif abs(angle_steers) > 5.: - self.learned_offsets["outer"] -= d_poly[3] / self.learning_rate - self.offset = self.learned_offsets["outer"] - elif angle_steers < -0.1: - if abs(angle_steers) < 2.: - self.learned_offsets["center"] += d_poly[3] / self.learning_rate - self.offset = self.learned_offsets["center"] - elif 2. < abs(angle_steers) < 5.: - self.learned_offsets["inner"] += d_poly[3] / self.learning_rate - self.offset = self.learned_offsets["inner"] - elif abs(angle_steers) > 5.: - self.learned_offsets["outer"] += d_poly[3] / self.learning_rate - self.offset = self.learned_offsets["outer"] - - self.offset = clip(self.offset, -0.3, 0.3) - self.frame += 1 - - if self.frame == 12000: # every 2 mins - pickle.dump(self.learned_offsets, open("/data/curvaturev4.p", "wb")) - self.frame = 0 - if self.debug: - with open('/data/curvdebug.csv', 'a') as csv_file: - csv_file_writer = csv.writer(csv_file, delimiter=',', quotechar='"', quoting=csv.QUOTE_MINIMAL) - csv_file_writer.writerow([self.learned_offsets, v_ego]) - return self.offset diff --git a/selfdrive/controls/lib/pathplanner.py b/selfdrive/controls/lib/pathplanner.py index d73ec9e3b..0ca9e694f 100644 --- a/selfdrive/controls/lib/pathplanner.py +++ b/selfdrive/controls/lib/pathplanner.py @@ -9,7 +9,6 @@ from selfdrive.controls.lib.lateral_mpc import libmpc_py from selfdrive.controls.lib.drive_helpers import MPC_COST_LAT from selfdrive.controls.lib.lane_planner import LanePlanner import selfdrive.messaging as messaging -from selfdrive.controls.lib.curvature_learner import CurvatureLearner LOG_MPC = os.environ.get('LOG_MPC', False) @@ -30,7 +29,6 @@ class PathPlanner(object): self.setup_mpc(CP.steerRateCost) self.solution_invalid_cnt = 0 self.path_offset_i = 0.0 - self.curvature_offset = CurvatureLearner(debug=False) def setup_mpc(self, steer_rate_cost): self.libmpc = libmpc_py.libmpc @@ -60,13 +58,7 @@ class PathPlanner(object): # Run MPC self.angle_steers_des_prev = self.angle_steers_des_mpc VM.update_params(sm['liveParameters'].stiffnessFactor, sm['liveParameters'].steerRatio) - #curvature_factor = VM.curvature_factor(v_ego) - if active: - curvfac = self.curvature_offset.update(angle_steers - angle_offset, self.LP.d_poly, v_ego) - else: - curvfac = 0. - - curvature_factor = VM.curvature_factor(v_ego) + curvfac + curvature_factor = VM.curvature_factor(v_ego) # TODO: Check for active, override, and saturation # if active: