diff --git a/__init__.py b/__init__.py index f93f7314..6b2d73a8 100644 --- a/__init__.py +++ b/__init__.py @@ -2,7 +2,8 @@ # pylint: skip-file from .python import Panda, PandaDFU, flash_release, \ BASEDIR, ensure_st_up_to_date, PandaSerial, pack_can_buffer, unpack_can_buffer, \ - DEFAULT_FW_FN, DEFAULT_H7_FW_FN, MCU_TYPE_H7, MCU_TYPE_F4, DLC_TO_LEN, LEN_TO_DLC + DEFAULT_FW_FN, DEFAULT_H7_FW_FN, MCU_TYPE_H7, MCU_TYPE_F4, DLC_TO_LEN, LEN_TO_DLC, \ + ALTERNATIVE_EXPERIENCE from .python.config import BOOTSTUB_ADDRESS, BLOCK_SIZE_FX, APP_ADDRESS_FX, \ BLOCK_SIZE_H7, APP_ADDRESS_H7, DEVICE_SERIAL_NUMBER_ADDR_H7, \ diff --git a/python/__init__.py b/python/__init__.py index fb1d24a8..cc8207d1 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -114,6 +114,12 @@ def ensure_can_packet_version(fn): return fn(self, *args, **kwargs) return wrapper +class ALTERNATIVE_EXPERIENCE: + DEFAULT = 0 + DISABLE_DISENGAGE_ON_GAS = 1 + DISABLE_STOCK_AEB = 2 + RAISE_LONGITUDINAL_LIMITS_TO_ISO_MAX = 8 + class Panda(object): # matches cereal.car.CarParams.SafetyModel diff --git a/tests/safety/common.py b/tests/safety/common.py index 591d334c..6d4d51e6 100644 --- a/tests/safety/common.py +++ b/tests/safety/common.py @@ -5,17 +5,11 @@ import importlib import numpy as np from typing import Optional, List, Dict from opendbc.can.packer import CANPacker # pylint: disable=import-error -from panda import LEN_TO_DLC +from panda import ALTERNATIVE_EXPERIENCE, LEN_TO_DLC from panda.tests.safety import libpandasafety_py MAX_WRONG_COUNTERS = 5 -class ALTERNATIVE_EXPERIENCE: - DEFAULT = 0 - DISABLE_DISENGAGE_ON_GAS = 1 - DISABLE_STOCK_AEB = 2 - RAISE_LONGITUDINAL_LIMITS_TO_ISO_MAX = 8 - def package_can_msg(msg): addr, _, dat, bus = msg ret = libpandasafety_py.ffi.new('CANPacket_t *')