diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
| commit | ada2c09581d2d13acfa5ce9a97671c0ec17863f1 (patch) | |
| tree | 2f776adc59d0c63e403d2043cb8460e65d6c46fe /src/drivers/PinMap.h | |
| parent | 18cff286c75f432095db4b188e0f9a8a9e2bd8e8 (diff) | |
| parent | c9a5c3fa5c930a5939d3114a6c6b48570d61ca24 (diff) | |
Merge branch 'develop' into infineat-external-resources
# Conflicts:
# src/displayapp/screens/Symbols.h
# src/displayapp/screens/settings/SettingWatchFace.cpp
# src/displayapp/screens/settings/SettingWatchFace.h
Diffstat (limited to 'src/drivers/PinMap.h')
| -rw-r--r-- | src/drivers/PinMap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/PinMap.h b/src/drivers/PinMap.h index 833c6477..a70cfc41 100644 --- a/src/drivers/PinMap.h +++ b/src/drivers/PinMap.h @@ -4,8 +4,8 @@ namespace Pinetime { namespace PinMap { -#ifdef WATCH_P8 - // COLMI P8 +#if defined(DRIVER_PINMAP_P8) + // COLMI P8 and variants static constexpr uint8_t Charging = 19; static constexpr uint8_t Cst816sReset = 13; static constexpr uint8_t Button = 17; |