Nothing should change

# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/host_test_app.c
#	simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/main.c
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/main.c
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/simple_peripheral.c
#	simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx/simple_gatt_profile.c
#	simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/simple_gatt_profile.h

.gitignore

@@ -5,7 +5,4 @@ xdctools_*/
 ccsv8/
 
 # CSS build files
-FlashROM/
-
-# python cache
-__pycache__/
+FlashROM/

.idea/scopes/Driver.xml

@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="Driver" pattern="file[BioProCC2650]:simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/*||file[BioProCC2650]:simplelink/ble_sdk_2_02_02_25/src/boards/CC2650_LAUNCHXL/*||file[BioProCC2650]:tirtos_cc13xx_cc26xx_2_21_01_08/products/tidrivers_cc13xx_cc26xx_2_21_01_01/packages/ti/drivers//*" />
-</component>

python_test_code/devlib/util.py

@@ -1,673 +0,0 @@
-import re
-from typing import *
-
-T = TypeVar('T')
-
-
-@overload
-def part_prefix(line: str, char: str, from_right=False) -> Tuple[Optional[str], str]:
-    pass
-
-
-@overload
-def part_prefix(line: str, char: str, missing: T, from_right=False) -> Tuple[Union[str, T], str]:
-    pass
-
-
-def part_prefix(line: str, char: str, missing: Optional[T] = None, from_right=False) -> Tuple[Union[None, str, T], str]:
-    try:
-        if from_right:
-            i = line.rindex(char)
-        else:
-            i = line.index(char)
-        return line[:i], line[i + len(char):]
-    except ValueError:
-        return missing, line
-
-
-@overload
-def part_suffix(line: str, char: str, from_right=False) -> Tuple[str, Optional[str]]:
-    pass
-
-
-@overload
-def part_suffix(line: str, char: str, missing: T, from_right=False) -> Tuple[str, Union[str, T]]:
-    pass
-
-
-def part_suffix(line: str, char: str, missing: Optional[T] = None, from_right=False) -> Tuple[str, Union[None, str, T]]:
-    try:
-        if from_right:
-            i = line.rindex(char)
-        else:
-            i = line.index(char)
-        return line[:i], line[i + len(char):]
-    except ValueError:
-        return line, missing
-
-
-def hex_line(data: Union[bytes, Sequence[int]], split=' ', truncate=False) -> str:
-    """ bytes value to str
-
-    return example ::
-
-        # input
-        b'\x00ABC\x00'
-
-        # output
-        0x00 0x65 0x66 0x67 0x00
-
-        # output truncate version
-        0x00 0x65 (skip 0x02) 0x00
-
-    :param data: bytes value
-    :param split: char join between byte value
-    :param truncate: truncate output if too long
-    :return: byte value
-    """
-    if truncate and len(data) > 16:
-        line = list(map(lambda v: '%02X' % v, data[0:8]))
-        line.append('(skip 0x%02X)' % (len(data) - 12))
-        line.extend(map(lambda v: '%02X' % v, data[-4:]))
-        return split.join(line)
-    else:
-        return split.join(map(lambda v: '%02X' % v, data))
-
-
-def endian_switch(value: int, bit: int) -> int:
-    ret = 0
-
-    for _ in range(bit):
-        ret = (ret << 1) | (value & 1)
-
-        value >>= 1
-
-    return ret
-
-
-def append_buffer(buffer: List[int], shift: int, width: int, value: int, little_endian=False) -> int:
-    if width == 0:
-        return shift % 8
-
-    if len(buffer) == 0:
-        buffer.append(0)
-
-    if little_endian:
-        value = endian_switch(value, width)
-
-    while shift >= 8:
-        buffer.append(0)
-        shift -= 8
-
-    while shift + width >= 8:
-        # high
-        offset = 8 - shift
-        mask = (1 << offset) - 1
-        buffer[-1] |= (value >> (width - offset)) & mask
-
-        if shift + width == 8:
-            return 8
-
-        # low
-        buffer.append(0)
-        shift = 0
-        width -= offset
-        value &= (1 << width) - 1
-
-    offset = 8 - (shift + width)
-    mask = (1 << width) - 1
-    buffer[-1] |= (value & mask) << offset
-
-    return (shift + width) % 8
-
-
-class DeviceInstruction:
-    """
-    **Instruction Send**
-
-    raw byte data format. ::
-
-        | 0             |   1           |       2       |           3   |
-        0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
-        -----------------------------------------------------------------
-        |  RIS  |  ID   |       |  LEN  | .............................   real instruction send
-        |  VIS  |  ID   |  OPER |  LEN  | .............................   virtual instruction send
-        |  CIS  |  ID   |  OPER |  LEN  | .............................   command instruction send
-
-    ID
-        chip ID
-
-    RIS
-        header for real instruction type. (header=3)
-
-    VIS
-        header for virtual instruction type. (header=C)
-
-    CIS
-        header for command instruction type. (header=7)
-
-    OPER
-        operator/command
-
-    LEN, length
-        command/data length in bytes
-    """
-
-    TYP_RIS = 0x30
-    """header for real instruction type.
-    It is real instruction send to the chip which contain the chip configuration parameter.
-    """
-
-    TYP_VIS = 0xC0
-    """header for virtual instruction type.
-    It is virtual instruction send to the controller chip to control the chip.
-    """
-
-    TYP_CIS = 0x70
-    """header for command instruction type. 
-    It is command send to the controller chip for the special purpose.
-    """
-
-    VIS_RST = 0xF0
-    """reset virtual instruction"""
-
-    VIS_ASK = 0x30
-    """ask in virtual instruction"""
-
-    VIS_STI = 0xC0
-    """stimulation on virtual instruction"""
-
-    VIS_FUH = 0x90
-    """flush virtual instruction"""
-
-    VIS_INT = 0x60
-    """interrupt virtual instruction"""
-
-    VIS_CAL = 0xA0
-    """device calling"""
-
-    CIS_VOLT = 0x10
-    """get device battery voltage level"""
-
-
-class InstructionContentWidth:
-    """instruction width.
-
-    **format**
-
-    ::
-
-        InstructionContentWidth :str
-            = SIZE TYPE? ENDIAN? SIGN?
-
-        base = BASE ")"
-
-        SIGN = "+"
-
-    **SIZE**
-
-    bit width or byte length, default 1
-    '*' for array
-
-    **TYPE**
-
-    ==== ==================================
-    TYPE description
-    ==== ==================================
-    b    bits
-    B    bytes 2-base value
-    o, O bytes 8-base value
-    d, D bytes 10-base value
-    x, X bytes 16-base value
-    ==== ==================================
-
-    **ENDIAN**
-
-    ====== ==================================
-    ENDIAN description
-    ====== ==================================
-    >      big endian (default)
-    <      little endian
-    ====== ==================================
-
-    **BASE**
-
-    value base, 2 for bit default, 16 for byte default.
-
-    """
-
-    __slots__ = ('_size', '_bytes_type', '_signed', '_little_endian')
-
-    BASE = {
-        'b': 2,
-        'B': 2,
-        'o': 8,
-        'O': 8,
-        'd': 10,
-        'D': 10,
-        'x': 16,
-        'X': 16,
-    }
-
-    def __init__(self,
-                 size: Optional[int],
-                 bytes_type: str,
-                 signed_value=False,
-                 little_endian=False):
-        self._size = size
-        self._bytes_type = bytes_type
-        self._signed = signed_value
-        self._little_endian = little_endian
-
-    @property
-    def size(self) -> Optional[int]:
-        return self._size
-
-    @property
-    def little_endian(self) -> bool:
-        return self._little_endian
-
-    @property
-    def signed(self) -> bool:
-        # XXX  InstructionContentWidth.signed not used
-        return self._signed
-
-    @property
-    def bytes_unit(self) -> bool:
-        return self._bytes_type in 'BODX'
-
-    @property
-    def is_array(self) -> bool:
-        # XXX  InstructionContentWidth.is_array not used
-        return self._size is None
-
-    @property
-    def width(self) -> int:
-        if self._bytes_type in 'bB':
-            return self._size
-        else:
-            return self._size * 8
-
-    @property
-    def value_base(self) -> int:
-        return self.BASE[self._bytes_type]
-
-    def __str__(self):
-        return '%s%s%s%s' % (str(self._size) if self._size is not None else '*',
-                             self._bytes_type,
-                             '<' if self._little_endian else '>',
-                             '+' if self._signed else '')
-
-    PATTERN = re.compile(
-        r'(?P<SIZE>(\*|\d+))?(?P<TYPE>[XxDdOoBb])(?P<ENDIAN>[<>])?(?P<SIGN>\+)?(?P<EXPR>.+)')
-
-    @classmethod
-    def parse(cls, expr: str) -> Tuple['InstructionContentWidth', str]:
-        m = cls.PATTERN.match(expr)
-
-        if m is None:
-            raise RuntimeError('illegal instruction content width : ' + expr)
-
-        z = m.group('SIZE')
-        t = m.group('TYPE')
-        e = m.group('ENDIAN')
-        s = m.group('SIGN')
-        x = m.group('EXPR')
-
-        if z is None:
-            z = 1
-        elif z == '*':
-            z = None
-        else:
-            z = int(z)
-
-        return InstructionContentWidth(z, t, signed_value=s is not None, little_endian=e == '<'), x
-
-
-class InstructionContent:
-    """
-    **format**
-
-    ::
-
-        InstructionContent
-            = "#" ...                       # comment
-            | InstructionContent "#" ...    # instruction with comment
-            | InstructionDataContent
-            | InstructionConditionContent
-            | CompactInstructionContent
-    """
-
-    __slots__ = ('_comment',)
-
-    def __init__(self, comment: Optional[str] = None):
-        self._comment: Optional[str] = comment
-
-    @property
-    def width(self) -> int:
-        return 0
-
-    def build_instruction(self, context: Dict[str, Any], buffer: List[int], shift: int) -> int:
-        """
-
-        :param context: general case root
-        :param buffer: instruction buffer
-        :param shift: data offset
-        :return: next data offset
-        """
-
-        return shift
-
-    def __str__(self):
-        if self._comment is None:
-            return '#'
-        else:
-            return '#' + self._comment
-
-
-class InstructionDataContent(InstructionContent):
-    """
-    **format**
-
-    ::
-
-        InstructionDataContent
-            = InstructionContentWidth instruction_content
-
-        instruction_content
-            = int                   # binary number
-            | parameter_name :str
-            | parameter_name[index:int] # array parameter access
-
-
-
-
-    """
-
-    __slots__ = ('_width', '_value', '_index')
-
-    def __init__(self,
-                 width: InstructionContentWidth,
-                 value: Union[int, str],
-                 comment: Optional[str] = None):
-        super().__init__(comment)
-        self._width: InstructionContentWidth = width
-
-        if isinstance(value, str) and '[' in value and value.endswith(']'):
-            value, index = part_suffix(value[:-1], '[')
-
-            self._value: Union[int, str] = value
-            self._index: str = index
-        else:
-
-            self._value: Union[int, str] = value
-            self._index: str = None
-
-    @property
-    def width(self) -> int:
-        return self._width.width
-
-    def value(self, context: Dict[str, Any]) -> Union[int, List[int]]:
-        value = self._value
-
-        if isinstance(value, int):
-            return value
-
-        try:
-            return int(value, self._width.value_base)
-
-        except ValueError:
-            ret = context[value]
-
-            index = self._index
-            if index is None:
-                return ret
-
-            else:
-                try:
-                    index = int(index)
-                except ValueError:
-                    index = int(context[index])
-
-                return ret[index]
-
-    def build_instruction(self, context: Dict[str, Any], buffer: List[int], shift: int) -> int:
-        if self._width.is_array:
-            raise NotImplemented()
-
-        else:
-            value = int(self.value(context))
-
-            if self._width.bytes_unit:
-                if self._width.size == 1:
-                    buffer.append(value)
-
-                else:
-                    tmp = []
-                    for _ in range(self._width.size):
-                        tmp.append(value & 0xFF)
-                        value >>= 8
-
-                    if self._width.little_endian:
-                        buffer.extend(tmp)
-                    else:
-                        buffer.extend(tmp[::-1])
-
-                return 8
-
-            else:
-                width = self._width.width
-                return append_buffer(buffer, shift, width, value,
-                                     little_endian=self._width.little_endian)
-
-    def __str__(self):
-        if isinstance(self._value, int):
-            value = bin(self._value)[2:]
-        else:
-            if self._index is not None:
-                value = '%s[%s]' % (self._value, str(self._index))
-            else:
-                value = self._value
-
-        if self._comment is None:
-            return '%s%s' % (self._width, value)
-        else:
-            return '%s%s#%s' % (self._width, value, self._comment)
-
-
-class InstructionConditionContent(InstructionDataContent):
-    """
-    **json format**
-
-    ::
-
-        InstructionConditionContent
-            = InstructionContentWidth parameter_name "?"
-            | InstructionContentWidth parameter_name "?:" if_false
-            | InstructionContentWidth parameter_name "?" if_true ":" if_false
-
-        if_true, if_false
-            = int
-            | parameter_name :str
-    """
-
-    __slots__ = ('_true', '_false')
-
-    def __init__(self,
-                 width: InstructionContentWidth,
-                 value: str,
-                 if_true: Union[None, int, str] = None,
-                 if_false: Union[None, int, str] = None,
-                 comment: Optional[str] = None):
-
-        if if_true is not None and if_false is None:
-            raise RuntimeError('lost if_true')
-
-        super().__init__(width, value, comment)
-
-        self._true = if_true
-        self._false = if_false
-
-    def value(self, context: Dict[str, Any]) -> Union[int, List[int]]:
-        value = context[self._value]
-        test = value is not None
-
-        if self._true is None and self._false is None:
-            return 1 if test else 0
-
-        elif self._true is None:
-            assert self._false is not None
-
-            if test:
-                return value
-            else:
-                branch = self._false
-
-        else:
-            assert self._true is not None
-            assert self._false is not None
-
-            branch = self._true if test else self._false
-
-        if isinstance(branch, int):
-            return branch
-
-        try:
-            return int(branch, self._width.value_base)
-
-        except ValueError:
-            return context[branch]
-
-    def __str__(self):
-        if self._comment is None:
-            c = ''
-        else:
-            c = '#' + self._comment
-
-        if self._true is None and self._false is None:
-            return "%s%s?%s" % (self._width, self._value, c)
-        elif self._true is None:
-            return "%s%s?:%s%s" % (self._width, self._value, self._false, c)
-        else:
-            return "%s%s?%s:%s%s" % (self._width, self._value, self._true, self._false, c)
-
-
-class CompactInstructionContent(InstructionContent):
-    """
-    **json format**
-
-    ::
-
-        CompactInstructionContent
-            = InstructionContent ";" InstructionContent ...
-
-    """
-
-    __slots__ = ('_instruction',)
-
-    def __init__(self, instruction: List[InstructionContent]):
-        super().__init__()
-        self._instruction = instruction
-
-    @property
-    def width(self) -> int:
-        return sum(map(lambda i: i.width, self._instruction))
-
-    def build_instruction(self, context: Dict[str, Any], buffer: List[int], shift: int) -> int:
-        for instruction in self._instruction:
-            shift = instruction.build_instruction(context, buffer, shift)
-
-        return shift
-
-    def __str__(self) -> str:
-        return ';'.join(map(str, self._instruction))
-
-
-def parse_instruction(expr: str) -> InstructionContent:
-    origin_expr = expr
-
-    if expr == '#':
-        return InstructionContent()
-
-    elif expr.startswith('#'):
-        return InstructionContent(comment=expr[1:])
-
-    elif ';' in expr:
-        return CompactInstructionContent([parse_instruction(v) for v in expr.split(';')])
-
-    else:
-        ins_argv = {}
-        expr, comment = part_suffix(expr, '#')
-        expr, condition = part_suffix(expr, '?')
-
-        if condition is not None:
-            ins_type = InstructionConditionContent
-
-            if len(condition) == 0:
-                ins_argv['if_true'] = None
-                ins_argv['if_false'] = None
-
-            else:
-                t, f = part_prefix(condition, ':')
-
-                if t is None:
-                    raise RuntimeError('illegal condition instruction : ' + origin_expr)
-
-                elif len(t) == 0:
-                    t = None
-
-                ins_argv['if_true'] = t
-                ins_argv['if_false'] = f
-
-        else:
-            ins_type = InstructionDataContent
-
-        width, expr = InstructionContentWidth.parse(expr)
-
-        return ins_type(width, expr, **ins_argv, comment=comment)
-
-
-def eval_instruction(expr: Union[str, int], context: Dict[str, Any], buffer: Optional[List[int]] = None) -> List[int]:
-    if buffer is None:
-        buffer = []
-
-    if isinstance(expr, str):
-        ins = parse_instruction(expr)
-
-        ins.build_instruction(context, buffer, 0)
-
-    elif isinstance(expr, int):
-        if expr in (DeviceInstruction.VIS_RST,
-                    DeviceInstruction.VIS_ASK,
-                    DeviceInstruction.VIS_STI,
-                    DeviceInstruction.VIS_FUH,
-                    DeviceInstruction.VIS_INT,
-                    DeviceInstruction.VIS_CAL):
-            buffer.extend([DeviceInstruction.TYP_VIS, expr])
-
-        else:
-            raise RuntimeError('unknown expr code : ' + str(expr))
-
-    else:
-        raise RuntimeError('illegal expr type : ' + str(expr))
-
-    return buffer
-
-
-def print_instruction(expr: Union[str, int],
-                      context: Dict[str, Any],
-                      append_ris_type: Optional[str] = None):
-    buffer = []
-
-    eval_instruction(expr, context, buffer)
-
-    if append_ris_type is not None and isinstance(expr, str):
-        length = len(buffer)
-        buffer.insert(0, 0x30)
-        buffer.insert(1, length)
-
-    if append_ris_type is None:
-        print(hex_line(buffer))
-    else:
-        for i, v in enumerate(buffer):
-            print(append_ris_type, '[%d]' % i, ' = ', '0x%02X' % v, ';', sep='')

python_test_code/general/gptimer.py

@@ -1,22 +0,0 @@
-CPU_FREQUENCY = 48e6
-
-
-def headstage_gptimer_get_frequency_load_value(frequency: float) -> int:
-    load = int(CPU_FREQUENCY / frequency) - 1
-
-    if load < 0xFFFF:
-        return load
-    else:
-        return 0xFA0000 | int(load / 250) - 1
-
-
-def headstage_gptimer_get_timeout_load_value(timeout_us: int) -> int:
-    load = int(timeout_us * CPU_FREQUENCY / 1e6) - 1
-
-    if load < 0xFFFF:
-        return load
-    else:
-        return 0xFA0000 | int(load / 250) - 1
-
-
-print('0x%06X' % headstage_gptimer_get_frequency_load_value(0.8))

python_test_code/sti/sti00.py

@@ -1,115 +0,0 @@
-from typing import Dict, Any
-
-from devlib.util import print_instruction, DeviceInstruction
-
-CHANNEL_STI_0 = 0
-CHANNEL_STI_1 = 1
-
-STI_WAVEFORM_POS = 0x00
-STI_WAVEFORM_NEG = 0x01
-STI_WAVEFORM_P2N = 0x02
-STI_WAVEFORM_N2P = 0x03
-
-STI_PRECISION_10 = 0
-STI_PRECISION_01 = 1
-
-STI_INSTRUCTION = {
-    'GLOBAL':  '5b11111;2b0#GV;12bCURRENT',
-    'LOCAL':   '5b11111;2b01#LV;3b>CHANNEL;1b>PRECISION;3b>STI_MODE;12b>STI_FREQ;10b>STI_PW;10b>STI_PW_IPI;10b>STI_NUM',
-    'CHANNEL': '5b11111;2b10#CE;ba0;ba1;ba2;ba3;ba4;ba5;ba6;ba7;ba8;ba9;baa;bab;bac;bad;bae;baf'
-}
-
-DEFAULT_PARAMETER = {
-    'CURRENT':    10,  # uA
-    'CHANNEL':    CHANNEL_STI_0,
-    'STI_MODE':   STI_WAVEFORM_POS,
-    'PRECISION':  STI_PRECISION_10,
-    'STI_FREQ':   1000,  # Hz
-    'STI_PW':     100,  # us
-    'STI_PW_IPI': 50,  # us
-    'STI_NUM':    900,
-}
-
-
-def validate_frequency_parameter(parameter: Dict[str, Any]) -> bool:
-    p = int(parameter['PRECISION'])
-    f = int(parameter['STI_FREQ'])
-    w = int(parameter['STI_PW'])
-    i = int(parameter['STI_PW_IPI'])
-    return 1e6 * (1 if p == 0 else 10) / f >= 2 * w + i
-
-
-def get_channel_enable_parameter(*channel: int):
-    return {
-        'a0': 1 if 0 in channel else 0,
-        'a1': 1 if 1 in channel else 0,
-        'a2': 1 if 2 in channel else 0,
-        'a3': 1 if 3 in channel else 0,
-        'a4': 1 if 4 in channel else 0,
-        'a5': 1 if 5 in channel else 0,
-        'a6': 1 if 6 in channel else 0,
-        'a7': 1 if 7 in channel else 0,
-        'a8': 1 if 8 in channel else 0,
-        'a9': 1 if 9 in channel else 0,
-        'aa': 1 if 10 in channel else 0,
-        'ab': 1 if 11 in channel else 0,
-        'ac': 1 if 12 in channel else 0,
-        'ad': 1 if 13 in channel else 0,
-        'ae': 1 if 14 in channel else 0,
-        'af': 1 if 15 in channel else 0,
-    }
-
-
-# -------------------------------------------------------------------------------------------------------------------- #
-
-STI_PARAMETER_0 = {
-    'CURRENT':    10,  # uA
-    'CHANNEL':    CHANNEL_STI_0,
-    'STI_MODE':   STI_WAVEFORM_POS,
-    'PRECISION':  STI_PRECISION_10,
-    'STI_FREQ':   10,  # Hz
-    'STI_PW':     10,  # us
-    'STI_PW_IPI': 10,  # us
-    'STI_NUM':    900,
-}
-
-STI_PARAMETER_1 = {
-    'CURRENT':    10,  # uA
-    'CHANNEL':    CHANNEL_STI_1,
-    'STI_MODE':   STI_WAVEFORM_NEG,
-    'PRECISION':  STI_PRECISION_10,
-    'STI_FREQ':   10,  # Hz
-    'STI_PW':     10,  # us
-    'STI_PW_IPI': 10,  # us
-    'STI_NUM':    900,
-}
-
-print_instruction(STI_INSTRUCTION['GLOBAL'], STI_PARAMETER_0, append_ris_type=False)
-
-valid_channel_0 = validate_frequency_parameter(STI_PARAMETER_0)
-valid_channel_1 = validate_frequency_parameter(STI_PARAMETER_1)
-enable_channel = []
-
-if not valid_channel_0:
-    print('invalidate parameter')
-else:
-    print('----')
-    print_instruction(STI_INSTRUCTION['LOCAL'], STI_PARAMETER_0, append_ris_type=False)
-    enable_channel.append(0)
-
-if not valid_channel_1:
-    print('invalidate parameter')
-else:
-    print('----')
-    print_instruction(STI_INSTRUCTION['LOCAL'], STI_PARAMETER_1, append_ris_type=False)
-    enable_channel.append(1)
-
-if valid_channel_0 or valid_channel_1:
-    print('----')
-    print_instruction(STI_INSTRUCTION['CHANNEL'], get_channel_enable_parameter(*enable_channel), append_ris_type=False)
-
-print('--sti--')
-print_instruction(DeviceInstruction.VIS_STI, {})
-
-print('--int--')
-print_instruction(DeviceInstruction.VIS_INT, {})

python_test_code/sti/sti10.py

@@ -1,134 +0,0 @@
-from typing import Dict, Any
-
-from devlib.util import print_instruction, DeviceInstruction
-
-CHANNEL_STI_0 = 0
-CHANNEL_STI_1 = 1
-
-STI_WAVEFORM_POS = 0x00
-STI_WAVEFORM_NEG = 0x01
-STI_WAVEFORM_P2N = 0x02
-STI_WAVEFORM_N2P = 0x03
-STI_WAVEFORM_SIN = 0x04
-
-STI_PRECISION_10 = 0
-STI_PRECISION_01 = 1
-
-STI_NUM_INFINITE = 1000
-
-STI_INSTRUCTION = {
-    'GLOBAL': '3b001#header#;1b0;12bCURRENT',
-    'LOCAL':  '3b010#header;1b0;4b>CHANNEL;3b>STI_MODE;1b>PRECISION;12b>STI_FREQ;10b>STI_PW;10b>STI_PW_IPI;10b>STI_NUM'
-}
-
-DEFAULT_PARAMETER = {
-    'CURRENT':    10,  # uA
-    'CHANNEL':    CHANNEL_STI_0,
-    'STI_MODE':   STI_WAVEFORM_POS,
-    'PRECISION':  STI_PRECISION_10,
-    'STI_FREQ':   1000,  # Hz
-    'STI_PW':     100,  # us
-    'STI_PW_IPI': 50,  # us
-    'STI_NUM':    STI_NUM_INFINITE,
-}
-
-
-def validate_frequency_parameter(parameter: Dict[str, Any]) -> bool:
-    p = int(parameter['PRECISION'])
-    f = int(parameter['STI_FREQ'])
-    w = int(parameter['STI_PW'])
-    i = int(parameter['STI_PW_IPI'])
-    return 1e6 * (1 if p == 0 else 10) / f >= 2 * w + i
-
-
-SPIN_TIMEOUT = [
-    (10, 53),
-    (20, 106),
-    (30, 160),
-    (40, 214),
-    (50, 265),
-    (60, 319),
-    (70, 374),
-    (80, 427),
-    (100, 533),
-    (150, 800),
-    (200, 1066),
-    (300, 1600),
-    (400, 2133),
-    (500, 2666),
-    (1000, 5332),
-]
-
-
-def get_spin_timeout_value(timeout_us: int) -> int:
-    if timeout_us == 0:
-        return 0
-
-    elif timeout_us <= SPIN_TIMEOUT[0][0]:
-        return SPIN_TIMEOUT[0][1]
-
-    elif timeout_us >= SPIN_TIMEOUT[-1][0]:
-        return SPIN_TIMEOUT[-1][1]
-
-    else:
-        for i in range(len(SPIN_TIMEOUT)):
-            t0 = SPIN_TIMEOUT[i][0]
-            v0 = SPIN_TIMEOUT[i][1]
-
-            if timeout_us == t0:
-                return v0
-
-            t1 = SPIN_TIMEOUT[i + 1][0]
-            v1 = SPIN_TIMEOUT[i + 1][1]
-
-            if t0 < timeout_us < t1:
-                dt = t1 - t0
-                return int((t1 - timeout_us) * v0 / dt + (timeout_us - t0) * v1 / dt)
-
-        raise RuntimeError()
-
-
-# -------------------------------------------------------------------------------------------------------------------- #
-
-
-STI_PARAMETER_0 = {
-    'CURRENT':    10,  # uA
-    'CHANNEL':    CHANNEL_STI_0,
-    'STI_MODE': STI_WAVEFORM_SIN,
-    'PRECISION':  STI_PRECISION_10,
-    'STI_FREQ':   10,  # Hz
-    'STI_PW':     10,  # us
-    'STI_PW_IPI': 10,  # us
-    'STI_NUM':    STI_NUM_INFINITE,
-}
-
-STI_PARAMETER_1 = {
-    'CURRENT':    10,  # uA
-    'CHANNEL':    CHANNEL_STI_1,
-    'STI_MODE': STI_WAVEFORM_SIN,
-    'PRECISION':  STI_PRECISION_10,
-    'STI_FREQ':   10,  # Hz
-    'STI_PW':     10,  # us
-    'STI_PW_IPI': 10,  # us
-    'STI_NUM':    STI_NUM_INFINITE,
-}
-
-print_instruction(STI_INSTRUCTION['GLOBAL'], STI_PARAMETER_0, append_ris_type='ins')
-
-if not validate_frequency_parameter(STI_PARAMETER_0):
-    print('invalidate parameter')
-else:
-    print('----')
-    print_instruction(STI_INSTRUCTION['LOCAL'], STI_PARAMETER_0, append_ris_type='ins')
-
-if not validate_frequency_parameter(STI_PARAMETER_1):
-    print('invalidate parameter')
-else:
-    print('----')
-    print_instruction(STI_INSTRUCTION['LOCAL'], STI_PARAMETER_1, append_ris_type='ins')
-
-print('--sti--')
-print_instruction(DeviceInstruction.VIS_STI, {})
-
-print('--int--')
-print_instruction(DeviceInstruction.VIS_INT, {})

python_test_code/uni/population.py

@@ -1,72 +0,0 @@
-import unittest
-from random import randint
-
-
-def pop_count(value: int) -> int:
-    value -= ((value >> 1) & 0x55555555)
-    value = (((value >> 2) & 0x33333333) + (value & 0x33333333))
-    value = (((value >> 4) + value) & 0x0f0f0f0f)
-    value += (value >> 8)
-    value += (value >> 16)
-    return value & 0x0000003f
-
-
-def bit_reverse(value: int) -> int:
-    value = (((value & 0xaaaaaaaa) >> 1) | ((value & 0x55555555) << 1))
-    value = (((value & 0xcccccccc) >> 2) | ((value & 0x33333333) << 2))
-    value = (((value & 0xf0f0f0f0) >> 4) | ((value & 0x0f0f0f0f) << 4))
-    value = (((value & 0xff00ff00) >> 8) | ((value & 0x00ff00ff) << 8))
-    return (value >> 16) | (value << 16)
-
-
-def umc_pass_check(v1: int, v2: int) -> bool:
-    return pop_count(v1) + pop_count(v2) == 4
-
-
-class PopCountTest(unittest.TestCase):
-    def test_zero(self):
-        self.assertEqual(0, pop_count(0))
-
-    def test_one(self):
-        self.assertEqual(1, pop_count(1))
-
-    def test_two(self):
-        for _ in range(4):
-            a = randint(0, 8)
-            b = randint(0, 8)
-
-            while a == b:
-                b = randint(0, 8)
-
-            a = 1 << a
-            b = 1 << b
-            v = a | b
-            self.assertEqual(2, pop_count(v))
-
-
-class BitReverseTest(unittest.TestCase):
-    def test_zero(self):
-        self.assertEqual(0, bit_reverse(0))
-
-    def test_one(self):
-        self.assertEqual(0x8000_0000, bit_reverse(1))
-
-    def test_random_one(self):
-        for _ in range(4):
-            a = randint(0, 15)
-            b = 31 - a
-
-            va = 1 << a
-            vb = 1 << b
-
-            self.assertEqual(vb, bit_reverse(va), f"a = {a}, b = {b}")
-
-
-class UmcPassCheckTest(unittest.TestCase):
-    def test_validate(self):
-        self.assertFalse(umc_pass_check(0b0101_0001_0100_0000_0000_0000_0000_0000,
-                                        0b0101_0000_0000_1100_0000_0000_0000_0000))
-
-
-if __name__ == '__main__':
-    unittest.main()

python_test_code/uni/rearrange_channel.py

@@ -1,6 +1,6 @@
 import unittest
-from random import randint
 from typing import List, Optional
+from random import randint
 
 REC_CHANNEL_COUNT = 16
 
@@ -60,33 +60,6 @@ def rearrange_channel_mux_table(channel_table: List[bool]) -> Optional[List[int]
     return channel_mux
 
 
-def rearrange_channel_count(channel_table: List[int]) -> List[int]:
-    ret = [0 for _ in range(REC_CHANNEL_COUNT)]
-
-    i = len(channel_table) - 1
-
-    if i < 0:
-        return ret
-
-    c = channel_table[i]
-
-    if i == 0:
-        ret[c] += 1
-        return ret
-
-    while c >= 0:
-        ret[channel_table[i]] += 1
-
-        c -= 1
-
-        if i == 0:
-            i = len(channel_table) - 1
-        else:
-            i -= 1
-
-    return ret
-
-
 class UniRearrangeMuxChannelTest(unittest.TestCase):
     def test_empty_channel(self):
         self.assertIsNone(rearrange_channel_mux_table(to_channel_table()))
@@ -104,42 +77,6 @@ class UniRearrangeMuxChannelTest(unittest.TestCase):
                          rearrange_channel_mux_table(to_channel_table(1, 2)))
         self.assertEqual([2, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
                          rearrange_channel_mux_table(to_channel_table(2, 1)))
-        self.assertEqual([3, 7, 2, 3, 7, 2, 3, 7, 0, 0, 0, 0, 0, 0, 0, 0],
-                         rearrange_channel_mux_table(to_channel_table(7, 3, 2)))
-
-    def test_many_channel(self):
-        self.assertEqual([5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ],
-                         rearrange_channel_mux_table(to_channel_table(5)))
-
-        self.assertEqual([2, 5, 2, 5, 2, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ],
-                         rearrange_channel_mux_table(to_channel_table(2, 5)))
-
-        self.assertEqual([1, 3, 5, 1, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ],
-                         rearrange_channel_mux_table(to_channel_table(1, 3, 5)))
-
-        self.assertEqual([3, 5, 0, 1, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ],
-                         rearrange_channel_mux_table(to_channel_table(0, 1, 3, 5)))
-
-        self.assertEqual([5, 0, 1, 2, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ],
-                         rearrange_channel_mux_table(to_channel_table(0, 1, 2, 3, 5)))
-
-        self.assertEqual([0, 1, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ],
-                         rearrange_channel_mux_table(to_channel_table(0, 1, 2, 3, 4, 5)))
-
-
-class UniRearrangeChannelCount(unittest.TestCase):
-    def test_empty_channel(self):
-        self.assertEqual([0 for _ in range(REC_CHANNEL_COUNT)], rearrange_channel_count([]))
-
-    def test_single_channel(self):
-        self.assertEqual([0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                         rearrange_channel_count([2]))
-        self.assertEqual([0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                         rearrange_channel_count([4]))
-
-    def test_two_channel(self):
-        self.assertEqual([0, 0, 2, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-                         rearrange_channel_count([2, 4]))
 
 
 if __name__ == '__main__':

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/app/.ccsproject

@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/app/.cproject

@@ -15,10 +15,21 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.424169782" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out" prebuildStep="">
-					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.424169782." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.136928788" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.37064489">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1210258155" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties=""
+							   cleanCommand="${CG_CLEAN_CMD}" description=""
+							   errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser"
+							   id="com.ti.ccstudio.buildDefinitions.TMS470.Default.424169782" name="FlashROM"
+							   parent="com.ti.ccstudio.buildDefinitions.TMS470.Default"
+							   postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out"
+							   prebuildStep="">
+					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.424169782." name="/"
+								resourcePath="">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1537255176"
+								   name="TI Build Tools"
+								   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
+								   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1109092833">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1528413609"
+									superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
@@ -26,26 +37,58 @@
 								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.0.06_core"/>
 								<listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
 								<listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
-								<listOptionValue builtIn="false" value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
+								<listOptionValue builtIn="false"
+												 value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
 								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
 								<listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
 								<listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
+								<listOptionValue builtIn="false"
+												 value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
 								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1594012352" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.884318453" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.533944020" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1506775938" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1113348311" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1386730269" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1504759685" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1493045381" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.720922480" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.621501022" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1073606662" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1750727892"
+									superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
+									value="18.1.5.LTS" valueType="string"/>
+							<targetPlatform
+									id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1816818114"
+									name="Platform"
+									superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}"
+									 id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.642479704"
+									 name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal"
+									 superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.479338557"
+								  name="ARM Compiler"
+								  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.994949198"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1779598874"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.721307142"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.125246157"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN"
+										value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.2012061320"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.476352492"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.168539226"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
+										valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-									<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\host_test\cc26xx\app\cc2650"/>
+									<listOptionValue builtIn="false"
+													 value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\host_test\cc26xx\app\master"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/host_test/cc26xx/app"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
@@ -57,7 +100,8 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/target"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
+									<listOptionValue builtIn="false"
+													 value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
 									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/sdata"/>
@@ -67,7 +111,9 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.2012350267" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.363193887"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
+										valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
 									<listOptionValue builtIn="false" value="CC2650_HOSTTESTAPP"/>
@@ -77,7 +123,7 @@
 									<listOptionValue builtIn="false" value="ICALL_MAX_NUM_ENTITIES=6"/>
 									<listOptionValue builtIn="false" value="ICALL_MAX_NUM_TASKS=3"/>
 									<listOptionValue builtIn="false" value="MAX_NUM_BLE_CONNS=8"/>
-									<listOptionValue builtIn="false" value="MAX_PDU_SIZE=255"/>
+									<listOptionValue builtIn="false" value="MAX_PDU_SIZE=251"/>
 									<listOptionValue builtIn="false" value="NPI_USE_UART"/>
 									<listOptionValue builtIn="false" value="USE_ICALL"/>
 									<listOptionValue builtIn="false" value="xBOARD_DISPLAY_EXCLUDE_LCD"/>
@@ -85,69 +131,162 @@
 									<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
 									<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.224289740" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.294930590" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1311940013"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.2064874038"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.451343672" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1434051367"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.2064869740" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1403269172" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.299069087" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1054593545" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.799465540"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.517472866"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER"
+										value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.507310624"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.2049396471"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
-									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
+									<listOptionValue builtIn="false"
+													 value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
 								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1087313500" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1358529988" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1106701818" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1931280841" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.2110223277"
+										name="C Sources"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.918000918"
+										name="C++ Sources"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.641978750"
+										name="Assembly Sources"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1409087668"
+										name="Assembly Sources"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.37064489" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1134406099" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.210645710" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1502641146" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1870612882" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.505994136" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1109092833"
+								  name="ARM Linker"
+								  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1678442973"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE"
+										value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.367075675"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE"
+										value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1837422418"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE"
+										value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.917185204"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE"
+										value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.892817829"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY"
+										valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
-									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
-									<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
+									<listOptionValue builtIn="false"
+													 value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
+									<listOptionValue builtIn="false"
+													 value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.2037194602" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.974559234"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH"
+										valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.983516893" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.27476708"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="16002-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.149997443" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1443585498" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1373189675" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1262389112" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1547031242" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.148684573" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1853959754" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.896474434" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.235707068"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.282108168"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER"
+										value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1474361267"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO"
+										value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.839523781"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on"
+										valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.556382195"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on"
+										valueType="enumerated"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.893707763"
+										name="Linker Command Files"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.347090872"
+										name="Linker Command Files"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType
+										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1986196973"
+										name="Generated Linker Command Files"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.112378568" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1489301946" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1781561401" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1666511750" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1217013712"
+								  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.2005021581"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8"
+										valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.843817789"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8"
+										valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.444921916"
+										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT"
+										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL"
+										valueType="enumerated"/>
 							</tool>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1597178438" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1157586592" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1206125950" name="XDCtools"
+								  superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1447176325"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH"
+										valueType="stringList">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
 									<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
 								</option>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.818653015" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.1701617419" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.902568806" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1802155224" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1913827880" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1356547121" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.278021553"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET"
+										value="ti.targets.arm.elf.M3" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.1259072406"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM"
+										value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1080552633"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW"
+										value="ti.platforms.simplelink:CC2650F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1728380155"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE"
+										value="release" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1621099990"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR"
+										value="${CG_TOOL_ROOT}" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.355879919"
+										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS"
+										value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/app/targetConfigs/CC2650F128.ccxml

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="2" id="The Converter Usage">
-                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
-                        <choice Name="Overclock with user specified value" value="unused">
-                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
-                        </choice>
-                    </property>
-                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="1" id="Power Selection">
+                <choice Name="Probe supplied power" value="1">
+                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
+                </choice>
+            </property>
+            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
+            <property Type="choicelist" Value="4" id="SWD Mode Settings">
+                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                 </choice>
             </property>
             <platform XML_version="1.2" id="platform_0">

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/config/ccs_compiler_defines.bcfg

@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2019-04-28 18:23:23.057000)
+** Stack Frontier Generator 1.1.0 (2019-10-01 14:44:57.758000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
 --define=ICALL_STACK0_ADDR=0x8001
 --define=ICALL_STACK0_START=0x8000
---define=ICALL_RAM0_START=0x20004340
+--define=ICALL_RAM0_START=0x20004310
 

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/config/ccs_linker_defines.cmd

@@ -1,10 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2019-04-28 18:23:23.057000)
+** Stack Frontier Generator 1.1.0 (2019-10-01 14:44:57.758000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
---define=ICALL_RAM0_START=0x20004340
+--define=ICALL_RAM0_START=0x20004310
 --define=ICALL_STACK0_START=0x8000
 --define=ICALL_STACK0_ADDR=0x8001
 

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/config/lib_linker.cmd

@@ -4,5 +4,5 @@
  */
 
 "C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\host\host_pcxx.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pcxx_41c.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_full_v41.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pcxx_41c_ext.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_full_v41_v42.a"

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/config/src/sysbios/makefile

@@ -16,7 +16,7 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa
 
 TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
 
-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/cc2650" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
 
 CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
 ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/stack/.ccsproject

@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/stack/.cproject

@@ -13,133 +13,254 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd " prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
-					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.862906140" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1373763881">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.749555863" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
-								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
-								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
-								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
-								<listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
-								<listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_ble_stack.cmd;"/>
-								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
-								<listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
-							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1226924946" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.666439040" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1487778905" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.352371900" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1312023808" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.342082829" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.348530318" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.1738096723" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1803929349" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.327756378" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.84498721" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
-									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/examples/host_test/cc26xx/stack"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/aes/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv/cc26xx"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
-									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_COMMON}/npi/src"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx/npi/stack"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
-									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
-									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.449036407" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="CC26XX"/>
-									<listOptionValue builtIn="false" value="CC26XXWARE"/>
-									<listOptionValue builtIn="false" value="DATA="/>
-									<listOptionValue builtIn="false" value="EXT_HAL_ASSERT"/>
-									<listOptionValue builtIn="false" value="FLASH_ROM_BUILD"/>
-									<listOptionValue builtIn="false" value="INCLUDE_AES_DECRYPT"/>
-									<listOptionValue builtIn="false" value="NEAR_FUNC="/>
-									<listOptionValue builtIn="false" value="OSAL_CBTIMER_NUM_TASKS=1"/>
-									<listOptionValue builtIn="false" value="OSAL_SNV=1"/>
-									<listOptionValue builtIn="false" value="POWER_SAVING"/>
-									<listOptionValue builtIn="false" value="USE_ICALL"/>
-									<listOptionValue builtIn="false" value="xDEBUG"/>
-									<listOptionValue builtIn="false" value="xDEBUG_ENC"/>
-									<listOptionValue builtIn="false" value="xDEBUG_GPIO"/>
-									<listOptionValue builtIn="false" value="xDEBUG_SW_TRACE"/>
-									<listOptionValue builtIn="false" value="xTESTMODES"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.242123959" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.601259316" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
-									<listOptionValue builtIn="false" value="48"/>
-									<listOptionValue builtIn="false" value="16004"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.911375671" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
-									<listOptionValue builtIn="false" value="225"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.897642261" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.916023731" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1852873766" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
-									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
-									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
-								</option>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.977794136" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.980317392" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1333878599" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.289210215" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
-							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1373763881" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1720562086" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1630117678" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1302394488" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1128043424" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.137622820" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
-									<listOptionValue builtIn="false" value="libc.a"/>
-									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
-									<listOptionValue builtIn="false" value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
-									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.790272373" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
-									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.1324992868" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
-									<listOptionValue builtIn="false" value="16002-D"/>
-									<listOptionValue builtIn="false" value="10325-D"/>
-									<listOptionValue builtIn="false" value="10247-D"/>
-									<listOptionValue builtIn="false" value="10229-D"/>
-								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.216507169" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1382163767" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1890909858" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.830512447" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT" value="startup_entry" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1081803857" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.249638271" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.407917293" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.2031489241" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1616606673" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
-							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1647667237" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1600156533" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.360730399" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1462981440" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry excluding="cc26x0f128.cmd|TOOLS/buildConfig-4.0.opt" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
+                <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties=""
+                               cleanCommand="${CG_CLEAN_CMD}" description=""
+                               id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658" name="FlashROM"
+                               parent="com.ti.ccstudio.buildDefinitions.TMS470.Default"
+                               postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd "
+                               prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
+                    <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.893345658." name="/"
+                                resourcePath="">
+                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.475246864"
+                                   name="TI Build Tools"
+                                   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
+                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.786665632">
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1030725040"
+                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+                                <listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
+                                <listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
+                                <listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
+                                <listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=libc.a"/>
+                                <listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
+                                <listOptionValue builtIn="false"
+                                                 value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_ble_stack.cmd;"/>
+                                <listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
+                                <listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
+                            </option>
+                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1972562543"
+                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
+                                    value="18.1.4.LTS" valueType="string"/>
+                            <targetPlatform
+                                    id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.169579217"
+                                    name="Platform"
+                                    superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+                            <builder buildPath="${BuildDirectory}"
+                                     id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1467594372"
+                                     name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal"
+                                     superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1117062776"
+                                  name="ARM Compiler"
+                                  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.737537651"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.2122298168"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.922316537"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.686520452"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN"
+                                        value="true" valueType="boolean"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1306361468"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.570791435"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1996254735"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
+                                        valueType="includePath">
+                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/examples/host_test/cc26xx/stack"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target/_common"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/target"/>
+                                    <listOptionValue builtIn="false"
+                                                     value="${SRC_COMMON}/hal/src/target/_common/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/hal/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/osal/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/saddr"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/aes/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv/cc26xx"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/services/src/nv"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/icall/src/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
+                                    <listOptionValue builtIn="false" value="${SRC_BLE_CORE}/controller/cc26xx/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_COMMON}/npi/src"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx/npi/stack"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/icall/inc"/>
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
+                                    <listOptionValue builtIn="false" value="${CC26XXWARE}"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.1424063549"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
+                                        valueType="definedSymbols">
+                                    <listOptionValue builtIn="false" value="CC26XX"/>
+                                    <listOptionValue builtIn="false" value="CC26XXWARE"/>
+                                    <listOptionValue builtIn="false" value="DATA="/>
+                                    <listOptionValue builtIn="false" value="EXT_HAL_ASSERT"/>
+                                    <listOptionValue builtIn="false" value="FLASH_ROM_BUILD"/>
+                                    <listOptionValue builtIn="false" value="INCLUDE_AES_DECRYPT"/>
+                                    <listOptionValue builtIn="false" value="NEAR_FUNC="/>
+                                    <listOptionValue builtIn="false" value="OSAL_CBTIMER_NUM_TASKS=1"/>
+                                    <listOptionValue builtIn="false" value="OSAL_SNV=1"/>
+                                    <listOptionValue builtIn="false" value="POWER_SAVING"/>
+                                    <listOptionValue builtIn="false" value="USE_ICALL"/>
+                                    <listOptionValue builtIn="false" value="xDEBUG"/>
+                                    <listOptionValue builtIn="false" value="xDEBUG_ENC"/>
+                                    <listOptionValue builtIn="false" value="xDEBUG_GPIO"/>
+                                    <listOptionValue builtIn="false" value="xDEBUG_SW_TRACE"/>
+                                    <listOptionValue builtIn="false" value="xTESTMODES"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.754989819"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.1080092437"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
+                                        valueType="stringList">
+                                    <listOptionValue builtIn="false" value="48"/>
+                                    <listOptionValue builtIn="false" value="16004"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.999024864"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
+                                        valueType="stringList">
+                                    <listOptionValue builtIn="false" value="225"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1556840847"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1818892958"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER"
+                                        value="true" valueType="boolean"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1434574785"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE"
+                                        valueType="stringList">
+                                    <listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
+                                    <listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
+                                </option>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.1986725920"
+                                        name="C Sources"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1096088215"
+                                        name="C++ Sources"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.1564058248"
+                                        name="Assembly Sources"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.745772697"
+                                        name="Assembly Sources"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+                            </tool>
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.786665632"
+                                  name="ARM Linker"
+                                  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1677233886"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE"
+                                        value="256" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.689154633"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE"
+                                        value="0" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1820684332"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE"
+                                        value="&quot;${ProjName}.map&quot;" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1938454486"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE"
+                                        value="${ProjName}.out" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1081456336"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY"
+                                        valueType="libs">
+                                    <listOptionValue builtIn="false" value="libc.a"/>
+                                    <listOptionValue builtIn="false"
+                                                     value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
+                                    <listOptionValue builtIn="false"
+                                                     value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
+                                    <listOptionValue builtIn="false"
+                                                     value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1520088784"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH"
+                                        valueType="libPaths">
+                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
+                                    <listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.416149148"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
+                                        valueType="stringList">
+                                    <listOptionValue builtIn="false" value="16002-D"/>
+                                    <listOptionValue builtIn="false" value="10325-D"/>
+                                    <listOptionValue builtIn="false" value="10247-D"/>
+                                    <listOptionValue builtIn="false" value="10229-D"/>
+                                </option>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.256169156"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.899497414"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER"
+                                        value="true" valueType="boolean"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1750046018"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO"
+                                        value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.1884235777"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT"
+                                        value="startup_entry" valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1126585282"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on"
+                                        valueType="enumerated"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.917059863"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on"
+                                        valueType="enumerated"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.329975596"
+                                        name="Linker Command Files"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.30261043"
+                                        name="Linker Command Files"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+                                <inputType
+                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.498724975"
+                                        name="Generated Linker Command Files"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+                            </tool>
+                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1533021831"
+                                  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.958672258"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8"
+                                        valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.148593719"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8"
+                                        valueType="string"/>
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1639548187"
+                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT"
+                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL"
+                                        valueType="enumerated"/>
+                            </tool>
+                        </toolChain>
+                    </folderInfo>
+                    <sourceEntries>
+                        <entry excluding="cc26x0f128.cmd|TOOLS/buildConfig-4.0.opt"
+                               flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                    </sourceEntries>
+                </configuration>
+            </storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
@@ -157,4 +278,5 @@
 			<content-type-mapping configuration="" content-type="org.eclipse.cdt.core.cxxSource" language="com.ti.ccstudio.core.TIGPPLanguage"/>
 		</project-mappings>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 </cproject>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/ccs/stack/targetConfigs/CC2650F128.ccxml

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="2" id="The Converter Usage">
-                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
-                        <choice Name="Overclock with user specified value" value="unused">
-                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
-                        </choice>
-                    </property>
-                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="1" id="Power Selection">
+                <choice Name="Probe supplied power" value="1">
+                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
+                </choice>
+            </property>
+            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
+            <property Type="choicelist" Value="4" id="SWD Mode Settings">
+                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
                 </choice>
             </property>
             <platform XML_version="1.2" id="platform_0">

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/host_test/iar/stack/build_config.opt

@@ -132,7 +132,7 @@
 /* -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 */
+ -DBLE_V42_FEATURES=EXT_DATA_LEN_CFG 
 
 /* Include Transport Layer (Full or PTM) */
 /* -DHCI_TL_NONE */

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/app/.ccsproject

@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/app/.cproject

@@ -18,12 +18,8 @@
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.rtsc.XDCtools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser;org.eclipse.cdt.core.GmakeErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o      ${ProjName}.hex ${ProjName}.out" prebuildStep="">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1422447968"
-								   name="TI Build Tools"
-								   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
-								   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1198402338">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1621456516"
-									superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.1922362875" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1071679543">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1377631246" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
@@ -38,55 +34,17 @@
 								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
 								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1743525540"
-									name="Compiler version"
-									superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
-									value="18.1.5.LTS" valueType="string"/>
-							<targetPlatform
-									id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1923259253"
-									name="Platform"
-									superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}"
-									 id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1779067805"
-									 keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true"
-									 parallelizationNumber="optimal"
-									 superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.613173958"
-								  name="ARM Compiler"
-								  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.342903528"
-										name="Target processor version (--silicon_version, -mv)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1478061741"
-										name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.460891013"
-										name="Application binary interface. (--abi)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.429679904"
-										name="Little endian code [See 'General' page to edit] (--little_endian, -me)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN"
-										value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1643626429"
-										name="Optimization level (--opt_level, -O)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.601582984"
-										name="Speed vs. size trade-offs (--opt_for_speed, -mf)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.322885347"
-										name="Add dir to #include search path (--include_path, -I)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
-										valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.695936984" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
+							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.2142624326" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.2095295399" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1496019566" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1299158319" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.417771094" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.995606718" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.513777133" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1840848862" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.1837051560" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1397198365" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 									<listOptionValue builtIn="false" value="C:\ti\simplelink\ble_sdk_2_02_02_25\src\examples\simple_peripheral\cc26xx\app\headstage"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/app"/>
@@ -112,15 +70,11 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.126612185"
-										name="Pre-define NAME (--define, -D)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
-										valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.758278059" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
-									<listOptionValue builtIn="false" value="CC2650_LAUNCHXL"/>
+									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
 									<listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_SPI2"/>
-                                    <listOptionValue builtIn="false" value="HEADSTAGE_MA_USE_ADC"/>
 									<listOptionValue builtIn="false" value="CC26XX"/>
 									<listOptionValue builtIn="false" value="GAPROLE_TASK_STACK_SIZE=540"/>
 									<listOptionValue builtIn="false" value="HEAPMGR_SIZE=0"/>
@@ -132,197 +86,71 @@
 									<listOptionValue builtIn="false" value="xdc_runtime_Assert_DISABLE_ALL"/>
 									<listOptionValue builtIn="false" value="xdc_runtime_Log_DISABLE_ALL"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.2068756498"
-										name="Debugging model"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1950504663"
-										name="C Dialect"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.1475277164"
-										name="Enable support for GCC extensions (DEPRECATED) (--gcc)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC"
-										value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.275716768"
-										name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
-										valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.1105953535" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.1684853035" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC.2077644312" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.266823305" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1572259170"
-										name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
-										valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.505718689" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.409486974"
-										name="Wrap diagnostic messages (--diag_wrap)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1205714801"
-										name="Emit diagnostic identifier numbers (--display_error_number, -pden)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER"
-										value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.227798212"
-										name="Place each function in a separate subsection (--gen_func_subsections, -ms)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1580464089"
-										name="Read options from specified file (--cmd_file, -@)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE"
-										valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.858803724" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.791653937" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.454975368" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1259580466" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg"/>
 								</option>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.2086978995"
-										name="C Sources"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.599989674"
-										name="C++ Sources"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.985689011"
-										name="Assembly Sources"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.860993169"
-										name="Assembly Sources"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.206131472" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1669124724" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.562073012" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1919832233" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1198402338"
-								  name="ARM Linker"
-								  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1980812168"
-										name="Set C system stack size (--stack_size, -stack)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE"
-										value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.604359436"
-										name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE"
-										value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.605421445"
-										name="Link information (map) listed into &lt;file&gt; (--map_file, -m)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE"
-										value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1425430523"
-										name="Specify output file name (--output_file, -o)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE"
-										value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1076512063"
-										name="Include library file or command file as input (--library, -l)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY"
-										valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1071679543" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.36866143" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.481674132" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.972512468" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1533396585" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1618216407" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
 									<listOptionValue builtIn="false" value="${ROM}/common_rom_releases/03282014/common_rom.symbols"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1704469433"
-										name="Add &lt;dir&gt; to library search path (--search_path, -i)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH"
-										valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1053586850" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.737788064"
-										name="Suppress diagnostic &lt;id&gt; (--diag_suppress)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
-										valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.908946987" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="16002-D"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1256724103"
-										name="Wrap diagnostic messages (--diag_wrap)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1363276362"
-										name="Emit diagnostic identifier numbers (--display_error_number)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER"
-										value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.439996804"
-										name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO"
-										value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.2063712626"
-										name="Aggressively reduce size of the DWARF information (--compress_dwarf)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on"
-										valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1634913080"
-										name="Eliminate sections not needed in the executable (--unused_section_elimination)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on"
-										valueType="enumerated"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1186187707"
-										name="Linker Command Files"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.329534377"
-										name="Linker Command Files"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType
-										id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.571369317"
-										name="Generated Linker Command Files"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1381107909" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.103615451" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.937188518" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1028366906" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1361825729" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.801002988" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1925643270" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1961258967" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.385303940" name="ARM Hex Utility"
-								  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1687380504"
-										name="Specify rom width (--romwidth, -romwidth=width)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8"
-										valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.1954173385"
-										name="Specify memory width (--memwidth, -memwidth=width)"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8"
-										valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1612714305"
-										name="Output format"
-										superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT"
-										value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL"
-										valueType="enumerated"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1252262796" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1100535645" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.950153704" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.969164031" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
 							</tool>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1496651133" name="XDCtools"
-								  superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1070496263"
-										name="Package repositories (--xdcpath)"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH"
-										valueType="stringList">
+							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.150970797" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.802214893" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
 									<listOptionValue builtIn="false" value="${COM_TI_RTSC_TIRTOSCC13XX_CC26XX_REPOS}"/>
 									<listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
 								</option>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.1369376857"
-										name="Target (-t)"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET"
-										value="ti.targets.arm.elf.M3" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.498611106"
-										name="Platform (-p)"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM"
-										value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.712644920"
-										name="Platform (-p)"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW"
-										value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.864506159"
-										name="Build-profile (-r)"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE"
-										value="release" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.2142459898"
-										name="Compiler tools directory (-c)"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR"
-										value="${CG_TOOL_ROOT}" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.2071237842"
-										name="Additional compiler options (--compileOptions)"
-										superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS"
-										value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.1283770407" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="ti.targets.arm.elf.M3" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.356163931" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.729156046" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.simplelink:CC2640F128" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.1519137679" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1587019241" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="${CG_TOOL_ROOT}" valueType="string"/>
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1518185315" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/app/targetConfigs/CC2650F128.ccxml

@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="1" id="Power Selection">
-                <choice Name="Probe supplied power" value="1">
-                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
-                </choice>
-            </property>
-            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
-            <property Type="choicelist" Value="4" id="SWD Mode Settings">
-                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="2" id="The Converter Usage">
+                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
+                        <choice Name="Overclock with user specified value" value="unused">
+                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
+                        </choice>
+                    </property>
+                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
                 </choice>
             </property>
             <platform XML_version="1.2" id="platform_0">

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/config/src/sysbios/makefile

@@ -16,11 +16,11 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa
 
 TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
 
-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/dev_info" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
 
-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
+ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
+AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
 
 DEL = C:/ti/xdctools_3_32_02_25_core/packages/../bin/rm -f
 CP = C:/ti/xdctools_3_32_02_25_core/packages/../bin/cp -f

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.ccsproject

@@ -9,6 +9,6 @@
 	<linkerCommandFile value="cc26x0f128.cmd"/>
 	<rts value="libc.a"/>
 	<createSlaveProjects value=""/>
-	<connection value="common/targetdb/connections/TIXDS110_Connection.xml"/>
+	<connection value="common/targetdb/connections/TIXDS100v3_Dot7_Connection.xml"/>
 	<isTargetManual value="false"/>
 </projectOptions>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.cproject

@@ -15,12 +15,8 @@
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684" name="FlashROM" parent="com.ti.ccstudio.buildDefinitions.TMS470.Default" postannouncebuildStep="" postbuildStep="${CG_TOOL_HEX} -order MS --memwidth=8 --romwidth=8 --intel -o ${ProjName}.hex ${ProjName}.out;${TOOLS_BLE}/frontier/frontier.exe ccs ${PROJECT_LOC}/${ConfigName}/${ProjName}_linkInfo.xml ${ORG_PROJ_DIR}/../../ccs/config/ccs_compiler_defines.bcfg ${ORG_PROJ_DIR}/../../ccs/config/ccs_linker_defines.cmd" preannouncebuildStep="" prebuildStep="&quot;${TOOLS_BLE}/lib_search/lib_search.exe&quot; ${ORG_PROJ_DIR}/build_config.opt &quot;${TOOLS_BLE}/lib_search/params_split_cc2640.xml&quot; ${SRC_BLE_CORE}/../blelib &quot;${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd&quot;">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Default.1209999684." name="/" resourcePath="">
-                        <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.2074238986"
-                                   name="TI Build Tools"
-                                   superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain"
-                                   targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.148013746">
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.833674768"
-                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.929750171" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1479696404" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
@@ -30,46 +26,17 @@
 								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
 								<listOptionValue builtIn="false" value="OUTPUT_TYPE=executable"/>
 							</option>
-                            <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.91116411"
-                                    superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION"
-                                    value="18.1.4.LTS" valueType="string"/>
-                            <targetPlatform
-                                    id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.729117574"
-                                    name="Platform"
-                                    superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
-                            <builder buildPath="${BuildDirectory}"
-                                     id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.1049643344"
-                                     name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal"
-                                     superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
-                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1500328690"
-                                  name="ARM Compiler"
-                                  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.1732561390"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1008755768"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.1303985247"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.680608899"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN"
-                                        value="true" valueType="boolean"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.1369821195"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.469619136"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1916297111"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH"
-                                        valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.201372544" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.1.4.LTS" valueType="string"/>
+							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug.1951196199" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.targetPlatformDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug.20903631" name="GNU Make.FlashROM" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.builderDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug.1176131016" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.compilerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.647279085" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.1443871767" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CODE_STATE.16" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.227818129" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.ABI.eabi" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN.784155377" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.494285153" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.581550859" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH.1288777730" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/examples/simple_peripheral/cc26xx/stack"/>
 									<listOptionValue builtIn="false" value="${SRC_EX}/common/cc26xx"/>
@@ -93,9 +60,7 @@
 									<listOptionValue builtIn="false" value="${SRC_EX}/profiles/roles"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.461117382"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE"
-                                        valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.986125825" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CC26XX"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
 									<listOptionValue builtIn="false" value="CC26XXWARE"/>
@@ -116,134 +81,60 @@
 									<listOptionValue builtIn="false" value="xTESTMODES"/>
 									<listOptionValue builtIn="false" value="xTEST_BLEBOARD"/>
 								</option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.2032339029"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.653240305"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS"
-                                        valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.372638078" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.C_DIALECT.C99" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.201347726" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="48"/>
 									<listOptionValue builtIn="false" value="16004"/>
 								</option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.738763507"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING"
-                                        valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.73314177" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING" valueType="stringList">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.640302916"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.526476506"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER"
-                                        value="true" valueType="boolean"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.1797055053"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE"
-                                        valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.1126279750" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER.1492280006" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE.538453952" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.CMD_FILE" valueType="stringList">
 									<listOptionValue builtIn="false" value="${SRC_EX}/config/build_components.opt"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/build_config.opt"/>
 								</option>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.498731550"
-                                        name="C Sources"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1585281532"
-                                        name="C++ Sources"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.253755398"
-                                        name="Assembly Sources"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.1473169379"
-                                        name="Assembly Sources"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.313905687" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS.1129729173" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__CPP_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS.156783227" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS.538375181" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.148013746"
-                                  name="ARM Linker"
-                                  superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.968990490"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE"
-                                        value="256" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.740945917"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE"
-                                        value="0" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.650302364"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE"
-                                        value="&quot;${ProjName}.map&quot;" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.1896286345"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE"
-                                        value="${ProjName}.out" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.317147830"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY"
-                                        valueType="libs">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1008890994" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE.1873600405" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.STACK_SIZE" value="256" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE.1359172875" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.HEAP_SIZE" value="0" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE.1355177509" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE.829303802" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY.1078356909" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
 									<listOptionValue builtIn="false" value="${ORG_PROJ_DIR}/../../ccs/config/lib_linker.cmd"/>
 									<listOptionValue builtIn="false" value="${ROM}/ble_rom_releases/04242014/ble_rom_patch.symbols"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}/driverlib/bin/ccs/driverlib.lib"/>
 								</option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.932239677"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH"
-                                        valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1707930214" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH" valueType="libPaths">
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/lib"/>
 									<listOptionValue builtIn="false" value="${CG_TOOL_ROOT}/include"/>
 								</option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.1432215405"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS"
-                                        valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS.59164041" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_SUPPRESS" valueType="stringList">
 									<listOptionValue builtIn="false" value="16002-D"/>
 									<listOptionValue builtIn="false" value="10247-D"/>
 									<listOptionValue builtIn="false" value="10325-D"/>
 									<listOptionValue builtIn="false" value="10229-D"/>
 								</option>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1227797037"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.317429606"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER"
-                                        value="true" valueType="boolean"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1265405801"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO"
-                                        value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.1568599290"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT"
-                                        value="startup_entry" valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1910777613"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on"
-                                        valueType="enumerated"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.444047828"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on"
-                                        valueType="enumerated"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1074932025"
-                                        name="Linker Command Files"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.1096594144"
-                                        name="Linker Command Files"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
-                                <inputType
-                                        id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.1847623715"
-                                        name="Generated Linker Command Files"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.11567165" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER.1727810233" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.1385277262" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT.1153340314" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.ENTRY_POINT" value="startup_entry" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.450995330" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.1827942626" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1279238428" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS.526125450" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS.581803256" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
-                            <tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1313691321"
-                                  name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1579314374"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8"
-                                        valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.530787755"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8"
-                                        valueType="string"/>
-                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1276441033"
-                                        superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT"
-                                        value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL"
-                                        valueType="enumerated"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.947560992" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1295209583" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH.110293046" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.1122561921" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
 							</tool>
 						</toolChain>
 					</folderInfo>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/.launches/simple_peripheral_cc2650em_stack.launch

@@ -12,7 +12,6 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650em_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS100v3 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
-<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe_0/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650em\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650em_stack.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650em_stack"/>
 </listAttribute>

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/simple_peripheral/ccs/stack/targetConfigs/CC2650F128.ccxml

@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <configurations XML_version="1.2" id="configurations_0">
-<configuration XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
-        <instance XML_version="1.2" desc="Texas Instruments XDS110 USB Debug Probe_0" href="connections/TIXDS110_Connection.xml" id="Texas Instruments XDS110 USB Debug Probe_0" xml="TIXDS110_Connection.xml" xmlpath="connections"/>
-        <connection XML_version="1.2" id="Texas Instruments XDS110 USB Debug Probe_0">
-            <instance XML_version="1.2" href="drivers/tixds510icepick_c.xml" id="drivers" xml="tixds510icepick_c.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds510cs_dap.xml" id="drivers" xml="tixds510cs_dap.xml" xmlpath="drivers"/>
-            <instance XML_version="1.2" href="drivers/tixds510cortexM.xml" id="drivers" xml="tixds510cortexM.xml" xmlpath="drivers"/>
-            <property Type="choicelist" Value="1" id="Power Selection">
-                <choice Name="Probe supplied power" value="1">
-                    <property Type="stringfield" Value="3.3" id="Voltage Level"/>
-                </choice>
-            </property>
-            <property Type="choicelist" Value="0" id="JTAG Signal Isolation"/>
-            <property Type="choicelist" Value="4" id="SWD Mode Settings">
-                <choice Name="cJTAG (1149.7) 2-pin advanced modes" value="enable">
-                    <property Type="choicelist" Value="1" id="XDS110 Aux Port"/>
+<configuration XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS100v3 USB Debug Probe_0" href="connections/TIXDS100v3_Dot7_Connection.xml" id="Texas Instruments XDS100v3 USB Debug Probe_0" xml="TIXDS100v3_Dot7_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS100v3 USB Debug Probe_0">
+            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cortexM.xml" id="drivers" xml="tixds100v2cortexM.xml" xmlpath="drivers"/>
+            <property Type="choicelist" Value="2" id="The Converter Usage">
+                <choice Name="Generate 1149.7 2-pin advanced modes" value="enable">
+                    <property Type="choicelist" Value="1" id="The Converter 1149.7 Frequency">
+                        <choice Name="Overclock with user specified value" value="unused">
+                            <property Type="choicelist" Value="5" id="-- Choose a value from 1.0MHz to 50.0MHz"/>
+                        </choice>
+                    </property>
+                    <property Type="choicelist" Value="5" id="The Target Scan Format"/>
                 </choice>
             </property>
             <platform XML_version="1.2" id="platform_0">

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/host_test/ccs/config/src/sysbios/makefile

@@ -16,11 +16,11 @@ BIOS_INC  = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/pa
 
 TARGET_INC = -I"C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/"
 
-INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/cc2650" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
+INCS = $(BIOS_INC) $(TARGET_INC)  --include_path="C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/cc2650" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/icall/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/profiles/roles" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/npi/src" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/heapmgr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/controller/cc26xx/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/target" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/target/_common/cc26xx" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/hal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/osal/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/sdata" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/services/src/saddr" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/components/icall/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/inc" --include_path="C:/ti/simplelink/ble_sdk_2_02_02_25/src/rom" --include_path="C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/cc26xxware_2_24_03_17272"  -IC:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ 
 
-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.4.LTS/bin/armar rq
+CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
+ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/include
+AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.5.LTS/bin/armar rq
 
 DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
 CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f

simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.c

@@ -264,7 +264,6 @@ const SPI_Config SPI_config[] = {  //
         .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
         //
     },
-#ifdef HEADSTAGE_MA_USE_SPI2
     {
         //
         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
@@ -272,7 +271,6 @@ const SPI_Config SPI_config[] = {  //
         .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
         //
     },
-#endif
     {NULL, NULL, NULL}};
 /*
  *  ========================== SPI DMA end =====================================
@@ -512,156 +510,3 @@ const PWM_Config PWM_config[BOOSTXL_CC2650MA_PWMCOUNT + 1] = {
 /*
  *  ============================= PWM end ======================================
  */
-
-/*
- *  ============================= ADC begin ======================================
- */
-
-#ifdef HEADSTAGE_MA_USE_ADC
-
-#include <ti/drivers/ADC.h>
-#include <ti/drivers/adc/ADCCC26XX.h>
-
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(ADC_config, ".const:ADC_config")
-#pragma DATA_SECTION(adcCC26xxHWAttrs, ".const:adcCC26xxHWAttrs")
-#endif
-
-ADCCC26XX_Object adcCC26xxObjects[BOOSTXL_CC2650MA_ADCCOUNT];
-
-const ADCCC26XX_HWAttrs adcCC26xxHWAttrs[BOOSTXL_CC2650MA_ADCCOUNT] = {
-    //
-    {
-        //
-        .adcDIO              = DIO7,
-        .adcCompBInput       = ADC_COMPB_IN_AUXIO7,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = DIO8,
-        .adcCompBInput       = ADC_COMPB_IN_AUXIO6,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = DIO9,
-        .adcCompBInput       = ADC_COMPB_IN_AUXIO5,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = PIN_UNASSIGNED,
-        .adcCompBInput       = ADC_COMPB_IN_AUXIO4,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = PIN_UNASSIGNED,
-        .adcCompBInput       = ADC_COMPB_IN_AUXIO3,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = PIN_UNASSIGNED,
-        .adcCompBInput       = ADC_COMPB_IN_AUXIO2,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = PIN_UNASSIGNED,
-        .adcCompBInput       = ADC_COMPB_IN_AUXIO1,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = PIN_UNASSIGNED,
-        .adcCompBInput       = ADC_COMPB_IN_AUXIO0,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_10P9_MS,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = PIN_UNASSIGNED,
-        .adcCompBInput       = ADC_COMPB_IN_DCOUPL,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = PIN_UNASSIGNED,
-        .adcCompBInput       = ADC_COMPB_IN_VSS,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    },
-    {
-        //
-        .adcDIO              = PIN_UNASSIGNED,
-        .adcCompBInput       = ADC_COMPB_IN_VDDS,
-        .refSource           = ADCCC26XX_FIXED_REFERENCE,
-        .samplingDuration    = ADCCC26XX_SAMPLING_DURATION_2P7_US,
-        .inputScalingEnabled = true,
-        .triggerSource       = ADCCC26XX_TRIGGER_MANUAL
-        //
-    }
-    //
-};
-
-const ADC_Config ADC_config[] = {
-    //
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[0], &adcCC26xxHWAttrs[0]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[1], &adcCC26xxHWAttrs[1]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[2], &adcCC26xxHWAttrs[2]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[3], &adcCC26xxHWAttrs[3]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[4], &adcCC26xxHWAttrs[4]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[5], &adcCC26xxHWAttrs[5]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[6], &adcCC26xxHWAttrs[6]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[7], &adcCC26xxHWAttrs[7]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[8], &adcCC26xxHWAttrs[8]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[9], &adcCC26xxHWAttrs[9]},
-    {&ADCCC26XX_fxnTable, &adcCC26xxObjects[10], &adcCC26xxHWAttrs[10]},
-    {NULL, NULL, NULL},
-};
-
-#endif // HEADSTAGE_MA_USE_ADC
-
-/*
- *  ============================= ADC end ======================================
- */

simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.h

@@ -101,44 +101,42 @@ extern const PIN_Config BoardGpioInitTable[];
 
 /* Connector J2 */
 #define Board_BP_Pin_J2_19             DIO8
-#define Board_BP_Pin_J2_18             DIO9          /* CS */
-#define Board_BP_Pin_J2_17             IOID_UNUSED   /* NC */
-#define Board_BP_Pin_J2_15             DIO11         /* MOSI */
-#define Board_BP_Pin_J2_14             DIO12         /* MISO */
+#define Board_BP_Pin_J2_18             DIO9
+#define Board_BP_Pin_J2_17             IOID_UNUSED
+#define Board_BP_Pin_J2_15             DIO11
+#define Board_BP_Pin_J2_14             DIO12
 #define Board_BP_Pin_J2_13             DIO13
 #define Board_BP_Pin_J2_12             DIO14
-#define Board_BP_Pin_J2_11             IOID_UNUSED   /* NC */
+#define Board_BP_Pin_J2_11             IOID_UNUSED
 
 /* Mapping of BoosterPack Connector Pins to BoosterPack Standard Functions (reflecting the BoosterPack Standard)
 */
 
-/* Connector J1 */
-#define Board_BP_AnalogIn_0            Board_BP_Pin_J1_2
-#define Board_BP_UART_Rx               Board_BP_Pin_J1_3 /* To MCU on LaunchPad */
-#define Board_BP_UART_Tx               Board_BP_Pin_J1_4 /* From MCU on LauchPad*/
-#define Board_BP_GPIO_0                Board_BP_Pin_J1_5
-#define Board_BP_AnalogIn_1            Board_BP_Pin_J1_6
-#define Board_BP_SPI_CLK               Board_BP_Pin_J1_7
-#define Board_BP_GPIO_1                Board_BP_Pin_J1_8
-#define Board_BP_I2C_SCL               Board_BP_Pin_J1_9
-#define Board_BP_I2C_SDA               Board_BP_Pin_J1_10
-
-/* Connector J2 */
-#define Board_BP_PWM_0                 Board_BP_Pin_J2_19
-#define Board_BP_SPI_CS_Wireless       Board_BP_Pin_J2_18
-#define Board_BP_GPIO_3                Board_BP_Pin_J2_17
-#define Board_BP_SPI_MOSI              Board_BP_Pin_J2_15
-#define Board_BP_SPI_MISO              Board_BP_Pin_J2_14
-#define Board_BP_SPI_CS_Display        Board_BP_Pin_J2_13
-#define Board_BP_SPI_CS_Other          Board_BP_Pin_J2_12
-#define Board_BP_GPIO_2                Board_BP_Pin_J2_11
+/* Connector J1 and J2*/
+#define Board_BP_AnalogIn_0            IOID_UNUSED
+#define Board_BP_AnalogIn_1            IOID_UNUSED
+#define Board_BP_SPI_CS_Wireless       IOID_UNUSED
+#define Board_BP_SPI_CS_Display        IOID_UNUSED
+#define Board_BP_SPI_CS_Other          IOID_UNUSED
+#define Board_BP_SPI_MISO              DIO12
+#define Board_BP_SPI_MOSI              DIO11
+#define Board_BP_SPI_CLK               DIO10
+#define Board_BP_I2C_SCL               IOID_UNUSED
+#define Board_BP_I2C_SDA               IOID_UNUSED
+#define Board_BP_UART_Rx               DIO1
+#define Board_BP_UART_Tx               DIO0
+#define Board_BP_GPIO_0                IOID_UNUSED
+#define Board_BP_GPIO_1                IOID_UNUSED
+#define Board_BP_GPIO_2                IOID_UNUSED
+#define Board_BP_GPIO_3                IOID_UNUSED
+#define Board_BP_PWM_0                 IOID_UNUSED
 
 /* Mapping of application specific functionality of the BoosterPack to BoosterPack Pins (application dependent)
 */
 
 /* On-board LEDs */
-#define Board_GLED                     DIO2                      /* Green LED */
-#define Board_RLED                     DIO4                      /* Red LED */
+#define Board_GLED                     PIN_UNASSIGNED            /* Green LED */
+#define Board_RLED                     PIN_UNASSIGNED            /* Red LED */
 
 /* UART Board */
 #define Board_UART_TX                  Board_BP_UART_Rx          /* RXD */
@@ -148,7 +146,7 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_SPI0_MISO                Board_BP_SPI_MISO
 #define Board_SPI0_MOSI                Board_BP_SPI_MOSI
 #define Board_SPI0_CLK                 Board_BP_SPI_CLK
-#define Board_SPI0_CS                  Board_BP_SPI_CS_Wireless
+#define Board_SPI0_CS                  PIN_UNASSIGNED
 
 #define Board_SPI1_MISO                PIN_UNASSIGNED
 #define Board_SPI1_MOSI                PIN_UNASSIGNED
@@ -156,8 +154,8 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_SPI1_CS                  PIN_UNASSIGNED
 
 /* Power Management Board */
-#define Board_SRDY                     Board_BP_Pin_J2_19
-#define Board_MRDY                     Board_BP_Pin_J1_2
+#define Board_SRDY                     PIN_UNASSIGNED
+#define Board_MRDY                     PIN_UNASSIGNED
 
 /* PWM outputs */
 #define Board_PWMPIN0                  PIN_UNASSIGNED
@@ -173,7 +171,6 @@ extern const PIN_Config BoardGpioInitTable[];
 /** ============================================================================
  *  Instance identifiers
  *  ==========================================================================*/
-
 /* Generic SPI instance identifiers */
 #define Board_SPI0                  BOOSTXL_CC2650MA_SPI0
 

simplelink/ble_sdk_2_02_02_25/src/boards/CC2650_LAUNCHXL/CC2650_LAUNCHXL.h

@@ -84,9 +84,9 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_UART_RTS              IOID_18         /* RTS */
 
 /* SPI Board */
-#define Board_SPI0_MISO             IOID_8          /* RF1.20 */
-#define Board_SPI0_MOSI             IOID_9          /* RF1.18 */
-#define Board_SPI0_CLK              IOID_10         /* RF1.16 */
+#define Board_SPI0_MISO             IOID_9          /* RF1.20 */
+#define Board_SPI0_MOSI             IOID_8          /* RF1.18 */
+#define Board_SPI0_CLK              IOID_13         /* RF1.16 */
 #define Board_SPI0_CSN              PIN_UNASSIGNED
 #define Board_SPI1_MISO             PIN_UNASSIGNED
 #define Board_SPI1_MOSI             PIN_UNASSIGNED
@@ -130,14 +130,14 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_LCD_CS_OFF            0
 
 /* PWM outputs */
-#define Board_PWMPIN0               Board_RLED
-#define Board_PWMPIN1               Board_GLED
-#define Board_PWMPIN2               PIN_UNASSIGNED
-#define Board_PWMPIN3               PIN_UNASSIGNED
-#define Board_PWMPIN4               PIN_UNASSIGNED
-#define Board_PWMPIN5               PIN_UNASSIGNED
-#define Board_PWMPIN6               PIN_UNASSIGNED
-#define Board_PWMPIN7               IOID_11
+#define Board_PWMPIN0                       Board_RLED
+#define Board_PWMPIN1                       Board_GLED
+#define Board_PWMPIN2                       PIN_UNASSIGNED
+#define Board_PWMPIN3                       PIN_UNASSIGNED
+#define Board_PWMPIN4                       PIN_UNASSIGNED
+#define Board_PWMPIN5                       PIN_UNASSIGNED
+#define Board_PWMPIN6                       PIN_UNASSIGNED
+#define Board_PWMPIN7                       PIN_UNASSIGNED
 
 /** ============================================================================
  *  Instance identifiers

simplelink/ble_sdk_2_02_02_25/src/components/npi/src/inc/npi_config.h

@@ -66,7 +66,7 @@ extern "C"
 // ****************************************************************************
 
 #if !defined(NPI_SPI_CONFIG)
-#define NPI_SPI_CONFIG Board_SPI1
+#define NPI_SPI_CONFIG Board_SPI0
 #endif
 
 #ifndef NPI_FLOW_CTRL

simplelink/ble_sdk_2_02_02_25/src/components/npi/src/inc/npi_tl.h

@@ -55,7 +55,7 @@ extern "C"
 // includes
 // ****************************************************************************
 #include "hal_types.h"
-#include "npi/src/inc/npi_config.h"
+#include "inc/npi_config.h"
 
 // ****************************************************************************
 // defines

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/host_test_app.c

@@ -69,6 +69,7 @@
 
 #include "gapbondmgr.h"
 #include "osal_snv.h"
+#include "icall.h"
 #include "icall_apimsg.h"
 
 #include "util.h"
@@ -111,7 +112,7 @@
 
 // Task configuration
 #define HTA_TASK_PRIORITY                       1
-#define HTA_TASK_STACK_SIZE                     644
+#define HTA_TASK_STACK_SIZE                     844
 
 // data length extension
 #define APP_SUGGESTED_PDU_SIZE                  251
@@ -123,7 +124,7 @@
 static ICall_EntityID self;
 
 // Semaphore globally used to post events to the application thread
-static ICall_Semaphore semaphore;
+ICall_Semaphore semaphore;
 
 // Task configuration
 Task_Struct htaTask;
@@ -135,15 +136,13 @@ Char        htaTaskStack[HTA_TASK_STACK_SIZE];
 
 static void HostTestApp_init(void);
 static void HostTestApp_taskFxn(UArg a0, UArg a1);
-static void HostTestApp_processGapEvent(ICall_HciExtEvt *pMsg);
-static void HostTestApp_processAttEvent(ICall_HciExtEvt *pMsg);
-static void HostTestApp_processBLEEvent(ICall_HciExtEvt *pMsg);
+static void HostTestApp_processGapEvent(ICall_HciExtEvt *message);
+static void HostTestApp_processAttEvent(gattMsgEvent_t *message);
+static void HostTestApp_processBLEEvent(ICall_HciExtEvt *message);
 static void sendCommandCompleteEvent(uint8 eventCode, uint16 opcode, uint8 numParam, uint8 *param);
 static void sendCommandStatusEvent(uint8_t eventCode, uint16_t status, uint16_t opcode);
 static void sendBLECompleteEvent(uint8 eventLen, uint8 *pEvent);
 
-extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
-
 /**
  * @fn      HostTestApp_createTask
  *
@@ -200,7 +199,6 @@ static void HostTestApp_init(void) {
 
     GGS_SetParameter(GGS_DEVICE_NAME_ATT, strlen(DEVICE_NAME), (void *)DEVICE_NAME);
 
-    // extend PDU size
     HCI_LE_WriteSuggestedDefaultDataLenCmd(APP_SUGGESTED_PDU_SIZE, APP_SUGGESTED_TX_TIME);
 }
 
@@ -235,16 +233,16 @@ static void HostTestApp_taskFxn(UArg a0, UArg a1) {
                 if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == self)) {
                     // Process incoming messages
                     switch (message->hdr.event) {
-                    case HCI_GAP_EVENT_EVENT:
-                        HostTestApp_processGapEvent(message);
-                        break;
+                        case HCI_GAP_EVENT_EVENT:
+                            HostTestApp_processGapEvent(message);
+                            break;
 
-                    case GATT_MSG_EVENT:
-                        HostTestApp_processAttEvent((gattMsgEvent_t *)message);
-                        break;
+                        case GATT_MSG_EVENT:
+                            HostTestApp_processAttEvent((gattMsgEvent_t *)message);
+                            break;
 
-                    default:
-                        break;
+                        default:
+                            break;
                     }
                 }
 
@@ -271,69 +269,69 @@ static void HostTestApp_taskFxn(UArg a0, UArg a1) {
  */
 static void HostTestApp_processGapEvent(ICall_HciExtEvt *message) {
     switch (message->hdr.status) {
-    case HCI_COMMAND_COMPLETE_EVENT_CODE: {
-        hciEvt_CmdComplete_t *pkt = (hciEvt_CmdComplete_t *)message;
+        case HCI_COMMAND_COMPLETE_EVENT_CODE: {
+            hciEvt_CmdComplete_t *pkt = (hciEvt_CmdComplete_t *)message;
 
-        if (lastAppOpcodeSent == pkt->cmdOpcode) {
-            // app processes this as it was embedded message to stack
+            if (lastAppOpcodeSent == pkt->cmdOpcode) {
+                // app processes this as it was embedded message to stack
 
-            // Reset last opcode sent
-            lastAppOpcodeSent = 0xFFFF;
-        } else {
-            osal_msg_hdr_t *msgHdr;
-            uint8           len;
+                // Reset last opcode sent
+                lastAppOpcodeSent = 0xFFFF;
+            } else {
+                osal_msg_hdr_t *msgHdr;
+                uint8           len;
 
-            msgHdr = (osal_msg_hdr_t *)message;
-            msgHdr--;  // Backup to the message header
+                msgHdr = (osal_msg_hdr_t *)message;
+                msgHdr--;  // Backup to the message header
 
-            len = (uint8)(msgHdr->len - sizeof(hciEvt_CmdComplete_t));
+                len = (uint8)(msgHdr->len - sizeof(hciEvt_CmdComplete_t));
 
-            sendCommandCompleteEvent(HCI_COMMAND_COMPLETE_EVENT_CODE, pkt->cmdOpcode, len, pkt->pReturnParam);
+                sendCommandCompleteEvent(HCI_COMMAND_COMPLETE_EVENT_CODE, pkt->cmdOpcode, len, pkt->pReturnParam);
+            }
+            break;
         }
-        break;
-    }
 
-    case HCI_DISCONNECTION_COMPLETE_EVENT_CODE:
-        break;
+        case HCI_DISCONNECTION_COMPLETE_EVENT_CODE:
+            break;
 
-    case HCI_COMMAND_STATUS_EVENT_CODE: {
-        hciEvt_CommandStatus_t *pkt = (hciEvt_CommandStatus_t *)message;
+        case HCI_COMMAND_STATUS_EVENT_CODE: {
+            hciEvt_CommandStatus_t *pkt = (hciEvt_CommandStatus_t *)message;
 
-        if (lastAppOpcodeSent == pkt->cmdOpcode) {
-            // app processes this as it was embedded msg to stack
+            if (lastAppOpcodeSent == pkt->cmdOpcode) {
+                // app processes this as it was embedded msg to stack
 
-            // Reset last opcode sent
-            lastAppOpcodeSent = 0xFFFF;
+                // Reset last opcode sent
+                lastAppOpcodeSent = 0xFFFF;
 
-        } else if (pkt->cmdOpcode == HCI_LE_SET_PHY) {
-            sendCommandStatusEvent(HCI_COMMAND_STATUS_EVENT_CODE, pkt->cmdStatus, pkt->cmdOpcode);
+            } else if (pkt->cmdOpcode == HCI_LE_SET_PHY) {
+                sendCommandStatusEvent(HCI_COMMAND_STATUS_EVENT_CODE, pkt->cmdStatus, pkt->cmdOpcode);
+            }
+            break;
         }
-    } break;
 
-    case HCI_LE_EVENT_CODE:
-        HostTestApp_processBLEEvent(message);
-        break;
+        case HCI_LE_EVENT_CODE:
+            HostTestApp_processBLEEvent(message);
+            break;
 
-    case HCI_BLE_HARDWARE_ERROR_EVENT_CODE:
-        AssertHandler(HAL_ASSERT_CAUSE_HARDWARE_ERROR, 0);
-        break;
+        case HCI_BLE_HARDWARE_ERROR_EVENT_CODE:
+            break;
 
-    case HCI_VE_EVENT_CODE: {
-        hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_t *)message;
+        case HCI_VE_EVENT_CODE: {
+            hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_t *)message;
 
-        if (lastAppOpcodeSent == pkt->cmdOpcode) {
-            // app processes this as it was embedded msg to stack
+            if (lastAppOpcodeSent == pkt->cmdOpcode) {
+                // app processes this as it was embedded msg to stack
 
-            // Reset last opcode sent
-            lastAppOpcodeSent = 0xFFFF;
-        } else {
-            sendCommandCompleteEvent(HCI_VE_EVENT_CODE, pkt->cmdOpcode, pkt->length, pkt->pEventParam);
+                // Reset last opcode sent
+                lastAppOpcodeSent = 0xFFFF;
+            } else {
+                sendCommandCompleteEvent(HCI_VE_EVENT_CODE, pkt->cmdOpcode, pkt->length, pkt->pEventParam);
+            }
+            break;
         }
-        break;
-    }
 
-    default:
-        break;
+        default:
+            break;
     }
 }
 
@@ -380,17 +378,17 @@ static void HostTestApp_processBLEEvent(ICall_HciExtEvt *message) {
     uint8 eventLen = 0;
 
     switch (pEvt->BLEEventCode) {
-    case HCI_BLE_PHY_UPDATE_COMPLETE_EVENT: {
-        event[0] = HCI_BLE_PHY_UPDATE_COMPLETE_EVENT;  // event code
-        event[1] = pEvt->status;                       // status
-        event[2] = LO_UINT16(pEvt->connHandle);        // connection handle (LSB)
-        event[3] = HI_UINT16(pEvt->connHandle);        // connection handle (MSB)
-        event[4] = pEvt->txPhy;                        // TX PHY
-        event[5] = pEvt->rxPhy;                        // RX PHY
+        case HCI_BLE_PHY_UPDATE_COMPLETE_EVENT: {
+            event[0] = HCI_BLE_PHY_UPDATE_COMPLETE_EVENT;  // event code
+            event[1] = pEvt->status;                       // status
+            event[2] = LO_UINT16(pEvt->connHandle);        // connection handle (LSB)
+            event[3] = HI_UINT16(pEvt->connHandle);        // connection handle (MSB)
+            event[4] = pEvt->txPhy;                        // TX PHY
+            event[5] = pEvt->rxPhy;                        // RX PHY
 
-        eventLen = HCI_PHY_UPDATE_COMPLETE_EVENT_LEN;
-        break;
-    }
+            eventLen = HCI_PHY_UPDATE_COMPLETE_EVENT_LEN;
+            break;
+        }
     }
 
     if (eventLen > 0) {
@@ -399,7 +397,6 @@ static void HostTestApp_processBLEEvent(ICall_HciExtEvt *message) {
     }
 }
 
-
 /**
  * This generic function sends a Command Complete or a Vendor Specific Command
  * Complete Event to the Host.

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/host_test_app.h

@@ -9,7 +9,7 @@
  Target Device: CC2650, CC2640
 
  ******************************************************************************
- 
+
  Copyright (c) 2013-2018, Texas Instruments Incorporated
  All rights reserved.
 
@@ -49,37 +49,16 @@
 #define HOSTESTAPP_H
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
-/*********************************************************************
- * INCLUDES
- */
-
-/*********************************************************************
- * CONSTANTS
- */
-
-/*********************************************************************
- * MACROS
- */
-
-/*********************************************************************
- * FUNCTIONS
- */
-
 /*
  * Task creation function for the Host Test App.
  */
 extern void HostTestApp_createTask(void);
 
-
-/*********************************************************************
-*********************************************************************/
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* HOSTESTAPP_H */
+#endif

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/cc2650_master.h

@@ -7,8 +7,6 @@
 
 #include <ti/sysbios/knl/Semaphore.h>
 
-#define MASTER_PIN_USE_CC26XX
-
 #include "master_mem.h"
 #include "master_pin.h"
 #include "master_spi.h"
@@ -75,8 +73,8 @@ extern ICall_Semaphore semaphore;
 
 static void master_init();
 static void master_event_handle();
-struct void master_handle_notify(uint16 length, uint8 *value);
-struct void master_switch_memory();
+static void master_handle_notify(uint16 length, uint8 *value);
+static void master_switch_memory();
 
 /*========================
  ==== notify variable ====
@@ -107,24 +105,32 @@ static void master_init() {
     master_reset();
 }
 
-static void master_event_handle() {}
-
-static void master_pin_callback(PIN_Handle handle, PIN_Id pin) {
-    switch (pin) {
-    case PIN_MEM_RST:
-        // memory reset
-        flag_enable(EVT_PIN_RESET);
-        break;
-
-    case PIN_MEM_REQ:
-        // memory switch request
-        flag_enable(EVT_PIN_REQST);
-        break;
+static void master_event_handle() {
+    if (flag_mask(EVT_PIN_RESET)) {
+        flag_disable(EVT_PIN_RESET);
+        master_reset();
+    } else if (flag_mask(EVT_PIN_REQST)) {
+        flag_disable(EVT_PIN_REQST);
+        master_switch_memory();
     }
 }
 
-struct void master_handle_notify(uint16 length, uint8 *value) {
-    if (!master_pin_input(PIN_MEM_RST) || flag_mask(EVT_PIN_RESET)) {
+static void master_pin_callback(PIN_Handle handle, PIN_Id pin) {
+    switch (pin) {
+        case PIN_MEM_RST:
+            // memory reset
+            flag_notify(EVT_PIN_RESET);
+            break;
+
+        case PIN_MEM_REQ:
+            // memory switch request
+            flag_notify(EVT_PIN_REQST);
+            break;
+    }
+}
+
+static void master_handle_notify(uint16 length, uint8 *value) {
+    if (master_pi3_resetting() || flag_mask(EVT_PIN_RESET)) {
         // ignore all incoming notify;
         flag_disable(EVT_PIN_RESET);
         master_reset();
@@ -150,8 +156,7 @@ struct void master_handle_notify(uint16 length, uint8 *value) {
 
     master_mem_submit(p - master_mem_buffer);
 
-    if (master_pin_input(PIN_MEM_BZY) &&  //
-        (not_offset >= MEM_SWITCH_THRESHOLD || flag_mask(EVT_PIN_REQST))) {
+    if (master_pi3_not_busy() && ((not_offset >= MEM_SWITCH_THRESHOLD) || flag_mask(EVT_PIN_REQST))) {
         flag_disable(EVT_PIN_REQST);
         master_switch_memory();
     }
@@ -159,12 +164,12 @@ struct void master_handle_notify(uint16 length, uint8 *value) {
     master_pin_output(PIN_LED_GRN, not_counter & 0x10);
 }
 
-struct void master_switch_memory() {
+static void master_switch_memory() {
     uint16_t cnt_offset = not_offset;
     not_offset          = MEM_META_LENGTH;
 
     // localize current buffer
-    uint8_t *p = spi_tx_buffer;
+    uint8_t *p = master_mem_buffer;
 
     *p++ = MEM_INS_WRITE;                        // instruction
     *p++ = 0;                                    // address
@@ -177,9 +182,10 @@ struct void master_switch_memory() {
     master_mem_submit(p - master_mem_buffer);
 
     // switch memory
-    master_mem_select((mem_sel++) & 0x01);
+    mem_sel++;
+    master_mem_select(mem_sel & 0x01);
 
     master_pin_output(PIN_LED_RED, mem_sel & 0x10);
 }
 
-#endif  // CC2650_MASTER_H
+#endif  // CC2650_MASTER_H

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/lp/master_pin.h

@@ -6,7 +6,7 @@
 #endif
 
 #define PIN_LED_RED IOID_6
-#define PIN_LED_GRN IOID_6
+#define PIN_LED_GRN IOID_7
 
 #define PIN_MEM_RST IOID_10
 #define PIN_MEM_BZY IOID_11

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/ma/master_pin.h

@@ -14,9 +14,9 @@
 #define PIN_MEM_REQ DIO14
 
 #define PIN_SPI_CS DIO9
-#define PIN_SPI_CK Board_SPI0_CLK   // DIO10
-#define PIN_SPI_DI Board_SPI0_MISO  // DIO12
-#define PIN_SPI_DO Board_SPI0_MOSI  // DIO11
+#define PIN_SPI_CK DIO10
+#define PIN_SPI_DO DIO11
+#define PIN_SPI_DI DIO12
 
 #define PIN_DEBUG_1 IOID_UNUSED
 #define PIN_DEBUG_2 IOID_UNUSED

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/master_mem.h

@@ -6,7 +6,7 @@
 
 // clang-format off
 #define MEM_BUFFER_SIZE         SPI_TX_BUFFER_SIZE
-#define MEM_SWITCH_THRESHOLD    0x1000
+#define MEM_SWITCH_THRESHOLD    0x0800
 
 #define MSM_REG_WRITE 0x01
 #define MEM_INS_WRITE 0x02

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/master_pin.h

@@ -10,6 +10,7 @@
 #include "ma/master_pin.h"
 #endif
 
+static PIN_State  master_pins_state;
 static PIN_Handle master_pins_handle;
 
 static PIN_Config master_pin_config_table[] = {  //
@@ -44,30 +45,22 @@ static PIN_Config master_pin_config_table[] = {  //
 
 static void master_pin_callback(PIN_Handle handle, PIN_Id pin);
 
-#define master_pin_open()                                                    \
-    do {                                                                     \
-        PIN_State state;                                                     \
-        master_pins_handle = PIN_open(&state, master_pin_config_table);      \
-        PIN_registerIntCb(master_pins_handle, master_pin_callback);          \
-        PIN_setInterrupt(master_pins_handle, HTA_MEM_RST | PIN_IRQ_NEGEDGE); \
-        PIN_setInterrupt(master_pins_handle, HTA_MEM_REQ | PIN_IRQ_NEGEDGE); \
+#define master_pin_open()                                                           \
+    do {                                                                            \
+        master_pins_handle = PIN_open(&master_pins_state, master_pin_config_table); \
+        PIN_registerIntCb(master_pins_handle, master_pin_callback);                 \
+        PIN_setInterrupt(master_pins_handle, PIN_MEM_RST | PIN_IRQ_NEGEDGE);        \
+        PIN_setInterrupt(master_pins_handle, PIN_MEM_REQ | PIN_IRQ_NEGEDGE);        \
     } while (0)
 
 #define master_pin_add(configuration) PIN_add(master_pins_handle, configuration)
 #define master_pin_remove(pin) PIN_remove(master_pins_handle, pin)
 #define master_pin_close() PIN_close(master_pins_handle)
 
-#ifdef MASTER_PIN_USE_CC26XX
-
-#include <ti/drivers/pin/PINCC26xx.h>
-#define headstage_pin_output(pin, value) PINCC26XX_setOutputValue(headstage_pins_handle, PIN_ID(pin), (value))
-#define headstage_pin_input(pin) PINCC26XX_getInputValue(PIN_ID(pin))
-
-#else
-
 #define master_pin_output(pin, value) PIN_setOutputValue(master_pins_handle, PIN_ID(pin), (value))
 #define master_pin_input(pin) PIN_getInputValue(PIN_ID(pin))
 
-#endif
+#define master_pi3_resetting()  !master_pin_input(PIN_MEM_RST)
+#define master_pi3_not_busy() master_pin_input(PIN_MEM_BZY)
 
 #endif MASTER_PIN_H

simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master/master_spi.h

@@ -9,7 +9,7 @@
 
 #include "master_pin.h"
 
-#define SPI_TX_BUFFER_SIZE 50
+#define SPI_TX_BUFFER_SIZE 250
 
 static uint8_t master_tx_buffer[SPI_TX_BUFFER_SIZE] = {0};
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h

@@ -23,7 +23,7 @@ Instruction Specification
 
 file defined:
 
-Bio_Pro_Sci / �� / Pi3/DataServer / CC2650 / CC2650���誘銵�
+Bio_Pro_Sci / 研發 / Pi3/DataServer / CC2650 / CC2650通用指令表
 
 ```
 struct instruction {
@@ -98,7 +98,7 @@ instruction operator
  =====================*/
 
 uint16_t               EVENT_MASK = 0;
-static ICall_Semaphore semaphore;
+extern ICall_Semaphore semaphore;
 
 // clang-format off
 #define EVT_ALL             0xFFFF  // all event mask
@@ -242,13 +242,13 @@ static ICall_Semaphore semaphore;
  * make task sleep in certain [ms].
  * count with cpu tick.
  */
-#define headstage_cpu_delay_ms(ms) CPUdelay((ms) * 16000)
+#define headstage_cpu_delay_ms(ms) CPUdelay(ms * 16000)
 
 /**
  * make task sleep in certain [us].
  * count with cpu tick.
  */
-#define headstage_cpu_delay_us(us) CPUdelay((us) * 16)
+#define headstage_cpu_delay_us(ms) CPUdelay(ms * 16)
 
 /*======================================
  ==== abstract function declaration ====
@@ -283,12 +283,10 @@ static void headstage_update_vis_instruction(uint8_t vis_oper);
  */
 static uint8_t CHIP_ID = 0;
 
-#define CONNECT_HANDLE_UNCONNECTED 0xFFFF
-
 /**
  * connection handle. updated by system.
  */
-static uint16_t CONNECT_HANDLE = CONNECT_HANDLE_UNCONNECTED;
+static uint16_t CONNECT_HANDLE = 0;
 
 /*====================
  ==== event table ====
@@ -314,7 +312,7 @@ typedef struct {
  ==== device implement implement header ====
  =========================================*/
 
-#include "headstage_sti.h"
+#include "headstage_uni.h"
 
 /*======================
  ==== main function ====

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_cis_led.h

@@ -1,11 +1,12 @@
 /* Copyright (c) 2019. BioPro. Scientific.
  */
+#ifndef HEADSTAGE_LED_H
+#error "headstage_led.h not included"
+#endif
 
 #ifndef HEADSTAGE_CIS_LED_H
 #define HEADSTAGE_CIS_LED_H
 
-#include "headstage_led.h"
-
 // clang-format off
 #define CIS_LED_DISABLE 0x00
 #define CIS_LED_ENABLE  0x01

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_clock.h

@@ -9,57 +9,36 @@
 #define HRADSTAGE_CLOCK_H
 
 #include <ti/sysbios/knl/Clock.h>
-#include "headstage_LED.h"
-
 
 #define EVT_PERIODIC_CLOCK EVT_PERIODIC_0
 
 static Clock_Handle clock_handle = NULL;
-static Clock_Handle LED_clock_handle = NULL;
-
 
 static void headstage_clock_callback(UArg arg) {
     flag_notify(EVT_PERIODIC_CLOCK);
 }
 
+#define headstage_clock_start() Clock_start(clock_handle)
+#define headstage_clock_stop() Clock_stop(clock_handle)
+#define headstage_clock_active() (clock_handle && Clock_isActive(clock_handle))
 
-
-#define headstage_clock_start(_clock_handle) Clock_start(_clock_handle)
-#define headstage_clock_stop(_clock_handle) Clock_stop(_clock_handle)
-#define headstage_clock_active(_clock_handle) (_clock_handle && Clock_isActive(_clock_handle))
-static void LED_off();
-
-#define headstage_clock_close(_clock_handle)     \
+#define headstage_clock_close()     \
     do {                            \
-        Clock_delete(_clock_handle); \
-        _clock_handle = NULL;        \
+        Clock_delete(clock_handle); \
+        clock_handle = NULL;        \
     } while (0)
 
 // XXX function not tested
-// period in millisecond
-#define headstage_clock_open(p)                                                       \
-    do {                                                                                    \
-        Clock_Params param;                                                                 \
-        Clock_Params_init(&param);                                                          \
-        param.period    = 0;                                                                \
-        param.startFlag = false;                                                            \
-        clock_handle    = Clock_create(headstage_clock_callback, 0, &param, NULL); \
-        uint32_t     _period = (p)*1000 / Clock_tickPeriod;                        \
-        Clock_setPeriod(clock_handle, _period); \
+// period in mini second
+#define headstage_clock_open(_period)                                               \
+    do {                                                                           \
+        Clock_Params param;                                                        \
+        Clock_Params_init(&param);                                                 \
+        param.period    = 48000*(_period);                                         \
+        param.startFlag = false;                                                   \
+        clock_handle    = Clock_create(headstage_clock_callback, 1, &param, NULL); \
     } while (0)
 
-#define headstage_LED_clock_open(p)                                                       \
-    do {                                                                                    \
-        Clock_Params param;                                                                 \
-        Clock_Params_init(&param);                                                          \
-        param.period    = 0;                                                                \
-        param.startFlag = false;                                                            \
-        LED_clock_handle    = Clock_create(headstage_LED_clock_callback, 0, &param, NULL); \
-        uint32_t     _period = (p)*1000 / Clock_tickPeriod;                        \
-        Clock_setPeriod(LED_clock_handle, _period); \
-    } while (0)
-
-
 #define headstage_clock_set_frequency(frequency)           \
     do {                                                   \
         uint32_t     _frequency = (uint32_t)(frequency);   \

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_debug.h

@@ -14,4 +14,4 @@ static uint8_t headstage_debug_instruction(uint8_t* ins_buf);
 
 #define headstage_set_debug_information() SimpleProfile_SetParameter(BLE_DEBUG_BUFF_CHAR, BLE_DEBUG_BUFF_SIZE, headstage_debug_buffer)
 
-#endif // HEADSTAGE_DEBUG_H
+#endif // HEADSTAGE_DEBUG_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_notify.h

@@ -73,18 +73,4 @@ static void headstage_notify_send() {
 #endif
 }
 
-#if defined(HEADSTAGE_TNI_H)
-#include "tni/headstage_notify.h"
-#elif defined(HEADSTAGE_UNI_H)
-#include "tni/headstage_notify.h"
-#elif defined(HEADSTAGE_ZM_H)
-#include "zm/headstage_notify.h"
-#elif defined(HEADSTAGE_STI_H)
-#include "sti/headstage_notify.h"
-#else
-
-#error "headstage_notify"
-
-#endif
-
 #endif  // HEADSTAGE_NOTIFY_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_notify_general.h

@@ -1,35 +0,0 @@
-/* Copyright (c) 2019. BioPro. Scientific.
- */
-
-#ifndef HEADSTAGE_NOTIFY_GENERAL_H
-#define HEADSTAGE_NOTIFY_GENERAL_H
-
-#ifndef HEADSTAGE_NOTIFY_H
-#error "headstage/headstage_notify.h not included"
-#endif
-
-static uint32_t not_buf_offset = 0;
-static uint32_t not_time_stamp = 0;
-
-static void headstage_notify_set_timestamp() {
-
-#ifdef HEADSTAGE_NOTIFY_TIMESTAMP_USE_US
-    not_time_stamp = headstage_time_stamp_us();
-#else
-    not_time_stamp = headstage_time_stamp_ms();
-#endif
-
-    headstage_notify_buffer[2] = not_time_stamp & 0xFF;
-    headstage_notify_buffer[3] = (not_time_stamp >> 8) & 0xFF;
-    headstage_notify_buffer[4] = (not_time_stamp >> 16) & 0xFF;
-    headstage_notify_buffer[5] = (not_time_stamp >> 24) & 0xFF;
-}
-
-static void _headstage_notify_flip_buffer(uint8_t data_length) {
-    headstage_notify_buffer[0] = CHIP_ID;
-    headstage_notify_buffer[1] = data_length;
-
-    not_buf_offset = 0;
-}
-
-#endif  // HEADSTAGE_NOTIFY_GENERAL_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_pin.h

@@ -6,22 +6,24 @@
 #include <Board.h>
 #include <ti/drivers/PIN.h>
 
-#if defined(HEADSTAGE_TNI_H)
-#include "tni/headstage_pin.h"
-#elif defined(HEADSTAGE_UNI_H)
-#include "uni/headstage_pin.h"
-#elif defined(HEADSTAGE_ZM_H)
-#include "zm/headstage_pin.h"
-#elif defined(HEADSTAGE_STI_H)
-#include "sti/headstage_pin.h"
-#else
-
-#error "headstage_pin headstage_pin_configuration not defined"
+static PIN_State  headstage_pins_state;
+static PIN_Handle headstage_pins_handle;
 
+#if defined(CC2650_LAUNCHXL)
+#define PIN_LED_R Board_RLED
+#define PIN_LED_G Board_GLED
 #endif
 
-static PIN_State headstage_pins_state;
-static PIN_Handle headstage_pins_handle;
+static PIN_Config headstage_pin_configuration[] = {  //
+
+// LED
+#if defined(CC2650_LAUNCHXL)
+    PIN_LED_R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    PIN_LED_G | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+#endif
+
+    //
+    PIN_TERMINATE};
 
 #define headstage_pin_add(configuration) PIN_add(headstage_pins_handle, configuration)
 #define headstage_pin_remove(pin) PIN_remove(headstage_pins_handle, pin)
@@ -32,17 +34,7 @@ static PIN_Handle headstage_pins_handle;
         headstage_pins_handle = PIN_open(&headstage_pins_state, headstage_pin_configuration); \
     } while (0)
 
-#ifdef HEADSTAGE_PIN_USE_CC26XX
-
-#include <ti/drivers/pin/PINCC26xx.h>
-#define headstage_pin_output(pin, value) PINCC26XX_setOutputValue(PIN_ID(pin), (value))
-#define headstage_pin_input(pin) PINCC26XX_getInputValue(PIN_ID(pin))
-
-#else
-
 #define headstage_pin_output(pin, value) PIN_setOutputValue(headstage_pins_handle, PIN_ID(pin), (value))
 #define headstage_pin_input(pin) PIN_getInputValue(PIN_ID(pin))
 
-#endif
-
-#endif  // HEADSTAGE_PIN_H
+#endif  // HEADSTAGE_PIN_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_spi.h

@@ -11,7 +11,7 @@
 /*
  * SPI parameter and function declaration
  */
-static SPI_Handle      spi_handle = NULL;
+static SPI_Handle      spi_handle;
 static SPI_Transaction spi_transaction;
 
 #define headstage_spi_close() SPI_close(spi_handle)

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_tni.h

@@ -35,7 +35,8 @@ Real instruction format
 #include "headstage_arm.h"
 #include "headstage_gptimer.h"
 #include "headstage_notify.h"
-#include "headstage_pin.h"
+#include "tni/headstage_notify.h"
+#include "tni/headstage_pin.h"
 #include "tni/headstage_spi.h"
 
 /*=================================
@@ -208,150 +209,150 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t *instructi
     uint8_t header = instruction[0] & 0xE0;
 
     switch (header) {
-        // direct instruction
-        case RIS_DIR: {
-            uint8_t amp_gain    = (instruction[0] & 0b00011000) >> 3;
-            uint8_t amp_lbf     = (instruction[0] & 0b00000111);
-            uint8_t channel     = (instruction[1] & 0b11110000) >> 4;
-            uint8_t chopper     = (instruction[1] & 0b00001000) >> 3;
-            uint8_t fast_settle = (instruction[1] & 0b00000100) >> 2;
-            uint8_t mode        = (instruction[1] == 0b00000010) ? STI_MODE_POS : STI_MODE_DISABLE;
-            uint8_t sti_volt_h  = (instruction[1] & 0b00000001);
-            uint8_t sti_volt_l  = (instruction[2] & 0b11110000) >> 4;
-            uint8_t sti_volt    = (sti_volt_h << 4) | sti_volt_l;
-            uint8_t sti_chp     = (instruction[2] & 0b00001111);
-            uint8_t sti_chn     = (instruction[3] & 0b11110000) >> 4;
-            uint8_t frequency   = (instruction[3] & 0b00001111);
+    // direct instruction
+    case RIS_DIR: {
+        uint8_t amp_gain    = (instruction[0] & 0b00011000) >> 3;
+        uint8_t amp_lbf     = (instruction[0] & 0b00000111);
+        uint8_t channel     = (instruction[1] & 0b11110000) >> 4;
+        uint8_t chopper     = (instruction[1] & 0b00001000) >> 3;
+        uint8_t fast_settle = (instruction[1] & 0b00000100) >> 2;
+        uint8_t mode        = (instruction[1] == 0b00000010) ? STI_MODE_POS : STI_MODE_DISABLE;
+        uint8_t sti_volt_h  = (instruction[1] & 0b00000001);
+        uint8_t sti_volt_l  = (instruction[2] & 0b11110000) >> 4;
+        uint8_t sti_volt    = (sti_volt_h << 4) | sti_volt_l;
+        uint8_t sti_chp     = (instruction[2] & 0b00001111);
+        uint8_t sti_chn     = (instruction[3] & 0b11110000) >> 4;
+        uint8_t frequency   = (instruction[3] & 0b00001111);
 
-            INSTRUCTION.mode                   = mode;
-            INSTRUCTION.channel_table[channel] = TRUE;
-            INSTRUCTION.frequency_mode         = FREQ_MODE_INDEX;
-            INSTRUCTION.frequency              = frequency;
-            INSTRUCTION.amp_gain               = amp_gain;
-            INSTRUCTION.amp_low_band_freq      = amp_lbf;
-            INSTRUCTION.chopper                = chopper;
-            INSTRUCTION.fast_settle            = fast_settle;
-            INSTRUCTION.sti_volt               = sti_volt;
-            INSTRUCTION.sti_channel_pmos       = sti_chp;
-            INSTRUCTION.sti_channel_nmos       = sti_chn;
+        INSTRUCTION.mode                   = mode;
+        INSTRUCTION.channel_table[channel] = TRUE;
+        INSTRUCTION.frequency_mode         = FREQ_MODE_INDEX;
+        INSTRUCTION.frequency              = frequency;
+        INSTRUCTION.amp_gain               = amp_gain;
+        INSTRUCTION.amp_low_band_freq      = amp_lbf;
+        INSTRUCTION.chopper                = chopper;
+        INSTRUCTION.fast_settle            = fast_settle;
+        INSTRUCTION.sti_volt               = sti_volt;
+        INSTRUCTION.sti_channel_pmos       = sti_chp;
+        INSTRUCTION.sti_channel_nmos       = sti_chn;
+        break;
+    }
+
+    // recording instruction
+    case RIS_REC: {
+        uint8_t amp_gain  = (instruction[0] & 0b00011000) >> 3;
+        uint8_t amp_lbf   = (instruction[0] & 0b00000111);
+        uint8_t frequency = (instruction[1] & 0b11110000) >> 4;
+
+        INSTRUCTION.mode              = STI_MODE_DISABLE;
+        INSTRUCTION.amp_gain          = amp_gain;
+        INSTRUCTION.amp_low_band_freq = amp_lbf;
+        INSTRUCTION.frequency_mode    = FREQ_MODE_INDEX;
+        INSTRUCTION.frequency         = frequency;
+
+        uint8_t cha = (instruction[2] & 0b11110000) >> 4;
+        uint8_t chb = (instruction[2] & 0b00001111);
+        uint8_t chc = (instruction[3] & 0b11110000) >> 4;
+        uint8_t chd = (instruction[3] & 0b00001111);
+
+        if (instruction[1] & 0b1000) INSTRUCTION.channel_table[cha] = TRUE;
+        if (instruction[1] & 0b0100) INSTRUCTION.channel_table[chb] = TRUE;
+        if (instruction[1] & 0b0010) INSTRUCTION.channel_table[chc] = TRUE;
+        if (instruction[1] & 0b0001) INSTRUCTION.channel_table[chd] = TRUE;
+        break;
+    }
+
+    // artifact recording instruction
+    case RIS_ARM: {
+        uint8_t arm_mode  = (instruction[0] & 0b00000111);
+        uint8_t frequency = (instruction[1] & 0b11110000) >> 4;
+
+        INSTRUCTION.mode              = STI_MODE_DISABLE;
+        INSTRUCTION.amp_gain          = arm_mode;
+        INSTRUCTION.amp_low_band_freq = 0;
+        INSTRUCTION.frequency_mode    = FREQ_MODE_INDEX;
+        INSTRUCTION.frequency         = frequency;
+
+        uint8_t cha = (instruction[2] & 0b11110000) >> 4;
+        uint8_t chb = (instruction[2] & 0b00001111);
+        uint8_t chc = (instruction[3] & 0b11110000) >> 4;
+        uint8_t chd = (instruction[3] & 0b00001111);
+
+        if (instruction[1] & 0b1000) INSTRUCTION.channel_table[cha] = TRUE;
+        if (instruction[1] & 0b0100) INSTRUCTION.channel_table[chb] = TRUE;
+        if (instruction[1] & 0b0010) INSTRUCTION.channel_table[chc] = TRUE;
+        if (instruction[1] & 0b0001) INSTRUCTION.channel_table[chd] = TRUE;
+
+        switch (arm_mode) {
+        case 1:
+            INSTRUCTION.mode = ARM_MODE_RAMP;
             break;
         }
+        break;
+    }
 
-        // recording instruction
-        case RIS_REC: {
-            uint8_t amp_gain  = (instruction[0] & 0b00011000) >> 3;
-            uint8_t amp_lbf   = (instruction[0] & 0b00000111);
-            uint8_t frequency = (instruction[1] & 0b11110000) >> 4;
+    // stimulating instruction
+    case RIS_STI: {
+        uint8 mode = (instruction[0] & 0b00011000) >> 3;
 
-            INSTRUCTION.mode              = STI_MODE_DISABLE;
-            INSTRUCTION.amp_gain          = amp_gain;
-            INSTRUCTION.amp_low_band_freq = amp_lbf;
-            INSTRUCTION.frequency_mode    = FREQ_MODE_INDEX;
-            INSTRUCTION.frequency         = frequency;
+        switch (mode) {
+        // simple instruction
+        case 0: {
+            uint8_t mode        = (instruction[0] & 0b00000111);
+            uint8_t sti_freq    = (instruction[1] & 0b11110000) >> 4;
+            uint8_t chopper     = (instruction[1] & 0b00001000);
+            uint8_t fast_settle = (instruction[1] & 0b00000100);
+            uint8_t sti_chp     = (instruction[2] & 0b11110000) >> 4;
+            uint8_t sti_chn     = (instruction[2] & 0b00001111);
+            uint8_t sti_volt    = (instruction[3] & 0b11111000) >> 3;
 
-            uint8_t cha = (instruction[2] & 0b11110000) >> 4;
-            uint8_t chb = (instruction[2] & 0b00001111);
-            uint8_t chc = (instruction[3] & 0b11110000) >> 4;
-            uint8_t chd = (instruction[3] & 0b00001111);
-
-            if (instruction[1] & 0b1000) INSTRUCTION.channel_table[cha] = TRUE;
-            if (instruction[1] & 0b0100) INSTRUCTION.channel_table[chb] = TRUE;
-            if (instruction[1] & 0b0010) INSTRUCTION.channel_table[chc] = TRUE;
-            if (instruction[1] & 0b0001) INSTRUCTION.channel_table[chd] = TRUE;
-            break;
-        }
-
-        // artifact recording instruction
-        case RIS_ARM: {
-            uint8_t arm_mode  = (instruction[0] & 0b00000111);
-            uint8_t frequency = (instruction[1] & 0b11110000) >> 4;
-
-            INSTRUCTION.mode              = STI_MODE_DISABLE;
-            INSTRUCTION.amp_gain          = arm_mode;
-            INSTRUCTION.amp_low_band_freq = 0;
-            INSTRUCTION.frequency_mode    = FREQ_MODE_INDEX;
-            INSTRUCTION.frequency         = frequency;
-
-            uint8_t cha = (instruction[2] & 0b11110000) >> 4;
-            uint8_t chb = (instruction[2] & 0b00001111);
-            uint8_t chc = (instruction[3] & 0b11110000) >> 4;
-            uint8_t chd = (instruction[3] & 0b00001111);
-
-            if (instruction[1] & 0b1000) INSTRUCTION.channel_table[cha] = TRUE;
-            if (instruction[1] & 0b0100) INSTRUCTION.channel_table[chb] = TRUE;
-            if (instruction[1] & 0b0010) INSTRUCTION.channel_table[chc] = TRUE;
-            if (instruction[1] & 0b0001) INSTRUCTION.channel_table[chd] = TRUE;
-
-            switch (arm_mode) {
-                case 1:
-                    INSTRUCTION.mode = ARM_MODE_RAMP;
-                    break;
-            }
-            break;
-        }
-
-        // stimulating instruction
-        case RIS_STI: {
-            uint8 mode = (instruction[0] & 0b00011000) >> 3;
+            INSTRUCTION.mode           = mode;
+            INSTRUCTION.chopper        = chopper;
+            INSTRUCTION.fast_settle    = fast_settle;
+            INSTRUCTION.sti_volt       = sti_volt;
+            INSTRUCTION.frequency_mode = FREQ_MODE_INDEX;
+            INSTRUCTION.frequency      = sti_freq;
 
             switch (mode) {
-                // simple instruction
-                case 0: {
-                    uint8_t mode        = (instruction[0] & 0b00000111);
-                    uint8_t sti_freq    = (instruction[1] & 0b11110000) >> 4;
-                    uint8_t chopper     = (instruction[1] & 0b00001000);
-                    uint8_t fast_settle = (instruction[1] & 0b00000100);
-                    uint8_t sti_chp     = (instruction[2] & 0b11110000) >> 4;
-                    uint8_t sti_chn     = (instruction[2] & 0b00001111);
-                    uint8_t sti_volt    = (instruction[3] & 0b11111000) >> 3;
-
-                    INSTRUCTION.mode           = mode;
-                    INSTRUCTION.chopper        = chopper;
-                    INSTRUCTION.fast_settle    = fast_settle;
-                    INSTRUCTION.sti_volt       = sti_volt;
-                    INSTRUCTION.frequency_mode = FREQ_MODE_INDEX;
-                    INSTRUCTION.frequency      = sti_freq;
-
-                    switch (mode) {
-                        case STI_MODE_POS:
-                        case STI_MODE_P2N: {
-                            INSTRUCTION.sti_channel_pmos = sti_chp;
-                            INSTRUCTION.sti_channel_nmos = sti_chn;
-                            break;
-                        }
-                        case STI_MODE_NEG:
-                        case STI_MODE_N2P: {
-                            INSTRUCTION.sti_channel_pmos = sti_chn;
-                            INSTRUCTION.sti_channel_nmos = sti_chp;
-                            break;
-                        }
-                    }
-                    break;
-                }
-
-                // continuous frequency
-                case 1: {
-                    uint8_t  prec = (instruction[0] & 0b00000111);
-                    uint32_t freq = (instruction[1] << 16) | (instruction[2] << 8) | (instruction[3]);
-
-                    // XXX consider precision
-                    INSTRUCTION.frequency_mode = FREQ_MODE_VALUE;
-                    INSTRUCTION.frequency      = freq;
-                    break;
-                }
-
-                // reserved
-                case 2:
-                case 3:
-                default:
-                    break;
+            case STI_MODE_POS:
+            case STI_MODE_P2N: {
+                INSTRUCTION.sti_channel_pmos = sti_chp;
+                INSTRUCTION.sti_channel_nmos = sti_chn;
+                break;
+            }
+            case STI_MODE_NEG:
+            case STI_MODE_N2P: {
+                INSTRUCTION.sti_channel_pmos = sti_chn;
+                INSTRUCTION.sti_channel_nmos = sti_chp;
+                break;
+            }
             }
             break;
         }
 
-        case RIS_ART: {
+        // continuous frequency
+        case 1: {
+            uint8_t  prec = (instruction[0] & 0b00000111);
+            uint32_t freq = (instruction[1] << 16) | (instruction[2] << 8) | (instruction[3]);
+
+            // XXX consider precision
+            INSTRUCTION.frequency_mode = FREQ_MODE_VALUE;
+            INSTRUCTION.frequency      = freq;
             break;
         }
+
+        // reserved
+        case 2:
+        case 3:
+        default:
+            break;
+        }
+        break;
+    }
+
+    case RIS_ART: {
+        break;
+    }
     }
 
     // update gptimer frequency
@@ -379,42 +380,42 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t *instructi
 
 static void headstage_update_vis_instruction(uint8_t vis_oper) {
     switch (vis_oper) {
-        case VIS_STI:
-            INSTRUCTION.flag_start = TRUE;
-            headstage_gptimer_start();
-            break;
+    case VIS_STI:
+        INSTRUCTION.flag_start = TRUE;
+        headstage_gptimer_start();
+        break;
 
-        // reset
-        case VIS_RST:
-            // stop gptimer
-            headstage_gptimer_stop();
+    // reset
+    case VIS_RST:
+        // stop gptimer
+        headstage_gptimer_stop();
 
-            // reset. reset all variable
-            reset_parameter_table();
-            memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
+        // reset. reset all variable
+        reset_parameter_table();
+        memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
 
-            not_buf_offset = NOT_BUF_OFFSET_INIT;
+        not_buf_offset = NOT_BUF_OFFSET_INIT;
 
-            INSTRUCTION.channel_pointer = -1;
-            break;
+        INSTRUCTION.channel_pointer = -1;
+        break;
 
-        // interrupt
-        case VIS_INT:
-            // stop gptimer
-            headstage_gptimer_stop();
+    // interrupt
+    case VIS_INT:
+        // stop gptimer
+        headstage_gptimer_stop();
 
-            // stop. reset channel table
-            memset(&INSTRUCTION.channel_table, 0, REC_CHANNEL_COUNT);
-            memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
+        // stop. reset channel table
+        memset(&INSTRUCTION.channel_table, 0, REC_CHANNEL_COUNT);
+        memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
 
-            not_buf_offset = NOT_BUF_OFFSET_INIT;
+        not_buf_offset = NOT_BUF_OFFSET_INIT;
 
-            INSTRUCTION.channel_pointer = -1;
-            break;
+        INSTRUCTION.channel_pointer = -1;
+        break;
 
-        default:
-            break;
-            // nothing
+    default:
+        break;
+        // nothing
     }
 }
 
@@ -582,66 +583,66 @@ static bool update_ins_rec_buffer() {
  */
 static void update_ins_sti_buffer() {
     switch (INSTRUCTION.mode) {
-        case STI_MODE_POS:
-        case STI_MODE_NEG:
-            // copy [4:7]
-            spi_txbuf[4] = spi_txbuf[0];
-            spi_txbuf[5] = spi_txbuf[1];
-            spi_txbuf[6] = spi_txbuf[2];
-            spi_txbuf[7] = spi_txbuf[3];
-            // copy [8:B]
-            spi_txbuf[8]  = spi_txbuf[0];
-            spi_txbuf[9]  = spi_txbuf[1];
-            spi_txbuf[10] = spi_txbuf[2];
-            spi_txbuf[11] = spi_txbuf[3];
-            // reset [C:F]
-            spi_txbuf[12] = 0;
-            spi_txbuf[13] = 0;
-            spi_txbuf[14] = 0;
-            spi_txbuf[15] = 0;
-            // change content
-            update_ins_sti_enable(spi_txbuf, TRUE);
-            // ins buf [4:7]
-            update_ins_sti_enable(spi_txbuf + 4, TRUE);
-            update_ins_sti_channel(spi_txbuf + 4, 0xF, INSTRUCTION.sti_channel_pmos);
-            // ins buf [8:B]
-            update_ins_sti_enable(spi_txbuf + 8, FALSE);
-            break;
-        case STI_MODE_P2N:
-        case STI_MODE_N2P:
-            // copy [4:7]
-            spi_txbuf[4] = spi_txbuf[0];
-            spi_txbuf[5] = spi_txbuf[1];
-            spi_txbuf[6] = spi_txbuf[2];
-            spi_txbuf[7] = spi_txbuf[3];
-            // copy [8:B]
-            spi_txbuf[8]  = spi_txbuf[0];
-            spi_txbuf[9]  = spi_txbuf[1];
-            spi_txbuf[10] = spi_txbuf[2];
-            spi_txbuf[11] = spi_txbuf[3];
-            // copy [C:F]
-            spi_txbuf[12] = spi_txbuf[0];
-            spi_txbuf[13] = spi_txbuf[1];
-            spi_txbuf[14] = spi_txbuf[2];
-            spi_txbuf[15] = spi_txbuf[3];
-            // change content
-            update_ins_sti_enable(spi_txbuf + 0, TRUE);
-            update_ins_sti_channel(spi_txbuf + 0, INSTRUCTION.sti_channel_pmos, INSTRUCTION.sti_channel_nmos);
-            // ins buf [4:7]
-            update_ins_sti_enable(spi_txbuf + 4, TRUE);
-            update_ins_sti_channel(spi_txbuf + 4, INSTRUCTION.sti_channel_nmos, INSTRUCTION.sti_channel_pmos);
-            // ins buf [8:B]
-            update_ins_sti_enable(spi_txbuf + 8, TRUE);
-            update_ins_sti_channel(spi_txbuf + 8, 0xF, INSTRUCTION.sti_channel_nmos);
-            // ins buf [C:F]
-            update_ins_sti_enable(spi_txbuf + 12, FALSE);
-            break;
-        case STI_MODE_AWF:
-            // XXX define the voltage change
-            break;
-        default:
-            // do nothing
-            break;
+    case STI_MODE_POS:
+    case STI_MODE_NEG:
+        // copy [4:7]
+        spi_txbuf[4] = spi_txbuf[0];
+        spi_txbuf[5] = spi_txbuf[1];
+        spi_txbuf[6] = spi_txbuf[2];
+        spi_txbuf[7] = spi_txbuf[3];
+        // copy [8:B]
+        spi_txbuf[8]  = spi_txbuf[0];
+        spi_txbuf[9]  = spi_txbuf[1];
+        spi_txbuf[10] = spi_txbuf[2];
+        spi_txbuf[11] = spi_txbuf[3];
+        // reset [C:F]
+        spi_txbuf[12] = 0;
+        spi_txbuf[13] = 0;
+        spi_txbuf[14] = 0;
+        spi_txbuf[15] = 0;
+        // change content
+        update_ins_sti_enable(spi_txbuf, TRUE);
+        // ins buf [4:7]
+        update_ins_sti_enable(spi_txbuf + 4, TRUE);
+        update_ins_sti_channel(spi_txbuf + 4, 0xF, INSTRUCTION.sti_channel_pmos);
+        // ins buf [8:B]
+        update_ins_sti_enable(spi_txbuf + 8, FALSE);
+        break;
+    case STI_MODE_P2N:
+    case STI_MODE_N2P:
+        // copy [4:7]
+        spi_txbuf[4] = spi_txbuf[0];
+        spi_txbuf[5] = spi_txbuf[1];
+        spi_txbuf[6] = spi_txbuf[2];
+        spi_txbuf[7] = spi_txbuf[3];
+        // copy [8:B]
+        spi_txbuf[8]  = spi_txbuf[0];
+        spi_txbuf[9]  = spi_txbuf[1];
+        spi_txbuf[10] = spi_txbuf[2];
+        spi_txbuf[11] = spi_txbuf[3];
+        // copy [C:F]
+        spi_txbuf[12] = spi_txbuf[0];
+        spi_txbuf[13] = spi_txbuf[1];
+        spi_txbuf[14] = spi_txbuf[2];
+        spi_txbuf[15] = spi_txbuf[3];
+        // change content
+        update_ins_sti_enable(spi_txbuf + 0, TRUE);
+        update_ins_sti_channel(spi_txbuf + 0, INSTRUCTION.sti_channel_pmos, INSTRUCTION.sti_channel_nmos);
+        // ins buf [4:7]
+        update_ins_sti_enable(spi_txbuf + 4, TRUE);
+        update_ins_sti_channel(spi_txbuf + 4, INSTRUCTION.sti_channel_nmos, INSTRUCTION.sti_channel_pmos);
+        // ins buf [8:B]
+        update_ins_sti_enable(spi_txbuf + 8, TRUE);
+        update_ins_sti_channel(spi_txbuf + 8, 0xF, INSTRUCTION.sti_channel_nmos);
+        // ins buf [C:F]
+        update_ins_sti_enable(spi_txbuf + 12, FALSE);
+        break;
+    case STI_MODE_AWF:
+        // XXX define the voltage change
+        break;
+    default:
+        // do nothing
+        break;
     }
 }
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_uni.h

@@ -40,7 +40,7 @@
 #define UMC_HEADER      0b0101
 // clang-format on
 
-#define HEADSTAGE_NOTIFY_TIMESTAMP_USE_US
+#define HEADSTAGE_NOTIFY_USE_TDC4VAF2
 
 /*================
  ==== include ====
@@ -50,8 +50,8 @@
 #include "headstage_arm.h"
 #include "headstage_notify.h"
 #include "headstage_debug.h"
-#include "headstage_pin.h"
-#include "headstage_notify.h"
+#include "tni/headstage_notify.h"
+#include "uni/headstage_pin.h"
 #include "uni/headstage_spi.h"
 #include "uni/headstage_pwm.h"
 #include "uni/headstage_adc.h"
@@ -407,8 +407,7 @@ static void rearrange_channel_mux_table() {
     int8_t next_enable_channel = last_enable_channel;
     int8_t channel_mux_index   = last_enable_channel;
 
-    INSTRUCTION.channel_mux[channel_mux_index] = last_enable_channel;
-    channel_mux_index--;
+    INSTRUCTION.channel_mux[channel_mux_index--] = last_enable_channel;
 
     while (channel_mux_index >= 0) {
         int8_t i = next_enable_channel - 1;
@@ -423,8 +422,7 @@ static void rearrange_channel_mux_table() {
         if (i < 0) {
             break;
         } else {
-            INSTRUCTION.channel_mux[channel_mux_index] = next_enable_channel;
-            channel_mux_index--;
+            INSTRUCTION.channel_mux[channel_mux_index--] = next_enable_channel;
         }
     }
 
@@ -532,7 +530,6 @@ static void headstage_init() {
     headstage_pin_open();
     headstage_spi_open();
     headstage_pwm_open();
-
     headstage_pin_output(PIN_RESET, 1);    // initialize DBS chip
     headstage_pin_output(PIN_TRIGGER, 0);  // chip select is ok
 }
@@ -608,6 +605,7 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
             for (unsigned int i = 0; i < REC_CHANNEL_COUNT; i++) {
                 INSTRUCTION.channel_table[i] = (4 <= i && i <= 8);
             }
+            headstage_pin_output(PIN_LED_R, 0);
             break;
         }
         case RIS_RECONFIG:
@@ -626,68 +624,67 @@ static void headstage_update_ris_instruction(uint8_t ins_len, uint8_t* instructi
     }
 }
 
-//static void headstage_update_vis_instruction(uint8_t vis_oper) {
-//    switch (vis_oper) {
-//        // reset
-//        case VIS_RST:
-//            memset(&INSTRUCTION, 0, sizeof(struct HEADSTAGE_PARAMETER_TABLE));
-//            memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
-//            memset(spi_rxbuf, 0, SPI_BUFFER_SIZE);
-//            headstage_pwm_stop(headstage_system_pwm_handle);
-//
-//            headstage_spi_transaction_cancel(headstage_spi_ask_handle);
-//            headstage_spi_transaction_cancel(headstage_spi_lsk_handle);
-//
-//            headstage_pwm_stop(headstage_system_pwm_handle);
-//            headstage_pwm_stop(headstage_poly_r_pwm_handle);
-//
-//            // try to pull PIN_RESET PIN to ground
-//            headstage_pin_output(PIN_RESET, 0);
-//            headstage_cpu_delay_ms(1);
-//            headstage_pin_output(PIN_RESET, 1);
-//
-//            headstage_state = UMC_STATE_HANDSHAKE;
-//
-//            break;
-//
-//        case VIS_STI:
-//            if (headstage_state == UMC_STATE_INTERRUPT) {
-//                headstage_state = UMC_STATE_WAIT_START;
-//                flag_notify(EVT_UMC_ASK);
-//
-//            } else {
-//                rearrange_channel_mux_table();
-//                headstage_pin_output(PIN_LED_RED,0);
-//                headstage_pwm_start(headstage_system_pwm_handle);
-//                headstage_pwm_start(headstage_poly_r_pwm_handle);
-//                flag_notify(EVT_UMC_LSK);
-//            }
-//
-//            break;
-//
-//        // interrupt
-//        case VIS_INT:
-//            headstage_spi_transaction_cancel(headstage_spi_lsk_handle);
-//
-//            headstage_state = UMC_STATE_INTERRUPT;
-//            tx_put_u32(0, build_configure_instruction(UMC_IRQ, UMC_IRQ_CODE));
-//            headstage_spi_ask_transaction(4);
-//            break;
-//
-//        case VIS_BLE_T:
-//            //        headstage_gptimer_init();
-//            //        headstage_gptimer_set_frequency(4000);
-//            //        headstage_pin_output(PIN_RESET, 0);
-//            break;
-//
-//        case VIS_SHIFT_T:
-//
-//            break;
-//
-//        default:
-//            break;
-//    }
-//}
+static void headstage_update_vis_instruction(uint8_t vis_oper) {
+    switch (vis_oper) {
+        // reset
+        case VIS_RST:
+            memset(&INSTRUCTION, 0, sizeof(struct HEADSTAGE_PARAMETER_TABLE));
+            memset(spi_txbuf, 0, SPI_BUFFER_SIZE);
+            memset(spi_rxbuf, 0, SPI_BUFFER_SIZE);
+            headstage_pwm_stop(headstage_system_pwm_handle);
+
+            headstage_spi_transaction_cancel(headstage_spi_ask_handle);
+            headstage_spi_transaction_cancel(headstage_spi_lsk_handle);
+
+            headstage_pwm_stop(headstage_system_pwm_handle);
+            headstage_pwm_stop(headstage_poly_r_pwm_handle);
+
+            // try to pull PIN_RESET PIN to ground
+            headstage_pin_output(PIN_RESET, 0);
+            headstage_cpu_delay_ms(1);
+            headstage_pin_output(PIN_RESET, 1);
+
+            headstage_state = UMC_STATE_HANDSHAKE;
+
+            break;
+
+        case VIS_STI:
+            if (headstage_state == UMC_STATE_INTERRUPT) {
+                headstage_state = UMC_STATE_WAIT_START;
+                flag_notify(EVT_UMC_ASK);
+
+            } else {
+                rearrange_channel_mux_table();
+                headstage_pwm_start(headstage_system_pwm_handle);
+                headstage_pwm_start(headstage_poly_r_pwm_handle);
+                flag_notify(EVT_UMC_LSK);
+            }
+
+            break;
+
+        // interrupt
+        case VIS_INT:
+            headstage_spi_transaction_cancel(headstage_spi_lsk_handle);
+
+            headstage_state = UMC_STATE_INTERRUPT;
+            tx_put_u32(0, build_configure_instruction(UMC_IRQ, UMC_IRQ_CODE));
+            headstage_spi_ask_transaction(4);
+            break;
+
+        case VIS_BLE_T:
+            //        headstage_gptimer_init();
+            //        headstage_gptimer_set_frequency(4000);
+            //        headstage_pin_output(PIN_RESET, 0);
+            break;
+
+        case VIS_SHIFT_T:
+
+            break;
+
+        default:
+            break;
+    }
+}
 
 static uint8_t headstage_debug_instruction(uint8_t* ins_buf) {
     return 0;

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_zm.h

@@ -19,7 +19,7 @@
 #include "headstage_arm.h"
 #include "headstage_clock.h"
 #include "headstage_notify.h"
-#include "headstage_pin.h"
+#include "zm/headstage_pin.h"
 #include "zm/headstage_spi.h"
 #include "headstage_led.h"
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_LED.h

@@ -1,105 +0,0 @@
-#include "headstage_pin.h"
-#include "headstage_clock.h"
-#include "headstage_gptimer.h"
-#include <ti/drivers/PIN.h>
-#include "board.h"
-
-
-#ifndef HEADSTAGE_LED_H_INCLUDED
-#define HEADSTAGE_LED_H_INCLUDED
-#define Red                     0x00
-#define Green                   0x01
-#define Blue                    0x02
-#define Orange                  0x03
-
-static uint16_t LED_times;
-static uint16_t LED_freq;
-static uint16_t LED_pw;                     // in milliseconds
-static uint8_t  LED_times_infinite;
-static uint8_t  LED_on_NoFlash = 0;
-static uint8_t  GPTimer_low_freq_flag;
-static uint8_t  LED_color;
-static uint8_t  LED_flag;
-static GPTimerCC26XX_Handle gptimer_handle_LED;
-static GPTimerCC26XX_Handle gptimer_handle_LED_off;
-
-static void headstage_gptimer_set_frequency(GPTimerCC26XX_Handle gptimer_handle, uint16_t frequency);
-static void headstage_gptimer_set_periods(GPTimerCC26XX_Handle gptimer_handle, uint16_t timeout_ms);
-static void headstage_gptimer_start(GPTimerCC26XX_Handle _clock_handle);
-static void headstage_gptimer_stop(GPTimerCC26XX_Handle _clock_handle);
-static void LED_periods (uint8_t color , uint16_t frequency , uint16_t pulse_width , uint16_t times){
-
-    GPTimer_low_freq_flag = 0x09;
-    headstage_gptimer_set_frequency(gptimer_handle_LED, frequency *10);
-
-    if(pulse_width > 1000){
-        LED_pw = pulse_width;
-        LED_on_NoFlash = 0x01;
-    }
-    else{
-        LED_pw = pulse_width;
-        LED_on_NoFlash = 0x00;
-    }
-    if(times >= 100){
-        LED_times = times;
-        LED_times_infinite = 0x01;
-    }
-    else{
-        LED_times = times;
-        LED_times_infinite = 0x00;
-    }
-    LED_color = color;
-    headstage_gptimer_set_periods(gptimer_handle_LED_off , LED_pw);
-    headstage_gptimer_start(gptimer_handle_LED);
-
-}
-
-static void LED_flash_color(uint8_t color){
-    switch(color){
-    case(Red):
-        headstage_pin_output(PIN_LED_R, 1);
-
-        break;
-    case(Green):
-        headstage_pin_output(PIN_LED_G, 1);
-        break;
-    case(Blue):
-        headstage_pin_output(PIN_LED_B, 1);
-        break;
-    case(Orange):
-        headstage_pin_output(PIN_LED_B, 1);
-        headstage_pin_output(PIN_LED_G, 1);
-        break;
-    default:
-        break;
-    }
-}
-
-static void LED_off(){
-    headstage_pin_output(PIN_LED_R, 0);
-    headstage_pin_output(PIN_LED_G, 0);
-    headstage_pin_output(PIN_LED_B, 0);
-}
-static void LED_stop(){
-    LED_off();
-    headstage_gptimer_stop(gptimer_handle_LED);
-
-}
-
-static void LED_main_handle(){
-    if(LED_flag == 0x01){
-        if(LED_on_NoFlash == 0x01){
-            LED_off();
-            LED_flash_color(LED_color);
-        }
-        else{
-            LED_off();
-            LED_flash_color(LED_color);
-            headstage_gptimer_start(gptimer_handle_LED_off);
-        }
-    }
-
-}
-
-
-#endif //HEADSTAGE_LED_H_INCLUDED

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_adc.h

@@ -11,17 +11,13 @@
 #include <ti/drivers/ADC.h>
 
 #if defined(CC2650_LAUNCHXL)
-
 #define CC2650_ADC0 CC2650_LAUNCHXL_ADC0
 #define CC2650_ADC1 CC2650_LAUNCHXL_ADC1
 #define CC2650_ADC2 CC2650_LAUNCHXL_ADC2
-
 #elif defined(BOOSTXL_CC2650MA)
-
-#define CC2650_ADC0 BOOSTXL_CC2650MA_ADC0  // DIO7
-#define CC2650_ADC1 BOOSTXL_CC2650MA_ADC1  // DIO8
-#define CC2650_ADC2 BOOSTXL_CC2650MA_ADC2  // DIO9
-
+#define CC2650_ADC0 BOOSTXL_CC2650MA_ADC0
+#define CC2650_ADC1 BOOSTXL_CC2650MA_ADC1
+#define CC2650_ADC2 BOOSTXL_CC2650MA_ADC2
 #endif
 
 static ADC_Handle headstage_adc_handle_0;
@@ -35,10 +31,10 @@ static ADC_Handle headstage_adc_handle_2;
     do {                                                        \
         ADC_init();                                             \
         ADC_Params param;                                       \
-        ADC_Params_init(&param);                                \
+        ADC_Params_init(&params);                               \
         headstage_adc_handle_0 = ADC_open(CC2650_ADC0, &param); \
         headstage_adc_handle_1 = ADC_open(CC2650_ADC1, &param); \
         headstage_adc_handle_2 = ADC_open(CC2650_ADC2, &param); \
     } while (0)
 
-#endif  // HEADSTAGE_ADC_H
+#endif  // HEADSTAGE_ADC_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_gptimer.h

@@ -7,93 +7,47 @@
 #include <ti/drivers/timer/GPTimerCC26XX.h>
 #include <ti/sysbios/BIOS.h>
 #include <xdc/runtime/Types.h>
-#include "headstage_LED.h"
-#include "headstage_pin.h"
-#include <ti/drivers/PIN.h>
 
-static GPTimerCC26XX_Handle gptimer_handle_p0;
-static GPTimerCC26XX_Handle gptimer_handle_p1;
-extern GPTimerCC26XX_Handle gptimer_handle_LED;
+#define EVT_PERIODIC_GPTIMER_0 EVT_PERIODIC_0
+#define EVT_PERIODIC_GPTIMER_1 EVT_PERIODIC_1
+#define EVT_PERIODIC_GPTIMER_2 EVT_PERIODIC_2
 
-static GPTimerCC26XX_Handle gptimer_handle_s0;
-static GPTimerCC26XX_Handle gptimer_handle_s1;
-extern GPTimerCC26XX_Handle gptimer_handle_LED_off;
+static GPTimerCC26XX_Handle gptimer_handle_0;
+static GPTimerCC26XX_Handle gptimer_handle_1;
+static GPTimerCC26XX_Handle gptimer_handle_2;
 
+static void headstage_gptimer_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
 
-static void headstage_sti_gptimer_main_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
-static void headstage_sti_gptimer_step_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
-static void GPTimer_callback_LED(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
-static void headstage_LED_clock_callback(GPTimerCC26XX_Handle handle, GPTimerCC26XX_IntMask interruptMask);
-
-static void headstage_gptimer_set_frequency(GPTimerCC26XX_Handle gptimer_handle, uint16_t frequency){
-        uint32_t     _frequency = (uint32_t)(frequency);
-        Types_FreqHz _cpu_freq;
-        BIOS_getCpuFreq(&_cpu_freq);
-        GPTimerCC26XX_Value _load = _cpu_freq.lo / _frequency - 1;
-        _load                     = (_load < 0xFFFF) ? _load : ((0xFA0000 | (_load / 250)) - 1);
-        GPTimerCC26XX_setLoadValue(gptimer_handle, _load);
-    }
-static void headstage_gptimer_start(GPTimerCC26XX_Handle _clock_handle){
-    GPTimerCC26XX_start(_clock_handle);
-}
-static void headstage_gptimer_stop(GPTimerCC26XX_Handle _clock_handle){
-    GPTimerCC26XX_stop(_clock_handle);
-}
+#define headstage_gptimer_start(gptimer_handle) GPTimerCC26XX_start(gptimer_handle)
+#define headstage_gptimer_stop(gptimer_handle) GPTimerCC26XX_stop(gptimer_handle)
 #define headstage_gptimer_close(gptimer_handle) GPTimerCC26XX_close(gptimer_handle)
 
-static void headstage_gptimer_open() {
-    GPTimerCC26XX_Params params;
-    GPTimerCC26XX_Params_init(&params);
+#define headstage_gptimer_open()                                                                        \
+    do {                                                                                                \
+        GPTimerCC26XX_Params params;                                                                    \
+        GPTimerCC26XX_Params_init(&params);                                                             \
+        params.width          = GPT_CONFIG_16BIT;                                                       \
+        params.mode           = GPT_MODE_PERIODIC_DOWN;                                                 \
+        params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;                                          \
+        gptimer_handle_0      = GPTimerCC26XX_open(Board_GPTIMER0A, &params);                           \
+        gptimer_handle_1      = GPTimerCC26XX_open(Board_GPTIMER1A, &params);                           \
+        gptimer_handle_2      = GPTimerCC26XX_open(Board_GPTIMER2A, &params);                           \
+        GPTimerCC26XX_setLoadValue(gptimer_handle_0, 0xFFFFFF);                                         \
+        GPTimerCC26XX_setLoadValue(gptimer_handle_1, 0xFFFFFF);                                         \
+        GPTimerCC26XX_setLoadValue(gptimer_handle_2, 0xFFFFFF);                                         \
+        GPTimerCC26XX_registerInterrupt(gptimer_handle_0, headstage_gptimer_callback, GPT_INT_TIMEOUT); \
+        GPTimerCC26XX_registerInterrupt(gptimer_handle_1, headstage_gptimer_callback, GPT_INT_TIMEOUT); \
+        GPTimerCC26XX_registerInterrupt(gptimer_handle_2, headstage_gptimer_callback, GPT_INT_TIMEOUT); \
+    } while (0)
 
-    params.width          = GPT_CONFIG_16BIT;
-    params.mode           = GPT_MODE_PERIODIC_DOWN;
-    params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;
-
-    gptimer_handle_p0 = GPTimerCC26XX_open(Board_GPTIMER0A, &params);
-    gptimer_handle_p1 = GPTimerCC26XX_open(Board_GPTIMER0B, &params);
-    gptimer_handle_LED = GPTimerCC26XX_open(Board_GPTIMER2A, &params);
-
-    GPTimerCC26XX_Params_init(&params);
-
-    params.width          = GPT_CONFIG_16BIT;
-    params.mode           = GPT_MODE_ONESHOT_DOWN;
-    params.debugStallMode = GPTimerCC26XX_DEBUG_STALL_OFF;
-
-    gptimer_handle_s0 = GPTimerCC26XX_open(Board_GPTIMER1A, &params);
-    gptimer_handle_s1 = GPTimerCC26XX_open(Board_GPTIMER1B, &params);
-    gptimer_handle_LED_off = GPTimerCC26XX_open(Board_GPTIMER2B, &params);
-
-    GPTimerCC26XX_registerInterrupt(gptimer_handle_p0, headstage_sti_gptimer_main_callback, GPT_INT_TIMEOUT);
-    GPTimerCC26XX_registerInterrupt(gptimer_handle_p1, headstage_sti_gptimer_main_callback, GPT_INT_TIMEOUT);
-    GPTimerCC26XX_registerInterrupt(gptimer_handle_LED, GPTimer_callback_LED, GPT_INT_TIMEOUT);
-
-    GPTimerCC26XX_registerInterrupt(gptimer_handle_s0, headstage_sti_gptimer_step_callback, GPT_INT_TIMEOUT);
-    GPTimerCC26XX_registerInterrupt(gptimer_handle_s1, headstage_sti_gptimer_step_callback, GPT_INT_TIMEOUT);
-    GPTimerCC26XX_registerInterrupt(gptimer_handle_LED_off, headstage_LED_clock_callback, GPT_INT_TIMEOUT);
-
-}
-
-#define headstage_gptimer_set_load_value(gptimer_handle, load_value) GPTimerCC26XX_setLoadValue(gptimer_handle, load_value)
-
-
-
-#define headstage_gptimer_set_timeout(gptimer_handle, timeout_us)                                \
+#define headstage_gptimer_set_frequency(gptimer_handle, frequency)                               \
     do {                                                                                         \
+        uint32_t     _frequency = (uint32_t)(frequency);                                         \
         Types_FreqHz _cpu_freq;                                                                  \
         BIOS_getCpuFreq(&_cpu_freq);                                                             \
-        GPTimerCC26XX_Value _load = (timeout_us)*_cpu_freq.lo / 1000000 - 1;                     \
+        GPTimerCC26XX_Value _load = _cpu_freq.lo / _frequency - 1;                               \
         _load                     = (_load < 0xFFFF) ? _load : ((0xFA0000 | (_load / 250)) - 1); \
         GPTimerCC26XX_setLoadValue(gptimer_handle, _load);                                       \
     } while (0)
 
-static void headstage_gptimer_set_periods(GPTimerCC26XX_Handle gptimer_handle,uint16_t timeout_ms){
-
-        Types_FreqHz _cpu_freq;
-        BIOS_getCpuFreq(&_cpu_freq);
-        GPTimerCC26XX_Value _load = (timeout_ms)*_cpu_freq.lo / 1000 - 1;
-        _load                     = (_load < 0xFFFF) ? _load : ((0xFA0000 | (_load / 250)) - 1);
-        GPTimerCC26XX_setLoadValue(gptimer_handle, _load);
-    }
-#define headstage_gptimer_set_callback(handle, callback) GPTimerCC26XX_registerInterrupt(handle, callback, GPT_INT_TIMEOUT);
-
-#endif  // HEADSTAGE_GPTIMER_H
+#endif  // HEADSTAGE_GPTIMER_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_notify.h

@@ -1,49 +1,37 @@
 /* Copyright (c) 2019. BioPro. Scientific.
  */
 
-/*
-
-notify data format
-==================
-
-struct {
-    u8      device_id;
-    u8      data_length;
-
-    u32     cpu_timestamp;
-
-    u4      _;
-    u12     battery_voltage;
-
-    u4      sti_channel;
-    u12     sti_channel_voltage;
-
-    u16     sti_remind_times;
-
-    u4      sti_channel;
-    u12     sti_channel_voltage;
-
-    u16     sti_remind_times;
-
-    // total 16 bytes
-}
-
- */
-#ifndef HEADSTAGE_NOTIFY_STI_H
-#define HEADSTAGE_NOTIFY_STI_H
+#ifndef HEADSTAGE_NOTIFY_TDC4VC3_H
+#define HEADSTAGE_NOTIFY_TDC4VC3_H
 
 #ifndef HEADSTAGE_NOTIFY_H
 #error "headstage/headstage_notify.h not included"
 #endif
 
-#include "../headstage_notify_general.h"
+#define NOT_BUF_OFFSET_INIT 6
 
-#define NOT_BUF_OFFSET_INIT 8
-#define NOT_BUF_ALMOST_FULL 15
+static uint32_t not_buf_offset = NOT_BUF_OFFSET_INIT;
+static uint32_t not_time_stamp = 0;
 
-#define headstage_notify_flip_buffer() _headstage_notify_flip_buffer(not_buf_offset);
+static void headstage_notify_set_timestamp() {
+    not_time_stamp = headstage_time_stamp_us();
 
-static uint8_t headstage_notify_append_data(uint8_t channel, uint16_t data_value, uint16_t times_remind) {
+    headstage_notify_buffer[2] = not_time_stamp & 0xFF;
+    headstage_notify_buffer[3] = (not_time_stamp >> 8) & 0xFF;
+    headstage_notify_buffer[4] = (not_time_stamp >> 16) & 0xFF;
+    headstage_notify_buffer[5] = (not_time_stamp >> 24) & 0xFF;
+}
+
+static void headstage_notify_flip_buffer() {
+    uint8_t data_count = not_buf_offset;
+
+    headstage_notify_buffer[0] = CHIP_ID;
+    headstage_notify_buffer[1] = data_count;
+
+    not_buf_offset = NOT_BUF_OFFSET_INIT;
+}
+
+static uint8_t headstage_notify_append_data(uint8_t channel, uint16_t data_value) {
     if (not_buf_offset <= NOT_BUF_OFFSET_INIT) {
         headstage_notify_set_timestamp();
 
@@ -54,24 +42,17 @@ static uint8_t headstage_notify_append_data(uint8_t channel, uint16_t data_value
         return not_buf_offset;
     }
 
-    if (channel == CHANNEL_BATTERY) {
-        headstage_notify_buffer[6] = ((data_value >> 8) & 0x0F);
-        headstage_notify_buffer[7] = (data_value & 0xFF);
-
-    } else {
-        headstage_notify_buffer[not_buf_offset++] = ((channel & 0x0F) << 4) | ((data_value >> 8) & 0x0F);
-        headstage_notify_buffer[not_buf_offset++] = (data_value & 0xFF);
-        headstage_notify_buffer[not_buf_offset++] = ((times_remind >> 8) & 0xFF);
-        headstage_notify_buffer[not_buf_offset++] = (times_remind & 0xFF);
-    }
+    headstage_notify_buffer[not_buf_offset++] = ((channel & 0x0F) << 4) | ((data_value >> 8) & 0x0F);
+    headstage_notify_buffer[not_buf_offset++] = (data_value & 0xFF);
 
     uint8_t ret = not_buf_offset;
 
-    if (not_buf_offset >= NOT_BUF_ALMOST_FULL) {
+    if (not_buf_offset >= BLE_NOT_BUFF_SIZE) {
         headstage_notify_flip_buffer();
     }
 
     return ret;
 }
 
-#endif  // HEADSTAGE_NOTIFY_STI_H
+
+#endif  // HEADSTAGE_NOTIFY_TDC4VC3_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_pin.h

@@ -1,57 +1,60 @@
 /* Copyright (c) 2019. BioPro. Scientific.
  */
-#ifndef HEADSTAGE_PIN_STI_H
-#define HEADSTAGE_PIN_STI_H
+#ifndef HEADSTAGE_PIN_H
+#define HEADSTAGE_PIN_H
 
+#include <Board.h>
+#include <ti/drivers/PIN.h>
+
+static PIN_State  headstage_pins_state;
+static PIN_Handle headstage_pins_handle;
+
+// clang-format off
+// XXX name those pin with its propose
+#define PIN_STI_0       IOID_0
+#define PIN_STI_1       IOID_1
+#define PIN_STI_3       IOID_3
+#define PIN_STI_5       IOID_5
+#define PIN_STI_6       IOID_6
+#define PIN_STI_7       IOID_7
+#define PIN_STI_10      IOID_10
+#define PIN_STI_11      IOID_11
+// clang-format on
 
 #if defined(CC2650_LAUNCHXL)
-
-// clang-format off
-#define PIN_LED_R       IOID_6
-#define PIN_LED_G       IOID_7
-#define PIN_LED_B       IOID_5
-#define PIN_PON1        IOID_9
-#define PIN_POL1        IOID_14
-#define PIN_POL0        IOID_13
-#define PIN_PON0        IOID_8
-#define PIN_TPS         IOID_15
-#define PIN_CUR         IOID_11
-#define PIN_VBAT        IOID_28
-#define PIN_SEN0        IOID_29
-#define PIN_SEN1        IOID_30
-// clang-format on
-
-#elif defined(BOOSTXL_CC2650MA)
-
-// clang-format off
-#define PIN_LED_R       IOID_14
-#define PIN_LED_G       IOID_13
-#define PIN_LED_B       IOID_12
-#define PIN_PON1        IOID_5
-#define PIN_POL1        IOID_6
-#define PIN_POL0        IOID_10
-#define PIN_PON0        IOID_11
-#define PIN_TPS         IOID_3
-#define PIN_CUR         IOID_4
-#define PIN_VBAT        IOID_7
-#define PIN_SEN0        IOID_8
-#define PIN_SEN1        IOID_9
-// clang-format on
-
+#define PIN_LED_R Board_RLED
+#define PIN_LED_G Board_GLED
 #endif
 
 static PIN_Config headstage_pin_configuration[] = {  //
-    PIN_PON1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_POL1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_POL0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_PON0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
-    PIN_TPS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    PIN_STI_0 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    PIN_STI_1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    PIN_STI_3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    PIN_STI_5 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    PIN_STI_6 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    PIN_STI_7 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    PIN_STI_10 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+    PIN_STI_11 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
 
+// LED
+#if defined(CC2650_LAUNCHXL)
     PIN_LED_R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
     PIN_LED_G | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    PIN_LED_B | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+#endif
 
     //
     PIN_TERMINATE};
 
-#endif  // HEADSTAGE_PIN_STI_H
+#define headstage_pin_add(configuration) PIN_add(headstage_pins_handle, configuration)
+#define headstage_pin_remove(pin) PIN_remove(headstage_pins_handle, pin)
+#define headstage_pin_close() PIN_close(headstage_pins_handle)
+
+#define headstage_pin_open()                                                                  \
+    do {                                                                                      \
+        headstage_pins_handle = PIN_open(&headstage_pins_state, headstage_pin_configuration); \
+    } while (0)
+
+#define headstage_pin_output(pin, value) PIN_setOutputValue(headstage_pins_handle, PIN_ID(pin), (value))
+#define headstage_pin_input(pin) PIN_getInputValue(PIN_ID(pin))
+
+#endif  // HEADSTAGE_PIN_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/headstage_pwm.h

@@ -38,10 +38,4 @@ static PWM_Handle headstage_pwm_handle;
         if (status < 0) PWM_start(headstage_pwm_handle);             \
     } while (0)
 
-static void headstage_pwm_value(uint16_t duty_cycle){
-
-        PWM_stop(headstage_pwm_handle);                                                       \
-        PWM_setDuty(headstage_pwm_handle, duty_cycle);
-        PWM_start(headstage_pwm_handle);
-    }
 #endif  // HEADSTAGE_PWM_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/sti/neulive_sti.devlib.json

@@ -1,221 +0,0 @@
-{
-  "name": "NeuliveSTI",
-  "version": "0.1",
-  "match_rule": {
-    "local_name_pattern": "NeuliveSTI.*",
-    "major_product_number": 1,
-    "minor_product_number": 2,
-    "major_version_number": 0,
-    "minor_version_number": 1
-  },
-  "constant": {
-    "SET_CH_NUM": 2,
-    "FREQ_PREC_LIST": [
-      1,
-      0.1
-    ]
-  },
-  "parameters": {
-    "SET_CH": {
-      "description": "channel to set",
-      "private": true,
-      "domain": [
-        "SET_CH_NUM"
-      ],
-      "value": "VALUE + 1"
-    },
-    "RAW_CHANNEL": {
-      "description": "record channels",
-      "record_meta": true,
-      "domain": {
-        "set": [
-          "SET_CH_NUM"
-        ]
-      },
-      "value": "VALUE + 1"
-    },
-    "CHANNEL": {
-      "description": "record channels",
-      "domain": "property",
-      "value": "[0, *_value('RAW_CHANNEL')]"
-    },
-    "SAMPLE_RATE": {
-      "description": "",
-      "domain": "constant",
-      "initial": 1
-    },
-    "AMP_GAIN": {
-      "description": "",
-      "domain": "constant",
-      "initial": 1
-    },
-    "STI_MODE": {
-      "description": "Stimulation mode",
-      "domain": {
-        "array": [
-          4
-        ],
-        "index": "SET_CH",
-        "size": "SET_CH_NUM"
-      },
-      "value": [
-        "Positive Pulse",
-        "Negative Pulse",
-        "Pos to Neg Pulse",
-        "Neg to Pos Pulse"
-      ]
-    },
-    "CURRENT": {
-      "description": "Stimulation current",
-      "domain": [
-        4001
-      ]
-    },
-    "STI_FREQ": {
-      "description": "Stimulation frequency",
-      "domain": {
-        "array": [
-          2001
-        ],
-        "index": "SET_CH",
-        "size": "SET_CH_NUM"
-      },
-      "value": {
-        "expression": "VALUE * _value('PRECISION')",
-        "dependency": "PRECISION"
-      },
-      "guard": {
-        "expression": "_value('STI_PW_LENGTH') >= 0",
-        "raise": "STI_FREQ too small"
-      }
-    },
-    "STI_PW": {
-      "description": "Stimulation pulse width",
-      "domain": {
-        "array": [
-          1000
-        ],
-        "index": "SET_CH",
-        "size": "SET_CH_NUM"
-      },
-      "guard": {
-        "expression": "_value('STI_PW_LENGTH') >= 0",
-        "raise": "STI_PW too large"
-      }
-    },
-    "STI_PW_IPI": {
-      "description": "Stimulation Inter Phase Interval",
-      "domain": {
-        "array": [
-          1000
-        ],
-        "index": "SET_CH",
-        "size": "SET_CH_NUM"
-      },
-      "guard": {
-        "expression": "_value('STI_PW_LENGTH') >= 0",
-        "raise": "STI_PW too small"
-      }
-    },
-    "STI_NUM": {
-      "description": "Stimulation Times",
-      "domain": {
-        "array": [
-          1000
-        ],
-        "index": "SET_CH",
-        "size": "SET_CH_NUM"
-      }
-    },
-    "PRECISION": {
-      "alias": "PREC",
-      "description": "frequency precision",
-      "domain": {
-        "array": [
-          "len(FREQ_PREC_LIST)"
-        ],
-        "index": "SET_CH",
-        "size": "SET_CH_NUM"
-      },
-      "value": "FREQ_PREC_LIST[VALUE]",
-      "guard": {
-        "expression": "_value('STI_PW_LENGTH') >= 0",
-        "raise": "STI_FREQ too small"
-      }
-    },
-    "STI_PW_LENGTH": {
-      "description": "1000000 / freq - (2 * pw + ipi)",
-      "private": true,
-      "domain": "property",
-      "value": "1000000 / _value('STI_FREQ') - (2 * _value('STI_PW') + _value('STI_PW_IPI'))"
-    }
-  },
-  "instruction": {
-    "start": [
-      {
-        "expression": "len(CHANNEL) > 0",
-        "raise": "no stimulation channel"
-      },
-      "_data_format('TDC4VC3')",
-      "set_current",
-      "_sleep(100)",
-      "set_parameter",
-      "_sleep(100)",
-      "set_channel_enable",
-      "_sleep(100)",
-      "VIS_STI",
-      "_notify(True)",
-      "_sync(True)"
-    ],
-    "set_current": {
-      "type": "RIS",
-      "data": [
-        "5b11111#header;2b0#GV;12bCURRENT"
-      ]
-    },
-    "set_parameter": {
-      "type": "RIS",
-      "foreach-parameter": {
-        "parameter": "RAW_CHANNEL",
-        "variable": [
-          "channel"
-        ]
-      },
-      "data": [
-        "5b11111#header;2b01#LV",
-        "3b>channel",
-        "1b>PRECISION[channel]",
-        "3b>STI_MODE[channel]",
-        "12b>STI_FREQ[channel]",
-        "10b>STI_PW[channel]",
-        "10b>STI_PW_IPI[channel]",
-        "10b>STI_NUM[channel]"
-      ]
-    },
-    "set_channel_enable": {
-      "type": "RIS",
-      "parameter": {
-        "a0": "1 if 0 in RAW_CHANNEL else 0",
-        "a1": "1 if 1 in RAW_CHANNEL else 0",
-        "a2": "1 if 2 in RAW_CHANNEL else 0",
-        "a3": "1 if 3 in RAW_CHANNEL else 0",
-        "a4": "1 if 4 in RAW_CHANNEL else 0",
-        "a5": "1 if 5 in RAW_CHANNEL else 0",
-        "a6": "1 if 6 in RAW_CHANNEL else 0",
-        "a7": "1 if 7 in RAW_CHANNEL else 0",
-        "a8": "1 if 8 in RAW_CHANNEL else 0",
-        "a9": "1 if 9 in RAW_CHANNEL else 0",
-        "aa": "1 if 10 in RAW_CHANNEL else 0",
-        "ab": "1 if 11 in RAW_CHANNEL else 0",
-        "ac": "1 if 12 in RAW_CHANNEL else 0",
-        "ad": "1 if 13 in RAW_CHANNEL else 0",
-        "ae": "1 if 14 in RAW_CHANNEL else 0",
-        "af": "1 if 15 in RAW_CHANNEL else 0"
-      },
-      "data": [
-        "5b11111#header;2b10#CE",
-        "a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;aa;ab;ac;ad;ae;af"
-      ]
-    }
-  }
-}

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/tni/elite.devlib.json

@@ -1,219 +0,0 @@
-{
-  "name": "Elite",
-  "version": "0.1",
-  "match_rule": {
-    "local_name_pattern": "Elite.*",
-    "major_product_number": 0,
-    "minor_product_number": 1,
-    "major_version_number": 0,
-    "minor_version_number": 1
-  },
-  "constant": {
-    "REC_CHANNEL_COUNT": 16,
-    "STI_CHANNEL_COUNT": 15,
-    "ADC_SAMPLE_RATE_LIST": [
-      15,
-      25,
-      40,
-      50,
-      100,
-      250,
-      500,
-      1000,
-      2500,
-      4000,
-      5000
-    ],
-    "STI_FREQ_LIST": [
-      15,
-      25,
-      40,
-      50,
-      100,
-      250,
-      500,
-      1000,
-      2500,
-      4000,
-      5000
-    ]
-  },
-  "parameters": {
-    "MODE": {
-      "description": "working mode",
-      "value": [
-        "Recording Mode",
-        "Stimulation Mode",
-        "Artifact Mode"
-      ]
-    },
-    "CHANNEL": {
-      "description": "record channels",
-      "record_meta": true,
-      "domain": {
-        "set": [
-          "REC_CHANNEL_COUNT"
-        ]
-      }
-    },
-    "SAMPLE_RATE": {
-      "alias": "ADC_RATE",
-      "description": "sampling rate",
-      "record_meta": true,
-      "domain": [
-        "len(ADC_SAMPLE_RATE_LIST)"
-      ],
-      "value": "ADC_SAMPLE_RATE_LIST[VALUE]"
-    },
-    "AMP_GAIN": {
-      "description": "",
-      "record_meta": true,
-      "value": [
-        400,
-        1000,
-        2000
-      ]
-    },
-    "LOW_FREQ_BAND": {
-      "description": "",
-      "record_meta": true,
-      "domain": [
-        7
-      ]
-    },
-    "STI_MODE": {
-      "description": "stimulation mode",
-      "value": [
-        "Positive Pulse",
-        "Negative Pulse",
-        "Pos to Neg Pulse",
-        "Neg to Pos Pulse",
-        "Arbitrary Waveform"
-      ]
-    },
-    "STI_VOLT": {
-      "description": "stimulation voltage",
-      "domain": [
-        32
-      ],
-      "value": "2 + 3 * VALUE / 31"
-    },
-    "STI_FREQ": {
-      "description": "stimulation frequency",
-      "domain": [
-        "len(STI_FREQ_LIST)"
-      ],
-      "value": "STI_FREQ_LIST[VALUE]"
-    },
-    "STI_PMOS": {
-      "description": "stimulation PMOS channel",
-      "domain": [
-        "STI_CHANNEL_COUNT"
-      ],
-      "guard": "STI_PMOS != STI_NMOS"
-    },
-    "STI_NMOS": {
-      "description": "stimulation NMOS channel",
-      "domain": [
-        "STI_CHANNEL_COUNT"
-      ],
-      "guard": "STI_PMOS != STI_NMOS"
-    },
-    "CHOPPER": {
-      "description": "",
-      "domain": "bool"
-    },
-    "FAST_SETTLE": {
-      "description": "",
-      "domain": "bool"
-    }
-  },
-  "instruction": {
-    "start": [
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "start_recording",
-          "1": "start_stimulation",
-          "2": "start_artifact"
-        }
-      },
-      "VIS_STI"
-    ],
-    "start_recording": [
-      {
-        "expression": "len(CHANNEL) > 0",
-        "raise": "no recording channel"
-      },
-      "data_format",
-      "_notify(True)",
-      "start_recording0",
-      "_sync(True)"
-    ],
-    "start_artifact": [
-      {
-        "expression": "len(CHANNEL) > 0",
-        "raise": "no recording channel"
-      },
-      "data_format",
-      "_notify(True)",
-      "start_artifact0",
-      "_sync(True)"
-    ],
-    "data_format": [
-      "_data_format('TDC4VAF2')"
-    ],
-    "start_recording0": {
-      "type": "RIS",
-      "foreach-parameter": {
-        "parameter": "CHANNEL",
-        "variable": [
-          "a",
-          "b",
-          "c",
-          "d"
-        ]
-      },
-      "data": [
-        "3b110#recording header;2b<AMP_GAIN;3b<LOW_FREQ_BAND",
-        "4b>SAMPLE_RATE;1ba?;1bb?;1bc?;1bd?",
-        "4b<a?:0;4b<b?:0",
-        "4b<c?:0;4b<d?:0"
-      ]
-    },
-    "start_artifact0": {
-      "type": "RIS",
-      "foreach-parameter": {
-        "parameter": "CHANNEL",
-        "variable": [
-          "a",
-          "b",
-          "c",
-          "d"
-        ]
-      },
-      "data": [
-        "3b100#artifact mode header;2b0;3b001",
-        "4b>SAMPLE_RATE;1ba?;1bb?;1bc?;1bd?",
-        "4b<a?:0;4b<b?:0",
-        "4b<c?:0;4b<d?:0"
-      ]
-    },
-    "start_stimulation": [
-      "start_stimulation0"
-    ],
-    "start_stimulation0": {
-      "type": "RIS",
-      "guard": {
-        "expression": "STI_PMOS != STI_NMOS",
-        "raise": "same N/PMos channel"
-      },
-      "data": [
-        "3b111#stimulation header;2b0;3bSTI_MODE",
-        "4b>STI_FREQ;1bCHOPPER;1bFAST_SETTLE;2b0",
-        "4b<STI_PMOS;4b<STI_NMOS",
-        "5b<STI_VOLT;3b0"
-      ]
-    }
-  }
-}