From 4d53dd087b18b3d3bae5e17e6a5aef2f72077880 Mon Sep 17 00:00:00 2001 From: EricB-ADI <122300463+EricB-ADI@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:29:00 -0500 Subject: [PATCH] fix(BLE): Fix build error in OTAS Example (#1071) Co-authored-by: EricB-ADI --- Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c b/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c index 6c8ebd4e8b3..e1748d10954 100644 --- a/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c +++ b/Examples/MAX32690/Bluetooth/BLE_otas/dats_main.c @@ -450,11 +450,8 @@ static void datsSetup(dmEvt_t *pMsg) { /* Initialize control information */ datsCb.restoringResList = FALSE; - < < < < < < < < < - Temporary merge branch 1 memcpy(&datsScanDataDisc[2], deviceName, sizeof(deviceName)); - datsScanDataDisc[0] = sizeof(deviceName); - datsScanDataDisc[1] = DM_ADV_TYPE_LOCAL_NAME; - == == == == = memcpy(&datsScanDataDisc[2], deviceName, sizeof(deviceName)); + + memcpy(&datsScanDataDisc[2], deviceName, sizeof(deviceName)); datsScanDataDisc[0] = sizeof(deviceName); datsScanDataDisc[1] = DM_ADV_TYPE_LOCAL_NAME;