Merge pull request #669 from martinl/feature_subaru_lane_lines

Add lane lines visible indicators to Subaru dash display
old-commit-hash: 64a6e9776c

selfdrive/car/subaru/carcontroller.py

@@ -36,7 +36,7 @@ class CarController(object):
     print(DBC)
     self.packer = CANPacker(DBC[car_fingerprint]['pt'])
 
-  def update(self, sendcan, enabled, CS, frame, actuators, pcm_cancel_cmd, visual_alert):
+  def update(self, sendcan, enabled, CS, frame, actuators, pcm_cancel_cmd, visual_alert, left_line, right_line):
     """ Controls thread """
 
     P = self.params
@@ -70,7 +70,7 @@ class CarController(object):
       self.es_distance_cnt = CS.es_distance_msg["Counter"]
 
     if self.es_lkas_cnt != CS.es_lkas_msg["Counter"]:
-      can_sends.append(subarucan.create_es_lkas(self.packer, CS.es_lkas_msg, visual_alert))
+      can_sends.append(subarucan.create_es_lkas(self.packer, CS.es_lkas_msg, visual_alert, left_line, right_line))
       self.es_lkas_cnt = CS.es_lkas_msg["Counter"]
 
     sendcan.send(can_list_to_can_capnp(can_sends, msgtype='sendcan'))

selfdrive/car/subaru/interface.py

@@ -217,5 +217,6 @@ class CarInterface(object):
 
   def apply(self, c):
     self.CC.update(self.sendcan, c.enabled, self.CS, self.frame, c.actuators,
-                   c.cruiseControl.cancel, c.hudControl.visualAlert)
+                   c.cruiseControl.cancel, c.hudControl.visualAlert,
+                   c.hudControl.leftLaneVisible, c.hudControl.rightLaneVisible)
     self.frame += 1

selfdrive/car/subaru/subarucan.py

@@ -43,12 +43,15 @@ def create_es_distance(packer, es_distance_msg, pcm_cancel_cmd):
 
   return packer.make_can_msg("ES_Distance", 0, values)
 
-def create_es_lkas(packer, es_lkas_msg, visual_alert):
+def create_es_lkas(packer, es_lkas_msg, visual_alert, left_line, right_line):
 
   values = copy.copy(es_lkas_msg)
   if visual_alert == VisualAlert.steerRequired:
     values["Keep_Hands_On_Wheel"] = 1
 
+  values["LKAS_Left_Line_Visible"] = int(left_line)
+  values["LKAS_Right_Line_Visible"] = int(right_line)
+
   values["Checksum"] = subaru_checksum(packer, values, 802)
 
   return packer.make_can_msg("ES_LKAS_State", 0, values)