Compare commits

...

6 Commits

Author SHA1 Message Date
weiting2 c95924fb63 [WARNING] do NOT use linux version CCS on simple central.
DLE can not enable on linux CCS
2020-07-20 16:57:32 +08:00
weiting2 d573b14179 linux version CCS. test central 2020-07-17 18:33:00 +08:00
weiting2 4b81306a4b linux version CCS. attempt to enable DLE 2020-07-17 16:59:00 +08:00
weiting2 206fe6a09d linux version CCS. attempt to enable DLE 2020-07-17 16:24:38 +08:00
weiting2 d84141a904 linux version CCS. attempt to enable DLE 2020-07-16 12:49:59 +08:00
weiting2 ffbf822141 linux version CCS 2020-07-16 11:09:02 +08:00
17 changed files with 26 additions and 26 deletions
@@ -132,7 +132,7 @@
/* -DBLE_V42_FEATURES=SECURE_CONNS_CFG+PRIVACY_1_2_CFG+EXT_DATA_LEN_CFG */
/* -DBLE_V42_FEATURES=SECURE_CONNS_CFG+PRIVACY_1_2_CFG */
/* -DBLE_V42_FEATURES=PRIVACY_1_2_CFG+EXT_DATA_LEN_CFG */
/* -DBLE_V42_FEATURES=SECURE_CONNS_CFG+EXT_DATA_LEN_CFG */
-DBLE_V42_FEATURES=SECURE_CONNS_CFG+EXT_DATA_LEN_CFG
/* -DBLE_V42_FEATURES=SECURE_CONNS_CFG */
/* -DBLE_V42_FEATURES=PRIVACY_1_2_CFG */
/* -DBLE_V42_FEATURES=EXT_DATA_LEN_CFG */
@@ -180,13 +180,13 @@ static void Board_keyCallback(PIN_Handle hPin, PIN_Id pinId)
#if defined (BOOSTXL_CC2650MA)
if ( PIN_getInputValue(PIN_MEM_INS) == 0 )
{
if(KEY_INSTEAD_UART == 1)
{
keysPressed |= KEY_RIGHT;
}
else{
// if(KEY_INSTEAD_UART == 1)
// {
// keysPressed |= KEY_RIGHT;
// }
// else{
keysPressed |= KEY_UART_EN;
}
// }
}
if ( PIN_getInputValue(PIN_MEM_REQ) == 0 )
@@ -106,7 +106,7 @@
*/
#ifdef USE_ICALL
#include <ICall.h>
#include <icall.h>
typedef ICall_CSState halIntState_t;
@@ -55,7 +55,7 @@
#include <inc/hw_aon_rtc.h>
#include <driverlib/aon_rtc.h>
#include <driverlib/aon_event.h>
#include "ICall.h"
#include "icall.h"
/*******************************************************************************
* MACROS
@@ -48,7 +48,7 @@
#include <stdint.h>
#include "ICall.h"
#include "icall.h"
#ifdef __cplusplus
extern "C" {
@@ -55,7 +55,7 @@ extern "C"
// includes
// ****************************************************************************
#include "hal_types.h"
#include "OSAL.h"
#include "osal.h"
// ****************************************************************************
// defines
@@ -75,7 +75,7 @@
#ifdef ICALL_JT
#include "icall_JT.h"
#else
#include <ICall.h>
#include <icall.h>
#endif /* ICALL_JT */
#endif /* USE_ICALL */
@@ -47,8 +47,8 @@
Release Date: 2018-04-02 18:03:35
*****************************************************************************/
#include "OSAL.h"
#include "OSAL_Tasks.h"
#include "osal.h"
#include "osal_tasks.h"
#include "hal_mcu.h"
#include "osal_cbtimer.h"
@@ -51,13 +51,13 @@
*/
#include "comdef.h"
#include "OSAL.h"
#include "OSAL_Memory.h"
#include "osal.h"
#include "osal_memory.h"
#ifdef ICALL_JT
#include "icall_JT.h"
#else
#include <ICall.h>
#include <icall.h>
#endif /* ICALL_JT */
/**************************************************************************************************
@@ -59,7 +59,7 @@
#ifdef ICALL_JT
#include "icall_JT.h"
#else
#include <ICall.h>
#include <icall.h>
#endif /* ICALL_JT */
#endif /* USE_ICALL */
@@ -62,11 +62,11 @@ extern "C"
#include <limits.h>
#include "comdef.h"
#include "OSAL_Memory.h"
#include "OSAL_Timers.h"
#include "osal_memory.h"
#include "osal_timers.h"
#ifdef USE_ICALL
#include <ICall.h>
#include <icall.h>
#endif /* USE_ICALL */
/*********************************************************************
@@ -80,7 +80,7 @@ the last entry in the page (higher memory address).
#include "hal_flash.h"
#include "hal_types.h"
#include "pwrmon.h"
#include "OSAL.h"
#include "osal.h"
#include "osal_snv.h"
#include "hal_assert.h"
#include <driverlib/vims.h>
@@ -1598,9 +1598,9 @@ static void SimpleBLECentral_processGATTMsg(gattMsgEvent_t *pMsg)
mem_UART_newline();
#else
// MTU size
uint8_t connect_done[4] = {"M", "T", "U", pMsg->msg.mtuEvt.MTU};
// uint8_t connect_done[4] = {"M", "T", "U", (uint8_t) (pMsg->msg.mtuEvt.MTU)};
uint8_t connect_done[4] = {'M', 'T', 'U', pMsg->msg.mtuEvt.MTU};
UART_write(uart_handle, connect_done, 4);
#endif
#endif
}
@@ -51,7 +51,7 @@
#include "hal_types.h"
#include "ble_user_config.h"
#include <ti/drivers/rf/rf.h>
#include <ti/drivers/rf/RF.h>
#if defined(BLE_V42_FEATURES) && (BLE_V42_FEATURES & SECURE_CONNS_CFG)
#include "ecc/ECCROMCC26XX.h"
@@ -49,7 +49,7 @@
*/
#include "osal_snv.h"
#include "osal_bufmgr.h"
#include "hci.h"
//#include "hci.h"
#include "sm.h"
#include "gap.h"
#include "gatt.h"