From ce8e1dde92ac95fc799e1ac12a4f4fce8ea864c1 Mon Sep 17 00:00:00 2001
From: Allen Hill <allenofthehills@gmail.com>
Date: Mon, 6 Jul 2026 12:00:58 -0700
Subject: [PATCH] fixup fixup bus send/read parity & acking

---
 src/avclan/bus.hpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/avclan/bus.hpp b/src/avclan/bus.hpp
index 66e51ff..2043f99 100644
--- a/src/avclan/bus.hpp
+++ b/src/avclan/bus.hpp
@@ -94,9 +94,9 @@ public:
   bool sendstartbit();
   Error::Read readstartbit();
 
-  template <auto N, std::unsigned_integral T, class Trailer>
-    requires(sizeof(T) < 3 && N < 16) &&
-            requires { std::is_base_of_v<trailer_bits_t, Trailer>; }
+  template <auto N, std::unsigned_integral T,
+            std::derived_from<trailer_bits_t> Trailer>
+    requires(sizeof(T) < 3 && N < 16 && !std::same_as<Trailer, with_ack_t>)
   Error::Send send(T bits, Trailer /*tag*/) {
     const auto parity = sendbits<N>(bits);
 
@@ -117,9 +117,9 @@ public:
     return Send{0};
   };
 
-  template <auto N, std::unsigned_integral T, class Trailer>
-    requires(sizeof(T) < 3 && N < 16) &&
-            requires { std::is_base_of_v<trailer_bits_t, Trailer>; }
+  template <auto N, std::unsigned_integral T,
+            std::derived_from<trailer_bits_t> Trailer>
+    requires(sizeof(T) < 3 && N < 16 && !std::same_as<Trailer, with_ack_t>)
   Error::Read read(T *bits, Trailer /*tag*/) {
     const auto calc_parity = readbits<N>(bits);
     if constexpr (std::is_same_v<Trailer, with_parity_t>) {