Revert "paddle"

This reverts commit 2fb8526d01.

opendbc_repo/opendbc/safety/modes/gm.h

@@ -316,9 +316,6 @@ static void gm_rx_hook(const CANPacket_t *msg) {
         uint32_t now_us = microsecond_timer_get();
         gm_update_periodic_phase(&gm_bd_state, now_us, GM_PADDLE_PERIOD_US, GM_PADDLE_LOCK_TOLERANCE_US);
         gm_bd_state.next_tx_us = now_us + GM_PADDLE_TX_OFFSET_US;
-        // Keep PRNDL2 locked to the same cadence as the paddle frame.
-        gm_update_periodic_phase(&gm_prndl2_state, now_us, GM_PADDLE_PERIOD_US, GM_PADDLE_LOCK_TOLERANCE_US);
-        gm_prndl2_state.next_tx_us = now_us + GM_PADDLE_TX_OFFSET_US;
         gm_try_send_periodic_spoof(now_us, 0xBDU, 7U, &gm_bd_state, GM_PADDLE_PERIOD_US);
         gm_try_send_periodic_spoof(now_us, 0x1F5U, 8U, &gm_prndl2_state, GM_PADDLE_PERIOD_US);
       }
@@ -328,9 +325,6 @@ static void gm_rx_hook(const CANPacket_t *msg) {
       uint32_t now_us = microsecond_timer_get();
       gm_update_periodic_phase(&gm_prndl2_state, now_us, GM_PADDLE_PERIOD_US, GM_PADDLE_LOCK_TOLERANCE_US);
       gm_prndl2_state.next_tx_us = now_us + GM_PADDLE_TX_OFFSET_US;
-      // Keep paddle cadence aligned if PRNDL2 is the only stable timing source.
-      gm_update_periodic_phase(&gm_bd_state, now_us, GM_PADDLE_PERIOD_US, GM_PADDLE_LOCK_TOLERANCE_US);
-      gm_bd_state.next_tx_us = now_us + GM_PADDLE_TX_OFFSET_US;
       gm_try_send_periodic_spoof(now_us, 0x1F5U, 8U, &gm_prndl2_state, GM_PADDLE_PERIOD_US);
       gm_try_send_periodic_spoof(now_us, 0xBDU, 7U, &gm_bd_state, GM_PADDLE_PERIOD_US);
     }
@@ -474,8 +468,10 @@ static bool gm_tx_hook(const CANPacket_t *msg) {
           gm_bd_state.next_tx_us = now_us + GM_PADDLE_TX_OFFSET_US;
         }
       }
-      // Feed-only stream: always block controller TX and let panda periodic TX own wire output.
-      tx = false;
+      bool scheduler_ready = gm_periodic_scheduler_ready(&gm_bd_state, now_us, GM_PADDLE_STALE_US, GM_PADDLE_FEED_STALE_US);
+      if (scheduler_ready) {
+        tx = false;
+      }
     }
   }
 
@@ -497,8 +493,10 @@ static bool gm_tx_hook(const CANPacket_t *msg) {
           gm_prndl2_state.next_tx_us = now_us + GM_PADDLE_TX_OFFSET_US;
         }
       }
-      // Feed-only stream: always block controller TX and let panda periodic TX own wire output.
-      tx = false;
+      bool scheduler_ready = gm_periodic_scheduler_ready(&gm_prndl2_state, now_us, GM_PADDLE_STALE_US, GM_PADDLE_FEED_STALE_US);
+      if (scheduler_ready) {
+        tx = false;
+      }
     }
   }
 

panda/board/obj/gitversion.h

@@ -1,2 +1,2 @@
 extern const uint8_t gitversion[19];
-const uint8_t gitversion[19] = "DEV-d3b1cc8e-DEBUG";
+const uint8_t gitversion[19] = "DEV-6a639c86-DEBUG";

panda/board/obj/version

@@ -1 +1 @@
-DEV-d3b1cc8e-DEBUG
+DEV-6a639c86-DEBUG