Skip to content

Commit c039eb6

Browse files
hathachhathach
committed
fix compile issue with upgrading nrfx v2 and tinyusb
1 parent 7e86e7d commit c039eb6

File tree

3 files changed

+30
-172
lines changed

3 files changed

+30
-172
lines changed

‎libraries/Bluefruit52Lib/src/services/BLEHidAdafruit.cpp

Lines changed: 3 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -46,151 +46,9 @@ enum
4646

4747
uint8_t const hid_report_descriptor[] =
4848
{
49-
//------------- Keyboard Report -------------//
50-
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ),
51-
HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ),
52-
HID_COLLECTION ( HID_COLLECTION_APPLICATION ),
53-
HID_REPORT_ID ( REPORT_ID_KEYBOARD ),
54-
HID_USAGE_PAGE( HID_USAGE_PAGE_KEYBOARD ),
55-
// 8 bits Modifier Keys (Shfit, Control, Alt)
56-
HID_USAGE_MIN ( 224 ),
57-
HID_USAGE_MAX ( 231 ),
58-
HID_LOGICAL_MIN ( 0 ),
59-
HID_LOGICAL_MAX ( 1 ),
60-
61-
HID_REPORT_COUNT ( 8 ),
62-
HID_REPORT_SIZE ( 1 ),
63-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ),
64-
65-
// 8 bit reserved
66-
HID_REPORT_COUNT ( 1 ),
67-
HID_REPORT_SIZE ( 8 ),
68-
HID_INPUT ( HID_CONSTANT ),
69-
70-
// 6-byte Keycodes
71-
HID_USAGE_PAGE (HID_USAGE_PAGE_KEYBOARD),
72-
HID_USAGE_MIN ( 0 ),
73-
HID_USAGE_MAX ( 255 ),
74-
HID_LOGICAL_MIN ( 0 ),
75-
HID_LOGICAL_MAX ( 255 ),
76-
77-
HID_REPORT_COUNT ( 6 ),
78-
HID_REPORT_SIZE ( 8 ),
79-
HID_INPUT ( HID_DATA | HID_ARRAY | HID_ABSOLUTE ),
80-
81-
// LED Indicator Kana | Compose | Scroll Lock | CapsLock | NumLock
82-
HID_USAGE_PAGE ( HID_USAGE_PAGE_LED ),
83-
/* 5-bit Led report */
84-
HID_USAGE_MIN ( 1 ),
85-
HID_USAGE_MAX ( 5 ),
86-
HID_REPORT_COUNT ( 5 ),
87-
HID_REPORT_SIZE ( 1 ),
88-
HID_OUTPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ),
89-
/* led padding */
90-
HID_REPORT_COUNT ( 1 ),
91-
HID_REPORT_SIZE ( 3 ),
92-
HID_OUTPUT ( HID_CONSTANT ),
93-
HID_COLLECTION_END,
94-
95-
//------------- Consumer Control Report -------------//
96-
HID_USAGE_PAGE ( HID_USAGE_PAGE_CONSUMER ),
97-
HID_USAGE ( HID_USAGE_CONSUMER_CONTROL ),
98-
HID_COLLECTION ( HID_COLLECTION_APPLICATION ),
99-
HID_REPORT_ID( REPORT_ID_CONSUMER_CONTROL ),
100-
HID_LOGICAL_MIN ( 0x00 ),
101-
HID_LOGICAL_MAX_N( 0x03FF, 2 ),
102-
HID_USAGE_MIN ( 0x00 ),
103-
HID_USAGE_MAX_N ( 0x03FF, 2 ),
104-
HID_REPORT_COUNT ( 1 ),
105-
HID_REPORT_SIZE ( 16 ),
106-
HID_INPUT ( HID_DATA | HID_ARRAY | HID_ABSOLUTE ),
107-
HID_COLLECTION_END,
108-
109-
//------------- Mouse Report: buttons + dx + dy + scroll + pan -------------//
110-
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ),
111-
HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ),
112-
HID_COLLECTION ( HID_COLLECTION_APPLICATION ),
113-
HID_REPORT_ID( REPORT_ID_MOUSE ),
114-
HID_USAGE (HID_USAGE_DESKTOP_POINTER ),
115-
HID_COLLECTION ( HID_COLLECTION_PHYSICAL ),
116-
HID_USAGE_PAGE ( HID_USAGE_PAGE_BUTTON ),
117-
HID_USAGE_MIN ( 1 ),
118-
HID_USAGE_MAX ( 5 ),
119-
HID_LOGICAL_MIN ( 0 ),
120-
HID_LOGICAL_MAX ( 1 ),
121-
122-
HID_REPORT_COUNT ( 5 ), /* Forward, Backward, Middle, Right, Left */
123-
HID_REPORT_SIZE ( 1 ),
124-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ),
125-
126-
HID_REPORT_COUNT ( 1 ),
127-
HID_REPORT_SIZE ( 3 ),
128-
HID_INPUT ( HID_CONSTANT ), /* 5 bit padding followed 3 bit buttons */
129-
130-
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ),
131-
HID_USAGE ( HID_USAGE_DESKTOP_X ),
132-
HID_USAGE ( HID_USAGE_DESKTOP_Y ),
133-
HID_LOGICAL_MIN ( 0x81 ), /* -127 */
134-
HID_LOGICAL_MAX ( 0x7f ), /* 127 */
135-
136-
HID_REPORT_COUNT ( 2 ), /* X, Y position */
137-
HID_REPORT_SIZE ( 8 ),
138-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_RELATIVE ), /* relative values */
139-
140-
HID_USAGE ( HID_USAGE_DESKTOP_WHEEL ), /* mouse scroll */
141-
HID_LOGICAL_MIN ( 0x81 ), /* -127 */
142-
HID_LOGICAL_MAX ( 0x7f ), /* 127 */
143-
HID_REPORT_COUNT( 1 ),
144-
HID_REPORT_SIZE ( 8 ), /* 8-bit value */
145-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_RELATIVE ), /* relative values */
146-
147-
HID_USAGE_PAGE ( HID_USAGE_PAGE_CONSUMER ),
148-
HID_USAGE_N ( HID_USAGE_CONSUMER_AC_PAN, 2 ), /* Horizontal wheel scroll */
149-
HID_LOGICAL_MIN ( 0x81 ), /* -127 */
150-
HID_LOGICAL_MAX ( 0x7f ), /* 127 */
151-
HID_REPORT_COUNT( 1 ),
152-
HID_REPORT_SIZE ( 8 ), /* 8-bit value */
153-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_RELATIVE ), /* relative values */
154-
HID_COLLECTION_END,
155-
HID_COLLECTION_END,
156-
157-
#if 0
158-
//------------- Gamepad Report -------------//
159-
/* Byte 0: 4 pad | 2 Y-axis | 2 X-axis
160-
* Byte 1: Button7-Button0
161-
*/
162-
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ),
163-
HID_USAGE ( HID_USAGE_DESKTOP_GAMEPAD ),
164-
HID_COLLECTION ( HID_COLLECTION_APPLICATION ),
165-
HID_REPORT_ID ( REPORT_ID_GAMEPAD ),
166-
HID_USAGE (HID_USAGE_DESKTOP_POINTER ),
167-
HID_COLLECTION ( HID_COLLECTION_PHYSICAL ),
168-
// X,Y joystick
169-
HID_USAGE ( HID_USAGE_DESKTOP_X ),
170-
HID_USAGE ( HID_USAGE_DESKTOP_Y ),
171-
HID_LOGICAL_MIN ( 0xFF ), /* -1 */
172-
HID_LOGICAL_MAX ( 0x01 ), /* 1 */
173-
HID_REPORT_COUNT( 2 ), /* X, Y position */
174-
HID_REPORT_SIZE ( 2 ), /* 2-bit value */
175-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ), /* input values */
176-
HID_COLLECTION_END,
177-
178-
/* X,Y padding */
179-
HID_REPORT_COUNT ( 4 ),
180-
HID_REPORT_SIZE ( 1 ),
181-
HID_INPUT ( HID_CONSTANT | HID_VARIABLE | HID_ABSOLUTE),
182-
183-
// Buttons
184-
HID_USAGE_PAGE ( HID_USAGE_PAGE_BUTTON ),
185-
HID_USAGE_MIN ( 1 ),
186-
HID_USAGE_MAX ( 8 ),
187-
HID_LOGICAL_MIN ( 0 ),
188-
HID_LOGICAL_MAX ( 1 ),
189-
HID_REPORT_COUNT ( 8 ), // Keyboard
190-
HID_REPORT_SIZE ( 1 ),
191-
HID_INPUT ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE),
192-
HID_COLLECTION_END
193-
#endif
49+
TUD_HID_REPORT_DESC_KEYBOARD( HID_REPORT_ID(REPORT_ID_KEYBOARD) ),
50+
TUD_HID_REPORT_DESC_CONSUMER( HID_REPORT_ID(REPORT_ID_CONSUMER_CONTROL) ),
51+
TUD_HID_REPORT_DESC_MOUSE ( HID_REPORT_ID(REPORT_ID_MOUSE) )
19452
};
19553

19654
BLEHidAdafruit::BLEHidAdafruit(void)

‎libraries/InternalFileSytem/examples/Internal_StressTest/Internal_StressTest.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ uint16_t get_rand(void)
129129

130130
for(int i=0; i<2; i++)
131131
{
132-
nrf_rng_event_clear(NRF_RNG_EVENT_VALRDY);
133-
nrf_rng_task_trigger(NRF_RNG_TASK_START);
132+
nrf_rng_event_clear(NRF_RNG, NRF_RNG_EVENT_VALRDY);
133+
nrf_rng_task_trigger(NRF_RNG, NRF_RNG_TASK_START);
134134

135-
while ( !nrf_rng_event_get(NRF_RNG_EVENT_VALRDY) ) yield();
135+
while ( !nrf_rng_event_check(NRF_RNG, NRF_RNG_EVENT_VALRDY) ) yield();
136136

137-
bytes[i] = nrf_rng_random_value_get();
137+
bytes[i] = nrf_rng_random_value_get(NRF_RNG);
138138
}
139139

140140
return (bytes[0] << 8) + bytes[1];

‎libraries/PDM/src/PDM.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,22 @@ int PDMClass::begin(int channels, long sampleRate)
6767
#ifndef NRF52832_XXAA
6868
NRF_PDM->RATIO = ((PDM_RATIO_RATIO_Ratio80 << PDM_RATIO_RATIO_Pos) & PDM_RATIO_RATIO_Msk);
6969
#endif
70-
nrf_pdm_clock_set(NRF_PDM_FREQ_1280K);
70+
nrf_pdm_clock_set(NRF_PDM, NRF_PDM_FREQ_1280K);
7171
break;
7272
case 41667:
73-
nrf_pdm_clock_set(NRF_PDM_FREQ_2667K);
73+
nrf_pdm_clock_set(NRF_PDM, NRF_PDM_FREQ_2667K);
7474
break;
7575
default:
7676
return 0; // unsupported
7777
}
7878

7979
switch (channels) {
8080
case 2:
81-
nrf_pdm_mode_set(NRF_PDM_MODE_STEREO, NRF_PDM_EDGE_LEFTFALLING);
81+
nrf_pdm_mode_set(NRF_PDM, NRF_PDM_MODE_STEREO, NRF_PDM_EDGE_LEFTFALLING);
8282
break;
8383

8484
case 1:
85-
nrf_pdm_mode_set(NRF_PDM_MODE_MONO, NRF_PDM_EDGE_LEFTFALLING);
85+
nrf_pdm_mode_set(NRF_PDM, NRF_PDM_MODE_MONO, NRF_PDM_EDGE_LEFTFALLING);
8686
break;
8787

8888
default:
@@ -97,13 +97,13 @@ int PDMClass::begin(int channels, long sampleRate)
9797

9898
pinMode(_dinPin, INPUT);
9999

100-
nrf_pdm_psel_connect(digitalPinToPinName(_clkPin), digitalPinToPinName(_dinPin));
100+
nrf_pdm_psel_connect(NRF_PDM, digitalPinToPinName(_clkPin), digitalPinToPinName(_dinPin));
101101

102102
// clear events and enable PDM interrupts
103-
nrf_pdm_event_clear(NRF_PDM_EVENT_STARTED);
104-
nrf_pdm_event_clear(NRF_PDM_EVENT_END);
105-
nrf_pdm_event_clear(NRF_PDM_EVENT_STOPPED);
106-
nrf_pdm_int_enable(NRF_PDM_INT_STARTED | NRF_PDM_INT_STOPPED);
103+
nrf_pdm_event_clear(NRF_PDM, NRF_PDM_EVENT_STARTED);
104+
nrf_pdm_event_clear(NRF_PDM, NRF_PDM_EVENT_END);
105+
nrf_pdm_event_clear(NRF_PDM, NRF_PDM_EVENT_STOPPED);
106+
nrf_pdm_int_enable(NRF_PDM, NRF_PDM_INT_STARTED | NRF_PDM_INT_STOPPED);
107107

108108
if (_pwrPin > -1) {
109109
// power the mic on
@@ -124,17 +124,17 @@ int PDMClass::begin(int channels, long sampleRate)
124124
// _doubleBuffer.swap();
125125

126126
// enable and trigger start task
127-
nrf_pdm_enable();
128-
nrf_pdm_event_clear(NRF_PDM_EVENT_STARTED);
129-
nrf_pdm_task_trigger(NRF_PDM_TASK_START);
127+
nrf_pdm_enable(NRF_PDM);
128+
nrf_pdm_event_clear(NRF_PDM, NRF_PDM_EVENT_STARTED);
129+
nrf_pdm_task_trigger(NRF_PDM, NRF_PDM_TASK_START);
130130

131131
return 1;
132132
}
133133

134134
void PDMClass::end()
135135
{
136136
// disable PDM and IRQ
137-
nrf_pdm_disable();
137+
nrf_pdm_disable(NRF_PDM);
138138

139139
NVIC_DisableIRQ(PDM_IRQn);
140140

@@ -147,7 +147,7 @@ void PDMClass::end()
147147
// Don't disable high frequency oscillator since it could be in use by RADIO
148148

149149
// unconfigure the I/O and un-mux
150-
nrf_pdm_psel_disconnect();
150+
nrf_pdm_psel_disconnect(NRF_PDM);
151151

152152
pinMode(_clkPin, INPUT);
153153
}
@@ -181,7 +181,7 @@ void PDMClass::onReceive(void(*function)(void))
181181

182182
void PDMClass::setGain(int gain)
183183
{
184-
nrf_pdm_gain_set(gain, gain);
184+
nrf_pdm_gain_set(NRF_PDM, gain, gain);
185185
}
186186

187187
void PDMClass::setBufferSize(int bufferSize)
@@ -191,12 +191,12 @@ void PDMClass::setBufferSize(int bufferSize)
191191

192192
void PDMClass::IrqHandler()
193193
{
194-
if (nrf_pdm_event_check(NRF_PDM_EVENT_STARTED)) {
195-
nrf_pdm_event_clear(NRF_PDM_EVENT_STARTED);
194+
if (nrf_pdm_event_check(NRF_PDM, NRF_PDM_EVENT_STARTED)) {
195+
nrf_pdm_event_clear(NRF_PDM, NRF_PDM_EVENT_STARTED);
196196

197197
if (_doubleBuffer.available() == 0) {
198198
// switch to the next buffer
199-
nrf_pdm_buffer_set((uint32_t*)_doubleBuffer.data(), _doubleBuffer.availableForWrite() / (sizeof(int16_t) * _channels));
199+
nrf_pdm_buffer_set(NRF_PDM, (uint32_t*)_doubleBuffer.data(), _doubleBuffer.availableForWrite() / (sizeof(int16_t) * _channels));
200200

201201
// make the current one available for reading
202202
_doubleBuffer.swap(_doubleBuffer.availableForWrite());
@@ -207,12 +207,12 @@ void PDMClass::IrqHandler()
207207
}
208208
} else {
209209
// buffer overflow, stop
210-
nrf_pdm_disable();
210+
nrf_pdm_disable(NRF_PDM);
211211
}
212-
} else if (nrf_pdm_event_check(NRF_PDM_EVENT_STOPPED)) {
213-
nrf_pdm_event_clear(NRF_PDM_EVENT_STOPPED);
214-
} else if (nrf_pdm_event_check(NRF_PDM_EVENT_END)) {
215-
nrf_pdm_event_clear(NRF_PDM_EVENT_END);
212+
} else if (nrf_pdm_event_check(NRF_PDM, NRF_PDM_EVENT_STOPPED)) {
213+
nrf_pdm_event_clear(NRF_PDM, NRF_PDM_EVENT_STOPPED);
214+
} else if (nrf_pdm_event_check(NRF_PDM, NRF_PDM_EVENT_END)) {
215+
nrf_pdm_event_clear(NRF_PDM, NRF_PDM_EVENT_END);
216216
}
217217
}
218218

0 commit comments

Comments
 (0)