Skip to content

Commit 8167f4d

Browse files
committed
cardputer-adv: Move variant.cpp -> extra_variants/variant.cpp
Fixes issues with #includes inherited from `configuration.h` when building for pioarduino. Aligns cardputer-adv with other variants like t_deck_pro.
1 parent b53fe7a commit 8167f4d

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

variants/esp32s3/m5stack_cardputer_adv/variant.cpp renamed to src/platform/extra_variants/m5stack_cardputer_adv/variant.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
#include "AudioBoard.h"
21
#include "configuration.h"
32

3+
#ifdef M5STACK_CARDPUTER_ADV
4+
5+
#include "AudioBoard.h"
6+
47
DriverPins PinsAudioBoardES8311;
58
AudioBoard board(AudioDriverES8311, PinsAudioBoardES8311);
69

@@ -38,3 +41,5 @@ void lateInitVariant()
3841
es8311_write_reg(0x32, 0xBF); // DAC volume (0dB)
3942
es8311_write_reg(0x37, 0x08); // EQ bypass
4043
}
44+
45+
#endif

variants/esp32s3/m5stack_cardputer_adv/platformio.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ build_flags =
1010
-D M5STACK_CARDPUTER_ADV
1111
-D ARDUINO_USB_CDC_ON_BOOT=1
1212
-I variants/esp32s3/m5stack_cardputer_adv
13-
build_src_filter =
14-
${esp32s3_base.build_src_filter}
15-
+<../variants/esp32s3/m5stack_cardputer_adv>
1613
lib_deps =
1714
${esp32s3_base.lib_deps}
1815
# renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main

0 commit comments

Comments
 (0)