delete unused lines

old-commit-hash: 10ae22a192
commatwo_master
Adeeb Shihadeh 5 years ago
parent 53fc3f1e7e
commit bd980f6048
  1. 1
      release/remote_build.py
  2. 12
      selfdrive/controls/lib/vehicle_model.py
  3. 8
      tools/sim/lib/can.py

@ -46,7 +46,6 @@ def start_build(name):
conn.send("echo \"git took $SECONDS seconds\"\n") conn.send("echo \"git took $SECONDS seconds\"\n")
push = "PUSH=master-ci" if branch == "master" else "" push = "PUSH=master-ci" if branch == "master" else ""
#comma_jwt = "COMMA_JWT=" + os.getenv('COMMA_JWT', '')
conn.send("%s /data/openpilot_source/release/build_devel.sh\n" % push) conn.send("%s /data/openpilot_source/release/build_devel.sh\n" % push)
conn.send('echo "RESULT:" $?\n') conn.send('echo "RESULT:" $?\n')

@ -195,15 +195,3 @@ class VehicleModel():
""" """
return self.calc_curvature(sa, u) * u return self.calc_curvature(sa, u) * u
if __name__ == '__main__':
"""
import math
from selfdrive.car.honda.interface import CarInterface
from selfdrive.car.honda.values import CAR
CP = CarInterface.get_params(CAR.CIVIC)
VM = VehicleModel(CP)
print(VM.yaw_rate(math.radians(20), 10.))
"""
pass

@ -1,6 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import cereal.messaging as messaging import cereal.messaging as messaging
#from opendbc.can.parser import CANParser
from opendbc.can.packer import CANPacker from opendbc.can.packer import CANPacker
from selfdrive.boardd.boardd_api_impl import can_list_to_can_capnp from selfdrive.boardd.boardd_api_impl import can_list_to_can_capnp
from selfdrive.car.honda.values import FINGERPRINTS, CAR from selfdrive.car.honda.values import FINGERPRINTS, CAR
@ -9,7 +8,6 @@ import math
from selfdrive.test.longitudinal_maneuvers.plant import get_car_can_parser from selfdrive.test.longitudinal_maneuvers.plant import get_car_can_parser
cp = get_car_can_parser() cp = get_car_can_parser()
#cp = CANParser("honda_civic_touring_2016_can_generated")
packer = CANPacker("honda_civic_touring_2016_can_generated") packer = CANPacker("honda_civic_touring_2016_can_generated")
rpacker = CANPacker("acura_ilx_2016_nidec") rpacker = CANPacker("acura_ilx_2016_nidec")
@ -77,17 +75,17 @@ def sendcan_function(sendcan):
if cp.vl[0x1fa]['COMPUTER_BRAKE_REQUEST']: if cp.vl[0x1fa]['COMPUTER_BRAKE_REQUEST']:
brake = cp.vl[0x1fa]['COMPUTER_BRAKE'] * 0.003906248 brake = cp.vl[0x1fa]['COMPUTER_BRAKE'] * 0.003906248
else: else:
brake = 0.0 brake = 0.0
if cp.vl[0x200]['GAS_COMMAND'] > 0: if cp.vl[0x200]['GAS_COMMAND'] > 0:
gas = cp.vl[0x200]['GAS_COMMAND'] / 256.0 gas = cp.vl[0x200]['GAS_COMMAND'] / 256.0
else: else:
gas = 0.0 gas = 0.0
if cp.vl[0xe4]['STEER_TORQUE_REQUEST']: if cp.vl[0xe4]['STEER_TORQUE_REQUEST']:
steer_torque = cp.vl[0xe4]['STEER_TORQUE']*1.0/0x1000 steer_torque = cp.vl[0xe4]['STEER_TORQUE']*1.0/0x1000
else: else:
steer_torque = 0.0 steer_torque = 0.0
return (gas, brake, steer_torque) return (gas, brake, steer_torque)

Loading…
Cancel
Save