Skip to content

Commit 2847447

Browse files
EricB-ADIEricB-ADI
authored
fix(Examples): Updated Wording in FCC Examples (#832)
1 parent f7c6e35 commit 2847447

File tree

8 files changed

+69
-37
lines changed

8 files changed

+69
-37
lines changed

‎Examples/MAX32655/Bluetooth/BLE_fcc/main.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ void TMR2_IRQHandler(void)
151151
void printUsage(void)
152152
{
153153
APP_TRACE_INFO0("Usage: ");
154-
APP_TRACE_INFO0(" (0) Transmit on RF channel 0 (2402 MHz)");
155-
APP_TRACE_INFO0(" (1) Transmit on RF channel 19 (2440 MHz)");
156-
APP_TRACE_INFO0(" (2) Transmit on RF channel 39 (2480 MHz)");
154+
APP_TRACE_INFO0(" (0) Transmit Continuous Modulated on RF channel 0 (2402 MHz)");
155+
APP_TRACE_INFO0(" (1) Transmit Continuous Modulated on RF channel 19 (2440 MHz)");
156+
APP_TRACE_INFO0(" (2) Transmit Continuous Modulated RF channel 39 (2480 MHz)");
157157
APP_TRACE_INFO0(" (3) Receive on RF channel 39 (2480 MHz)");
158158
APP_TRACE_INFO0(" (4) Set Transmit power");
159-
APP_TRACE_INFO0(" (5) Enable constant TX");
159+
APP_TRACE_INFO0(" (5) Enable Constant Unmodulated TX");
160160
APP_TRACE_INFO0(" (6) Disable constant TX -- MUST be called after (5)");
161161
/* APP_TRACE_INFO0(" (7) Set PA value"); */
162162
APP_TRACE_INFO0(" (8) Set PHY");
@@ -193,27 +193,27 @@ static void processConsoleRX(uint8_t rxByte)
193193
switch (cmd) {
194194
case '0':
195195

196-
APP_TRACE_INFO1("Transmit RF channel 0, 255 bytes/pkt, 0xAA, %s, forever ..",
196+
APP_TRACE_INFO1("Transmit RF channel 0, 255 bytes/pkt, PRBS15, %s, forever ..",
197197
getPhyStr(phy));
198-
res = LlEnhancedTxTest(0, 255, LL_TEST_PKT_TYPE_AA, phy, 0);
198+
res = LlEnhancedTxTest(0, 255, LL_TEST_PKT_TYPE_PRBS15, phy, 0);
199199
APP_TRACE_INFO2("res = %u %s", res, res == LL_SUCCESS ? "(SUCCESS)" : "(FAIL)");
200200
cmd = 0;
201201
break;
202202

203203
case '1':
204204

205-
APP_TRACE_INFO1("Transmit RF channel 19, 255 bytes/pkt, 0xAA, %s, forever ..",
205+
APP_TRACE_INFO1("Transmit RF channel 19, 255 bytes/pkt, PRBS15, %s, forever ..",
206206
getPhyStr(phy));
207-
res = LlEnhancedTxTest(19, 255, LL_TEST_PKT_TYPE_AA, phy, 0);
207+
res = LlEnhancedTxTest(19, 255, LL_TEST_PKT_TYPE_PRBS15, phy, 0);
208208
APP_TRACE_INFO2("res = %u %s", res, res == LL_SUCCESS ? "(SUCCESS)" : "(FAIL)");
209209
cmd = 0;
210210
break;
211211

212212
case '2':
213213

214-
APP_TRACE_INFO1("Transmit RF channel 39, 255 bytes/pkt, 0xAA, %s, forever ..",
214+
APP_TRACE_INFO1("Transmit RF channel 39, 255 bytes/pkt, PRBS15, %s, forever ..",
215215
getPhyStr(phy));
216-
res = LlEnhancedTxTest(39, 255, LL_TEST_PKT_TYPE_AA, phy, 0);
216+
res = LlEnhancedTxTest(39, 255, LL_TEST_PKT_TYPE_PRBS15, phy, 0);
217217
APP_TRACE_INFO2("res = %u %s", res, res == LL_SUCCESS ? "(SUCCESS)" : "(FAIL)");
218218
cmd = 0;
219219
break;

‎Examples/MAX32665/Bluetooth/BLE_fcc/main.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,14 @@ void TMR2_IRQHandler(void)
158158
void printUsage(void)
159159
{
160160
APP_TRACE_INFO0("Usage: ");
161-
APP_TRACE_INFO0(" (0) Transmit on RF channel 0 (2402 MHz)");
162-
APP_TRACE_INFO0(" (1) Transmit on RF channel 19 (2440 MHz)");
163-
APP_TRACE_INFO0(" (2) Transmit on RF channel 39 (2480 MHz)");
161+
APP_TRACE_INFO0(" (0) Transmit Continuous Modulated on RF channel 0 (2402 MHz)");
162+
APP_TRACE_INFO0(" (1) Transmit Continuous Modulated on RF channel 19 (2440 MHz)");
163+
APP_TRACE_INFO0(" (2) Transmit Continuous Modulated RF channel 39 (2480 MHz)");
164164
APP_TRACE_INFO0(" (3) Receive on RF channel 39 (2480 MHz)");
165165
APP_TRACE_INFO0(" (4) Set Transmit power");
166-
APP_TRACE_INFO0(" (5) Enable constant PRBS9 TX");
166+
APP_TRACE_INFO0(" (5) Enable Constant Unmodulated TX");
167167
APP_TRACE_INFO0(" (6) Disable constant TX -- MUST be called after (5)");
168+
/* APP_TRACE_INFO0(" (7) Set PA value"); */
168169
APP_TRACE_INFO0(" (8) Set PHY");
169170
APP_TRACE_INFO0(" (9) TX Frequency Hop");
170171
APP_TRACE_INFO0(" (e) End transmission -- MUST be used after each (0-3, 9)");
@@ -199,27 +200,27 @@ static void processConsoleRX(uint8_t rxByte)
199200
switch (cmd) {
200201
case '0':
201202

202-
APP_TRACE_INFO1("Transmit RF channel 0 (2402M), 255 bytes/pkt, 0xPRBS9, %s, forever ..",
203+
APP_TRACE_INFO1("Transmit RF channel 0 (2402M), 255 bytes/pkt, PRBS15, %s, forever ..",
203204
getPhyStr());
204-
res = LlEnhancedTxTest(0, 255, LL_TEST_PKT_TYPE_PRBS9, phy, 0);
205+
res = LlEnhancedTxTest(0, 255, LL_TEST_PKT_TYPE_PRBS15, phy, 0);
205206
APP_TRACE_INFO2("res = %u %s", res, res == LL_SUCCESS ? "(SUCCESS)" : "(FAIL)");
206207
cmd = 0;
207208
break;
208209

209210
case '1':
210211

211-
APP_TRACE_INFO1("Transmit RF channel 19 (2440M), 255 bytes/pkt, 0xPRBS9, %s, forever ..",
212+
APP_TRACE_INFO1("Transmit RF channel 19 (2440M), 255 bytes/pkt, PRBS15, %s, forever ..",
212213
getPhyStr());
213-
res = LlEnhancedTxTest(19, 255, LL_TEST_PKT_TYPE_PRBS9, phy, 0);
214+
res = LlEnhancedTxTest(19, 255, LL_TEST_PKT_TYPE_PRBS15, phy, 0);
214215
APP_TRACE_INFO2("res = %u %s", res, res == LL_SUCCESS ? "(SUCCESS)" : "(FAIL)");
215216
cmd = 0;
216217
break;
217218

218219
case '2':
219220

220-
APP_TRACE_INFO1("Transmit RF channel 39 (2480M), 255 bytes/pkt, 0xPRBS9, %s, forever ..",
221+
APP_TRACE_INFO1("Transmit RF channel 39 (2480M), 255 bytes/pkt, PRBS15, %s, forever ..",
221222
getPhyStr());
222-
res = LlEnhancedTxTest(39, 255, LL_TEST_PKT_TYPE_PRBS9, phy, 0);
223+
res = LlEnhancedTxTest(39, 255, LL_TEST_PKT_TYPE_PRBS15, phy, 0);
223224
APP_TRACE_INFO2("res = %u %s", res, res == LL_SUCCESS ? "(SUCCESS)" : "(FAIL)");
224225
cmd = 0;
225226
break;

‎Examples/MAX32690/Bluetooth/BLE_fcc/main.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ void TMR2_IRQHandler(void)
151151
void printUsage(void)
152152
{
153153
APP_TRACE_INFO0("Usage: ");
154-
APP_TRACE_INFO0(" (0) Transmit on RF channel 0 (2402 MHz)");
155-
APP_TRACE_INFO0(" (1) Transmit on RF channel 19 (2440 MHz)");
156-
APP_TRACE_INFO0(" (2) Transmit on RF channel 39 (2480 MHz)");
154+
APP_TRACE_INFO0(" (0) Transmit Continuous Modulated on RF channel 0 (2402 MHz)");
155+
APP_TRACE_INFO0(" (1) Transmit Continuous Modulated on RF channel 19 (2440 MHz)");
156+
APP_TRACE_INFO0(" (2) Transmit Continuous Modulated RF channel 39 (2480 MHz)");
157157
APP_TRACE_INFO0(" (3) Receive on RF channel 39 (2480 MHz)");
158158
APP_TRACE_INFO0(" (4) Set Transmit power");
159-
APP_TRACE_INFO0(" (5) Enable constant TX");
159+
APP_TRACE_INFO0(" (5) Enable Constant Unmodulated TX");
160160
APP_TRACE_INFO0(" (6) Disable constant TX -- MUST be called after (5)");
161161
/* APP_TRACE_INFO0(" (7) Set PA value"); */
162162
APP_TRACE_INFO0(" (8) Set PHY");
@@ -193,7 +193,7 @@ static void processConsoleRX(uint8_t rxByte)
193193
switch (cmd) {
194194
case '0':
195195

196-
APP_TRACE_INFO1("Transmit RF channel 0, 255 bytes/pkt, 0xAA, %s, forever ..",
196+
APP_TRACE_INFO1("Transmit RF channel 0, 255 bytes/pkt, PRBS15, %s, forever ..",
197197
getPhyStr(phy));
198198
res = LlEnhancedTxTest(0, 255, LL_TEST_PKT_TYPE_PRBS15, phy, 0);
199199
APP_TRACE_INFO2("res = %u %s", res, res == LL_SUCCESS ? "(SUCCESS)" : "(FAIL)");
@@ -202,7 +202,7 @@ static void processConsoleRX(uint8_t rxByte)
202202

203203
case '1':
204204

205-
APP_TRACE_INFO1("Transmit RF channel 19, 255 bytes/pkt, 0xAA, %s, forever ..",
205+
APP_TRACE_INFO1("Transmit RF channel 19, 255 bytes/pkt, PRBS15, %s, forever ..",
206206
getPhyStr(phy));
207207
res = LlEnhancedTxTest(19, 255, LL_TEST_PKT_TYPE_PRBS15, phy, 0);
208208
APP_TRACE_INFO2("res = %u %s", res, res == LL_SUCCESS ? "(SUCCESS)" : "(FAIL)");
@@ -211,7 +211,7 @@ static void processConsoleRX(uint8_t rxByte)
211211

212212
case '2':
213213

214-
APP_TRACE_INFO1("Transmit RF channel 39, 255 bytes/pkt, 0xAA, %s, forever ..",
214+
APP_TRACE_INFO1("Transmit RF channel 39, 255 bytes/pkt, PRBS15, %s, forever ..",
215215
getPhyStr(phy));
216216
res = LlEnhancedTxTest(39, 255, LL_TEST_PKT_TYPE_PRBS15, phy, 0);
217217
APP_TRACE_INFO2("res = %u %s", res, res == LL_SUCCESS ? "(SUCCESS)" : "(FAIL)");

‎Libraries/Cordio/controller/include/ble/bb_ble_api.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,14 @@ void BbBleResetConnStats(void);
365365
*/
366366
/*************************************************************************************************/
367367
void BbBleGetTestStats(BbBleDataPktStats_t *pStats);
368-
368+
/*************************************************************************************************/
369+
/*!
370+
* \brief Reset test mode packet statistics.
371+
*
372+
* \return None.
373+
*/
374+
/*************************************************************************************************/
375+
void BbBleResetTestStats(void);
369376
/*************************************************************************************************/
370377
/*!
371378
* \brief Get PDU filter statistics.

‎Libraries/Cordio/controller/sources/ble/bb/bb_ble_dtm.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,3 +290,12 @@ void BbBleGetTestStats(BbBleDataPktStats_t *pStats)
290290
{
291291
*pStats = bbTestStats;
292292
}
293+
/*************************************************************************************************/
294+
/*!
295+
* \brief Reset test mode packet statistics.
296+
*/
297+
/*************************************************************************************************/
298+
void BbBleResetTestStats(void)
299+
{
300+
memset(&bbTestStats, 0, sizeof(bbTestStats));
301+
}

‎Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "util/bstream.h"
3434
#include "lmgr_api.h"
3535
#include <string.h>
36+
#include "bb_ble_api.h"
3637

3738
/*************************************************************************************************/
3839
/*!
@@ -266,9 +267,11 @@ static void lhciCommonSendCmdCmplEvt(LhciHdr_t *pCmdHdr, uint8_t status, uint8_t
266267
/* --- test --- */
267268

268269
case HCI_OPCODE_LE_RECEIVER_TEST:
270+
269271
lhciPackCmdCompleteEvtStatus(pBuf, status);
270272
break;
271273
case HCI_OPCODE_LE_TRANSMITTER_TEST:
274+
272275
lhciPackCmdCompleteEvtStatus(pBuf, status);
273276
break;
274277
case HCI_OPCODE_LE_TEST_END:
@@ -420,10 +423,13 @@ bool_t lhciCommonDecodeCmdPkt(LhciHdr_t *pHdr, uint8_t *pBuf)
420423
/* --- test --- */
421424

422425
case HCI_OPCODE_LE_RECEIVER_TEST:
426+
423427
status = LlRxTest(pBuf[0], 0);
424428
paramLen = LHCI_LEN_LE_RECEIVER_TEST_EVT;
425429
break;
426430
case HCI_OPCODE_LE_TRANSMITTER_TEST:
431+
432+
427433
status = LlTxTest(pBuf[0], pBuf[1], pBuf[2], 0);
428434
paramLen = LHCI_LEN_LE_TRANSMITTER_TEST_EVT;
429435
break;

‎Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd_vs.c

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "wsf_msg.h"
3838
#include "wsf_trace.h"
3939
#include "util/bstream.h"
40+
#include "bb_ble_api.h"
4041
#include <string.h>
4142

4243
/**************************************************************************************************
@@ -81,7 +82,7 @@ bool_t lhciCommonVsStdDecodeCmdPkt(LhciHdr_t *pHdr, uint8_t *pBuf)
8182
uint8_t status = HCI_SUCCESS;
8283
uint8_t evtParamLen = 1; /* default is status field only */
8384
uint32_t regReadAddr = 0;
84-
LlTestReport_t rpt = { 0 };
85+
8586

8687
/* Decode and consume command packet. */
8788

@@ -199,9 +200,15 @@ bool_t lhciCommonVsStdDecodeCmdPkt(LhciHdr_t *pHdr, uint8_t *pBuf)
199200
status = LlEnhancedTxTest(pBuf[0], pBuf[1], pBuf[2], pBuf[3], numPackets);
200201
break;
201202
}
202-
case LHCI_OPCODE_VS_END_TEST: {
203-
status = LlEndTest(&rpt);
204-
evtParamLen += sizeof(LlTestReport_t);
203+
case LHCI_OPCODE_VS_RESET_TEST_STATS: {
204+
status = LL_SUCCESS;
205+
206+
break;
207+
}
208+
case LHCI_OPCODE_VS_RX_TEST:
209+
{
210+
uint16_t numPackets = (pBuf[4] << 8) | pBuf[3];
211+
status = LlEnhancedRxTest(pBuf[0], pBuf[1], pBuf[2], numPackets);
205212
break;
206213
}
207214

@@ -227,14 +234,14 @@ bool_t lhciCommonVsStdDecodeCmdPkt(LhciHdr_t *pHdr, uint8_t *pBuf)
227234
case LHCI_OPCODE_VS_SET_TX_TEST_ERR_PATT:
228235
case LHCI_OPCODE_VS_SET_SNIFFER_ENABLE:
229236
case LHCI_OPCODE_VS_REG_WRITE:
230-
237+
case LHCI_OPCODE_VS_RX_TEST:
231238
case LHCI_OPCODE_VS_TX_TEST:
232239

233240
/* no action */
234241
break;
235242

236-
case LHCI_OPCODE_VS_END_TEST: {
237-
memcpy(pBuf, (uint8_t *)&rpt, sizeof(LlTestReport_t));
243+
case LHCI_OPCODE_VS_RESET_TEST_STATS: {
244+
BbBleResetTestStats();
238245
break;
239246
}
240247

‎Libraries/Cordio/controller/sources/ble/lhci/lhci_int.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,12 @@ extern "C" {
360360
HCI_OPCODE(HCI_OGF_VENDOR_SPEC, 0x302) /*!< Reset connection stats. */
361361
#define LHCI_OPCODE_VS_TX_TEST \
362362
HCI_OPCODE(HCI_OGF_VENDOR_SPEC, 0x303) /*!< Vendor specific TX test that takes numPkt param. */
363-
364-
#define LHCI_OPCODE_VS_END_TEST \
363+
#define LHCI_OPCODE_VS_RESET_TEST_STATS \
365364
HCI_OPCODE(HCI_OGF_VENDOR_SPEC, \
366365
0x304) /*!<Vendor specific End Test Returning More than RX Packets*/
366+
#define LHCI_OPCODE_VS_RX_TEST \
367+
HCI_OPCODE(HCI_OGF_VENDOR_SPEC, \
368+
0x305) /*!<Vendor specific RX Test*/
367369
/* Vendor specific event masks. */
368370
#define LHCI_VS_EVT_MASK_SCAN_REPORT_EVT 0x01 /*!< (Byte 0) VS event bit, scan report. */
369371
#define LHCI_VS_EVT_MASK_DIAG_TRACE_EVT 0x02 /*!< (Byte 0) VS event bit, diagnostic tracing. */

0 commit comments

Comments
 (0)