Fix ESP32 S3 CRSF/PPM autodetect (ExpressLRS#2586)

* S3 has 4 TX and 4 RX RMT channels. The RX ones start at channel 4. * Simplification after review
ot0tot · Mar 13, 2024 · a1771e6 · a1771e6
1 parent 7ff2bdb
commit a1771e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/lib/Handset/AutoDetect.cpp b/src/lib/Handset/AutoDetect.cpp
@@ -9,7 +9,6 @@
 
 #include <driver/rmt.h>
 
-constexpr rmt_channel_t PPM_RMT_CHANNEL = RMT_CHANNEL_0;
 constexpr auto RMT_TICKS_PER_US = 10;
 
 void AutoDetect::Begin()

diff --git a/src/lib/Handset/PPMHandset.cpp b/src/lib/Handset/PPMHandset.cpp
@@ -9,7 +9,6 @@
 
 #include <driver/rmt.h>
 
-constexpr rmt_channel_t PPM_RMT_CHANNEL = RMT_CHANNEL_0;
 constexpr auto RMT_TICKS_PER_US = 10;
 
 void PPMHandset::Begin()

diff --git a/src/lib/Handset/PPMHandset.h b/src/lib/Handset/PPMHandset.h
@@ -15,4 +15,10 @@ class PPMHandset final : public Handset
     uint32_t lastPPM = 0;
     size_t numChannels = 0;
     RingbufHandle_t rb = nullptr;
-};
+};
+
+#if defined(PLATFORM_ESP32_S3)
+constexpr rmt_channel_t PPM_RMT_CHANNEL = RMT_CHANNEL_4;
+#else
+constexpr rmt_channel_t PPM_RMT_CHANNEL = RMT_CHANNEL_0;
+#endif