rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-22 10:42:49 +00:00
Code Issues 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
parent 6eabbaf432 0ebdc7ab0c
commit 7cbae56e6c
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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

2
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
} }

2
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
} }