uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename BLACKBERRY_TRACKBALL_{TOP,BOTTOM} to BLACKBERRY_TRACKBALL_{UP,DOWN}

Browse Source
This commit is contained in:
László Monda
2019-06-13 14:37:14 +02:00
parent 3e87ed851a
commit b4cd3fab9b
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
keycluster/src/blackberry_trackball.c
View File

@@ -16,15 +16,15 @@ void BlackberryTrackball_Init(void)
PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_RIGHT_PORT, BLACKBERRY_TRACKBALL_RIGHT_PIN, kPORT_InterruptEitherEdge); PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_RIGHT_PORT, BLACKBERRY_TRACKBALL_RIGHT_PIN, kPORT_InterruptEitherEdge);
NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_RIGHT_IRQ); NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_RIGHT_IRQ);
CLOCK_EnableClock(BLACKBERRY_TRACKBALL_TOP_CLOCK); CLOCK_EnableClock(BLACKBERRY_TRACKBALL_UP_CLOCK);
PORT_SetPinMux(BLACKBERRY_TRACKBALL_TOP_PORT, BLACKBERRY_TRACKBALL_TOP_PIN, kPORT_MuxAsGpio); PORT_SetPinMux(BLACKBERRY_TRACKBALL_UP_PORT, BLACKBERRY_TRACKBALL_UP_PIN, kPORT_MuxAsGpio);
PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_TOP_PORT, BLACKBERRY_TRACKBALL_TOP_PIN, kPORT_InterruptEitherEdge); PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_UP_PORT, BLACKBERRY_TRACKBALL_UP_PIN, kPORT_InterruptEitherEdge);
NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_TOP_IRQ); NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_UP_IRQ);
CLOCK_EnableClock(BLACKBERRY_TRACKBALL_BOTTOM_CLOCK); CLOCK_EnableClock(BLACKBERRY_TRACKBALL_DOWN_CLOCK);
PORT_SetPinMux(BLACKBERRY_TRACKBALL_BOTTOM_PORT, BLACKBERRY_TRACKBALL_BOTTOM_PIN, kPORT_MuxAsGpio); PORT_SetPinMux(BLACKBERRY_TRACKBALL_DOWN_PORT, BLACKBERRY_TRACKBALL_DOWN_PIN, kPORT_MuxAsGpio);
PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_BOTTOM_PORT, BLACKBERRY_TRACKBALL_BOTTOM_PIN, kPORT_InterruptEitherEdge); PORT_SetPinInterruptConfig(BLACKBERRY_TRACKBALL_DOWN_PORT, BLACKBERRY_TRACKBALL_DOWN_PIN, kPORT_InterruptEitherEdge);
NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_BOTTOM_IRQ); NVIC_EnableIRQ(BLACKBERRY_TRACKBALL_DOWN_IRQ);
} }
void handleTrackball(void) void handleTrackball(void)
@@ -39,14 +39,14 @@ void handleTrackball(void)
GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_RIGHT_GPIO, 1U << BLACKBERRY_TRACKBALL_RIGHT_PIN); GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_RIGHT_GPIO, 1U << BLACKBERRY_TRACKBALL_RIGHT_PIN);
} }
if (PORT_GetPinsInterruptFlags(BLACKBERRY_TRACKBALL_TOP_PORT) & (1 << BLACKBERRY_TRACKBALL_TOP_PIN)) { if (PORT_GetPinsInterruptFlags(BLACKBERRY_TRACKBALL_UP_PORT) & (1 << BLACKBERRY_TRACKBALL_UP_PIN)) {
BlackBerryTrackball_PointerDelta.y++; BlackBerryTrackball_PointerDelta.y++;
GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_TOP_GPIO, 1U << BLACKBERRY_TRACKBALL_TOP_PIN); GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_UP_GPIO, 1U << BLACKBERRY_TRACKBALL_UP_PIN);
} }
if (PORT_GetPinsInterruptFlags(BLACKBERRY_TRACKBALL_BOTTOM_PORT) & (1 << BLACKBERRY_TRACKBALL_BOTTOM_PIN)) { if (PORT_GetPinsInterruptFlags(BLACKBERRY_TRACKBALL_DOWN_PORT) & (1 << BLACKBERRY_TRACKBALL_DOWN_PIN)) {
BlackBerryTrackball_PointerDelta.y--; BlackBerryTrackball_PointerDelta.y--;
GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_BOTTOM_GPIO, 1U << BLACKBERRY_TRACKBALL_BOTTOM_PIN); GPIO_ClearPinsInterruptFlags(BLACKBERRY_TRACKBALL_DOWN_GPIO, 1U << BLACKBERRY_TRACKBALL_DOWN_PIN);
} }
} }

20
keycluster/src/blackberry_trackball.h
View File

@@ -19,17 +19,17 @@
#define BLACKBERRY_TRACKBALL_RIGHT_CLOCK kCLOCK_PortA #define BLACKBERRY_TRACKBALL_RIGHT_CLOCK kCLOCK_PortA
#define BLACKBERRY_TRACKBALL_RIGHT_PIN 12 #define BLACKBERRY_TRACKBALL_RIGHT_PIN 12
#define BLACKBERRY_TRACKBALL_TOP_PORT PORTB #define BLACKBERRY_TRACKBALL_UP_PORT PORTB
#define BLACKBERRY_TRACKBALL_TOP_GPIO GPIOB #define BLACKBERRY_TRACKBALL_UP_GPIO GPIOB
#define BLACKBERRY_TRACKBALL_TOP_IRQ PORTB_IRQn #define BLACKBERRY_TRACKBALL_UP_IRQ PORTB_IRQn
#define BLACKBERRY_TRACKBALL_TOP_CLOCK kCLOCK_PortB #define BLACKBERRY_TRACKBALL_UP_CLOCK kCLOCK_PortB
#define BLACKBERRY_TRACKBALL_TOP_PIN 2 #define BLACKBERRY_TRACKBALL_UP_PIN 2
#define BLACKBERRY_TRACKBALL_BOTTOM_PORT PORTB #define BLACKBERRY_TRACKBALL_DOWN_PORT PORTB
#define BLACKBERRY_TRACKBALL_BOTTOM_GPIO GPIOB #define BLACKBERRY_TRACKBALL_DOWN_GPIO GPIOB
#define BLACKBERRY_TRACKBALL_BOTTOM_IRQ PORTB_IRQn #define BLACKBERRY_TRACKBALL_DOWN_IRQ PORTB_IRQn
#define BLACKBERRY_TRACKBALL_BOTTOM_CLOCK kCLOCK_PortB #define BLACKBERRY_TRACKBALL_DOWN_CLOCK kCLOCK_PortB
#define BLACKBERRY_TRACKBALL_BOTTOM_PIN 0 #define BLACKBERRY_TRACKBALL_DOWN_PIN 0
#define BLACKBERRY_TRACKBALL_IRQ_HANDLER1 PORTA_IRQHandler #define BLACKBERRY_TRACKBALL_IRQ_HANDLER1 PORTA_IRQHandler
#define BLACKBERRY_TRACKBALL_IRQ_HANDLER2 PORTB_IRQHandler #define BLACKBERRY_TRACKBALL_IRQ_HANDLER2 PORTB_IRQHandler