pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-05 21:24:34 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.5-changes

Browse Source
This commit is contained in:
Jonathan Bennett 2024-08-16 19:39:10 -05:00 committed by GitHub
commit 7cbae56e6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform/nrf52/architecture.h
View File

@ -65,6 +65,8 @@
#define HW_VENDOR meshtastic_HardwareModel_WIO_WM1110 #define HW_VENDOR meshtastic_HardwareModel_WIO_WM1110
#elif defined(TRACKER_T1000_E) #elif defined(TRACKER_T1000_E)
#define HW_VENDOR meshtastic_HardwareModel_TRACKER_T1000_E #define HW_VENDOR meshtastic_HardwareModel_TRACKER_T1000_E
#elif defined(ME25LS01)
#define HW_VENDOR meshtastic_HardwareModel_ME25LS01
#elif defined(PRIVATE_HW) || defined(FEATHER_DIY) #elif defined(PRIVATE_HW) || defined(FEATHER_DIY)
#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW #define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
#else #else
@ -119,4 +121,4 @@
#if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA) #if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
// No serial ports on this board - ONLY use segger in memory console // No serial ports on this board - ONLY use segger in memory console
#define USE_SEGGER #define USE_SEGGER
#endif #endif

4
variants/ME25LS01-4Y10TD/variant.h
View File

@ -126,7 +126,7 @@ extern "C" {
#define VBAT_AR_INTERNAL AR_INTERNAL_3_0 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
// Buzzer // Buzzer
#define BUZZER_EN_PIN -1 #define PIN_BUZZER (0 + 25)
#ifdef __cplusplus #ifdef __cplusplus
} }
@ -136,4 +136,4 @@ extern "C" {
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#endif // _VARIANT_ME25LS01_4Y10TD_ #endif // _VARIANT_ME25LS01_4Y10TD_

4
variants/ME25LS01-4Y10TD_e-ink/variant.h
View File

@ -149,7 +149,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define VBAT_AR_INTERNAL AR_INTERNAL_3_0 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0
// Buzzer // Buzzer
#define BUZZER_EN_PIN -1 #define PIN_BUZZER (0 + 25)
#ifdef __cplusplus #ifdef __cplusplus
} }
@ -159,4 +159,4 @@ static const uint8_t SCK = PIN_SPI_SCK;
* Arduino objects - C++ only * Arduino objects - C++ only
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#endif // _VARIANT_ME25LS01_4Y10TD__ #endif // _VARIANT_ME25LS01_4Y10TD__