Skip to content

Commit 50b43ec

Browse files
authored
Merge pull request #633 from adafruit/fix-gamepad-report-type-conflict
Fix gamepad report type conflict
2 parents 542d07d + 8bcf8d8 commit 50b43ec

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed

.github/workflows/githubci.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
arduino-platform: ['cluenrf52840', 'cplaynrf52840', 'feather52832', 'feather52840', 'feather52840sense', 'itsybitsy52840']
10+
arduino-platform:
11+
# Alphabetical order
12+
- 'cluenrf52840'
13+
- 'cplaynrf52840'
14+
- 'feather52832'
15+
- 'feather52840'
16+
- 'feather52840sense'
17+
- 'itsybitsy52840'
1118

1219
runs-on: ubuntu-latest
1320

@@ -19,13 +26,8 @@ jobs:
1926

2027
- name: Checkout code
2128
uses: actions/checkout@v2
22-
23-
- name: Checkout submodules
24-
shell: bash
25-
run: |
26-
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
27-
git submodule sync --recursive
28-
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive
29+
with:
30+
submodules: 'true'
2931

3032
- name: Install Arduino CLI and Tools
3133
run: |

libraries/Bluefruit52Lib/src/services/BLEHidGeneric.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,6 @@ typedef struct ATTR_PACKED
5353
uint16_t usage_value; ///< Usage value of the pressed control
5454
} hid_consumer_control_report_t;
5555

56-
/// Gamepad report
57-
typedef struct ATTR_PACKED
58-
{
59-
struct ATTR_PACKED
60-
{
61-
uint8_t x : 2;
62-
uint8_t y : 2;
63-
uint8_t : 4;
64-
};
65-
66-
uint8_t buttons;
67-
}hid_gamepad_report_t;
68-
69-
7056
class BLEHidGeneric : public BLEService
7157
{
7258
public:

0 commit comments

Comments
 (0)