summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoeycastillo <joeycastillo@utexas.edu>2023-01-25 10:32:35 -0600
committerjoeycastillo <joeycastillo@utexas.edu>2023-01-25 10:32:35 -0600
commite32f1d1926f2573c3540624a6a20f86f4954aa08 (patch)
tree9d157ddca7fabc8371e2bf7b249e0626a32843dd
parente512b731bb1c8f20624ecf89c4721ad948fb455c (diff)
downloadSensor-Watch-e32f1d1926f2573c3540624a6a20f86f4954aa08.tar.gz
Sensor-Watch-e32f1d1926f2573c3540624a6a20f86f4954aa08.tar.bz2
Sensor-Watch-e32f1d1926f2573c3540624a6a20f86f4954aa08.zip
rename definition for special edition boards
-rw-r--r--boards/OSO-FEAL-A1-00/pins.h2
-rw-r--r--boards/OSO-SWAT-A1-02/pins.h2
-rw-r--r--boards/OSO-SWAT-A1-04/pins.h2
-rw-r--r--boards/OSO-SWAT-A1-05/pins.h2
-rw-r--r--make.mk2
-rw-r--r--movement/watch_faces/settings/preferences_face.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/boards/OSO-FEAL-A1-00/pins.h b/boards/OSO-FEAL-A1-00/pins.h
index e8cd280a..7249f989 100644
--- a/boards/OSO-FEAL-A1-00/pins.h
+++ b/boards/OSO-FEAL-A1-00/pins.h
@@ -23,7 +23,7 @@
#define WATCH_RED_TCC_CHANNEL 0
#define WATCH_RED_TCC_PINMUX PINMUX_PA04E_TCC0_WO0
-#ifdef WATCH_SWAP_LED_PINS
+#ifdef WATCH_IS_BLUE_BOARD
#define GREEN GPIO(GPIO_PORTB, 22)
#define WATCH_GREEN_TCC_CHANNEL 2
#define WATCH_GREEN_TCC_PINMUX PINMUX_PB22F_TCC0_WO2
diff --git a/boards/OSO-SWAT-A1-02/pins.h b/boards/OSO-SWAT-A1-02/pins.h
index 8caaf198..1711be25 100644
--- a/boards/OSO-SWAT-A1-02/pins.h
+++ b/boards/OSO-SWAT-A1-02/pins.h
@@ -18,7 +18,7 @@
#define WATCH_BUZZER_TCC_CHANNEL 1
// LEDs
-#ifdef WATCH_SWAP_LED_PINS
+#ifdef WATCH_IS_BLUE_BOARD
#define RED GPIO(GPIO_PORTA, 21)
#define WATCH_RED_TCC_PINMUX PINMUX_PA21F_TCC0_WO7
#define WATCH_RED_TCC_CHANNEL 3
diff --git a/boards/OSO-SWAT-A1-04/pins.h b/boards/OSO-SWAT-A1-04/pins.h
index 89e1f586..2b851d95 100644
--- a/boards/OSO-SWAT-A1-04/pins.h
+++ b/boards/OSO-SWAT-A1-04/pins.h
@@ -18,7 +18,7 @@
#define WATCH_BUZZER_TCC_CHANNEL 1
// LEDs
-#ifdef WATCH_SWAP_LED_PINS
+#ifdef WATCH_IS_BLUE_BOARD
#define RED GPIO(GPIO_PORTA, 21)
#define WATCH_RED_TCC_PINMUX PINMUX_PA21F_TCC0_WO7
#define WATCH_RED_TCC_CHANNEL 3
diff --git a/boards/OSO-SWAT-A1-05/pins.h b/boards/OSO-SWAT-A1-05/pins.h
index fc25ba63..7d31b266 100644
--- a/boards/OSO-SWAT-A1-05/pins.h
+++ b/boards/OSO-SWAT-A1-05/pins.h
@@ -18,7 +18,7 @@
#define WATCH_BUZZER_TCC_CHANNEL 1
// LEDs
-#ifdef WATCH_SWAP_LED_PINS
+#ifdef WATCH_IS_BLUE_BOARD
#define RED GPIO(GPIO_PORTA, 21)
#define WATCH_RED_TCC_PINMUX PINMUX_PA21F_TCC0_WO7
#define WATCH_RED_TCC_CHANNEL 3
diff --git a/make.mk b/make.mk
index 446ad6fe..737e1f51 100644
--- a/make.mk
+++ b/make.mk
@@ -202,7 +202,7 @@ SRCS += \
endif
ifeq ($(LED), BLUE)
-CFLAGS += -DWATCH_SWAP_LED_PINS
+CFLAGS += -DWATCH_IS_BLUE_BOARD
endif
ifdef FIRMWARE
diff --git a/movement/watch_faces/settings/preferences_face.c b/movement/watch_faces/settings/preferences_face.c
index d3e62f74..b0e328b3 100644
--- a/movement/watch_faces/settings/preferences_face.c
+++ b/movement/watch_faces/settings/preferences_face.c
@@ -33,7 +33,7 @@ const char preferences_face_titles[PREFERENCES_FACE_NUM_PREFEFENCES][11] = {
"TO ", // Timeout: how long before we snap back to the clock face?
"LE ", // Low Energy mode: how long before it engages?
"LT ", // Light: duration
-#ifdef WATCH_SWAP_LED_PINS
+#ifdef WATCH_IS_BLUE_BOARD
"LT blu ", // Light: blue component (for watches with blue LED)
#else
"LT grn ", // Light: green component