From cc9d433db05191eb87506dd789d7aaac4f0e4aa5 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sat, 30 May 2026 08:59:26 -0500 Subject: [PATCH] Fix mini-epaper-s3 build: resolve SensorLib `isBitSet` macro conflict with SparkFun MMC5983MA (#10584) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Initial plan * Fix SensorLib isBitSet macro conflict with SparkFun MMC5983MA library SensorLib 0.3.4 defines isBitSet as a C preprocessor macro in SensorLib.h, which conflicts with SparkFun_MMC5983MA_IO.h's class method of the same name. When both libraries are included in the same translation unit (e.g., via configuration.h → SensorRtcHelper.hpp → SensorLib chain, alongside the SparkFun MMC5983MA library in lib_deps), the macro expansion causes compile errors like 'expected unqualified-id before const'. Fix: undefine the isBitSet macro right after including SensorRtcHelper.hpp in configuration.h, so it doesn't interfere with SparkFun's class method. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/configuration.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/configuration.h b/src/configuration.h index e48f346a5..f9c7721b7 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -31,6 +31,11 @@ along with this program. If not, see . #endif #if __has_include("SensorRtcHelper.hpp") #include "SensorRtcHelper.hpp" +// SensorLib defines isBitSet as a macro; undefine it here to avoid conflicts +// with the SparkFun MMC5983MA library, which has a class method of the same name. +#ifdef isBitSet +#undef isBitSet +#endif #endif /* Offer chance for variant-specific defines */