Merge branch 'master' into tft-gui-work

This commit is contained in:
Manuel 2024-06-04 18:24:40 +02:00 committed by GitHub
commit ca6b38b9fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -57,7 +57,7 @@
#elif defined(NRF52_PROMICRO_DIY)
#define HW_VENDOR meshtastic_HardwareModel_NRF52_PROMICRO_DIY
#elif defined(WIO_WM1110)
#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
#define HW_VENDOR meshtastic_HardwareModel_WIO_WM1110
#elif defined(PRIVATE_HW) || defined(FEATHER_DIY)
#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
#else