On stm32F2xx gpio is encoded to 20bits but the button definitions use 16bit type.

This commit is contained in:
Kha Vo
2016-02-25 11:12:27 -06:00
committed by Gregory Nutt
parent 95b18adf3b
commit c71ed665c2
13 changed files with 13 additions and 13 deletions
+1 -1
View File
@@ -61,7 +61,7 @@
* the BUTTON_* definitions in board.h * the BUTTON_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_USERKEY, GPIO_BTN_TAMPER, GPIO_BTN_WAKEUP GPIO_BTN_USERKEY, GPIO_BTN_TAMPER, GPIO_BTN_WAKEUP
}; };
@@ -65,7 +65,7 @@
* the BUTTON_* definitions in board.h * the BUTTON_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_BUT GPIO_BTN_BUT
}; };
@@ -57,7 +57,7 @@
* the BUTTON_* definitions in board.h * the BUTTON_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_BUT GPIO_BTN_BUT
}; };
@@ -65,7 +65,7 @@
* the BUTTON_* definitions in board.h * the BUTTON_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_TAMPER, GPIO_BTN_TAMPER,
GPIO_BTN_WKUP, GPIO_BTN_WKUP,
+1 -1
View File
@@ -60,7 +60,7 @@
* the BUTTON_* definitions in board.h * the BUTTON_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_USERKEY2, GPIO_BTN_USERKEY, GPIO_BTN_TAMPER, GPIO_BTN_WAKEUP GPIO_BTN_USERKEY2, GPIO_BTN_USERKEY, GPIO_BTN_TAMPER, GPIO_BTN_WAKEUP
}; };
+1 -1
View File
@@ -60,7 +60,7 @@
* the BUTTON_* and JOYSTICK_* definitions in board.h * the BUTTON_* and JOYSTICK_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_KEY, GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_KEY,
+1 -1
View File
@@ -65,7 +65,7 @@
* the BUTTON_* and JOYSTICK_* definitions in board.h * the BUTTON_* and JOYSTICK_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_USER GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_USER
}; };
+1 -1
View File
@@ -65,7 +65,7 @@
* the BUTTON_* and JOYSTICK_* definitions in board.h * the BUTTON_* and JOYSTICK_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_USER GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_USER
}; };
+1 -1
View File
@@ -65,7 +65,7 @@
* the BUTTON_* definitions in board.h * the BUTTON_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_USER GPIO_BTN_USER
}; };
+1 -1
View File
@@ -65,7 +65,7 @@
* the BUTTON_* definitions in board.h * the BUTTON_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_USER GPIO_BTN_USER
}; };
+1 -1
View File
@@ -65,7 +65,7 @@
* the BUTTON_* definitions in board.h * the BUTTON_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_USER GPIO_BTN_USER
}; };
+1 -1
View File
@@ -65,7 +65,7 @@
* the BUTTON_* definitions in board.h * the BUTTON_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_BTN_USER GPIO_BTN_USER
}; };
@@ -60,7 +60,7 @@
* the BUTTON_* and JOYSTICK_* definitions in board.h * the BUTTON_* and JOYSTICK_* definitions in board.h
*/ */
static const uint16_t g_buttons[NUM_BUTTONS] = static const uint32_t g_buttons[NUM_BUTTONS] =
{ {
GPIO_SW2, GPIO_SW3, GPIO_SW4 GPIO_SW2, GPIO_SW3, GPIO_SW4
}; };