Merge branch 'devel-en' into devel-zhs

This commit is contained in:
dragonpilot
2019-09-14 18:20:34 +10:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -71,7 +71,7 @@ def get_can_parser(CP):
]
else:
signals += [
("AUTO_HIGH_BEAM", "LIGHT_STALK_ISH", 0),
("AUTO_HIGH_BEAM", "LIGHT_STALK", 0),
("GAS_PEDAL", "GAS_PEDAL", 0),
]
checks += [
+1 -1
View File
@@ -29,7 +29,7 @@ def calc_d_poly(l_poly, r_poly, p_poly, l_prob, r_prob, lane_width):
path_from_right_lane = r_poly.copy()
path_from_right_lane[3] += lane_width / 2.0
lr_prob = l_prob * r_prob
lr_prob = l_prob + r_prob - l_prob * r_prob
d_poly_lane = (l_prob * path_from_left_lane + r_prob * path_from_right_lane) / (l_prob + r_prob + 0.0001)
return lr_prob * d_poly_lane + (1.0 - lr_prob) * p_poly
@@ -1 +1 @@
8a11bcbc9833e154e10b59a8babb2b4545372f56
9124fa5837ead9b74d97aef85897478a5e8b92d2