Merge branch 'master' into ui-neutral

cereal/log.capnp

@@ -130,6 +130,7 @@ struct OnroadEvent @0xc4fa6047f024e718 {
     userBookmark @95;
     excessiveActuation @96;
     audioFeedback @97;
+    neutralGear @98;
 
     soundsUnavailableDEPRECATED @47;
   }

selfdrive/car/car_specific.py

@@ -147,6 +147,8 @@ class CarSpecificEvents:
       events.add(EventName.wrongGear)
     if CS.gearShifter == GearShifter.reverse:
       events.add(EventName.reverseGear)
+    if CS.gearShifter == GearShifter.neutral:
+      events.add(EventName.neutralGear)
     if not CS.cruiseState.available:
       events.add(EventName.wrongCarMode)
     if CS.espDisabled:

selfdrive/selfdrived/events.py

@@ -793,6 +793,16 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = {
     ET.NO_ENTRY: NoEntryAlert("Reverse Gear"),
   },
 
+  EventName.neutralGear: {
+    ET.PERMANENT: Alert(
+      "Neutral\nGear",
+      "",
+      AlertStatus.normal, AlertSize.full,
+      Priority.LOWEST, VisualAlert.none, AudibleAlert.none, .2, creation_delay=0.5),
+    ET.USER_DISABLE: ImmediateDisableAlert("Neutral Gear"),
+    ET.NO_ENTRY: NoEntryAlert("Neutral Gear"),
+  },
+
   # On cars that use stock ACC the car can decide to cancel ACC for various reasons.
   # When this happens we can no long control the car so the user needs to be warned immediately.
   EventName.cruiseDisabled: {
@@ -912,6 +922,15 @@ if HARDWARE.get_device_type() == 'mici':
       ET.USER_DISABLE: ImmediateDisableAlert("Reverse"),
       ET.NO_ENTRY: NoEntryAlert("Reverse"),
     },
+    EventName.neutralGear: {
+      ET.PERMANENT: Alert(
+        "Neutral",
+        "",
+        AlertStatus.normal, AlertSize.full,
+        Priority.LOWEST, VisualAlert.none, AudibleAlert.none, .2, creation_delay=0.5),
+      ET.USER_DISABLE: ImmediateDisableAlert("Neutral"),
+      ET.NO_ENTRY: NoEntryAlert("Neutral"),
+    },
   })
 
 

selfdrive/ui/onroad/exp_button.py

@@ -50,12 +50,7 @@ class ExpButton(Widget):
 
     texture = self._txt_exp if self._held_or_actual_mode() else self._txt_wheel
     rl.draw_circle(center_x, center_y, self._rect.width / 2, self._black_bg)
-
-    src_rect = rl.Rectangle(0.0, 0.0, texture.width, texture.height)
-    dest_rect = rl.Rectangle(center_x, center_y, texture.width, texture.height)
-    origin = rl.Vector2(texture.width / 2.0, texture.height / 2.0)
-    rotation = -ui_state.sm['carState'].steeringAngleDeg
-    rl.draw_texture_pro(texture, src_rect, dest_rect, origin, rotation, self._white_color)
+    rl.draw_texture(texture, center_x - texture.width // 2, center_y - texture.height // 2, self._white_color)
 
   def _held_or_actual_mode(self):
     now = time.monotonic()