mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-28 14:21:25 +03:00
Code Issues Releases Activity

Mzybe clear up some signed/unsigned compile warnings

Browse Source
This commit is contained in:
OneOfEleven 2023-10-05 14:33:05 +01:00
parent 2372949eb9
commit 6b44659419
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
driver/keyboard.c
View File

@ -43,7 +43,7 @@ static const struct {
/* Zero row */ /* Zero row */
{ {
//Set to zero to handle special case of nothing pulled down. //Set to zero to handle special case of nothing pulled down.
.set_to_zero_mask = ~(0), .set_to_zero_mask = 0,
.pins = { .pins = {
{ .key = KEY_SIDE1, .pin = GPIOA_PIN_KEYBOARD_0}, { .key = KEY_SIDE1, .pin = GPIOA_PIN_KEYBOARD_0},
{ .key = KEY_SIDE2, .pin = GPIOA_PIN_KEYBOARD_1}, { .key = KEY_SIDE2, .pin = GPIOA_PIN_KEYBOARD_1},
@ -54,7 +54,7 @@ static const struct {
}, },
/* First row */ /* First row */
{ {
.set_to_zero_mask = ~(1 << GPIOA_PIN_KEYBOARD_4), .set_to_zero_mask = ~(1u << GPIOA_PIN_KEYBOARD_4),
.pins = { .pins = {
{ .key = KEY_MENU, .pin = GPIOA_PIN_KEYBOARD_0}, { .key = KEY_MENU, .pin = GPIOA_PIN_KEYBOARD_0},
{ .key = KEY_1, .pin = GPIOA_PIN_KEYBOARD_1}, { .key = KEY_1, .pin = GPIOA_PIN_KEYBOARD_1},
@ -64,7 +64,7 @@ static const struct {
}, },
/* Second row */ /* Second row */
{ {
.set_to_zero_mask = ~(1 << GPIOA_PIN_KEYBOARD_5), .set_to_zero_mask = ~(1u << GPIOA_PIN_KEYBOARD_5),
.pins = { .pins = {
{ .key = KEY_UP, .pin = GPIOA_PIN_KEYBOARD_0}, { .key = KEY_UP, .pin = GPIOA_PIN_KEYBOARD_0},
{ .key = KEY_2 , .pin = GPIOA_PIN_KEYBOARD_1}, { .key = KEY_2 , .pin = GPIOA_PIN_KEYBOARD_1},
@ -74,7 +74,7 @@ static const struct {
}, },
/* Third row */ /* Third row */
{ {
.set_to_zero_mask = ~(1 << GPIOA_PIN_KEYBOARD_6), .set_to_zero_mask = ~(1u << GPIOA_PIN_KEYBOARD_6),
.pins = { .pins = {
{ .key = KEY_DOWN, .pin = GPIOA_PIN_KEYBOARD_0}, { .key = KEY_DOWN, .pin = GPIOA_PIN_KEYBOARD_0},
{ .key = KEY_3 , .pin = GPIOA_PIN_KEYBOARD_1}, { .key = KEY_3 , .pin = GPIOA_PIN_KEYBOARD_1},
@ -84,7 +84,7 @@ static const struct {
}, },
/* Fourth row */ /* Fourth row */
{ {
.set_to_zero_mask = ~(1 << GPIOA_PIN_KEYBOARD_7), .set_to_zero_mask = ~(1u << GPIOA_PIN_KEYBOARD_7),
.pins = { .pins = {
{ .key = KEY_EXIT, .pin = GPIOA_PIN_KEYBOARD_0}, { .key = KEY_EXIT, .pin = GPIOA_PIN_KEYBOARD_0},
{ .key = KEY_STAR, .pin = GPIOA_PIN_KEYBOARD_1}, { .key = KEY_STAR, .pin = GPIOA_PIN_KEYBOARD_1},
@ -103,12 +103,13 @@ KEY_Code_t KEYBOARD_Poll(void)
// ***************** // *****************
for(int j = 0; j < ARRAY_SIZE(keyboard); j++) { for (int j = 0; j < ARRAY_SIZE(keyboard); j++)
{
//Set all high //Set all high
GPIOA->DATA |= 1 << GPIOA_PIN_KEYBOARD_4 | GPIOA->DATA |= 1u << GPIOA_PIN_KEYBOARD_4 |
1 << GPIOA_PIN_KEYBOARD_5 | 1u << GPIOA_PIN_KEYBOARD_5 |
1 << GPIOA_PIN_KEYBOARD_6 | 1u << GPIOA_PIN_KEYBOARD_6 |
1 << GPIOA_PIN_KEYBOARD_7 ; 1u << GPIOA_PIN_KEYBOARD_7 ;
//Clear the pin we are selecting //Clear the pin we are selecting
GPIOA->DATA &= keyboard[j].set_to_zero_mask; GPIOA->DATA &= keyboard[j].set_to_zero_mask;
@ -119,8 +120,9 @@ KEY_Code_t KEYBOARD_Poll(void)
uint16_t reg = GPIOA->DATA; uint16_t reg = GPIOA->DATA;
for (int i = 0; i < ARRAY_SIZE(keyboard[j].pins); i++) for (int i = 0; i < ARRAY_SIZE(keyboard[j].pins); i++)
{ {
uint16_t mask = 1 << keyboard[j].pins[i].pin; uint16_t mask = 1u << keyboard[j].pins[i].pin;
if(! (reg & mask)) { if (!(reg & mask))
{
Key = keyboard[j].pins[i].key; Key = keyboard[j].pins[i].key;
break; break;
} }