Skip to content

Commit

Permalink
Merge pull request commaai#185 from arne182/CrumResearch2
Browse files Browse the repository at this point in the history 
Crum research2
  • Loading branch information
@arne182
arne182 authored Apr 7, 2019
2 parents 788824c + a9dd34f commit d5f2bc4
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 11 deletions.
16 changes: 13 additions & 3 deletions selfdrive/car/chrysler/carstate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def get_camera_parser(CP):

class CarState(object):
def __init__(self, CP):
self.alcaLabels = ["MadMax","Normal","Wifey"]
self.alcaLabels = ["MadMax","Normal","Wifey","off"]
self.alcaMode = 2 # default to wifey on startup
self.prev_distance_button = 0
self.distance_button = 0
Expand Down Expand Up @@ -169,16 +169,25 @@ def update_ui_buttons(self,id,btn_status):
if self.cstm_btns.btns[id].btn_status > 0:
if (id == 1) and (btn_status == 0) and self.cstm_btns.btns[id].btn_name=="alca":
if self.cstm_btns.btns[id].btn_label2 == self.alcaLabels[self.alcaMode]:
self.alcaMode = (self.alcaMode + 1 ) % 3
self.alcaMode = (self.alcaMode + 1 ) % 4
else:
self.alcaMode = 0
self.cstm_btns.btns[id].btn_label2 = self.alcaLabels[self.alcaMode]
self.cstm_btns.hasChanges = True
if self.alcaMode == 3:
self.cstm_btns.set_button_status("alca", 0)

else:
self.cstm_btns.btns[id].btn_status = btn_status * self.cstm_btns.btns[id].btn_status
else:
self.cstm_btns.btns[id].btn_status = btn_status

if (id == 1) and self.cstm_btns.btns[id].btn_name=="alca":
self.alcaMode = (self.alcaMode + 1 ) % 4
self.kegman.conf['lastALCAMode'] = str(self.alcaMode) # write last ALCAMode setting to file
self.kegman.write_config(self.kegman.conf)
self.cstm_btns.btns[id].btn_label2 = self.alcaLabels[self.alcaMode]
self.cstm_btns.hasChanges = True

def update(self, cp, cp_cam):
# copy can_valid
self.can_valid = cp.can_valid
Expand Down Expand Up @@ -240,3 +249,4 @@ def update(self, cp, cp_cam):
self.lkas_counter = cp_cam.vl["LKAS_COMMAND"]['COUNTER']
self.lkas_car_model = cp_cam.vl["LKAS_HUD"]['CAR_MODEL']
self.lkas_status_ok = cp_cam.vl["LKAS_HEARTBIT"]['LKAS_STATUS_OK']

12 changes: 10 additions & 2 deletions selfdrive/car/gm/carstate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def __init__(self, CP, canbus):
self.kegman = kegman_conf()
self.CP = CP
# initialize can parser
self.alcaLabels = ["MadMax","Normal","Wifey"]
self.alcaLabels = ["MadMax","Normal","Wifey","off"]
self.alcaMode = int(self.kegman.conf['lastALCAMode']) # default to last ALCAmode on startup
self.car_fingerprint = CP.carFingerprint
self.cruise_buttons = CruiseButtons.UNPRESS
Expand Down Expand Up @@ -150,7 +150,7 @@ def update_ui_buttons(self,id,btn_status):
if self.cstm_btns.btns[id].btn_status > 0:
if (id == 1) and (btn_status == 0) and self.cstm_btns.btns[id].btn_name=="alca":
if self.cstm_btns.btns[id].btn_label2 == self.alcaLabels[self.alcaMode]:
self.alcaMode = (self.alcaMode + 1 ) % 3
self.alcaMode = (self.alcaMode + 1 ) % 4
self.kegman.conf['lastALCAMode'] = str(self.alcaMode) # write last distance bar setting to file
self.kegman.write_config(self.kegman.conf)
else:
Expand All @@ -159,10 +159,18 @@ def update_ui_buttons(self,id,btn_status):
self.kegman.write_config(self.kegman.conf)
self.cstm_btns.btns[id].btn_label2 = self.alcaLabels[self.alcaMode]
self.cstm_btns.hasChanges = True
if self.alcaMode == 3:
self.cstm_btns.set_button_status("alca", 0)
else:
self.cstm_btns.btns[id].btn_status = btn_status * self.cstm_btns.btns[id].btn_status
else:
self.cstm_btns.btns[id].btn_status = btn_status
if (id == 1) and self.cstm_btns.btns[id].btn_name=="alca":
self.alcaMode = (self.alcaMode + 1 ) % 4
self.kegman.conf['lastALCAMode'] = str(self.alcaMode) # write last ALCAMode setting to file
self.kegman.write_config(self.kegman.conf)
self.cstm_btns.btns[id].btn_label2 = self.alcaLabels[self.alcaMode]
self.cstm_btns.hasChanges = True

def update(self, pt_cp):

Expand Down
16 changes: 12 additions & 4 deletions selfdrive/car/honda/carstate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@ def __init__(self, CP):
self.Angle_Speed = [255,160,100,80,70,60,55,50,40,30,20,10,5]
self.blind_spot_on = bool(0)
#labels for ALCA modes
self.alcaLabels = ["MadMax","Normal","Wifey"]
self.alcaLabels = ["MadMax","Normal","Wifey","off"]
self.trLabels = ["0.9","dyn","2.7"]
self.alcaMode = int(self.kegman.conf['lastALCAMode']) # default to last ALCA Mode on startup
if self.alcaMode > 2:
self.alcaMode = 2
if self.alcaMode > 3:
self.alcaMode = 3
self.kegman.conf['lastALCAMode'] = str(self.alcaMode) # write last distance bar setting to file
self.kegman.write_config(self.kegman.conf)
self.trMode = int(self.kegman.conf['lastTrMode']) # default to last distance interval on startup
Expand Down Expand Up @@ -260,7 +260,7 @@ def update_ui_buttons(self,id,btn_status):
if self.cstm_btns.btns[id].btn_status > 0:
if (id == 0) and (btn_status == 0) and self.cstm_btns.btns[id].btn_name=="alca":
if self.cstm_btns.btns[id].btn_label2 == self.alcaLabels[self.alcaMode]:
self.alcaMode = (self.alcaMode + 1 ) % 3
self.alcaMode = (self.alcaMode + 1 ) % 4
self.kegman.conf['lastALCAMode'] = str(self.alcaMode) # write last distance bar setting to file
self.kegman.write_config(self.kegman.conf)
else:
Expand All @@ -269,6 +269,8 @@ def update_ui_buttons(self,id,btn_status):
self.kegman.write_config(self.kegman.conf)
self.cstm_btns.btns[id].btn_label2 = self.alcaLabels[self.alcaMode]
self.cstm_btns.hasChanges = True
if self.alcaMode == 3:
self.cstm_btns.set_button_status("alca", 0)

elif (id == 4) and (btn_status == 0) and self.cstm_btns.btns[id].btn_name=="tr":
if self.cstm_btns.btns[id].btn_label2 == self.trLabels[self.trMode]:
Expand All @@ -286,6 +288,12 @@ def update_ui_buttons(self,id,btn_status):
self.cstm_btns.btns[id].btn_status = btn_status * self.cstm_btns.btns[id].btn_status
else:
self.cstm_btns.btns[id].btn_status = btn_status
if (id == 0) and self.cstm_btns.btns[id].btn_name=="alca":
self.alcaMode = (self.alcaMode + 1 ) % 4
self.kegman.conf['lastALCAMode'] = str(self.alcaMode) # write last ALCAMode setting to file
self.kegman.write_config(self.kegman.conf)
self.cstm_btns.btns[id].btn_label2 = self.alcaLabels[self.alcaMode]
self.cstm_btns.hasChanges = True

def update(self, cp, cp_cam):

Expand Down
13 changes: 11 additions & 2 deletions selfdrive/car/toyota/carstate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def __init__(self, CP):
self.gasMode = 0
self.gasLabels = ["normal","sport","eco"]
#labelslabels for ALCA modes
self.alcaLabels = ["MadMax","Normal","Wifey"]
self.alcaLabels = ["MadMax","Normal","Wifey","off"]
self.alcaMode = int(self.kegman.conf['lastALCAMode']) # default to last ALCAmode on startup
#if (CP.carFingerprint == CAR.MODELS):
# ALCA PARAMS
Expand Down Expand Up @@ -253,14 +253,17 @@ def update_ui_buttons(self,id,btn_status):
if self.cstm_btns.btns[id].btn_status > 0:
if (id == 1) and (btn_status == 0) and self.cstm_btns.btns[id].btn_name=="alca":
if self.cstm_btns.btns[id].btn_label2 == self.alcaLabels[self.alcaMode]:
self.alcaMode = (self.alcaMode + 1 ) % 3
self.alcaMode = (self.alcaMode + 1 ) % 4
self.kegman.conf['lastALCAMode'] = str(self.alcaMode) # write last ALCAMode setting to file
self.kegman.write_config(self.kegman.conf)
else:
self.alcaMode = 0
self.kegman.conf['lastALCAMode'] = str(self.alcaMode) # write last ALCAMode setting to file
self.kegman.write_config(self.kegman.conf)
self.cstm_btns.btns[id].btn_label2 = self.alcaLabels[self.alcaMode]
self.cstm_btns.hasChanges = True
if self.alcaMode == 3:
self.cstm_btns.set_button_status("alca", 0)
elif (id == 5) and (btn_status == 0) and self.cstm_btns.btns[id].btn_name=="gas":
if self.cstm_btns.btns[id].btn_label2 == self.gasLabels[self.gasMode]:
self.gasMode = (self.gasMode + 1 ) % 3
Expand All @@ -272,6 +275,12 @@ def update_ui_buttons(self,id,btn_status):
self.cstm_btns.btns[id].btn_status = btn_status * self.cstm_btns.btns[id].btn_status
else:
self.cstm_btns.btns[id].btn_status = btn_status
if (id == 1) and self.cstm_btns.btns[id].btn_name=="alca":
self.alcaMode = (self.alcaMode + 1 ) % 4
self.kegman.conf['lastALCAMode'] = str(self.alcaMode) # write last ALCAMode setting to file
self.kegman.write_config(self.kegman.conf)
self.cstm_btns.btns[id].btn_label2 = self.alcaLabels[self.alcaMode]
self.cstm_btns.hasChanges = True

def update(self, cp, cp_cam):
# copy can_valid
Expand Down

0 comments on commit d5f2bc4

Please # to comment.