From 12789a1beeb230e0a6655226567b5a3088c17648 Mon Sep 17 00:00:00 2001 From: mbanth Date: Wed, 2 Jun 2021 15:02:27 +0100 Subject: [PATCH 1/3] Remove unused GPI-specific event names and replace with generic ones --- lib_xua/src/core/user/hid/user_hid.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib_xua/src/core/user/hid/user_hid.h b/lib_xua/src/core/user/hid/user_hid.h index 72d47abb..7eced6ca 100644 --- a/lib_xua/src/core/user/hid/user_hid.h +++ b/lib_xua/src/core/user/hid/user_hid.h @@ -12,11 +12,7 @@ * It defines a further 28 values for generic events. */ typedef enum hidEventId_t { - HID_EVENT_ID_GPI0 = 0, - HID_EVENT_ID_GPI1, - HID_EVENT_ID_GPI2, - HID_EVENT_ID_GPI3, - HID_EVENT_ID_EVT0, + HID_EVENT_ID_EVT0 = 0, HID_EVENT_ID_EVT1, HID_EVENT_ID_EVT2, HID_EVENT_ID_EVT3, @@ -44,6 +40,10 @@ typedef enum hidEventId_t { HID_EVENT_ID_EVT25, HID_EVENT_ID_EVT26, HID_EVENT_ID_EVT27, + HID_EVENT_ID_EVT28, + HID_EVENT_ID_EVT29, + HID_EVENT_ID_EVT30, + HID_EVENT_ID_EVT31, HID_EVENT_ID_INVALID = 0xffffffff, } hidEventId_t; From bc957cb5932c3419030e5bae5f4c8f9322b0d413 Mon Sep 17 00:00:00 2001 From: mbanth Date: Wed, 2 Jun 2021 15:12:12 +0100 Subject: [PATCH 2/3] Update change log --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 75a5e377..23ac34cf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,7 @@ lib_xua Change Log * CHANGED: Move HID descriptors to ease maintenance * CHANGED: Move legacy tests to separate directory + * CHANGED: Replace unused GPI-specific HID event names with generic ones 1.2.0 ----- From 162c9a14ce12d1a85c91ee6ae4de6ff0ab01b123 Mon Sep 17 00:00:00 2001 From: mbanth Date: Thu, 3 Jun 2021 10:51:23 +0100 Subject: [PATCH 3/3] Remove duplicate change log entry --- CHANGELOG.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 23ac34cf..7f4c9fdd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,7 +19,6 @@ lib_xua Change Log * FIXED: Runtime error when using mic array interface * CHANGED: Use XMOS Public Licence Version 1 * FIXED: Automate HID Report Descriptor length in AC1 HID Descriptor - * CHANGED: Move HID descriptors to ease maintenance 1.1.1 -----