From 0f61fe3a44cc9dbb9c0da30cd93899672eff65ea Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Thu, 10 Oct 2019 21:43:55 +1000 Subject: [PATCH] Fix python3 params.get issue --- selfdrive/car/car_helpers.py | 8 ++++---- selfdrive/car/honda/carcontroller.py | 6 +++--- selfdrive/car/honda/interface.py | 6 +++--- selfdrive/car/toyota/carcontroller.py | 8 ++++---- selfdrive/car/toyota/carstate.py | 2 +- selfdrive/car/toyota/interface.py | 8 ++++---- selfdrive/controls/controlsd.py | 6 +++--- selfdrive/controls/lib/driver_monitor.py | 6 +++--- selfdrive/controls/lib/lane_planner.py | 2 +- selfdrive/dragonpilot/appd/appd.py | 12 ++++++------ selfdrive/dragonpilot/dashcamd/dashcamd.py | 2 +- selfdrive/dragonpilot/shutdownd/shutdownd.py | 2 +- selfdrive/manager.py | 4 ++-- selfdrive/thermald.py | 4 ++-- 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index ff47e8e62..09dc7fa85 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -93,10 +93,10 @@ def fingerprint(logcan, sendcan, has_relay): car_fingerprint = None done = False - if params.get("DragonCacheCar") == "1" and params.get("DragonCachedFP") != "" and params.get("DragonCachedModel") != "": - car_fingerprint = pickle.loads(params.get("DragonCachedModel")) - finger = pickle.loads(params.get("DragonCachedFP")) - vin = pickle.loads(params.get("DragonCachedVIN")) + if params.get("DragonCacheCar", encoding='utf8') == "1" and params.get("DragonCachedFP", encoding='utf8') != "" and params.get("DragonCachedModel", encoding='utf8') != "": + car_fingerprint = pickle.loads(params.get("DragonCachedModel", encoding='utf8')) + finger = pickle.loads(params.get("DragonCachedFP", encoding='utf8')) + vin = pickle.loads(params.get("DragonCachedVIN", encoding='utf8')) done = True while not done: diff --git a/selfdrive/car/honda/carcontroller.py b/selfdrive/car/honda/carcontroller.py index 93e72bcf0..76f4fbbe7 100644 --- a/selfdrive/car/honda/carcontroller.py +++ b/selfdrive/car/honda/carcontroller.py @@ -96,9 +96,9 @@ class CarController(): hud_v_cruise, hud_show_lanes, hud_show_car, hud_alert): # dragonpilot, don't check for param too often as it's a kernel call if frame % 500 == 0: - self.dragon_enable_steering_on_signal = False if params.get("DragonEnableSteeringOnSignal") == "0" else True - self.dragon_allow_gas = False if params.get("DragonAllowGas") == "0" else True - self.dragon_lat_ctrl = False if params.get("DragonLatCtrl") == "0" else True + self.dragon_enable_steering_on_signal = True if params.get("DragonEnableSteeringOnSignal", encoding='utf8') == "1" else False + self.dragon_allow_gas = True if params.get("DragonAllowGas", encoding='utf8') == "1" else False + self.dragon_lat_ctrl = False if params.get("DragonLatCtrl", encoding='utf8') == "0" else True # *** apply brake hysteresis *** brake, self.braking, self.brake_steady = actuator_hystereses(actuators.brake, self.braking, self.brake_steady, CS.v_ego, CS.CP.carFingerprint) diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index d42e87baa..526a12876 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -383,9 +383,9 @@ class CarInterface(CarInterfaceBase): # dragonpilot, don't check for param too often as it's a kernel call ts = sec_since_boot() if ts - self.ts_last_check > 5.: - self.dragon_enable_steering_on_signal = False if params.get("DragonEnableSteeringOnSignal") == "0" else True - self.dragon_allow_gas = False if params.get("DragonAllowGas") == "0" else True - self.dragon_lat_ctrl = False if params.get("DragonLatCtrl") == "0" else True + self.dragon_enable_steering_on_signal = True if params.get("DragonEnableSteeringOnSignal", encoding='utf8') == "1" else True + self.dragon_allow_gas = True if params.get("DragonAllowGas", encoding='utf8') == "1" else False + self.dragon_lat_ctrl = False if params.get("DragonLatCtrl", encoding='utf8') == "0" else True self.ts_last_check = ts # ******************* do can recv ******************* diff --git a/selfdrive/car/toyota/carcontroller.py b/selfdrive/car/toyota/carcontroller.py index aaae0a8ce..b11b719db 100644 --- a/selfdrive/car/toyota/carcontroller.py +++ b/selfdrive/car/toyota/carcontroller.py @@ -129,10 +129,10 @@ class CarController(): right_line, lead, left_lane_depart, right_lane_depart): # dragonpilot, don't check for param too often as it's a kernel call if frame % 500 == 0: - self.dragon_enable_steering_on_signal = False if params.get("DragonEnableSteeringOnSignal") == "0" else True - self.dragon_allow_gas = False if params.get("DragonAllowGas") == "0" else True - self.dragon_lat_ctrl = False if params.get("DragonLatCtrl") == "0" else True - self.dragon_lane_departure_warning = False if params.get("DragonToyotaLaneDepartureWarning") == "0" else True + self.dragon_enable_steering_on_signal = True if params.get("DragonEnableSteeringOnSignal", encoding='utf8') == "1" else False + self.dragon_allow_gas = True if params.get("DragonAllowGas", encoding='utf8') == "1" else False + self.dragon_lat_ctrl = False if params.get("DragonLatCtrl", encoding='utf8') == "0" else True + self.dragon_lane_departure_warning = False if params.get("DragonToyotaLaneDepartureWarning", encoding='utf8') == "0" else True # *** compute control surfaces *** diff --git a/selfdrive/car/toyota/carstate.py b/selfdrive/car/toyota/carstate.py index ba1a0c5b9..c7604417b 100644 --- a/selfdrive/car/toyota/carstate.py +++ b/selfdrive/car/toyota/carstate.py @@ -145,7 +145,7 @@ class CarState(): # dragonpilot, don't check for param too often as it's a kernel call ts = sec_since_boot() if ts - self.ts_last_check > 5.: - self.dragon_toyota_stock_dsu = False if params.get("DragonToyotaStockDSU") == "0" else True + self.dragon_toyota_stock_dsu = True if params.get("DragonToyotaStockDSU", encoding='utf8') == "1" else False self.ts_last_check = ts # update prevs, update must run once per loop diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py index d8c87e54e..278643d80 100755 --- a/selfdrive/car/toyota/interface.py +++ b/selfdrive/car/toyota/interface.py @@ -309,10 +309,10 @@ class CarInterface(CarInterfaceBase): # dragonpilot, don't check for param too often as it's a kernel call ts = sec_since_boot() if ts - self.ts_last_check > 5.: - self.dragon_enable_steering_on_signal = False if params.get("DragonEnableSteeringOnSignal") == "0" else True - self.dragon_allow_gas = False if params.get("DragonAllowGas") == "0" else True - self.dragon_toyota_stock_dsu = True if params.get("DragonToyotaStockDSU") == "1" else False - self.dragon_lat_ctrl = False if params.get("DragonLatCtrl") == "0" else True + self.dragon_enable_steering_on_signal = True if params.get("DragonEnableSteeringOnSignal", encoding='utf8') == "1" else False + self.dragon_allow_gas = True if params.get("DragonAllowGas", encoding='utf8') == "1" else False + self.dragon_toyota_stock_dsu = True if params.get("DragonToyotaStockDSU", encoding='utf8') == "1" else False + self.dragon_lat_ctrl = False if params.get("DragonLatCtrl", encoding='utf8') == "0" else True self.ts_last_check = ts # ******************* do can recv ******************* diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 65bd16b2b..8f220dadc 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -526,9 +526,9 @@ def controlsd_thread(sm=None, pm=None, can_sock=None): # dragonpilot, don't check for param too often as it's a kernel call ts = sec_since_boot() if ts - ts_last_check > 5.: - dragon_toyota_stock_dsu = False if params.get("DragonToyotaStockDSU") == "0" else True - dragon_lat_control = False if params.get("DragonLatCtrl") == "0" else True - dragon_display_steering_limit_alert = False if params.get("DragonDisplaySteeringLimitAlert") == "0" else True + dragon_toyota_stock_dsu = True if params.get("DragonToyotaStockDSU", encoding='utf8') == "1" else False + dragon_lat_control = False if params.get("DragonLatCtrl", encoding='utf8') == "0" else True + dragon_display_steering_limit_alert = False if params.get("DragonDisplaySteeringLimitAlert", encoding='utf8') == "0" else True ts_last_check = ts start_time = sec_since_boot() diff --git a/selfdrive/controls/lib/driver_monitor.py b/selfdrive/controls/lib/driver_monitor.py index 3e8b1f712..13a6f8a76 100644 --- a/selfdrive/controls/lib/driver_monitor.py +++ b/selfdrive/controls/lib/driver_monitor.py @@ -97,10 +97,10 @@ class DriverStatus(): self.is_rhd_region_checked = False # dragonpilot - self.awareness_time = float(params.get("DragonSteeringMonitorTimer")) + self.awareness_time = float(params.get("DragonSteeringMonitorTimer", encoding='utf8')) self.awareness_time = 86400 if self.awareness_time <= 0. else self.awareness_time * 60. - self.dragon_enable_driver_safety_check = False if params.get("DragonEnableDriverSafetyCheck") == "0" else True - self.dragon_enable_driver_monitoring = False if params.get("DragonEnableDriverMonitoring") == "0" else True + self.dragon_enable_driver_safety_check = False if params.get("DragonEnableDriverSafetyCheck", encoding='utf8') == "0" else True + self.dragon_enable_driver_monitoring = False if params.get("DragonEnableDriverMonitoring", encoding='utf8') == "0" else True self._set_timers(active_monitoring=True) diff --git a/selfdrive/controls/lib/lane_planner.py b/selfdrive/controls/lib/lane_planner.py index d8effd06d..3582a6e64 100644 --- a/selfdrive/controls/lib/lane_planner.py +++ b/selfdrive/controls/lib/lane_planner.py @@ -70,7 +70,7 @@ class LanePlanner(): def update_lane(self, v_ego): ts = sec_since_boot() if ts - self.ts_last_check > 5.: - self.camera_offset = int(params.get("DragonCameraOffset")) * 0.01 + self.camera_offset = int(params.get("DragonCameraOffset", encoding='utf8')) * 0.01 self.ts_last_check = ts # only offset left and right lane lines; offsetting p_poly does not make sense self.l_poly[3] += self.camera_offset diff --git a/selfdrive/dragonpilot/appd/appd.py b/selfdrive/dragonpilot/appd/appd.py index 492e8a68f..79b46a7f0 100644 --- a/selfdrive/dragonpilot/appd/appd.py +++ b/selfdrive/dragonpilot/appd/appd.py @@ -27,12 +27,12 @@ gpsservice_main = "cn.dragonpilot.gpsservice.MainService" def main(gctx=None): - dragon_enable_tomtom = True if params.get('DragonEnableTomTom') == "1" else False - dragon_enable_autonavi = True if params.get('DragonEnableAutonavi') == "1" else False - dragon_enable_mixplorer = True if params.get('DragonEnableMixplorer') == "1" else False - dragon_boot_tomtom = True if params.get("DragonBootTomTom") == "1" else False - dragon_boot_autonavi = True if params.get("DragonBootAutonavi") == "1" else False - dragon_greypanda_mode = True if params.get("DragonGreyPandaMode") == "1" else False + dragon_enable_tomtom = True if params.get('DragonEnableTomTom', encoding='utf8') == "1" else False + dragon_enable_autonavi = True if params.get('DragonEnableAutonavi', encoding='utf8') == "1" else False + dragon_enable_mixplorer = True if params.get('DragonEnableMixplorer', encoding='utf8') == "1" else False + dragon_boot_tomtom = True if params.get("DragonBootTomTom", encoding='utf8') == "1" else False + dragon_boot_autonavi = True if params.get("DragonBootAutonavi", encoding='utf8') == "1" else False + dragon_greypanda_mode = True if params.get("DragonGreyPandaMode", encoding='utf8') == "1" else False dragon_grepanda_mode_started = False tomtom_is_running = False autonavi_is_running = False diff --git a/selfdrive/dragonpilot/dashcamd/dashcamd.py b/selfdrive/dragonpilot/dashcamd/dashcamd.py index a476d5ded..a72a58ac9 100644 --- a/selfdrive/dragonpilot/dashcamd/dashcamd.py +++ b/selfdrive/dragonpilot/dashcamd/dashcamd.py @@ -30,7 +30,7 @@ def main(gctx=None): thermal_sock = messaging.sub_sock(service_list['thermal'].port) while 1: - if params.get("DragonEnableDashcam") == "1": + if params.get("DragonEnableDashcam", encoding='utf8') == "1": now = datetime.datetime.now() file_name = now.strftime("%Y-%m-%d_%H-%M-%S") os.system("screenrecord --bit-rate %s --time-limit %s %s%s.mp4 &" % (bit_rates, duration, dashcam_videos, file_name)) diff --git a/selfdrive/dragonpilot/shutdownd/shutdownd.py b/selfdrive/dragonpilot/shutdownd/shutdownd.py index d5e634361..3da78fe4a 100644 --- a/selfdrive/dragonpilot/shutdownd/shutdownd.py +++ b/selfdrive/dragonpilot/shutdownd/shutdownd.py @@ -37,7 +37,7 @@ def main(gctx=None): time.sleep(1) def get_shutdown_val(): - val = params.get("DragonAutoShutdownAt") + val = params.get("DragonAutoShutdownAt", encoding='utf8') if val is None: return None else: diff --git a/selfdrive/manager.py b/selfdrive/manager.py index cbc3023dc..6cbea6540 100755 --- a/selfdrive/manager.py +++ b/selfdrive/manager.py @@ -550,11 +550,11 @@ def main(): if os.getenv("PREPAREONLY") is not None: return - if params.get("DragonEnableLogger") == "0": + if params.get("DragonEnableLogger", encoding='utf8') == "0": del managed_processes['loggerd'] del managed_processes['tombstoned'] - if params.get("DragonEnableUploader") == "0": + if params.get("DragonEnableUploader", encoding='utf8') == "0": del managed_processes['uploader'] # SystemExit on sigterm diff --git a/selfdrive/thermald.py b/selfdrive/thermald.py index 9642ef3c4..a7674f1b8 100755 --- a/selfdrive/thermald.py +++ b/selfdrive/thermald.py @@ -96,7 +96,7 @@ _TEMP_THRS_L = [42.5, 57.5, 72.5, 10000] _FAN_SPEEDS = [0, 16384, 32768, 65535] # max fan speed only allowed if battery is hot _BAT_TEMP_THERSHOLD = 45. -if params.get('DragonNoctuaMode') == "1": +if params.get('DragonNoctuaMode', encoding='utf8') == "1": _FAN_SPEEDS = [65535, 65535, 65535, 65535] _BAT_TEMP_THERSHOLD = 20. @@ -153,7 +153,7 @@ def thermald_thread(): ts_last_charging_ctrl = 0. ip_addr = '255.255.255.255' - dragon_charging_ctrl = True if params.get('DragonChargingCtrl') == "1" else False + dragon_charging_ctrl = True if params.get('DragonChargingCtrl', encoding='utf8') == "1" else False dragon_charging_max = int(params.get('DragonCharging')) dragon_discharging_min = int(params.get('DragonDisCharging')) charging_disabled = False