diff --git a/cereal/log.capnp b/cereal/log.capnp index 258c1f7ab4..d6629206b3 100644 --- a/cereal/log.capnp +++ b/cereal/log.capnp @@ -2407,7 +2407,6 @@ struct Event { uiDebug @102 :UIDebug; # *********** debug *********** - testJoystick @52 :Joystick; roadEncodeData @86 :EncodeData; driverEncodeData @87 :EncodeData; wideRoadEncodeData @88 :EncodeData; @@ -2476,5 +2475,6 @@ struct Event { uiPlanDEPRECATED @106 :UiPlan; liveLocationKalmanDEPRECATED @72 :LiveLocationKalman; liveTracksDEPRECATED @16 :List(LiveTracksDEPRECATED); + testJoystickDEPRECATED @52 :Joystick; } } diff --git a/cereal/services.py b/cereal/services.py index 926461aec2..e47ddc6c3f 100755 --- a/cereal/services.py +++ b/cereal/services.py @@ -75,7 +75,6 @@ _services: dict[str, tuple] = { # debug "uiDebug": (True, 0., 1), - "testJoystick": (True, 0.), "roadEncodeData": (False, 20.), "driverEncodeData": (False, 20.), "wideRoadEncodeData": (False, 20.), diff --git a/system/webrtc/tests/test_stream_session.py b/system/webrtc/tests/test_stream_session.py index 113fa5e7e6..6683c65804 100644 --- a/system/webrtc/tests/test_stream_session.py +++ b/system/webrtc/tests/test_stream_session.py @@ -50,7 +50,7 @@ class TestStreamSession: tested_msgs = [ {"type": "customReservedRawData0", "data": "test"}, # primitive {"type": "can", "data": [{"address": 0, "dat": "", "src": 0}]}, # list - {"type": "testJoystick", "data": {"axes": [0, 0], "buttons": [False]}}, # dict + {"type": "testJoystickDEPRECATED", "data": {"axes": [0, 0], "buttons": [False]}}, # dict ] mocked_pubmaster = mocker.MagicMock(spec=messaging.PubMaster)