Commit_xdchelp

# Conflicts:
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/headstage_pin.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/lp/headstage_uni_pin.h
#	simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/uni/ma/headstage_uni_pin.h

.clang-format

@@ -8,6 +8,6 @@ AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortFunctionsOnASingleLine: Empty
 BinPackArguments: false
 BinPackParameters: false
-IndentCaseLabels: false
+IndentCaseLabels: true
 SortIncludes: true
 TabWidth: 4

.gitignore

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

.idea/copyright/BioProSci.xml

@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="keyword" value="Copyright .*" />
+    <option name="notice" value="Copyright (c) &amp;#36;today.year. BioPro. Scientific." />
+    <option name="myName" value="BioProSci" />
+  </copyright>
+</component>

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings default="BioProSci">
+    <module2copyright>
+      <element module="SimplePeripheral" copyright="BioProSci" />
+    </module2copyright>
+  </settings>
+</component>

.idea/scopes/Driver.xml

@@ -0,0 +1,3 @@
+<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>

.idea/scopes/HostTest.xml

@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="HostTest" pattern="file[BioProCC2650]:simplelink/ble_sdk_2_02_02_25/src/examples/host_test/cc26xx/app/master//*" />
+</component>

.idea/scopes/SimplePeripheral.xml

@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="SimplePeripheral" pattern="file[BioProCC2650]:simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage//*" />
+</component>

README.md

@@ -0,0 +1,63 @@
+BioProCC2650
+============
+
+BioPro Device
+-------------
+
+### Major source code path
+
+`simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage.h`
+
+`simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/simple_peripheral.c`
+
+`simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/main.c`
+
+   
+### Current project
+
+1.  Elite
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_tni.h`
+
+2.  Neulive 1.2
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_uni.h`
+
+3.  Neulive 1.3
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_neulive.h`
+
+4.  EliteZM
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_zm.h`
+
+5.  NeuliveSTI
+
+    `simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_sti.h`
+
+### Notable source code
+    
+*   gpio table
+
+    `simplelink/ble_sdk_2_02_02_25/src/boards/BOOSTXL_CC2650MA/BOOSTXL_CC2650MA.h`
+
+    `simplelink/ble_sdk_2_02_02_25/src/boards/CC2650_LAUNCHXL/CC2650_LAUNCHXL.h`
+
+*   characteristic
+
+    `simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/simple_gatt_profile.h`
+
+    `simplelink/ble_sdk_2_02_02_25/src/profiles/simple_profile/cc26xx/simple_gatt_profile.c`
+
+BioPro Control
+--------------
+
+major source code path:
+
+`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`
+
+-----------------------------------------------
+
+Copyright (c) 2019. BioPro. Scientific.

python_test_code/devlib/util.py

@@ -0,0 +1,673 @@
+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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,115 @@
+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

@@ -0,0 +1,134 @@
+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

@@ -0,0 +1,72 @@
+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

@@ -0,0 +1,146 @@
+import unittest
+from random import randint
+from typing import List, Optional
+
+REC_CHANNEL_COUNT = 16
+
+
+def to_channel_table(*channel: int) -> List[bool]:
+    return [i in channel for i in range(REC_CHANNEL_COUNT)]
+
+
+def rearrange_channel_mux_table(channel_table: List[bool]) -> Optional[List[int]]:
+    enable_channel_number = 0
+    last_enable_channel = 0
+
+    for i in range(REC_CHANNEL_COUNT):
+        if channel_table[i]:
+            last_enable_channel = i
+            enable_channel_number += 1
+
+    if enable_channel_number == 0:
+        return None
+
+    channel_mux = [0 for _ in range(REC_CHANNEL_COUNT)]
+
+    if enable_channel_number == 1:
+        channel_mux[0] = last_enable_channel
+
+        return channel_mux
+
+    next_enable_channel = last_enable_channel
+    channel_mux_index = last_enable_channel
+
+    channel_mux[channel_mux_index] = last_enable_channel
+    channel_mux_index -= 1
+
+    while channel_mux_index >= 0:
+        i = next_enable_channel - 1
+
+        while i >= 0:
+            if channel_table[i]:
+                next_enable_channel = i
+                break
+
+            i -= 1
+
+        if i < 0:
+            break
+
+        else:
+            channel_mux[channel_mux_index] = next_enable_channel
+            channel_mux_index -= 1
+
+    offset = last_enable_channel - channel_mux_index
+
+    while channel_mux_index >= 0:
+        channel_mux[channel_mux_index] = channel_mux[channel_mux_index + offset]
+        channel_mux_index -= 1
+
+    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()))
+
+    def test_single_channel(self):
+        for _ in range(3):
+            c = randint(0, REC_CHANNEL_COUNT - 1)
+
+            expect = [c if i == 0 else 0 for i in range(REC_CHANNEL_COUNT)]
+            print(expect)
+            self.assertEqual(expect, rearrange_channel_mux_table(to_channel_table(c)))
+
+    def test_two_channel(self):
+        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(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__':
+    unittest.main()

simplelink/ble_sdk_2_02_02_25/examples/cc2650em/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/examples/cc2650em/simple_peripheral/ccs/app/.cproject

@@ -18,8 +18,12 @@
 			<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.1369151231" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.223507680">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.732777020" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<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">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2650F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
@@ -34,17 +38,55 @@
 								<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.579299287" 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.2112816025" 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.1418617668" 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.1368914557" 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.872349905" 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.1023813954" 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.1674413144" 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.184317276" 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.1068578615" 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.1943600764" 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.644525479" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.INCLUDE_PATH" valueType="includePath">
+							<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">
 									<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"/>
@@ -70,11 +112,15 @@
 									<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.1330623088" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+								<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">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="POWER_SAVING"/>
-									<listOptionValue builtIn="false" value="BOOSTXL_CC2650MA"/>
+									<listOptionValue builtIn="false" value="CC2650_LAUNCHXL"/>
 									<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"/>
@@ -86,71 +132,197 @@
 									<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.1308360247" 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.504235202" 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.105967788" 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.698913237" 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.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">
 									<listOptionValue builtIn="false" value="48"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.1399241416" 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.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">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.867926379" 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.980626282" 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.374992114" 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.1890491357" 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.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">
 									<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.263445006" 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.1235873701" 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.207268648" 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.1068957263" 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.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"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.223507680" 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.698430423" 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.402182782" 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.1628689699" 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.2141951901" 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.679112687" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.LIBRARY" valueType="libs">
+							<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">
 									<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.650613345" 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.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">
 									<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.782343525" 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.737788064"
+										name="Suppress diagnostic &lt;id&gt; (--diag_suppress)"
+										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.1555270082" 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.16105060" 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.1713299511" 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.68776981" 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.1860389255" 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.152379533" 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.158095632" 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.978853236" 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.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"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.2015106526" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.1270425102" 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.16813235" 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.318851558" 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.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>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.927640565" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1908494509" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+							<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">
 									<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.1746187707" 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.884959194" 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.943624305" 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.1521167272" 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.1901654533" 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.138005453" 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.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"/>
 							</tool>
 						</toolChain>
 					</folderInfo>

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.3.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.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/ 
 
-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.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_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/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/simple_peripheral/ccs/stack/.cproject

@@ -15,8 +15,12 @@
 			<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.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">
+                        <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">
 								<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,17 +30,46 @@
 								<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.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">
+                            <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">
 									<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"/>
@@ -60,7 +93,9 @@
 									<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.986125825" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
+                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.461117382"
+                                        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"/>
@@ -81,60 +116,134 @@
 									<listOptionValue builtIn="false" value="xTESTMODES"/>
 									<listOptionValue builtIn="false" value="xTEST_BLEBOARD"/>
 								</option>
-								<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">
+                                <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">
 									<listOptionValue builtIn="false" value="48"/>
 									<listOptionValue builtIn="false" value="16004"/>
 								</option>
-								<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">
+                                <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">
 									<listOptionValue builtIn="false" value="225"/>
 								</option>
-								<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">
+                                <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">
 									<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.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"/>
+                                <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"/>
 							</tool>
-							<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">
+                            <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">
 									<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.1707930214" 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.932239677"
+                                        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.59164041" 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.1432215405"
+                                        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.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"/>
+                                <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"/>
 							</tool>
-							<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 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>
 						</toolChain>
 					</folderInfo>

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

@@ -12,6 +12,7 @@
 <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,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/cc2650lp/host_test/ccs/config/src/makefile.libs

@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\host_test\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/host_test/ccs/config/src
+GEN_SRC_DIR ?= ../../config/src
 
 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")

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_16.9.4.LTS/include" --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.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/ 
 
-CC = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_16.9.4.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_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/examples/cc2650lp/simple_peripheral/ccs/app/.cproject

@@ -16,35 +16,35 @@
 				</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" id="com.ti.ccstudio.buildDefinitions.TMS470.Default.67178137.1867331134" 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="">
+				<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.1867331134" 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.1867331134." name="/" resourcePath="">
-						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain.936572434" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug.1170584915">
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1442263665" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
+						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain.260390339" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1981462200">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.23520031" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
 								<listOptionValue builtIn="false" value="DEVICE_CONFIGURATION_ID=Cortex M.CC2640F128"/>
 								<listOptionValue builtIn="false" value="DEVICE_ENDIANNESS=little"/>
 								<listOptionValue builtIn="false" value="OUTPUT_FORMAT=ELF"/>
-								<listOptionValue builtIn="false" value="CCS_MBS_VERSION=5.5.0"/>
-								<listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
 								<listOptionValue builtIn="false" value="RUNTIME_SUPPORT_LIBRARY=&quot;libc.a&quot;"/>
-								<listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
-								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.0.06_core"/>
-								<listOptionValue builtIn="false" value="RTSC_PRODUCTS=com.ti.rtsc.TIRTOSCC13XX_CC26XX:2.21.01.08;"/>
+								<listOptionValue builtIn="false" value="XDC_VERSION=3.32.2.25_core"/>
 								<listOptionValue builtIn="false" value="INACTIVE_REPOS="/>
 								<listOptionValue builtIn="false" value="EXPANDED_REPOS="/>
-								<listOptionValue builtIn="false" value="LINK_ORDER=TOOLS/ccs_linker_defines.cmd;TOOLS/cc26xx_app.cmd;"/>
+								<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="RTSC_MBS_VERSION=2.2.0"/>
 							</option>
-							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1948686990" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="16.9.4.LTS" valueType="string"/>
-							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.targetPlatformDebug.436655999" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.builderDebug.2122969898" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.builderDebug"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.compilerDebug.1022199392" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.compilerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.SILICON_VERSION.945741939" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.SILICON_VERSION.7M3" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CODE_STATE.1772665994" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CODE_STATE.16" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.ABI.28185992" name="Application binary interface. [See 'General' page to edit] (--abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.ABI.eabi" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.LITTLE_ENDIAN.1551593263" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL.528776966" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_LEVEL.4" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED.1185808991" name="Speed vs. size trade-offs (--opt_for_speed, -mf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.OPT_FOR_SPEED.0" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.INCLUDE_PATH.84242771" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.INCLUDE_PATH" valueType="includePath">
+							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.831968044" 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.1267545934" 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.750370594" 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.2015951802" 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.1110843462" 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.818133919" 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.1512178724" 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.403801048" 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.1265261063" 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.2140366031" 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.2021662899" 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"/>
@@ -70,10 +70,10 @@
 									<listOptionValue builtIn="false" value="${SRC_BLE_CORE}/rom"/>
 									<listOptionValue builtIn="false" value="${CC26XXWARE}"/>
 								</option>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEBUGGING_MODEL.619228148" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT.1814512415" name="C Dialect" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.C_DIALECT.C99" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GCC.1003845117" name="Enable support for GCC extensions (DEPRECATED) (--gcc)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GCC" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEFINE.1619548278" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DEFINE" valueType="definedSymbols">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEBUGGING_MODEL.1320751896" 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.1333288757" 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.1518806086" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.GCC" value="true" valueType="boolean"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE.142068852" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DEFINE" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_LCD"/>
 									<listOptionValue builtIn="false" value="BOARD_DISPLAY_EXCLUDE_UART"/>
 									<listOptionValue builtIn="false" value="CC2650_LAUNCHXL"/>
@@ -89,64 +89,68 @@
 									<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_5.2.compilerID.DIAG_WARNING.468139615" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WARNING" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WARNING.918239795" 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_5.2.compilerID.DISPLAY_ERROR_NUMBER.815341255" name="Emit diagnostic identifier numbers (--display_error_number, -pden)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_SUPPRESS.1499939580" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_SUPPRESS.999454079" 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_5.2.compilerID.DIAG_WRAP.1353908093" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GEN_FUNC_SUBSECTIONS.522002742" name="Place each function in a separate subsection (--gen_func_subsections, -ms)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CMD_FILE.1093592148" name="Read options from specified file (--cmd_file, -@)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compilerID.CMD_FILE" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compilerID.DIAG_WRAP.2100604413" 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.1575039329" 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.832421721" 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.636768539" 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_5.2.compiler.inputType__C_SRCS.1484724680" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__C_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__CPP_SRCS.1857516437" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__CPP_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM_SRCS.842046581" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM2_SRCS.880239501" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.compiler.inputType__ASM2_SRCS"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__C_SRCS.227087947" 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.39034037" 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.866335595" 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.1329381206" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.compiler.inputType__ASM2_SRCS"/>
 							</tool>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug.1170584915" name="ARM Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exe.linkerDebug">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.STACK_SIZE.1798831431" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.STACK_SIZE" value="256" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.HEAP_SIZE.1039761941" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.HEAP_SIZE" value="0" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.MAP_FILE.80438512" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.OUTPUT_FILE.323523388" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.OUTPUT_FILE" useByScannerDiscovery="false" value="${ProjName}.out" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY.203910805" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.LIBRARY" valueType="libs">
-									<listOptionValue builtIn="false" value="&quot;libc.a&quot;"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exe.linkerDebug.1981462200" 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.57445792" 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.636200649" 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.552585024" 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.1019171703" 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.1966015673" 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_5.2.linkerID.SEARCH_PATH.2045110069" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.SEARCH_PATH" valueType="libPaths">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.SEARCH_PATH.1109423160" 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_5.2.linkerID.DIAG_WRAP.1885279599" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_WRAP.off" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_SUPPRESS.1195915855" name="Suppress diagnostic &lt;id&gt; (--diag_suppress)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DIAG_SUPPRESS" valueType="stringList">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.DIAG_WRAP.1289256461" 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.1055939214" 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.DIAG_SUPPRESS.1474045154" 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_5.2.linkerID.DISPLAY_ERROR_NUMBER.812278410" name="Emit diagnostic identifier numbers (--display_error_number)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.XML_LINK_INFO.655770989" name="Detailed link information data-base into &lt;file&gt; (--xml_link_info, -xml_link_info)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.XML_LINK_INFO" value="&quot;${ProjName}_linkInfo.xml&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.UNUSED_SECTION_ELIMINATION.290129903" name="Eliminate sections not needed in the executable (--unused_section_elimination)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.UNUSED_SECTION_ELIMINATION" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.UNUSED_SECTION_ELIMINATION.on" valueType="enumerated"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.COMPRESS_DWARF.820922589" name="Aggressively reduce size of the DWARF information (--compress_dwarf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.COMPRESS_DWARF" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.linkerID.COMPRESS_DWARF.on" valueType="enumerated"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD_SRCS.1627390590" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD2_SRCS.314219026" name="Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__CMD2_SRCS"/>
-								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS.298789754" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.XML_LINK_INFO.834418659" 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.UNUSED_SECTION_ELIMINATION.1787080463" 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"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.linkerID.COMPRESS_DWARF.1975085474" 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"/>
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.exeLinker.inputType__CMD_SRCS.1644580451" 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.872014788" 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.1023837449" 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_5.2.hex.645947981" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex"/>
-							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1311186821" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.77089036" name="Package repositories (--xdcpath)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.1158315651" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex">
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.1.hex.ROMWIDTH.485049417" 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.97427136" 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.614513055" 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.1429090237" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
+								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.1017190303" 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.595027378" 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.942771587" 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.309371946" 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.567582658" 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.888142064" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="&quot;${CG_TOOL_ROOT}&quot;" valueType="string"/>
-								<option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.2133539592" 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.1689982900" 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.1214214406" 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.402329212" 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.35098461" 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.2036910366" 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.53221425" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;${COMPILER_FLAGS}&quot;" valueType="string"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -292,8 +296,8 @@
 								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS.1583605295" name="Generated Linker Command Files" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.exeLinker.inputType__GEN_CMDS"/>
 							</tool>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.1106108574" name="ARM Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex">
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.ROMWIDTH.1273210432" name="Specify rom width (--romwidth, -romwidth)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.ROMWIDTH" value="8" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.MEMWIDTH.1804106884" name="Specify memory width (--memwidth, -memwidth)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.MEMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.ROMWIDTH.1273210432" name="Specify rom width (--romwidth, -romwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.ROMWIDTH" value="8" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.MEMWIDTH.1804106884" name="Specify memory width (--memwidth, -memwidth=width)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.MEMWIDTH" value="8" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.OUTPUT_FORMAT.1229261984" name="Output format" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.OUTPUT_FORMAT" value="com.ti.ccstudio.buildDefinitions.TMS470_5.2.hex.OUTPUT_FORMAT.INTEL" valueType="enumerated"/>
 							</tool>
 							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.802347647" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/app/.launches/simple_peripheral_cc2650lp_app.launch

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.ti.ccstudio.debug.launchType.device.debugging">
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650lp_app}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650lp_app}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650lp_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650lp_app"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650lp_app}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650lp_app.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\app\FlashROM\simple_peripheral_cc2650lp_app.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650lp_app"/>

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/ccs_compiler_defines.bcfg

@@ -1,9 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2016-03-28 14:11:07.308000)
+** Stack Frontier Generator 1.1.0 (2019-05-13 17:33:59.404000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
---define=ICALL_STACK0_ADDR=0xe001
---define=ICALL_STACK0_START=0xe000
---define=ICALL_RAM0_START=0x20004368
+--define=ICALL_STACK0_ADDR=0xf001
+--define=ICALL_STACK0_START=0xf000
+--define=ICALL_RAM0_START=0x20004320
+

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/ccs_linker_defines.cmd

@@ -1,9 +1,10 @@
 /*
-** Stack Frontier Generator 1.1.0 (2016-03-28 14:11:07.308000)
+** Stack Frontier Generator 1.1.0 (2019-05-13 17:33:59.404000)
 **
 ** WARNING - Auto-generated file. Modifications could be lost!
 */
 
---define=ICALL_RAM0_START=0x20004368
---define=ICALL_STACK0_START=0xe000
---define=ICALL_STACK0_ADDR=0xe001
+--define=ICALL_RAM0_START=0x20004320
+--define=ICALL_STACK0_START=0xf000
+--define=ICALL_STACK0_ADDR=0xf001
+

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/lib_linker.cmd

@@ -4,5 +4,5 @@
  */
 
 "C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\host\host_pxxx.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pxxx_ext.a"
-"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_none_v41_v42.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\ctrl\cc2640\cc2640_ctrl_pxxx.a"
+"C:\ti\simplelink\ble_sdk_2_02_02_25\blelib\hci_tl\cc26xx\cc26xx_hci_tl_none.a"

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/src/makefile.libs

@@ -16,7 +16,7 @@
 # sources were generated) is:
 #    C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\config\src
 #
-GEN_SRC_DIR ?= ../../../../../ti/simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/config/src
+GEN_SRC_DIR ?= ../../config/src
 
 ifeq (,$(wildcard $(GEN_SRC_DIR)))
 $(error "ERROR: GEN_SRC_DIR must be set to the directory containing the generated sources")

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

@@ -1,12 +1,12 @@
 
-XOPTS = -I"C:/ti/xdctools_3_32_00_06_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
+XOPTS = -I"C:/ti/xdctools_3_32_02_25_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M3
 
 vpath % C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
-vpath %.c C:/ti/xdctools_3_32_00_06_core/packages/
+vpath %.c C:/ti/xdctools_3_32_02_25_core/packages/
 
 CCOPTS    = --endian=little -mv7M3 --abi=eabi -q -ms --opt_for_speed=0  --program_level_compile -o3 -g --optimize_with_debug  -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_family_arm_cc26xx_Boot_driverlibVersion=2 -Dti_sysbios_knl_Clock_stopCheckNext__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U
 
-XDC_ROOT  = C:/ti/xdctools_3_32_00_06_core/packages/
+XDC_ROOT  = C:/ti/xdctools_3_32_02_25_core/packages/
 
 BIOS_ROOT = C:/ti/tirtos_cc13xx_cc26xx_2_21_01_08/products/bios_6_46_01_38/packages/ti/sysbios/
 
@@ -16,14 +16,14 @@ 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.3.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.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-ASM = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.LTS/include
-AR = C:/ti/ccsv8/tools/compiler/ti-cgt-arm_18.1.3.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_00_06_core/packages/../bin/rm -f
-CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f
+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
 
 define RM
 	$(if $(wildcard $1),$(DEL) $1,:)

simplelink/ble_sdk_2_02_02_25/examples/cc2650lp/simple_peripheral/ccs/stack/.launches/simple_peripheral_cc2650lp_stack.launch

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.ti.ccstudio.debug.launchType.device.debugging">
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650lp_stack}"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="${build_artifact:simple_peripheral_cc2650lp_stack}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650lp_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2650F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="simple_peripheral_cc2650lp_stack"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:simple_peripheral_cc2650lp_stack}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\targetConfigs\CC2640F128.ccxml.Texas Instruments XDS110 USB Debug Probe/Cortex_M3_0" value="C:/ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650lp_stack.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM.C:\ti\simplelink\ble_sdk_2_02_02_25\examples\cc2650lp\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\cc2650lp\simple_peripheral\ccs\stack\FlashROM\simple_peripheral_cc2650lp_stack.out"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/simple_peripheral_cc2650lp_stack"/>

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

@@ -36,10 +36,11 @@
  *  CC2650 Booster Pack.
  */
 
-
 /*
  *  ====================== Includes ============================================
  */
+
+// clang-format off
 #include <xdc/std.h>
 #include <xdc/runtime/System.h>
 
@@ -56,6 +57,7 @@
 #include <inc/hw_ints.h>
 #include <driverlib/ioc.h>
 #include <driverlib/udma.h>
+// clang-format on
 
 #include "Board.h"
 
@@ -65,7 +67,7 @@
  *  settings for this board.
  *  When a pin is allocated and then de-allocated, it will revert to the state
  *  configured in this table.
-*/
+ */
 
 /* Place into subsections to allow the TI linker to remove items properly */
 #if defined(__TI_COMPILER_VERSION__)
@@ -73,20 +75,20 @@
 #pragma DATA_SECTION(PINCC26XX_hwAttrs, ".const:PINCC26XX_hwAttrs")
 #endif
 
-const PIN_Config BoardGpioInitTable[] = {
-    Board_RLED   | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,         /* LED initially off             */
-    Board_GLED   | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,         /* LED initially off             */
-    Board_UART_RX | PIN_INPUT_EN | PIN_PULLDOWN,                                              /* UART RX  */
-    Board_UART_TX | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                        /* UART TX */
-   Board_SRDY | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                           /* SRDY */
-   Board_MRDY | PIN_INPUT_EN | PIN_PULLDOWN,                                                 /* MRDY */
-
-    PIN_TERMINATE
-};
+const PIN_Config BoardGpioInitTable[] = {                                           //
+    Board_RLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, /* LED initially off             */
+    Board_GLED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX, /* LED initially off             */
+    Board_UART_RX | PIN_INPUT_EN | PIN_PULLDOWN,                                    /* UART RX  */
+    Board_UART_TX | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,              /* UART TX */
+    Board_SRDY | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,                 /* SRDY */
+    Board_MRDY | PIN_INPUT_EN | PIN_PULLDOWN,                                       /* MRDY */
+    PIN_TERMINATE};
 
 const PINCC26XX_HWAttrs PINCC26XX_hwAttrs = {
+    //
     .intPriority = ~0,
     .swiPriority = 0
+    //
 };
 /*============================================================================*/
 
@@ -97,13 +99,14 @@ const PINCC26XX_HWAttrs PINCC26XX_hwAttrs = {
 #if defined(__TI_COMPILER_VERSION__)
 #pragma DATA_SECTION(PowerCC26XX_config, ".const:PowerCC26XX_config")
 #endif
+
 const PowerCC26XX_Config PowerCC26XX_config = {
-    .policyInitFxn      = NULL,
-    .policyFxn          = &PowerCC26XX_standbyPolicy,
-    .calibrateFxn       = &PowerCC26XX_calibrate,
-    .enablePolicy       = TRUE,
-    .calibrateRCOSC_LF  = TRUE,
-    .calibrateRCOSC_HF  = TRUE,
+    .policyInitFxn     = NULL,
+    .policyFxn         = &PowerCC26XX_standbyPolicy,
+    .calibrateFxn      = &PowerCC26XX_calibrate,
+    .enablePolicy      = TRUE,
+    .calibrateRCOSC_LF = TRUE,
+    .calibrateRCOSC_HF = TRUE,
 };
 /*
  *  ============================= Power end ====================================
@@ -127,28 +130,32 @@ UARTCC26XX_Object uartCC26XXObjects[BOOSTXL_CC2650MA_UARTCOUNT];
 
 /* UART hardware parameter structure, also used to assign UART pins */
 const UARTCC26XX_HWAttrsV2 uartCC26XXHWAttrs[BOOSTXL_CC2650MA_UARTCOUNT] = {
+    //
     {
-        .baseAddr       = UART0_BASE,
-        .powerMngrId    = PowerCC26XX_PERIPH_UART0,
-        .intNum         = INT_UART0_COMB,
-        .intPriority    = ~0,
-        .swiPriority    = 0,
-        .txPin          = Board_UART_TX,
-        .rxPin          = Board_UART_RX,
-        .ctsPin         = PIN_UNASSIGNED,
-        .rtsPin         = PIN_UNASSIGNED
+        .baseAddr    = UART0_BASE,
+        .powerMngrId = PowerCC26XX_PERIPH_UART0,
+        .intNum      = INT_UART0_COMB,
+        .intPriority = ~0,
+        .swiPriority = 0,
+        .txPin       = Board_UART_TX,
+        .rxPin       = Board_UART_RX,
+        .ctsPin      = PIN_UNASSIGNED,
+        .rtsPin      = PIN_UNASSIGNED
+        //
     }
+    //
 };
 
 /* UART configuration structure */
-const UART_Config UART_config[] = {
+const UART_Config UART_config[] = {  //
     {
+        //
         .fxnTablePtr = &UARTCC26XX_fxnTable,
         .object      = &uartCC26XXObjects[0],
         .hwAttrs     = &uartCC26XXHWAttrs[0]
+        //
     },
-    {NULL, NULL, NULL}
-};
+    {NULL, NULL, NULL}};
 /*
  *  ============================= UART end =====================================
  */
@@ -170,26 +177,106 @@ UDMACC26XX_Object udmaObjects[BOOSTXL_CC2650MA_UDMACOUNT];
 
 /* UDMA configuration structure */
 const UDMACC26XX_HWAttrs udmaHWAttrs[BOOSTXL_CC2650MA_UDMACOUNT] = {
+    //
     {
+        //
         .baseAddr    = UDMA0_BASE,
         .powerMngrId = PowerCC26XX_PERIPH_UDMA,
         .intNum      = INT_DMA_ERR,
         .intPriority = ~0
+        //
     }
+    //
 };
 
 /* UDMA configuration structure */
-const UDMACC26XX_Config UDMACC26XX_config[] = {
+const UDMACC26XX_Config UDMACC26XX_config[] = {  //
     {
-         .object  = &udmaObjects[0],
-         .hwAttrs = &udmaHWAttrs[0]
+        //
+        .object  = &udmaObjects[0],
+        .hwAttrs = &udmaHWAttrs[0]
+        //
     },
-    {NULL, NULL}
-};
+    {NULL, NULL}};
 /*
  *  ============================= UDMA end =====================================
  */
 
+/*
+ *  ========================== SPI DMA begin ===================================
+ */
+/* Place into subsections to allow the TI linker to remove items properly */
+#if defined(__TI_COMPILER_VERSION__)
+#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
+#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
+#endif
+
+/* Include drivers */
+#include <ti/drivers/spi/SPICC26XXDMA.h>
+
+/* SPI objects */
+SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
+
+/* SPI configuration structure, describing which pins are to be used */
+const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
+    //
+    {
+        //
+        .baseAddr          = SSI0_BASE,
+        .intNum            = INT_SSI0_COMB,
+        .intPriority       = ~0,
+        .swiPriority       = 0,
+        .powerMngrId       = PowerCC26XX_PERIPH_SSI0,
+        .defaultTxBufValue = 0,
+        .rxChannelBitMask  = 1 << UDMA_CHAN_SSI0_RX,
+        .txChannelBitMask  = 1 << UDMA_CHAN_SSI0_TX,
+        .mosiPin           = Board_SPI0_MOSI,
+        .misoPin           = Board_SPI0_MISO,
+        .clkPin            = Board_SPI0_CLK,
+        .csnPin            = Board_SPI0_CS
+        //
+    },
+#ifdef HEADSTAGE_MA_USE_SPI2
+    {
+        //
+        .baseAddr          = SSI1_BASE,
+        .intNum            = INT_SSI1_COMB,
+        .intPriority       = ~0,
+        .swiPriority       = 0,
+        .powerMngrId       = PowerCC26XX_PERIPH_SSI1,
+        .defaultTxBufValue = 0,
+        .rxChannelBitMask  = 1 << UDMA_CHAN_SSI1_RX,
+        .txChannelBitMask  = 1 << UDMA_CHAN_SSI1_TX,
+        .mosiPin           = Board_SPI1_MOSI,
+        .misoPin           = Board_SPI1_MISO,
+        .clkPin            = Board_SPI1_CLK,
+        .csnPin            = Board_SPI1_CS  //
+    },
+#endif
+};
+
+/* SPI configuration structure */
+const SPI_Config SPI_config[] = {  //
+    {
+        //
+        .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+        .object      = &spiCC26XXDMAObjects[0],
+        .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
+        //
+    },
+#ifdef HEADSTAGE_MA_USE_SPI2
+    {
+        //
+        .fxnTablePtr = &SPICC26XXDMA_fxnTable,
+        .object      = &spiCC26XXDMAObjects[1],
+        .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
+        //
+    },
+#endif
+    {NULL, NULL, NULL}};
+/*
+ *  ========================== SPI DMA end =====================================
+ */
 
 /*
  *  ========================== Crypto begin ====================================
@@ -209,28 +296,28 @@ const UDMACC26XX_Config UDMACC26XX_config[] = {
 CryptoCC26XX_Object cryptoCC26XXObjects[BOOSTXL_CC2650MA_CRYPTOCOUNT];
 
 /* Crypto configuration structure, describing which pins are to be used */
-const CryptoCC26XX_HWAttrs cryptoCC26XXHWAttrs[BOOSTXL_CC2650MA_CRYPTOCOUNT] = {
-    {
-        .baseAddr       = CRYPTO_BASE,
-        .powerMngrId    = PowerCC26XX_PERIPH_CRYPTO,
-        .intNum         = INT_CRYPTO_RESULT_AVAIL_IRQ,
-        .intPriority    = ~0,
-    }
-};
+const CryptoCC26XX_HWAttrs cryptoCC26XXHWAttrs[BOOSTXL_CC2650MA_CRYPTOCOUNT] = {{
+    //
+    .baseAddr    = CRYPTO_BASE,
+    .powerMngrId = PowerCC26XX_PERIPH_CRYPTO,
+    .intNum      = INT_CRYPTO_RESULT_AVAIL_IRQ,
+    .intPriority = ~0,
+    //
+}};
 
 /* Crypto configuration structure */
-const CryptoCC26XX_Config CryptoCC26XX_config[] = {
+const CryptoCC26XX_Config CryptoCC26XX_config[] = {  //
     {
-         .object  = &cryptoCC26XXObjects[0],
-         .hwAttrs = &cryptoCC26XXHWAttrs[0]
+        //
+        .object  = &cryptoCC26XXObjects[0],
+        .hwAttrs = &cryptoCC26XXHWAttrs[0]
+        //
     },
-    {NULL, NULL}
-};
+    {NULL, NULL}};
 /*
  *  ========================== Crypto end ======================================
  */
 
-
 /*
  *  ========================= RF driver begin ==================================
  */
@@ -244,10 +331,12 @@ const CryptoCC26XX_Config CryptoCC26XX_config[] = {
 
 /* RF hwi and swi priority */
 const RFCC26XX_HWAttrs RFCC26XX_hwAttrs = {
+    //
     .hwiCpe0Priority = ~0,
     .hwiHwPriority   = ~0,
-    .swiCpe0Priority =  5,
-    .swiHwPriority   =  5,
+    .swiCpe0Priority = 5,
+    .swiHwPriority   = 5,
+    //
 };
 
 /*
@@ -270,20 +359,21 @@ const RFCC26XX_HWAttrs RFCC26XX_hwAttrs = {
 TRNGCC26XX_Object trngCC26XXObjects[BOOSTXL_CC2650MA_TRNGCOUNT];
 
 /* TRNG configuration structure, describing which pins are to be used */
-const TRNGCC26XX_HWAttrs TRNGCC26XXHWAttrs[BOOSTXL_CC2650MA_TRNGCOUNT] = {
-    {
-        .powerMngrId    = PowerCC26XX_PERIPH_TRNG,
-    }
-};
+const TRNGCC26XX_HWAttrs TRNGCC26XXHWAttrs[BOOSTXL_CC2650MA_TRNGCOUNT] = {{
+    //
+    .powerMngrId = PowerCC26XX_PERIPH_TRNG,
+    //
+}};
 
 /* TRNG configuration structure */
-const TRNGCC26XX_Config TRNGCC26XX_config[] = {
+const TRNGCC26XX_Config TRNGCC26XX_config[] = {  //
     {
-         .object  = &trngCC26XXObjects[0],
-         .hwAttrs = &TRNGCC26XXHWAttrs[0]
+        //
+        .object  = &trngCC26XXObjects[0],
+        .hwAttrs = &TRNGCC26XXHWAttrs[0]
+        //
     },
-    {NULL, NULL}
-};
+    {NULL, NULL}};
 
 /*
  *  ========================= TRNG end ====================================
@@ -301,14 +391,62 @@ const TRNGCC26XX_Config TRNGCC26XX_config[] = {
 
 /* GPTimer hardware attributes, one per timer part (Timer 0A, 0B, 1A, 1B..) */
 const GPTimerCC26XX_HWAttrs gptimerCC26xxHWAttrs[BOOSTXL_CC2650MA_GPTIMERPARTSCOUNT] = {
-    { .baseAddr = GPT0_BASE, .intNum = INT_GPT0A, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT0, .pinMux = GPT_PIN_0A, },
-    { .baseAddr = GPT0_BASE, .intNum = INT_GPT0B, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT0, .pinMux = GPT_PIN_0B, },
-    { .baseAddr = GPT1_BASE, .intNum = INT_GPT1A, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT1, .pinMux = GPT_PIN_1A, },
-    { .baseAddr = GPT1_BASE, .intNum = INT_GPT1B, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT1, .pinMux = GPT_PIN_1B, },
-    { .baseAddr = GPT2_BASE, .intNum = INT_GPT2A, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT2, .pinMux = GPT_PIN_2A, },
-    { .baseAddr = GPT2_BASE, .intNum = INT_GPT2B, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT2, .pinMux = GPT_PIN_2B, },
-    { .baseAddr = GPT3_BASE, .intNum = INT_GPT3A, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT3, .pinMux = GPT_PIN_3A, },
-    { .baseAddr = GPT3_BASE, .intNum = INT_GPT3B, .intPriority = (~0), .powerMngrId = PowerCC26XX_PERIPH_GPT3, .pinMux = GPT_PIN_3B, },
+    {
+        .baseAddr    = GPT0_BASE,
+        .intNum      = INT_GPT0A,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT0,
+        .pinMux      = GPT_PIN_0A,
+    },
+    {
+        .baseAddr    = GPT0_BASE,
+        .intNum      = INT_GPT0B,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT0,
+        .pinMux      = GPT_PIN_0B,
+    },
+    {
+        .baseAddr    = GPT1_BASE,
+        .intNum      = INT_GPT1A,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT1,
+        .pinMux      = GPT_PIN_1A,
+    },
+    {
+        .baseAddr    = GPT1_BASE,
+        .intNum      = INT_GPT1B,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT1,
+        .pinMux      = GPT_PIN_1B,
+    },
+    {
+        .baseAddr    = GPT2_BASE,
+        .intNum      = INT_GPT2A,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT2,
+        .pinMux      = GPT_PIN_2A,
+    },
+    {
+        .baseAddr    = GPT2_BASE,
+        .intNum      = INT_GPT2B,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT2,
+        .pinMux      = GPT_PIN_2B,
+    },
+    {
+        .baseAddr    = GPT3_BASE,
+        .intNum      = INT_GPT3A,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT3,
+        .pinMux      = GPT_PIN_3A,
+    },
+    {
+        .baseAddr    = GPT3_BASE,
+        .intNum      = INT_GPT3B,
+        .intPriority = (~0),
+        .powerMngrId = PowerCC26XX_PERIPH_GPT3,
+        .pinMux      = GPT_PIN_3B,
+    },
 };
 
 /*  GPTimer objects, one per full-width timer (A+B) (Timer 0, Timer 1..) */
@@ -316,14 +454,15 @@ GPTimerCC26XX_Object gptimerCC26XXObjects[BOOSTXL_CC2650MA_GPTIMERCOUNT];
 
 /* GPTimer configuration (used as GPTimer_Handle by driver and application) */
 const GPTimerCC26XX_Config GPTimerCC26XX_config[BOOSTXL_CC2650MA_GPTIMERPARTSCOUNT] = {
-    { &gptimerCC26XXObjects[0], &gptimerCC26xxHWAttrs[0], GPT_A },
-    { &gptimerCC26XXObjects[0], &gptimerCC26xxHWAttrs[1], GPT_B },
-    { &gptimerCC26XXObjects[1], &gptimerCC26xxHWAttrs[2], GPT_A },
-    { &gptimerCC26XXObjects[1], &gptimerCC26xxHWAttrs[3], GPT_B },
-    { &gptimerCC26XXObjects[2], &gptimerCC26xxHWAttrs[4], GPT_A },
-    { &gptimerCC26XXObjects[2], &gptimerCC26xxHWAttrs[5], GPT_B },
-    { &gptimerCC26XXObjects[3], &gptimerCC26xxHWAttrs[6], GPT_A },
-    { &gptimerCC26XXObjects[3], &gptimerCC26xxHWAttrs[7], GPT_B },
+    //
+    {&gptimerCC26XXObjects[0], &gptimerCC26xxHWAttrs[0], GPT_A},
+    {&gptimerCC26XXObjects[0], &gptimerCC26xxHWAttrs[1], GPT_B},
+    {&gptimerCC26XXObjects[1], &gptimerCC26xxHWAttrs[2], GPT_A},
+    {&gptimerCC26XXObjects[1], &gptimerCC26xxHWAttrs[3], GPT_B},
+    {&gptimerCC26XXObjects[2], &gptimerCC26xxHWAttrs[4], GPT_A},
+    {&gptimerCC26XXObjects[2], &gptimerCC26xxHWAttrs[5], GPT_B},
+    {&gptimerCC26XXObjects[3], &gptimerCC26xxHWAttrs[6], GPT_A},
+    {&gptimerCC26XXObjects[3], &gptimerCC26xxHWAttrs[7], GPT_B},
 };
 
 /*
@@ -341,14 +480,15 @@ const GPTimerCC26XX_Config GPTimerCC26XX_config[BOOSTXL_CC2650MA_GPTIMERPARTSCOU
 #endif
 /* PWM configuration, one per PWM output.   */
 PWMTimerCC26XX_HwAttrs pwmtimerCC26xxHWAttrs[BOOSTXL_CC2650MA_PWMCOUNT] = {
-    { .pwmPin = Board_PWMPIN0, .gpTimerUnit = Board_GPTIMER0A },
-    { .pwmPin = Board_PWMPIN1, .gpTimerUnit = Board_GPTIMER0B },
-    { .pwmPin = Board_PWMPIN2, .gpTimerUnit = Board_GPTIMER1A },
-    { .pwmPin = Board_PWMPIN3, .gpTimerUnit = Board_GPTIMER1B },
-    { .pwmPin = Board_PWMPIN4, .gpTimerUnit = Board_GPTIMER2A },
-    { .pwmPin = Board_PWMPIN5, .gpTimerUnit = Board_GPTIMER2B },
-    { .pwmPin = Board_PWMPIN6, .gpTimerUnit = Board_GPTIMER3A },
-    { .pwmPin = Board_PWMPIN7, .gpTimerUnit = Board_GPTIMER3B },
+    //
+    {.pwmPin = Board_PWMPIN0, .gpTimerUnit = Board_GPTIMER0A},
+    {.pwmPin = Board_PWMPIN1, .gpTimerUnit = Board_GPTIMER0B},
+    {.pwmPin = Board_PWMPIN2, .gpTimerUnit = Board_GPTIMER1A},
+    {.pwmPin = Board_PWMPIN3, .gpTimerUnit = Board_GPTIMER1B},
+    {.pwmPin = Board_PWMPIN4, .gpTimerUnit = Board_GPTIMER2A},
+    {.pwmPin = Board_PWMPIN5, .gpTimerUnit = Board_GPTIMER2B},
+    {.pwmPin = Board_PWMPIN6, .gpTimerUnit = Board_GPTIMER3A},
+    {.pwmPin = Board_PWMPIN7, .gpTimerUnit = Board_GPTIMER3B},
 };
 
 /* PWM object, one per PWM output */
@@ -358,18 +498,170 @@ extern const PWM_FxnTable PWMTimerCC26XX_fxnTable;
 
 /* PWM configuration (used as PWM_Handle by driver and application) */
 const PWM_Config PWM_config[BOOSTXL_CC2650MA_PWMCOUNT + 1] = {
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[0], &pwmtimerCC26xxHWAttrs[0] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[1], &pwmtimerCC26xxHWAttrs[1] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[2], &pwmtimerCC26xxHWAttrs[2] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[3], &pwmtimerCC26xxHWAttrs[3] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[4], &pwmtimerCC26xxHWAttrs[4] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[5], &pwmtimerCC26xxHWAttrs[5] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[6], &pwmtimerCC26xxHWAttrs[6] },
-    { &PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[7], &pwmtimerCC26xxHWAttrs[7] },
-    { NULL,                NULL,                 NULL                 }
-};
-
+    //
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[0], &pwmtimerCC26xxHWAttrs[0]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[1], &pwmtimerCC26xxHWAttrs[1]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[2], &pwmtimerCC26xxHWAttrs[2]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[3], &pwmtimerCC26xxHWAttrs[3]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[4], &pwmtimerCC26xxHWAttrs[4]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[5], &pwmtimerCC26xxHWAttrs[5]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[6], &pwmtimerCC26xxHWAttrs[6]},
+    {&PWMTimerCC26XX_fxnTable, &pwmtimerCC26xxObjects[7], &pwmtimerCC26xxHWAttrs[7]},
+    {NULL, NULL, NULL}};
 
 /*
  *  ============================= 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

@@ -89,24 +89,24 @@ extern const PIN_Config BoardGpioInitTable[];
 */
 
 /* Connector J1 */
-#define Board_BP_Pin_J1_2              IOID_UNUSED
+#define Board_BP_Pin_J1_2              DIO7
 #define Board_BP_Pin_J1_3              DIO0
 #define Board_BP_Pin_J1_4              DIO1
 #define Board_BP_Pin_J1_5              DIO2
 #define Board_BP_Pin_J1_6              DIO3
-#define Board_BP_Pin_J1_7              DIO11        /* SCLK */
+#define Board_BP_Pin_J1_7              DIO10
 #define Board_BP_Pin_J1_8              DIO4
 #define Board_BP_Pin_J1_9              DIO5
 #define Board_BP_Pin_J1_10             DIO6
 
 /* Connector J2 */
-#define Board_BP_Pin_J2_19             IOID_UNUSED
-#define Board_BP_Pin_J2_18             IOID_UNUSED
+#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             DIO8         /* MOSI */
-#define Board_BP_Pin_J2_14             DIO7         /* MISO */
-#define Board_BP_Pin_J2_13             DIO9         /* DAC_CS */
-#define Board_BP_Pin_J2_12             DIO12        /* ADC_CS */
+#define Board_BP_Pin_J2_15             DIO11         /* MOSI */
+#define Board_BP_Pin_J2_14             DIO12         /* MISO */
+#define Board_BP_Pin_J2_13             DIO13
+#define Board_BP_Pin_J2_12             DIO14
 #define Board_BP_Pin_J2_11             IOID_UNUSED   /* NC */
 
 /* Mapping of BoosterPack Connector Pins to BoosterPack Standard Functions (reflecting the BoosterPack Standard)
@@ -125,15 +125,14 @@ extern const PIN_Config BoardGpioInitTable[];
 
 /* Connector J2 */
 #define Board_BP_PWM_0                 Board_BP_Pin_J2_19
-#define Board_BP_SPI_CS_Wireless       PIN_UNASSIGNED
+#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        PIN_UNASSIGNED
-#define Board_BP_SPI_CS_Other          PIN_UNASSIGNED
+#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
 
-
 /* Mapping of application specific functionality of the BoosterPack to BoosterPack Pins (application dependent)
 */
 
@@ -145,11 +144,16 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_UART_TX                  Board_BP_UART_Rx          /* RXD */
 #define Board_UART_RX                  Board_BP_UART_Tx          /* TXD */
 
+/* SPI Board */
+#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_MISO                PIN_UNASSIGNED
-//#define Board_SPI0_MOSI                PIN_UNASSIGNED
-
+#define Board_SPI1_MISO                PIN_UNASSIGNED
+#define Board_SPI1_MOSI                PIN_UNASSIGNED
+#define Board_SPI1_CLK                 PIN_UNASSIGNED
+#define Board_SPI1_CS                  PIN_UNASSIGNED
 
 /* Power Management Board */
 #define Board_SRDY                     Board_BP_Pin_J2_19
@@ -165,16 +169,24 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_PWMPIN6                  PIN_UNASSIGNED
 #define Board_PWMPIN7                  PIN_UNASSIGNED
 
+
 /** ============================================================================
  *  Instance identifiers
  *  ==========================================================================*/
+
 /* Generic SPI instance identifiers */
 #define Board_SPI0                  BOOSTXL_CC2650MA_SPI0
+
+#ifdef HEADSTAGE_MA_USE_SPI2
 #define Board_SPI1                  BOOSTXL_CC2650MA_SPI1
+#endif
+
 /* Generic UART instance identifiers */
 #define Board_UART                  BOOSTXL_CC2650MA_UART0
+
 /* Generic TRNG instance identiifer */
 #define Board_TRNG                  BOOSTXL_CC2650MA_TRNG0
+
 /* Generic GPTimer instance identifiers */
 #define Board_GPTIMER0A             BOOSTXL_CC2650MA_GPTIMER0A
 #define Board_GPTIMER0B             BOOSTXL_CC2650MA_GPTIMER0B
@@ -184,6 +196,7 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_GPTIMER2B             BOOSTXL_CC2650MA_GPTIMER2B
 #define Board_GPTIMER3A             BOOSTXL_CC2650MA_GPTIMER3A
 #define Board_GPTIMER3B             BOOSTXL_CC2650MA_GPTIMER3B
+
 /* Generic PWM instance identifiers */
 #define Board_PWM0                  BOOSTXL_CC2650MA_PWM0
 #define Board_PWM1                  BOOSTXL_CC2650MA_PWM1
@@ -209,7 +222,19 @@ typedef enum BOOSTXL_CC2650MA_CryptoName {
 } BOOSTXL_CC2650MA_CryptoName;
 
 
+/*!
+ *  @def    BOOSTXL_CC2650MA_SPIName
+ *  @brief  Enum of SPI names on the CC2650 Booster Pack
+ */
+typedef enum BOOSTXL_CC2650MA_SPIName {
+    BOOSTXL_CC2650MA_SPI0 = 0,
 
+#ifdef HEADSTAGE_MA_USE_SPI2
+    BOOSTXL_CC2650MA_SPI1 ,
+#endif
+
+    BOOSTXL_CC2650MA_SPICOUNT
+} BOOSTXL_CC2650MA_SPIName;
 
 /*!
  *  @def    BOOSTXL_CC2650MA_TRNGName
@@ -287,6 +312,29 @@ typedef enum BOOSTXL_CC2650MA_PWM
     BOOSTXL_CC2650MA_PWMCOUNT
 } BOOSTXL_CC2650MA_PWM;
 
+#ifdef HEADSTAGE_MA_USE_ADC
+
+/*!
+ *  @def    BOOSTXL_CC2650MA_ADCName
+ *  @brief  Enum of ADCs
+ */
+typedef enum BOOSTXL_CC2650MA_ADCName {
+    BOOSTXL_CC2650MA_ADC0 = 0,
+    BOOSTXL_CC2650MA_ADC1,
+    BOOSTXL_CC2650MA_ADC2,
+    BOOSTXL_CC2650MA_ADC3,
+    BOOSTXL_CC2650MA_ADC4,
+    BOOSTXL_CC2650MA_ADC5,
+    BOOSTXL_CC2650MA_ADC6,
+    BOOSTXL_CC2650MA_ADC7,
+    BOOSTXL_CC2650MA_ADCDCOUPL,
+    BOOSTXL_CC2650MA_ADCVSS,
+    BOOSTXL_CC2650MA_ADCVDDS,
+    BOOSTXL_CC2650MA_ADCCOUNT
+} BOOSTXL_CC2650MA_ADCName;
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif

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

@@ -39,7 +39,6 @@ extern "C" {
 
 #include <ti/drivers/Power.h>
 
-//#include "BOOSTXL_CC2650MA.h"
 #include "BOOSTXL_CC2650MA.h"
 
 /* These #defines allow us to reuse TI-RTOS across other device families */

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

@@ -79,22 +79,23 @@ extern const PIN_Config BoardGpioInitTable[];
 
 /* UART Board */
 #define Board_UART_RX               IOID_2          /* RXD  */
-#define Board_UART_TX               PIN_UNASSIGNED  /* TXD  */
+#define Board_UART_TX               IOID_3          /* TXD  */
 #define Board_UART_CTS              IOID_19         /* CTS  */
 #define Board_UART_RTS              IOID_18         /* RTS */
 
 /* SPI Board */
-#define Board_SPI0_MISO             IOID_0          /* RF1.20 */
-#define Board_SPI0_MOSI             IOID_1          /* RF1.18 */
-#define Board_SPI0_CLK              IOID_3         /* RF1.16 */
+#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_CSN              PIN_UNASSIGNED
 #define Board_SPI1_MISO             PIN_UNASSIGNED
-#define Board_SPI1_MOSI             IOID_8          /* LED_MOSI */
-#define Board_SPI1_CLK              IOID_9          /* LED_CLK */
-
-
+#define Board_SPI1_MOSI             PIN_UNASSIGNED
+#define Board_SPI1_CLK              PIN_UNASSIGNED
 #define Board_SPI1_CSN              PIN_UNASSIGNED
 
+/* I2C */
+#define Board_I2C0_SCL0             IOID_4
+#define Board_I2C0_SDA0             IOID_5
 
 /* SPI */
 #define Board_SPI_FLASH_CS          IOID_20
@@ -102,8 +103,8 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_FLASH_CS_OFF          1
 
 /* Booster pack generic */
-#define Board_DIO0                  PIN_UNASSIGNED
-#define Board_DIO1_RFSW             PIN_UNASSIGNED
+#define Board_DIO0                  IOID_0
+#define Board_DIO1_RFSW             IOID_1
 #define Board_DIO12                 IOID_12
 #define Board_DIO15                 IOID_15
 #define Board_DIO16_TDO             IOID_16
@@ -129,27 +130,31 @@ 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                       PIN_UNASSIGNED
+#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
 
 /** ============================================================================
  *  Instance identifiers
  *  ==========================================================================*/
 /* Generic I2C instance identifiers */
 #define Board_I2C                   CC2650_LAUNCHXL_I2C0
+
 /* Generic SPI instance identifiers */
 #define Board_SPI0                  CC2650_LAUNCHXL_SPI0
 #define Board_SPI1                  CC2650_LAUNCHXL_SPI1
+
 /* Generic UART instance identifiers */
 #define Board_UART                  CC2650_LAUNCHXL_UART0
+
 /* Generic Crypto instance identifiers */
 #define Board_CRYPTO                CC2650_LAUNCHXL_CRYPTO0
+
 /* Generic GPTimer instance identifiers */
 #define Board_GPTIMER0A             CC2650_LAUNCHXL_GPTIMER0A
 #define Board_GPTIMER0B             CC2650_LAUNCHXL_GPTIMER0B
@@ -159,6 +164,7 @@ extern const PIN_Config BoardGpioInitTable[];
 #define Board_GPTIMER2B             CC2650_LAUNCHXL_GPTIMER2B
 #define Board_GPTIMER3A             CC2650_LAUNCHXL_GPTIMER3A
 #define Board_GPTIMER3B             CC2650_LAUNCHXL_GPTIMER3B
+
 /* Generic PWM instance identifiers */
 #define Board_PWM0                  CC2650_LAUNCHXL_PWM0
 #define Board_PWM1                  CC2650_LAUNCHXL_PWM1

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 "inc/npi_config.h"
+#include "npi/src/inc/npi_config.h"
 
 // ****************************************************************************
 // defines

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

@@ -45,87 +45,106 @@
  Release Date: 2018-04-02 18:03:35
  *****************************************************************************/
 
+/*================
+ ==== include ====
+ ===============*/
+
+// clang-format off
 #include <ti/sysbios/knl/Task.h>
-
 #include <ti/sysbios/hal/Hwi.h>
-
 #include <ti/sysbios/knl/Clock.h>
-
 #include <ti/sysbios/knl/Semaphore.h>
-
 #include <ti/sysbios/knl/Queue.h>
 
 #include <string.h>
 
 #include "hal_types.h"
-
 #include "hci_tl.h"
-
 #include "hci_ext.h"
-
 #include "gatt.h"
-
 #include "hci.h"
 
 #include "gapgattserver.h"
-
 #include "gattservapp.h"
 
 #include "gapbondmgr.h"
-
-#define OSAL_SNV 0
-
 #include "osal_snv.h"
-
 #include "icall_apimsg.h"
 
 #include "util.h"
 
 #include "inc/npi_ble.h"
-
 #include "inc/npi_task.h"
-
 #include <inc/hw_types.h>
-
 #include "hal_defs.h"
 
-#if defined(GATT_TEST) || defined(GATT_QUAL)
-#include "gatttest.h"
+#if defined ( USE_RCOSC )
+#include "rcosc_calibration.h"
+#endif // USE_RCOSC
+
+#if defined ( GATT_TEST ) || defined ( GATT_QUAL )
+  #include "gatttest.h"
 #endif
 
 #include "host_test_app.h"
 
-//#define PERIODIC_USE_GPTIMER
+#include "master/cc2650_master.h"
 
-#include "cc2650/cc2650_util.h"
+// clang-format on
 
-//#include "cc2650/cc2650_slave.h"
+/*=================
+ ==== constant ====
+ =================*/
 
-#include "cc2650/cc2650_master.h"
-
-// LE Event Lengths
-#define HCI_CMD_COMPLETE_EVENT_LEN 3
-#define HCI_CMD_VS_COMPLETE_EVENT_LEN 2
-#define HCI_CMD_STATUS_EVENT_LEN 4
-#define HCI_PHY_UPDATE_COMPLETE_EVENT_LEN 6
-
-static void HTA_init(void);
-static void HTA_main(UArg a0, UArg a1);
-static void HTA_handle_gap_event(ICall_HciExtEvt *message);
-static void HTA_handle_att_event(gattMsgEvent_t *message);
-static void HTA_handle_ble_event(ICall_HciExtEvt *message);
-static void send_command_complete_event(uint8 eventCode, uint16 opcode, uint8 numParam, uint8 *param);
-static void send_command_status_event(uint8_t eventCode, uint16_t status, uint16_t opcode);
-static void send_ble_complete_event(uint8 eventLen, uint8 *pEvent);
-
-extern void AssertHandler(uint8 assertCause, uint8 assertSubCause);
-
-// Task configuration
-#define HTA_TASK_STACK_SIZE 512
-Task_Struct hta_task;
-Char        hta_task_stack[HTA_TASK_STACK_SIZE];
+// clang-format off
 
 /*
+ * GAP GATT Attributes
+ */
+#define DEVICE_NAME "BioProController"
+
+// LE Event Lengths
+#define HCI_CMD_COMPLETE_EVENT_LEN              3
+#define HCI_CMD_VS_COMPLETE_EVENT_LEN           2
+#define HCI_CMD_STATUS_EVENT_LEN                4
+#define HCI_PHY_UPDATE_COMPLETE_EVENT_LEN       6
+
+// Task configuration
+#define HTA_TASK_PRIORITY                       1
+#define HTA_TASK_STACK_SIZE                     644
+
+// data length extension
+#define APP_SUGGESTED_PDU_SIZE                  251
+#define APP_SUGGESTED_TX_TIME                   2120
+
+// clang-format on
+
+// Entity ID globally used to check for source and/or destination of messages
+static ICall_EntityID self;
+
+// Semaphore globally used to post events to the application thread
+static ICall_Semaphore semaphore;
+
+// Task configuration
+Task_Struct htaTask;
+Char        htaTaskStack[HTA_TASK_STACK_SIZE];
+
+/*=========================
+ ==== function declare ====
+ ========================*/
+
+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 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
  *
  * @brief   Task creation function for the Host Test App.
@@ -135,29 +154,19 @@ Char        hta_task_stack[HTA_TASK_STACK_SIZE];
  * @return  none
  */
 void HostTestApp_createTask(void) {
-    /* main task */
-    Task_Params task_main_parameter;
-    Task_Params_init(&task_main_parameter);
-    task_main_parameter.stack     = hta_task_stack;
-    task_main_parameter.stackSize = HTA_TASK_STACK_SIZE;
-    task_main_parameter.priority  = 1;
+    Task_Params taskParams;
 
-    Task_construct(&hta_task, HTA_main, &task_main_parameter, NULL);
+    // Configure task
+    Task_Params_init(&taskParams);
+    taskParams.stack     = htaTaskStack;
+    taskParams.stackSize = HTA_TASK_STACK_SIZE;
+    taskParams.priority  = HTA_TASK_PRIORITY;
+
+    Task_construct(&htaTask, HostTestApp_taskFxn, &taskParams, NULL);
 }
 
-// Entity ID globally used to check for source and/or destination of messages
-static ICall_EntityID self;
-
-// Semaphore globally used to post events to the application thread
-extern ICall_Semaphore semaphore;
-
-extern uint16_t event_flags;
-
-// Stack build revision
-ICall_BuildRevision build_reversion;
-
-/*
- * @fn      HTA_init
+/**
+ * @fn      HostTestApp_init
  *
  * @brief   Called during initialization and contains application
  *          specific initialization (ie. hardware initialization/setup,
@@ -168,30 +177,35 @@ ICall_BuildRevision build_reversion;
  *
  * @return  none
  */
-static void HTA_init(void) {
+static void HostTestApp_init(void) {
     // Register the current thread as an ICall dispatcher application
     // so that the application can send and receive messages.
     ICall_registerApp(&self, &semaphore);
 
+    // Set device's Sleep Clock Accuracy
+    // HCI_EXT_SetSCACmd(40);
+
+#if defined(USE_RCOSC)
+    RCOSC_enableCalibration();
+#endif  // USE_RCOSC
+
     // Initialize GATT Client
     VOID GATT_InitClient();
 
     // Register to receive incoming ATT Indications or Notifications of attribute values.
     GATT_RegisterForInd(self);
 
-    // Register for GATT local events and ATT Responses pending for transmission.
-    GATT_RegisterForMsgs(self);
-
-    // Add our services to GATT Server
-    GGS_AddService(GATT_ALL_SERVICES);
-    GATTServApp_AddService(GATT_ALL_SERVICES);
-
     // Register for unprocessed HCI/Host event messages
     GAP_RegisterForMsgs(self);
+
+    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);
 }
 
-/*
- * @fn      HTA_main
+/**
+ * @fn      HostTestApp_taskFxn
  *
  * @brief   Application task entry point for the Host Test App.
  *
@@ -199,11 +213,10 @@ static void HTA_init(void) {
  *
  * @return  none
  */
-static void HTA_main(UArg a0, UArg a1) {
+static void HostTestApp_taskFxn(UArg a0, UArg a1) {
     // Initialize application
-    HTA_init();
-    HTA_util_init();
-    HTA_main_init();
+    HostTestApp_init();
+    master_init();
 
     // Application main loop
     for (;;) {
@@ -219,52 +232,50 @@ static void HTA_main(UArg a0, UArg a1) {
             ICall_HciExtEvt * message = NULL;
 
             if (ICall_fetchServiceMsg(&src, &dest, (void **)&message) == ICALL_ERRNO_SUCCESS) {
-                bool dealloc = true;
-
                 if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == self)) {
                     // Process incoming messages
                     switch (message->hdr.event) {
                     case HCI_GAP_EVENT_EVENT:
-                        HTA_handle_gap_event(message);
+                        HostTestApp_processGapEvent(message);
                         break;
 
                     case GATT_MSG_EVENT:
-                        HTA_handle_att_event((gattMsgEvent_t *)message);
+                        HostTestApp_processAttEvent((gattMsgEvent_t *)message);
                         break;
 
-                    case GAP_MSG_EVENT:
+                    default:
                         break;
                     }
                 }
 
-                if (dealloc && message) {
+                if (message) {
                     ICall_freeMsg(message);
                 }
             }
         }
 
-        if (event_flags > 0) {
-            HTA_event_call();
+        if (EVENT_MASK > 0) {
+            master_event_handle();
         }
     }
 }
 
-/*
- * @fn      HTA_handle_gap_event
+/**
+ * @fn      HostTestApp_processGapEvent
  *
  * @brief   Process an incoming GAP Event.
  *
- * @param   message - message to process
+ * @param   pMsg - message to process
  *
  * @return  none
  */
-static void HTA_handle_gap_event(ICall_HciExtEvt *message) {
+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;
 
         if (lastAppOpcodeSent == pkt->cmdOpcode) {
-            // application processes this as it was embedded message to stack
+            // app processes this as it was embedded message to stack
 
             // Reset last opcode sent
             lastAppOpcodeSent = 0xFFFF;
@@ -277,7 +288,7 @@ static void HTA_handle_gap_event(ICall_HciExtEvt *message) {
 
             len = (uint8)(msgHdr->len - sizeof(hciEvt_CmdComplete_t));
 
-            send_command_complete_event(HCI_COMMAND_COMPLETE_EVENT_CODE, pkt->cmdOpcode, len, pkt->pReturnParam);
+            sendCommandCompleteEvent(HCI_COMMAND_COMPLETE_EVENT_CODE, pkt->cmdOpcode, len, pkt->pReturnParam);
         }
         break;
     }
@@ -293,21 +304,19 @@ static void HTA_handle_gap_event(ICall_HciExtEvt *message) {
 
             // Reset last opcode sent
             lastAppOpcodeSent = 0xFFFF;
+
         } else if (pkt->cmdOpcode == HCI_LE_SET_PHY) {
-            send_command_status_event(HCI_COMMAND_STATUS_EVENT_CODE, pkt->cmdStatus, pkt->cmdOpcode);
+            sendCommandStatusEvent(HCI_COMMAND_STATUS_EVENT_CODE, pkt->cmdStatus, pkt->cmdOpcode);
         }
-        break;
-    }
+    } break;
 
-    case HCI_LE_EVENT_CODE: {
-        HTA_handle_ble_event(message);
+    case HCI_LE_EVENT_CODE:
+        HostTestApp_processBLEEvent(message);
         break;
-    }
 
-    case HCI_BLE_HARDWARE_ERROR_EVENT_CODE: {
+    case HCI_BLE_HARDWARE_ERROR_EVENT_CODE:
         AssertHandler(HAL_ASSERT_CAUSE_HARDWARE_ERROR, 0);
         break;
-    }
 
     case HCI_VE_EVENT_CODE: {
         hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_t *)message;
@@ -318,14 +327,26 @@ static void HTA_handle_gap_event(ICall_HciExtEvt *message) {
             // Reset last opcode sent
             lastAppOpcodeSent = 0xFFFF;
         } else {
-            send_command_complete_event(HCI_VE_EVENT_CODE, pkt->cmdOpcode, pkt->length, pkt->pEventParam);
+            sendCommandCompleteEvent(HCI_VE_EVENT_CODE, pkt->cmdOpcode, pkt->length, pkt->pEventParam);
         }
         break;
     }
+
+    default:
+        break;
     }
 }
 
-static void HTA_handle_att_event(gattMsgEvent_t *message) {
+/**
+ * @fn      HostTestApp_processAttEvent
+ *
+ * @brief   Process an incoming ATT Event.
+
+ * @param   pMsg - message to process
+ *
+ * @return  None.
+ */
+static void HostTestApp_processAttEvent(gattMsgEvent_t *message) {
     uint8_t method = message->method;
 
     if (message->hdr.status == blePending) {
@@ -335,30 +356,24 @@ static void HTA_handle_att_event(gattMsgEvent_t *message) {
     } else if ((method == ATT_WRITE_RSP) || (method == ATT_ERROR_RSP && message->msg.errorRsp.reqOpcode == ATT_WRITE_REQ)) {
         // pass
     } else if (method == ATT_HANDLE_VALUE_NOTI) {
-#ifdef HTA_PIN_RS
-        if (!PIN_getInputValue(HTA_PIN_RS)) {
-#endif
-            attHandleValueNoti_t *att_notify = (attHandleValueNoti_t *)(&message->msg);
-            HTA_main_handle_notify(att_notify->len, att_notify->pValue);
-#ifdef HTA_PIN_RS
-        }
-#endif
+        attHandleValueNoti_t *att_notify = (attHandleValueNoti_t *)(&message->msg);
+        master_handle_notify(att_notify->len, att_notify->pValue);
     }
 
     // Free message. Needed only for ATT Protocol messages
     GATT_bm_free(&message->msg, message->method);
 }
 
-/*
- * @fn      HTA_handle_ble_event
+/**
+ * @fn      HostTestApp_processBLEEvent
  *
  * @brief   Process an incoming BLE Event.
 
- * @param   message - message to process
+ * @param   pMsg - message to process
  *
  * @return  None.
  */
-static void HTA_handle_ble_event(ICall_HciExtEvt *message) {
+static void HostTestApp_processBLEEvent(ICall_HciExtEvt *message) {
     hciEvt_BLEPhyUpdateComplete_t *pEvt = (hciEvt_BLEPhyUpdateComplete_t *)message;
 
     uint8 event[HCI_PHY_UPDATE_COMPLETE_EVENT_LEN];
@@ -378,27 +393,24 @@ static void HTA_handle_ble_event(ICall_HciExtEvt *message) {
     }
     }
 
-    if (eventLen) {
+    if (eventLen > 0) {
         // Send BLE Complete Event
-        send_ble_complete_event(eventLen, event);
+        sendBLECompleteEvent(eventLen, event);
     }
 }
 
-/*
+
+/**
  * This generic function sends a Command Complete or a Vendor Specific Command
  * Complete Event to the Host.
  *
  */
-static void send_command_complete_event(uint8_t eventCode, uint16_t opcode, uint8_t numParam, uint8_t *param) {
-    npiPkt_t *msg;
-    uint8_t   totalLength;
-    uint8_t   txLen = 0;  // Length to transmit
-
+static void sendCommandCompleteEvent(uint8_t eventCode, uint16_t opcode, uint8_t numParam, uint8_t *param) {
     // The initial length will be:
     // OSAL message header(4) - not part of packet sent to HCI Host!
     // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
     // Return Parameters (0..N)
-    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;
+    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;
 
     // adjust the size of the event packet based on event code
     // Note: If not a vendor specific event, then the event includes:
@@ -408,131 +420,130 @@ static void send_command_complete_event(uint8_t eventCode, uint16_t opcode, uint
     totalLength += ((eventCode != HCI_VE_EVENT_CODE) ? HCI_CMD_COMPLETE_EVENT_LEN : HCI_CMD_VS_COMPLETE_EVENT_LEN);
 
     // allocate memory for OSAL hdr + packet
-    msg = (npiPkt_t *)ICall_allocMsg(totalLength);
+    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);
 
-    if (msg) {
+    uint8_t txLen = 0;  // Length to transmit
+
+    if (message) {
         // OSAL message event, status, and pointer to packet
-        msg->hdr.event  = HCI_EVENT_PACKET;
-        msg->hdr.status = 0xFF;
-        msg->pData      = (uint8 *)(msg + 1);
+        message->hdr.event  = HCI_EVENT_PACKET;
+        message->hdr.status = 0xFF;
+        message->pData      = (uint8 *)(message + 1);
 
         // fill in Command Complete Event data
-        msg->pData[0] = HCI_EVENT_PACKET;
-        msg->pData[1] = eventCode;
+        message->pData[0] = HCI_EVENT_PACKET;
+        message->pData[1] = eventCode;
 
         txLen += 2;
 
         // check if this isn't a vendor specific event
         if (eventCode != HCI_VE_EVENT_CODE) {
-            msg->pData[2] = numParam + HCI_CMD_COMPLETE_EVENT_LEN;
-            msg->pData[3] = 1;                  // hciCtrlCmdToken;     // event parameter 1
-            msg->pData[4] = LO_UINT16(opcode);  // event parameter 2
-            msg->pData[5] = HI_UINT16(opcode);  // event parameter 2
+            message->pData[2] = numParam + HCI_CMD_COMPLETE_EVENT_LEN;
+            message->pData[3] = 1;                  // hciCtrlCmdToken;     // event parameter 1
+            message->pData[4] = LO_UINT16(opcode);  // event parameter 2
+            message->pData[5] = HI_UINT16(opcode);  // event parameter 2
 
             txLen += 4;
 
             // remaining event parameters
-            (void)memcpy(&msg->pData[6], param, numParam);
+            (void)memcpy(&message->pData[6], param, numParam);
 
             txLen += numParam;
+        } else {
+            // it is a vendor specific event
 
-        } else {  // it is a vendor specific event
             // less one byte as number of complete packets not used in vendor specific event
-            msg->pData[2] = numParam + HCI_CMD_VS_COMPLETE_EVENT_LEN;
-            msg->pData[3] = param[0];           // event parameter 0: event opcode LSB
-            msg->pData[4] = param[1];           // event parameter 1: event opcode MSB
-            msg->pData[5] = param[2];           // event parameter 2: status
-            msg->pData[6] = LO_UINT16(opcode);  // event parameter 3: command opcode LSB
-            msg->pData[7] = HI_UINT16(opcode);  // event parameter 3: command opcode MSB
+            message->pData[2] = numParam + HCI_CMD_VS_COMPLETE_EVENT_LEN;
+            message->pData[3] = param[0];           // event parameter 0: event opcode LSB
+            message->pData[4] = param[1];           // event parameter 1: event opcode MSB
+            message->pData[5] = param[2];           // event parameter 2: status
+            message->pData[6] = LO_UINT16(opcode);  // event parameter 3: command opcode LSB
+            message->pData[7] = HI_UINT16(opcode);  // event parameter 3: command opcode MSB
 
             txLen += 6;
 
             // remaining event parameters
             // Note: The event opcode and status were already placed in the msg packet.
-            (void)memcpy(&msg->pData[8], &param[3], numParam - HCI_EVENT_MIN_LENGTH);
+            (void)memcpy(&message->pData[8], &param[3], numParam - HCI_EVENT_MIN_LENGTH);
 
             txLen += (numParam - HCI_EVENT_MIN_LENGTH);
         }
 
-        msg->pktLen = txLen;
+        message->pktLen = txLen;
 
-        NPITask_sendToHost((uint8_t *)msg);
+        NPITask_sendToHost((uint8_t *)message);
     }
 }
 
-/*
+/**
  * This generic function sends a Command Complete or a Vendor Specific Command
  * Complete Event to the Host.
  *
  */
-static void send_command_status_event(uint8_t eventCode, uint16_t status, uint16_t opcode) {
-    npiPkt_t *msg;
-    uint8_t   totalLength;
-
+static void sendCommandStatusEvent(uint8_t eventCode, uint16_t status, uint16_t opcode) {
     // The initial length will be:
     // OSAL message header(4) - not part of packet sent to HCI Host!
     // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
     // Command Status Event Data: Status (1) + Num HCI Cmd Pkt (1) + Cmd Opcode (2)
-    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
+    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
 
     // allocate memory for OSAL hdr + packet
-    msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-    if (msg) {
+    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);
+    if (message) {
         // OSAL message event, status, and pointer to packet
-        msg->hdr.event  = HCI_EVENT_PACKET;
-        msg->hdr.status = 0xFF;
+        message->hdr.event  = HCI_EVENT_PACKET;
+        message->hdr.status = 0xFF;
 
         // fill in length and data pointer
-        msg->pktLen = HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
-        msg->pData  = (uint8 *)(msg + 1);
+        message->pktLen = HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
+        message->pData  = (uint8 *)(message + 1);
 
         // fill in Command Complete Event data
-        msg->pData[0] = HCI_EVENT_PACKET;
-        msg->pData[1] = eventCode;
-        msg->pData[2] = HCI_CMD_STATUS_EVENT_LEN;
-        msg->pData[3] = status;
-        msg->pData[4] = 1;                  // number of HCI command packets
-        msg->pData[5] = LO_UINT16(opcode);  // opcode (LSB)
-        msg->pData[6] = HI_UINT16(opcode);  // opcode (MSB)
+        message->pData[0] = HCI_EVENT_PACKET;
+        message->pData[1] = eventCode;
+        message->pData[2] = HCI_CMD_STATUS_EVENT_LEN;
+        message->pData[3] = status;
+        message->pData[4] = 1;                  // number of HCI command packets
+        message->pData[5] = LO_UINT16(opcode);  // opcode (LSB)
+        message->pData[6] = HI_UINT16(opcode);  // opcode (MSB)
 
-        NPITask_sendToHost((uint8_t *)msg);
+        NPITask_sendToHost((uint8_t *)message);
     }
 }
 
-/*
- * This is a generic function used to send BLE Complete Event to the Host processor.
+/**
+ * This is a generic function used to send BLE Complete Event to the
+ * Host processor.
+ *
  */
-static void send_ble_complete_event(uint8 eventLen, uint8 *pEvent) {
-    npiPkt_t *msg;
-    uint8_t   totalLength;
-
+static void sendBLECompleteEvent(uint8 eventLen, uint8 *pEvent) {
     // The initial length will be:
     // OSAL message header(4) - not part of packet sent to HCI Host!
     // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
     // Event Data: eventLen
-    totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;
+    uint8_t totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + eventLen;
 
     // allocate memory for OSAL hdr + packet
-    msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-    if (msg) {
+    npiPkt_t *message = (npiPkt_t *)ICall_allocMsg(totalLength);
+    if (message) {
         // OSAL message event, status, and pointer to packet
-        msg->hdr.event  = HCI_EVENT_PACKET;
-        msg->hdr.status = 0xFF;
+        message->hdr.event  = HCI_EVENT_PACKET;
+        message->hdr.status = 0xFF;
 
         // fill in length and data pointer
-        msg->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
-        msg->pData  = (uint8 *)(msg + 1);
+        message->pktLen = HCI_EVENT_MIN_LENGTH + eventLen;
+        message->pData  = (uint8 *)(message + 1);
 
         // fill in BLE Complete Event data
-        msg->pData[0] = HCI_EVENT_PACKET;
-        msg->pData[1] = HCI_LE_EVENT_CODE;
-        msg->pData[2] = eventLen;
+        message->pData[0] = HCI_EVENT_PACKET;
+        message->pData[1] = HCI_LE_EVENT_CODE;
+        message->pData[2] = eventLen;
 
         // populate event data
         if (eventLen > 0) {
-            memcpy(&msg->pData[3], pEvent, eventLen);
+            memcpy(&message->pData[3], pEvent, eventLen);
         }
 
-        NPITask_sendToHost((uint8_t *)msg);
+        NPITask_sendToHost((uint8_t *)message);
     }
 }

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,16 +49,37 @@
 #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
+#endif /* HOSTESTAPP_H */

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

@@ -1,707 +0,0 @@
-/******************************************************************************
-
- @file  host_test_app_pm.c
-
- @brief This file contains the HostTest sample application for use with the
-        CC2650 Bluetooth Low Energy Protocol Stack.
-
- Group: WCS, BTS
- Target Device: CC2650, CC2640
-
- ******************************************************************************
- 
- Copyright (c) 2013-2018, Texas Instruments Incorporated
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- *  Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
- *  Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
- *  Neither the name of Texas Instruments Incorporated nor the names of
-    its contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ******************************************************************************
- Release Name: ble_sdk_2_02_02_25
- Release Date: 2018-04-02 18:03:35
- *****************************************************************************/
-
-/*********************************************************************
- * INCLUDES
- */
-#include <xdc/std.h>
-
-#include <xdc/runtime/Error.h>
-#include <xdc/runtime/System.h>
-
-#include <ti/sysbios/BIOS.h>
-#include <ti/sysbios/knl/Task.h>
-#include <ti/sysbios/hal/Hwi.h>
-#include <ti/sysbios/knl/Clock.h>
-#include <ti/sysbios/knl/Semaphore.h>
-#include <ti/sysbios/knl/Queue.h>
-#include <ti/drivers/UART.h> //For UART application
-
-#include <icall.h>
-#include <string.h>
-
-#include "hal_types.h"
-#include "hci_tl.h"
-#include "gatt.h"
-#include "hci.h"
-
-#include "gapgattserver.h"
-#include "gattservapp.h"
-
-#include "gapbondmgr.h"
-#include "osal_snv.h"
-#include "icall_apimsg.h"
-
-#include "util.h"
-#include <ti/mw/display/Display.h>
-
-#include "npi_pm.h"
-#include <inc/hw_types.h>
-#include "hal_defs.h"
-
-#if defined ( GATT_TEST ) || defined ( GATT_QUAL )
-  #include "gatttest.h"
-#endif
-
-#include "host_test_app.h"
-
-/*********************************************************************
- * CONSTANTS
- */
-
-// LE Event Lengths
-#define HCI_CMD_COMPLETE_EVENT_LEN              3
-#define HCI_CMD_VS_COMPLETE_EVENT_LEN           2
-#define HCI_CMD_STATUS_EVENT_LEN                4
-
-// Task configuration
-#define HTA_TASK_PRIORITY                       1
-#define HTA_TASK_STACK_SIZE                     644
-
-// NPI Events
-#define NPI_WRITECALLBACK_EVENT                 0x0002
-#define NPI_READ_EVENT                          0x0004
-#define NPI_MRDY_EVENT                          0x0008
-
-/*********************************************************************
- * GLOBAL VARIABLES
- */
-
-// Display Interface
-Display_Handle dispHandle = NULL;
-
-/*********************************************************************
- * LOCAL VARIABLES
- */
-// Entity ID globally used to check for source and/or destination of messages
-static ICall_EntityID selfEntity;
-
-// Semaphore globally used to post events to the application thread
-static ICall_Semaphore sem;
-
-// Queue object used for UART TX messages
-static Queue_Struct uartTx;
-static Queue_Handle uartTxQueue;
-
-// Task configuration
-Task_Struct htaTask;
-Char htaTaskStack[HTA_TASK_STACK_SIZE];
-
-#if !defined ( GATT_DB_OFF_CHIP )
-  static uint8 deviceName[GAP_DEVICE_NAME_LEN] = { 0 };
-  static uint16 appearance = 17;
-#endif
-
-// Pointer to last transmitted message
-npiPkt_t *pMsgLastBuf = NULL;
-
-// events for application
-static uint16_t events = NPI_WRITECALLBACK_EVENT;
-
-// Stack build revision
-buildRevision_t buildRev;
-
-/*********************************************************************
- * LOCAL FUNCTIONS
- */
-
-static void HostTestApp_init(void);
-static void HostTestApp_taskFxn(UArg a0, UArg a1);
-
-static void HostTestApp_processGapEvent(ICall_HciExtEvt *pMsg);
-
-//RTOS queue functions
-static void HostTestApp_sendMsg(npiPkt_t *pMsgBuf);
-
-//UART callback
-Void HostTestApp_writeCallBack(int size);
-Void HostTestApp_readCallBack(int size);
-
-static void sendCommandCompleteEvent(uint8 eventCode, uint16 opcode,
-                                     uint8 numParam, uint8 *param);
-
-/*********************************************************************
- * EXTERN FUNCTIONS
- */
-extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
-
-/*********************************************************************
- * PUBLIC FUNCTIONS
- */
-
-/*********************************************************************
- * @fn      HostTestApp_createTask
- *
- * @brief   Task creation function for the Host Test App.
- *
- * @param   none
- *
- * @return  none
- */
-void HostTestApp_createTask(void)
-{
-  Task_Params taskParams;
-
-  // Configure task
-  Task_Params_init(&taskParams);
-  taskParams.stack = htaTaskStack;
-  taskParams.stackSize = HTA_TASK_STACK_SIZE;
-  taskParams.priority = HTA_TASK_PRIORITY;
-
-  Task_construct(&htaTask, HostTestApp_taskFxn, &taskParams, NULL);
-}
-
-/*********************************************************************
- * @fn      HostTestApp_init
- *
- * @brief   Called during initialization and contains application
- *          specific initialization (ie. hardware initialization/setup,
- *          table initialization, power up notification, etc), and
- *          profile initialization/setup.
- *
- * @param   none
- *
- * @return  none
- */
-static void HostTestApp_init(void)
-{
-  // Register the current thread as an ICall dispatcher application
-  // so that the application can send and receive messages.
-  ICall_registerApp(&selfEntity, &sem);
-
-  // Set device's Sleep Clock Accuracy
-  //HCI_EXT_SetSCACmd(40);
-
-  // Create an RTOS queue for messages from stack to be sent to UART
-  uartTxQueue = Util_constructQueue(&uartTx);
-
-  dispHandle = Display_open(Display_Type_LCD, NULL);
-
-  // Register for unwanted HCI messages
-  GAP_RegisterForMsgs(selfEntity);
-
-  // Initialize GATT Client
-  VOID GATT_InitClient();
-
-  // Get build revision
-  VOID Util_buildRevision(&buildRev);
-
-#if !defined ( GATT_DB_OFF_CHIP )
-
-  #if defined ( GATT_QUAL )
-    VOID GATTQual_AddService( GATT_ALL_SERVICES ); // Includes GAP and GATT Services
-  #else
-    // Add our services to GATT Server
-    VOID GGS_AddService( GATT_ALL_SERVICES );
-    VOID GATTServApp_AddService( GATT_ALL_SERVICES );
-    #if defined ( GATT_TEST )
-      VOID GATTTest_AddService( GATT_ALL_SERVICES );
-    #endif
-  #endif
-
-  // Set device name
-  if ((buildRev.hostInfo & CENTRAL_CFG) && (buildRev.hostInfo & PERIPHERAL_CFG))
-  {
-    memcpy(deviceName, "TI BLE All", 10);
-  }
-  else if (buildRev.hostInfo & CENTRAL_CFG)
-  {
-    memcpy(deviceName, "TI BLE Central", 14);
-  }
-  else if (buildRev.hostInfo & PERIPHERAL_CFG)
-  {
-    memcpy(deviceName, "TI BLE Peripheral",  17);
-  }
-  else
-  {
-    memcpy(deviceName, "TI BLE Unknown",  14);
-  }
-
-  VOID GGS_SetParameter(GGS_DEVICE_NAME_ATT, strlen((char *)deviceName), deviceName);
-  VOID GGS_SetParameter(GGS_APPEARANCE_ATT, sizeof(uint16), (void*)&appearance);
-
-#endif // GATT_DB_OFF_CHIP
-
-#ifdef TI_DRIVERS_UART_INCLUDED
-  //Initialize the NPI layer
-  NPI_InitInterface(UART_INTERFACE, &HostTestApp_writeCallBack,
-                    &HostTestApp_readCallBack);
-#elif TI_DRIVERS_SPI_DMA_INCLUDED
-  //Initialize the NPI layer
-  NPI_InitInterface(SPI_INTERFACE, &HostTestApp_writeCallBack,
-                    &HostTestApp_readCallBack);
-#endif
-
-  //Register application with NPI for stack messages to be sent to UART
-  NPI_RegisterTask(selfEntity);
-
-  Display_print0(dispHandle, 0, 0, "TI BLEv2.0");
-  Display_print0(dispHandle, 1, 0, "HostTestApp");
-
-  // Display Host build configuration
-  if ((buildRev.hostInfo & CENTRAL_CFG) && (buildRev.hostInfo & PERIPHERAL_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "All");
-  }
-  else if ((buildRev.hostInfo & CENTRAL_CFG) &&
-           (buildRev.hostInfo & BROADCASTER_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "Cent+Bcast");
-  }
-  else if ((buildRev.hostInfo & PERIPHERAL_CFG) &&
-           (buildRev.hostInfo & OBSERVER_CFG))
-  {
-    Display_print0(dispHandle, 2, 0, "Peri+Observ");
-  }
-  else if (buildRev.hostInfo & CENTRAL_CFG)
-  {
-    Display_print0(dispHandle, 2, 0, "Central");
-  }
-  else if (buildRev.hostInfo & PERIPHERAL_CFG)
-  {
-    Display_print0(dispHandle, 2, 0, "Peripheral");
-  }
-  else
-  {
-    Display_print1(dispHandle, 2, 0, "Unknown build cfg %d", buildRev.hostInfo);
-  }
-}
-
-/*********************************************************************
- * @fn      HostTestApp_taskFxn
- *
- * @brief   Application task entry point for the Host Test App.
- *
- * @param   none
- *
- * @return  none
- */
-static void HostTestApp_taskFxn(UArg a0, UArg a1)
-{
-  // Initialize application
-  HostTestApp_init();
-
-  // Application main loop
-  for (;;)
-  {
-    // Waits for a signal to the semaphore associated with the calling thread.
-    // Note that the semaphore associated with a thread is signaled when a
-    // message is queued to the message receive queue of the thread or when
-    // ICall_signal() function is called onto the semaphore.
-    ICall_Errno errno = ICall_wait(ICALL_TIMEOUT_FOREVER);
-
-    if (errno == ICALL_ERRNO_SUCCESS)
-    {
-      ICall_EntityID dest;
-      ICall_ServiceEnum src;
-      ICall_HciExtEvt *pMsg = NULL;
-
-      if (ICall_fetchServiceMsg(&src, &dest,
-                                (void **)&pMsg) == ICALL_ERRNO_SUCCESS)
-      {
-        bool dealloc = true;
-
-        if ((src == ICALL_SERVICE_CLASS_BLE) && (dest == selfEntity))
-        {
-          // Process incoming messages
-          switch (pMsg->hdr.event)
-          {
-            case HCI_GAP_EVENT_EVENT:
-              HostTestApp_processGapEvent(pMsg);
-              break;
-
-            case HCI_ACL_DATA_PACKET:
-            case HCI_SCO_DATA_PACKET:
-            case HCI_EVENT_PACKET:
-              {
-                HostTestApp_sendMsg((npiPkt_t *)pMsg);
-                dealloc = false;
-              }
-              break;
-
-            default:
-              break;
-          }
-        }
-
-        if (dealloc == true)
-        {
-          ICall_freeMsg(pMsg);
-        }
-      }
-    }
-
-    if (events & NPI_READ_EVENT )
-    {
-      events &= ~NPI_READ_EVENT;
-      NPI_serialPacketParser(); //Call the parser..
-    }
-
-    if (events & NPI_MRDY_EVENT )
-    {
-      // This read is initiated to read again and again till you run out of
-      // bytes. This read was initiated in the callback but is actually done in
-      // this application thread
-      events &= ~NPI_MRDY_EVENT;
-#ifdef POWER_SAVING
-      NPI_MrdyEvent();
-#endif
-    }
-
-    // Check if write is complete and free the last written buffer
-    if(events & NPI_WRITECALLBACK_EVENT)
-    {
-      if (pMsgLastBuf)
-      {
-        ICall_freeMsg(pMsgLastBuf);  //Free the NPI/OSAL buffer which was sent
-        pMsgLastBuf = NULL;          //Need to have this to avoid memory leak
-      }
-
-      // If queue is not empty, we did add some frames to it
-      if (!Queue_empty(uartTxQueue))
-      {
-        pMsgLastBuf = (npiPkt_t *)Util_dequeueMsg(uartTxQueue);
-        if (pMsgLastBuf)
-        {
-          // send dequeued element to UART
-          events &= ~NPI_WRITECALLBACK_EVENT;
-          NPI_WriteTransport(pMsgLastBuf->pData, pMsgLastBuf->pktLen);
-        }
-      }
-    }
-  }
-}
-
-/*********************************************************************
- * @fn      HostTestApp_processGapEvent
- *
- * @brief   Process an incoming GAP Event.
- *
- * @param   pMsg - message to process
- *
- * @return  none
- */
-static void HostTestApp_processGapEvent(ICall_HciExtEvt *pMsg)
-{
-  switch(pMsg->hdr.status)
-  {
-    case HCI_COMMAND_COMPLETE_EVENT_CODE:
-      {
-        hciEvt_CmdComplete_t *pkt = (hciEvt_CmdComplete_t *)pMsg;
-
-        if (lastAppOpcodeSent == pkt->cmdOpcode)
-        {
-          // app processes this as it was embedded msg to stack
-
-          // Reset last opcode sent
-          lastAppOpcodeSent = 0xFFFF;
-        }
-        else
-        {
-          osal_msg_hdr_t *msgHdr;
-          uint8 len;
-
-          msgHdr = (osal_msg_hdr_t *)pMsg;
-          msgHdr--; // Backup to the msg header
-
-          len = (uint8)(msgHdr->len - sizeof ( hciEvt_CmdComplete_t ));
-
-          sendCommandCompleteEvent(HCI_COMMAND_COMPLETE_EVENT_CODE,
-                                   pkt->cmdOpcode, len, pkt->pReturnParam);
-        }
-      }
-      break;
-
-    case HCI_DISCONNECTION_COMPLETE_EVENT_CODE:
-      break;
-
-    case HCI_COMMAND_STATUS_EVENT_CODE:
-      {
-        hciEvt_CommandStatus_t *pkt = (hciEvt_CommandStatus_t *)pMsg;
-
-        if (lastAppOpcodeSent == pkt->cmdOpcode)
-        {
-          // app processes this as it was embedded msg to stack
-
-          // Reset last opcode sent
-          lastAppOpcodeSent = 0xFFFF;
-        }
-        // else - drop it for now
-      }
-      break;
-
-    case HCI_BLE_HARDWARE_ERROR_EVENT_CODE:
-      {
-        AssertHandler(HAL_ASSERT_CAUSE_HARDWARE_ERROR,0);
-      }
-      break;
-
-    case HCI_LE_EVENT_CODE:
-      break;
-
-    case HCI_VE_EVENT_CODE:
-      {
-        hciEvt_VSCmdComplete_t *pkt = (hciEvt_VSCmdComplete_t *)pMsg;
-
-        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);
-        }
-      }
-      break;
-
-    default:
-      break;
-  }
-}
-
-/*********************************************************************
- * @fn      HostTestApp_writeCallBack
- *
- * @brief   Callback for TX ISR
- *
- * @param   none
- *
- * @return  none
- */
-Void HostTestApp_writeCallBack(int size)
-{
-  events |= NPI_WRITECALLBACK_EVENT;
-  Semaphore_post(sem);
-}
-
-/*********************************************************************
- * @fn      HostTestApp_readCallBack
- *
- * @brief   Callback for RX ISR
- *
- * @param   none
- *
- * @return  none
- */
-Void HostTestApp_readCallBack(int size)
-{
-  if ( size == 0xFF )
-  {
-    events |= NPI_MRDY_EVENT;
-  }
-  else
-  {
-    events |= NPI_READ_EVENT;
-  }
-
-  Semaphore_post(sem);
-}
-
-/*********************************************************************
- * @fn      HostTestApp_sendMsg
- *
- * @brief   Sends packet to UART else queues it if not able to do so
- *
- * @param   none
- *
- * @return  none
- */
-static void HostTestApp_sendMsg(npiPkt_t *pMsgBuf)
-{
-  if ((events & NPI_WRITECALLBACK_EVENT) && (Queue_empty(uartTxQueue)))
-  {
-    events &= ~NPI_WRITECALLBACK_EVENT;
-
-    if (pMsgLastBuf)
-    {
-      ICall_freeMsg(pMsgLastBuf);  //Free the NPI/OSAL buffer which was sent
-      pMsgLastBuf = NULL;          //Need to have this to avoid memory leak
-    }
-
-    pMsgLastBuf = pMsgBuf;
-    NPI_WriteTransport(pMsgBuf->pData, pMsgBuf->pktLen);
-    return;
-  }
-
-  // Enqueue the message
-  Util_enqueueMsg(uartTxQueue, sem, (uint8*)pMsgBuf);
-}
-
-//*****************************************************************************
-// the function prototypes
-
-/*******************************************************************************
- * This generic function sends a Command Complete or a Vendor Specific Command
- * Complete Event to the Host.
- *
- */
-static void sendCommandCompleteEvent(uint8_t eventCode, uint16_t opcode,
-                                     uint8_t numParam, uint8_t *param)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
-  uint8_t   txLen = 0; // Length to transmit
-
-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Return Parameters (0..N)
-  totalLength = sizeof(npiPkt_t) + HCI_EVENT_MIN_LENGTH + numParam;
-
-  // adjust the size of the event packet based on event code
-  // Note: If not a vendor specific event, then the event includes:
-  //       Command Complete Data: Number of HCI Commands Allowed(1) + Command Opcode(2)
-  // Note: If a vendor specific event, then the event includes:
-  //       Vendor Specific Command Complete Data: Vendor Specific Event Opcode(2)
-  totalLength += ( (eventCode != HCI_VE_EVENT_CODE)  ?
-                   HCI_CMD_COMPLETE_EVENT_LEN        :
-                   HCI_CMD_VS_COMPLETE_EVENT_LEN );
-
-  // allocate memory for OSAL hdr + packet
-  msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-  if (msg)
-  {
-    // OSAL message event, status, and pointer to packet
-    msg->hdr.event  = HCI_EVENT_PACKET;
-    msg->hdr.status = 0xFF;
-    msg->pData      = (uint8*)(msg+1);
-
-    // fill in Command Complete Event data
-    msg->pData[0] = HCI_EVENT_PACKET;
-    msg->pData[1] = eventCode;
-
-    txLen += 2;
-
-    // check if this isn't a vendor specific event
-    if ( eventCode != HCI_VE_EVENT_CODE )
-    {
-      msg->pData[2] = numParam + HCI_CMD_COMPLETE_EVENT_LEN;
-      msg->pData[3] = 1;// hciCtrlCmdToken;     // event parameter 1
-      msg->pData[4] = LO_UINT16( opcode ); // event parameter 2
-      msg->pData[5] = HI_UINT16( opcode ); // event parameter 2
-
-      txLen += 4;
-
-      // remaining event parameters
-      (void)memcpy(&msg->pData[6], param, numParam);
-
-      txLen += numParam;
-    }
-    else // it is a vendor specific event
-    {
-      // less one byte as number of complete packets not used in vendor specific event
-      msg->pData[2] = numParam + HCI_CMD_VS_COMPLETE_EVENT_LEN;
-      msg->pData[3] = param[0];            // event parameter 0: event opcode LSB
-      msg->pData[4] = param[1];            // event parameter 1: event opcode MSB
-      msg->pData[5] = param[2];            // event parameter 2: status
-      msg->pData[6] = LO_UINT16( opcode ); // event parameter 3: command opcode LSB
-      msg->pData[7] = HI_UINT16( opcode ); // event parameter 3: command opcode MSB
-
-      txLen += 6;
-
-      // remaining event parameters
-      // Note: The event opcode and status were already placed in the msg packet.
-      (void)memcpy(&msg->pData[8], &param[3], numParam-HCI_EVENT_MIN_LENGTH);
-
-      txLen += (numParam-HCI_EVENT_MIN_LENGTH);
-    }
-
-    msg->pktLen = txLen;
-
-    HostTestApp_sendMsg((npiPkt_t *)msg);
-  }
-}
-
-/*******************************************************************************
- * This generic function sends a Command Complete or a Vendor Specific Command
- * Complete Event to the Host.
- *
- */
-void sendCommandStatusEvent(uint8_t eventCode, uint16_t status, uint16_t opcode)
-{
-  npiPkt_t *msg;
-  uint8_t   totalLength;
-
-  // The initial length will be:
-  // OSAL message header(4) - not part of packet sent to HCI Host!
-  // Minimum Event Data: Packet Type(1) + Event Code(1) + Length(1)
-  // Command Status Event Data: Status (1) + Num HCI Cmd Pkt (1) + Cmd Opcode (2)
-  totalLength = sizeof(npiPkt_t)     +
-                HCI_EVENT_MIN_LENGTH +
-                HCI_CMD_STATUS_EVENT_LEN;
-
-  // allocate memory for OSAL hdr + packet
-  msg = (npiPkt_t *)ICall_allocMsg(totalLength);
-  if (msg)
-  {
-    // OSAL message event, status, and pointer to packet
-    msg->hdr.event  = HCI_EVENT_PACKET;
-    msg->hdr.status = 0xFF;
-
-    // fill in length and data pointer
-    msg->pktLen = HCI_EVENT_MIN_LENGTH + HCI_CMD_STATUS_EVENT_LEN;
-    msg->pData  = (uint8*)(msg+1);
-
-    // fill in Command Complete Event data
-    msg->pData[0] = HCI_EVENT_PACKET;
-    msg->pData[1] = eventCode;
-    msg->pData[2] = HCI_CMD_STATUS_EVENT_LEN;
-    msg->pData[3] = status;
-    msg->pData[4] = 1;                 // number of HCI command packets
-    msg->pData[5] = LO_UINT16(opcode); // opcode (LSB)
-    msg->pData[6] = HI_UINT16(opcode); // opcode (MSB)
-
-    HostTestApp_sendMsg((npiPkt_t *)msg);
-  }
-}
-
-/*********************************************************************
-*********************************************************************/

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

@@ -44,28 +44,26 @@
  Release Date: 2018-04-02 18:03:35
  *****************************************************************************/
 
+/*================
+ ==== include ====
+ ===============*/
+
+// clang-format off
 #include <xdc/runtime/Error.h>
-
 #include <ti/drivers/Power.h>
-
 #include <ti/drivers/power/PowerCC26XX.h>
-
 #include <ti/sysbios/BIOS.h>
 
-#include "board.h"
-
-#include "hal_assert.h"
-
 #include "icall.h"
-
+#include "board.h"
 #include "inc/npi_task.h"
 
 #include "host_test_app.h"
 
 /* Header files required to enable instruction fetch cache */
-#include <driverlib/vims.h>
-
 #include <inc/hw_memmap.h>
+#include <driverlib/vims.h>
+// clang-format on
 
 #ifndef USE_DEFAULT_USER_CFG
 
@@ -76,10 +74,7 @@ bleUserCfg_t user0Cfg = BLE_USER_CFG;
 
 #endif  // USE_DEFAULT_USER_CFG
 
-
-extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
-
-/*
+/**
  * @fn          Main
  *
  * @brief       Application Main
@@ -95,10 +90,6 @@ extern void AssertHandler(uint8 assertCause, uint8 assertSubcause);
  * @return      None.
  */
 int main() {
-
-    /* Register Application callback to trap asserts raised in the Stack */
-    RegisterAssertCback(AssertHandler);
-
     PIN_init(BoardGpioInitTable);
 
     // Enable iCache prefetching
@@ -124,79 +115,3 @@ int main() {
 
     return 0;
 }
-
-/*
- * @fn          AssertHandler
- *
- * @brief       This is the Application's callback handler for asserts raised
- *              in the stack.  When EXT_HAL_ASSERT is defined in the Stack
- *              project this function will be called when an assert is raised,
- *              and can be used to observe or trap a violation from expected
- *              behavior.
- *
- *              As an example, for Heap allocation failures the Stack will raise
- *              HAL_ASSERT_CAUSE_OUT_OF_MEMORY as the assertCause and
- *              HAL_ASSERT_SUBCAUSE_NONE as the assertSubcause.  An application
- *              developer could trap any malloc failure on the stack by calling
- *              HAL_ASSERT_SPINLOCK under the matching case.
- *
- *              An application developer is encouraged to extend this function
- *              for use by their own application.  To do this, add hal_assert.c
- *              to your project workspace, the path to hal_assert.h (this can
- *              be found on the stack side). Asserts are raised by including
- *              hal_assert.h and using macro HAL_ASSERT(cause) to raise an
- *              assert with argument assertCause.  the assertSubcause may be
- *              optionally set by macro HAL_ASSERT_SET_SUBCAUSE(subCause) prior
- *              to asserting the cause it describes. More information is
- *              available in hal_assert.h.
- *
- * input parameters
- *
- * @param       assertCause    - Assert cause as defined in hal_assert.h.
- * @param       assertSubcause - Optional assert subcause (see hal_assert.h).
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void AssertHandler(uint8 assertCause, uint8 assertSubcause) {}
-
-/*
- * @fn          exceptionHandler
- *
- * @brief       Generic spinlock to trap RTOS raised errors.
- *
- * input parameters
- *
- * @param       None.
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void exceptionHandler(void) {
-     for (;;);
-}
-
-/*
- * @fn          smallErrorHook
- *
- * @brief       Error handler to be hooked into TI-RTOS.
- *
- * input parameters
- *
- * @param       eb - Pointer to Error Block.
- *
- * output parameters
- *
- * @param       None.
- *
- * @return      None.
- */
-void smallErrorHook(Error_Block *eb) {
-    for (;;);
-}

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

@@ -0,0 +1,185 @@
+#ifndef CC2650_MASTER_H
+#define CC2650_MASTER_H
+
+/*================
+ ==== include ====
+ ================*/
+
+#include <ti/sysbios/knl/Semaphore.h>
+
+#define MASTER_PIN_USE_CC26XX
+
+#include "master_mem.h"
+#include "master_pin.h"
+#include "master_spi.h"
+
+/*======================
+ ==== event control ====
+ =====================*/
+
+uint16_t               EVENT_MASK = 0;
+extern ICall_Semaphore semaphore;
+
+#define EVT_PIN_RESET 0x0010
+#define EVT_PIN_REQST 0x0020
+
+/**
+ * test event [flag] has been enabled.
+ */
+#define flag_mask(flag) ((EVENT_MASK & (flag)) != 0)
+
+/**
+ * enable event [flag].
+ */
+#define flag_enable(flag)               \
+    do {                                \
+        uint8 __key = Hwi_disable();    \
+        EVENT_MASK |= (uint16_t)(flag); \
+        Hwi_restore(__key);             \
+    } while (0)
+
+/**
+ * disable event [flag].
+ */
+#define flag_disable(flag)                 \
+    do {                                   \
+        uint8 __key = Hwi_disable();       \
+        EVENT_MASK &= ~((uint16_t)(flag)); \
+        Hwi_restore(__key);                \
+    } while (0)
+
+/**
+ * fire a event with [flag].
+ */
+#define flag_notify(flag)               \
+    do {                                \
+        uint8 __key = Hwi_disable();    \
+        EVENT_MASK |= (uint16_t)(flag); \
+        Hwi_restore(__key);             \
+        Semaphore_post(semaphore);      \
+    } while (0)
+
+/*======================
+ ==== utility macro ====
+ =====================*/
+
+#define unsafe_memcpy(p, src, len) \
+    do {                           \
+        memcpy(p, src, len);       \
+        p += len;                  \
+    } while (0)
+
+/*=========================
+ ==== function declare ====
+ ========================*/
+
+static void master_init();
+static void master_event_handle();
+struct void master_handle_notify(uint16 length, uint8 *value);
+struct void master_switch_memory();
+
+/*========================
+ ==== notify variable ====
+ =======================*/
+
+#define MEM_META_LENGTH 4
+
+static uint8    mem_sel     = 0;
+static uint16_t not_counter = 0;  // writing counter, increase when notify
+static uint16_t not_offset  = 0;  // writing pointer, current not writing index
+
+/*===========================
+ ==== function implement ====
+ ==========================*/
+
+#define master_reset()                 \
+    do {                               \
+        not_counter = 0;               \
+        not_offset  = MEM_META_LENGTH; \
+        mem_sel     = 0;               \
+        master_mem_select(mem_sel);    \
+    } while (0)
+
+static void master_init() {
+    master_pin_open();
+    master_spi_open();
+    master_mem_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;
+    }
+}
+
+struct void master_handle_notify(uint16 length, uint8 *value) {
+    if (!master_pin_input(PIN_MEM_RST) || flag_mask(EVT_PIN_RESET)) {
+        // ignore all incoming notify;
+        flag_disable(EVT_PIN_RESET);
+        master_reset();
+        return;
+    }
+
+    uint8_t counter = not_counter++;
+
+    // localize current buffer
+    uint8_t *p = master_mem_buffer;
+
+    // update offset
+    uint32_t cnt_offset = not_offset;
+    not_offset          = cnt_offset + 3 + length;
+
+    *p++ = MEM_INS_WRITE;                        // instruction
+    *p++ = (uint8_t)((cnt_offset >> 8) & 0xFF);  // address
+    *p++ = (uint8_t)(cnt_offset & 0xFF);         // address
+    *p++ = 0xFF;                                 // data header
+    *p++ = counter;                              // data counter
+    *p++ = length;                               // data content length
+    unsafe_memcpy(p, value, length);             // data content
+
+    master_mem_submit(p - master_mem_buffer);
+
+    if (master_pin_input(PIN_MEM_BZY) &&  //
+        (not_offset >= MEM_SWITCH_THRESHOLD || flag_mask(EVT_PIN_REQST))) {
+        flag_disable(EVT_PIN_REQST);
+        master_switch_memory();
+    }
+
+    master_pin_output(PIN_LED_GRN, not_counter & 0x10);
+}
+
+struct void master_switch_memory() {
+    uint16_t cnt_offset = not_offset;
+    not_offset          = MEM_META_LENGTH;
+
+    // localize current buffer
+    uint8_t *p = spi_tx_buffer;
+
+    *p++ = MEM_INS_WRITE;                        // instruction
+    *p++ = 0;                                    // address
+    *p++ = 0;                                    // address
+    *p++ = (uint8_t)((cnt_offset >> 8) & 0xFF);  // data: notify data length
+    *p++ = (uint8_t)(cnt_offset & 0xFF);         // data: notify data length
+    *p++ = 0;
+    *p++ = 0;
+
+    master_mem_submit(p - master_mem_buffer);
+
+    // switch memory
+    master_mem_select((mem_sel++) & 0x01);
+
+    master_pin_output(PIN_LED_RED, mem_sel & 0x10);
+}
+
+#endif  // CC2650_MASTER_H

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

@@ -0,0 +1,26 @@
+#ifndef MASTER_PIN_LP_H
+#define MASTER_PIN_LP_H
+
+#ifndef CC2650_LAUNCHXL
+#error "CC2650_LAUNCHXL not defined"
+#endif
+
+#define PIN_LED_RED IOID_6
+#define PIN_LED_GRN IOID_6
+
+#define PIN_MEM_RST IOID_10
+#define PIN_MEM_BZY IOID_11
+#define PIN_MEM_REQ IOID_12
+#define PIN_MEM_SEL IOID_15
+
+#define PIN_SPI_CS IOID_14
+#define PIN_SPI_CK Board_SPI0_CLK
+#define PIN_SPI_DI Board_SPI0_MISO
+#define PIN_SPI_DO Board_SPI0_MOSI
+
+#define PIN_DEBUG_1 IOID_4
+#define PIN_DEBUG_2 IOID_5
+#define PIN_DEBUG_3 IOID_21
+#define PIN_DEBUG_4 IOID_22
+
+#endif MASTER_PIN_LP_H

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

@@ -0,0 +1,26 @@
+#ifndef MASTER_PIN_MA_H
+#define MASTER_PIN_MA_H
+
+#ifndef BOOSTXL_CC2650MA
+#error "BOOSTXL_CC2650MA not defined"
+#endif
+
+#define PIN_LED_RED IOID_UNUSED
+#define PIN_LED_GRN IOID_UNUSED
+
+#define PIN_MEM_RST DIO4
+#define PIN_MEM_SEL DIO8
+#define PIN_MEM_BZY DIO13
+#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_DEBUG_1 IOID_UNUSED
+#define PIN_DEBUG_2 IOID_UNUSED
+#define PIN_DEBUG_3 IOID_UNUSED
+#define PIN_DEBUG_4 IOID_UNUSED
+
+#endif MASTER_PIN_MA_H

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

@@ -0,0 +1,33 @@
+#ifndef MASTER_MEM_H
+#define MASTER_MEM_H
+
+#include "master_pin.h"
+#include "master_spi.h"
+
+// clang-format off
+#define MEM_BUFFER_SIZE         SPI_TX_BUFFER_SIZE
+#define MEM_SWITCH_THRESHOLD    0x1000
+
+#define MSM_REG_WRITE 0x01
+#define MEM_INS_WRITE 0x02
+#define MEM_INS_READ  0x03
+#define MEM_REG_READ  0x05
+// clang-format on
+
+#define master_mem_buffer master_tx_buffer
+
+#define master_mem_select(value) master_pin_output(PIN_MEM_SEL, (value) ? 1 : 0)
+
+#define master_mem_submit(len) master_spi_transaction(len)
+
+#define master_mem_init()                     \
+    do {                                      \
+        master_mem_buffer[0] = MSM_REG_WRITE; \
+        master_mem_buffer[1] = 0b01000011;    \
+        master_mem_select(1);                 \
+        master_mem_submit(2);                 \
+        master_mem_select(0);                 \
+        master_mem_submit(2);                 \
+    } while (0)
+
+#endif  // MASTER_MEM_H

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

@@ -0,0 +1,73 @@
+#ifndef MASTER_PIN_H
+#define MASTER_PIN_H
+
+#include <Board.h>
+#include <ti/drivers/PIN.h>
+
+#if defined(CC2650_LAUNCHXL)
+#include "lp/master_pin.h"
+#elif defined(BOOSTXL_CC2650MA)
+#include "ma/master_pin.h"
+#endif
+
+static PIN_Handle master_pins_handle;
+
+static PIN_Config master_pin_config_table[] = {  //
+
+    // memory select
+    PIN_MEM_SEL | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL,
+
+    // master side is reading buffer.
+    PIN_MEM_BZY | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+
+    // master side request to switch buffer
+    PIN_MEM_REQ | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+
+    // memory reset reset
+    PIN_MEM_RST | PIN_INPUT_EN | PIN_PULLUP | PIN_HYSTERESIS,
+
+    // spi chip select, deprecate native CS pin
+    PIN_SPI_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+
+    // debug  pin
+    PIN_DEBUG_1 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+    PIN_DEBUG_2 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+    PIN_DEBUG_3 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+    PIN_DEBUG_4 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_HIGH | PIN_PUSHPULL,
+
+    // LED
+    PIN_LED_RED | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+    PIN_LED_GRN | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
+
+    //
+    PIN_TERMINATE};
+
+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); \
+    } 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
+
+#endif MASTER_PIN_H

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

@@ -0,0 +1,43 @@
+#ifndef MASTER_SPI_H
+#define MASTER_SPI_H
+
+// clang-format off
+#include <ti/drivers/SPI.h>
+#include <ti/drivers/dma/UDMACC26XX.h>
+#include <ti/drivers/spi/SPICC26XXDMA.h>
+// clang-format on
+
+#include "master_pin.h"
+
+#define SPI_TX_BUFFER_SIZE 50
+
+static uint8_t master_tx_buffer[SPI_TX_BUFFER_SIZE] = {0};
+
+static SPI_Handle      master_spi_handle;
+static SPI_Transaction master_spi_transaction;
+
+#define master_spi_open()                                                     \
+    do {                                                                      \
+        SPI_init();                                                           \
+        SPI_Params spi_parameter;                                             \
+        SPI_Params_init(&spi_parameter);                                      \
+        spi_parameter.transferMode    = SPI_MODE_BLOCKING;                    \
+        spi_parameter.mode            = SPI_MASTER;                           \
+        spi_parameter.bitRate         = 12000000;                             \
+        spi_parameter.transferTimeout = 1000;                                 \
+        spi_parameter.dataSize        = 8;                                    \
+        spi_parameter.frameFormat     = SPI_POL0_PHA0;                        \
+        master_spi_handle             = SPI_open(Board_SPI0, &spi_parameter); \
+    } while (0)
+
+#define master_spi_transaction(len)                               \
+    do {                                                          \
+        master_spi_transaction.txBuf = master_tx_buffer;          \
+        master_spi_transaction.rxBuf = NULL;                      \
+        master_spi_transaction.count = (len);                     \
+        master_pin_output(PIN_SPI_CS, 0);                         \
+        SPI_transfer(master_spi_handle, &master_spi_transaction); \
+        master_pin_output(PIN_SPI_CS, 1);                         \
+    } while (0)
+
+#endif  // MASTER_SPI_H

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/Elite.json

@@ -1,179 +0,0 @@
-{
-  "name": "Elite-ZM",
-  "version": "1.2.30",
-  "match_rule": {
-    "local_name_pattern": "Elite-ZM.+",
-    "major_product_number": 0,
-    "minor_product_number": 2,
-    "major_version_number": 1,
-    "minor_version_number": 2
-  },
-  "constant": {
-    "ADC_CHANNEL_NUMBER": [
-      12,
-      13,
-      14,
-      15
-    ],
-    "VOLT_MAX": 4095
-  },
-  "parameters": {
-    "CHANNEL": {
-      "description": "record channels",
-      "record_meta": true,
-      "domain": "property",
-      "value": [
-        0,
-        1,
-        2
-      ]
-    },
-    "SAMPLE_RATE": {
-      "description": "data sampling rate",
-      "record_meta": true,
-      "domain": "constant",
-      "value": 1
-    },
-    "AMP_GAIN": {
-      "description": "amp gain",
-      "record_meta": true,
-      "domain": "constant",
-      "value": 1
-    },
-    "MODE": {
-      "description": "working mode",
-      "value": [
-        "I-V Curve",
-        "Cyclic Voltammetry",
-        "Function Generator",
-        "Z-T Curve",
-        "V-T Curve",
-        "I-T Curve",
-        "ADC test"
-      ]
-    },
-    "VOLT_ORIGIN": {
-      "description": "Origin Voltage of Scan",
-      "domain": [
-        "VOLT_MAX"
-      ]
-    },
-    "VOLT_FINAL": {
-      "description": "The last Voltage of Scan",
-      "domain": [
-        "VOLT_MAX"
-      ],
-      "value": "1365 * VALUE"
-    },
-    "VOLT_STEP": {
-      "description": "Voltage Step",
-      "domain": [
-        5
-      ]
-    },
-    "STEP_TIME": {
-      "description": "How much time between two step",
-      "domain": [
-        4
-      ]
-    },
-    "DAC_VOLT": {
-      "description": "DAC output Voltage",
-      "domain": [
-        "VOLT_MAX"
-      ]
-    },
-    "ADC_CHANNEL": {
-      "description": "read ADC data",
-      "value": [
-        "ANA0",
-        "ANA1",
-        "ANA2",
-        "ANA3"
-      ]
-    }
-  },
-  "instruction": {
-    "start": [
-      {
-        "expression": "MODE",
-        "when": {
-          "0": "curve_iv",
-          "1": "curve_cv",
-          "2": "func_gen",
-          "6": "adc_test"
-        }
-      }
-    ],
-    "data_format": [
-      "_data_format('TDC4VAF2')"
-    ],
-    "curve_iv": [
-      "data_format",
-      "_notify(True)",
-      "curve_iv0",
-      "_sync(True)",
-      "VIS_STI"
-    ],
-    "curve_iv0": {
-      "type": "RIS",
-      "parameter": {
-        "va": "(VOLT_ORIGIN + 1) * 0x0010",
-        "vb": "(VOLT_FINAL + 1) * 0x0010",
-        "dv": "VOLT_STEP * 0x40",
-        "dt": "STEP_TIME * 0x12"
-      },
-      "data": [
-        "1X10;2B>va;2B>vb;B>dv;B>dt"
-      ]
-    },
-    "curve_cv": [
-      "data_format",
-      "_notify(True)",
-      "curve_cv0",
-      "_sync(True)",
-      "VIS_STI"
-    ],
-    "curve_cv0": {
-      "type": "RIS",
-      "parameter": {
-        "va": "(VOLT_ORIGIN + 1) * 0x0010",
-        "vb": "(VOLT_FINAL + 1) * 0x0010",
-        "dv": "VOLT_STEP * 0x40",
-        "dt": "STEP_TIME * 0x12"
-      },
-      "data": [
-        "1X20;2B>va;2B>vb;B>dv;B>dt"
-      ]
-    },
-    "func_gen": [
-      "data_format",
-      "func_gen0",
-      "VIS_STI"
-    ],
-    "func_gen0": {
-      "type": "RIS",
-      "parameter": {
-        "v": "(DAC_VOLT + 1) * 0x0010"
-      },
-      "data": [
-        "X30;X30;2B>v"
-      ]
-    },
-    "adc_test": [
-      "data_format",
-      "_notify(True)",
-      "adc_test0",
-      "_sync(True)",
-      "VIS_STI"
-    ],
-    "adc_test0": {
-      "type": "RIS",
-      "data": [
-        "X90;B>ADC_CHANNEL"
-      ]
-    }
-  }
-}
-
-

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

@@ -1,124 +0,0 @@
-
-#ifndef EliteADC
-#define EliteADC
-
-#include "Elite_PIN.h"
-#include "EliteSPI.h"
-#include "EliteNotify.h"
-
-
-// Elite ADC macro
-// ADC command, Elite will use these cmd to control ADC
-#define CMD_CURRENT_MEASURE 0xC5
-#define CMD_VOLT_MEASURE    0xD5
-#define CMD_DAC_MEASURE     0xE5
-#define CMD_BATTERY_MEASURE 0xF5
-
-// controller command, these are command from control box
-#define ADC_CH_CURRENT      0x00
-#define ADC_CH_VOLT         0x01
-#define ADC_CH_DAC          0x02
-#define ADC_CH_BAT          0x03
-
-static void ADC_write(uint8_t ADCin) {
-   /*
-    *   This function can only define [15]~[8] through ADCin
-    *   [7]~[0] should always be 0b11101011
-    *
-    *   [15]        : SS, 0 = no effect, 1 = start work, default 0b0
-    *   [14]~[12]   : MUX[2:0], default 0b000
-    *   [11]~[9]    : PGA[2:0], default 0b010 = FSR is ±2.048
-    *   [8]         : mode, 0 = continuous, 1 = one shot, default 0b1 (Power-down and single-shot mode )
-    *
-    *   [7]~[5]     : data rate, default 0b100 = 128 SPS
-    *   [4]         : Temperature? default 0b0 = ADC mode
-    *   [3]         : Pullup enable, default 0b1 = Pullup resistor enabled
-    *   [2]~[1]     : NOP, default 0b01
-    *   [0]         : reserved, default 0b1
-    *
-    */
-
-//    spi_ADC_txbuf[0] = 0b00000101;
-    for(int i=0 ; i<SPI_ADC_SIZE ; i++){
-        spi_ADC_txbuf[i] = 0;
-        spi_ADC_rxbuf[i] = 0;
-    }
-
-    spi_ADC_txbuf[0] = ADCin;
-    spi_ADC_txbuf[1] = 0b11101011;
-
-
-    ADC_SPI(2, spi_ADC_txbuf, spi_ADC_rxbuf);
-}
-
-static void ADC_read(uint8_t *ADCdata){
-    for(int i=0 ; i<SPI_ADC_SIZE ; i++){
-        spi_ADC_txbuf[i] = 0;
-        spi_ADC_rxbuf[i] = 0;
-    }
-
-    ADC_SPI(SPI_ADC_SIZE, spi_ADC_txbuf, ADCdata);
-}
-
-static void ADCGainControl(uint8_t ADCLevel){
-    if(ADCLevel == 0){
-        // ADC gain level = 0, using 200R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon100R, 0);
-    }
-    else if(ADCLevel == 1){
-        // ADC gain level = 1, using 10K resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 1);
-        PIN_setOutputValue(pin_handle, Turnon100R, 0);
-    }
-    else if(ADCLevel == 2){
-        // ADC gain level = 2, using 100R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon100R, 1);
-    }
-    else{
-        // default using 200R resister
-        PIN_setOutputValue(pin_handle, Turnon10K, 0);
-        PIN_setOutputValue(pin_handle, Turnon100R, 0);
-    }
-}
-
-
-static void ADCChannelSelect(uint8_t ADCChannel){
-    // set ADC parameter
-    // 0xC1~F1 = reading AIN0~AIN3. Using FSR+-6V, resolution = 187.5uV
-    // 0xC5~F5 = reading AIN0~AIN3. Using FSR+-2V, resolution = 62.5 uV
-    switch(ADCChannel){
-        // AINp is AIN0; AINn is GND
-        // measure AIN0, which is a current measure
-        case ADC_CH_CURRENT :{
-            ADC_write(CMD_CURRENT_MEASURE);
-            break;
-        }
-
-        // AINp is AIN1; AINn is GND
-        // AIN1, which is a volt measure
-        case ADC_CH_VOLT :{
-            ADC_write(CMD_VOLT_MEASURE);
-            break;
-        }
-
-        // AINp is AIN2; AINn is GND
-        // AIN2, measure DAC voltage (Note that this is NOT DAC real output value!!)
-        case ADC_CH_DAC :{
-            ADC_write(CMD_DAC_MEASURE);
-            break;
-        }
-
-        // measure battery volt
-        case ADC_CH_BAT :{
-            ADC_write(CMD_BATTERY_MEASURE);
-            break;
-        }
-        default :{
-            break;
-        }
-    }
-}
-
-#endif

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

@@ -1,62 +0,0 @@
-
-#ifndef EliteDAC
-#define EliteDAC
-
-static bool DACreset = true;
-/* DAC reset parameter */
-#define DACzero 0x85B2
-#define DACposMax 0x0000
-#define DACnegMax 0xFFFF
-
-#ifdef ELITE_VERSION_1_3
-#define DACOUT 0x30
-
-static void DAC_outputV(uint16_t voltLV) {
-    // C = command, X = don't care, D = data
-    // CCCC XXXX = command
-    // DDDD DDDD = v1
-    // DDDD XXXX = v2
-
-    uint8_t v1, v2 = 0;
-    v1 = (uint8_t) (voltLV >> 4) & 0xFF;
-    v2 = (uint8_t) ((voltLV & 0x000F) << 4) & 0xF0;
-
-    spi_DACtxbuf[0] = command;
-    spi_DACtxbuf[1] = v1;
-    spi_DACtxbuf[2] = v2;
-    for (int i = 3; i < SPI_DAC_SIZE; i++) {
-        spi_DACtxbuf[i] = 0;
-    }
-
-    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
-}
-#endif
-
-#ifdef ELITE_VERSION_1_4
-#define DACCLS 0x02
-#define DACOUT 0x31
-
-static void DAC_outputV(uint16_t voltLV) {
-    // C = command, X = don't care, D = data
-    // CCCC CCCC = command
-    // DDDD DDDD = v1
-    // DDDD DDDD = v2
-
-    // command
-    // 0x02 = clear
-    // 0x31 = output voltage
-
-    uint8_t v1, v2 = 0;
-    v1 = (uint8_t) ((voltLV & 0xFF00) >> 8);
-    v2 = (uint8_t) (voltLV & 0x00FF);
-
-    spi_DACtxbuf[0] = DACOUT;
-    spi_DACtxbuf[1] = v1;
-    spi_DACtxbuf[2] = v2;
-
-    DAC_SPI(SPI_DAC_SIZE, spi_DACtxbuf, spi_rxbuf);
-}
-
-#endif
-
-#endif

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

@@ -1,292 +0,0 @@
-
-#ifndef EliteCorrection
-#define EliteCorrection
-
-#include "EliteDAC.h"
-#include "EliteADC.h"
-
-/* DAC reset parameter */
-#define DACzero 0x85A2
-#define DACposMax 0x0000
-#define DACnegMax 0xFFFF
-
-typedef struct _formula{
-
-    int32_t coeff = 0;
-    int32_t offset = 0;
-
-}Formula;
-
-typedef struct _correction{
-
-    Formula ADC_volt = 0;
-    Formula ADC_current[3] = 0;
-    uint32_t Gain0Boundary[2] = {0, 0};
-    uint32_t Gain1BoundARY[2] = {0, 0};
-
-}Correction_data;
-
-/*
-*   Correction Array include all the correction coeff and offset
-*
-*   Correction formula format is " RealValue = coeff * code + offset "
-*   RealValue can be RealCurrent, RealVolt, or RealResister ...
-*   code is the code we read from ADC buffer
-*
-*   ADC measure Voltage
-*   Correction[0] = ADC Volt coeff
-*   Correction[1] = ADC Volt offset  => RealVolt = Correction[0] * code + Correction[1]
-*
-*   ADC measure Current
-*   Correctino[2] = ADC gain_lv0 coeff
-*   Correction[3] = ADC gain_lv0 offset => RealCurrent = Correction[2] * code + Correction[3]
-*   Correctino[4] = ADC gain_lv1 coeff
-*   Correction[5] = ADC gain_lv1 offset => RealCurrent = Correction[4] * code + Correction[5]
-*   Correctino[6] = ADC gain_lv2 coeff
-*   Correction[7] = ADC gain_lv2 offset => RealCurrent = Correction[6] * code + Correction[7]
-*
-*   DAC output Voltage
-*   Correction[8] = DAC coeff
-*   Correction[9] = DAC offset  => RealVolt = Correction[8] * DACcode + Correction[9]
-*
-*/
-#define BORAD_Chao_I
-
-#ifdef BORAD_CLASS_LEADER
-static Correction_data Correction;
-
-Correction.ADC_volt.coeff = (-629);
-Correction.ADC_volt.offset = 15447740;
-
-Correction.ADC_current_200k.coeff = 3056;
-Correction.ADC_current_200k.offset = -74771591;
-
-Correction.ADC_current_10K.coeff = 65461;
-Correction.ADC_current_10K.offset = -1601786957;
-
-Correction.ADC_current_200R.coeff = 3369;
-Correction.ADC_current_200R.offset = -82598293;
-
-Correction.Gain0Boundary[0] = 0x5F75;
-Correction.Gain0Boundary[1] = 0x5FB2;
-
-Correction.Gain1Boundary[0] = 0x5999;
-Correction.Gain1Boundary[1] = 0x6589;
-#endif
-
-
-#ifdef BORAD_TRICERATOPS
-static Correction_data Correction;
-
-Correction.ADC_volt.coeff = (-626);
-Correction.ADC_volt.offset = 15065046;
-
-Correction.ADC_current_200k.coeff = 0;
-Correction.ADC_current_200k.offset = 0;
-
-Correction.ADC_current_10K.coeff = 0;
-Correction.ADC_current_10K.offset = 0;
-
-Correction.ADC_current_200R.coeff = 0;
-Correction.ADC_current_200R.offset = 0;
-
-Correction.Gain0Boundary[0] = 0;
-Correction.Gain0Boundary[1] = 0;
-
-Correction.Gain1Boundary[0] = 0;
-Correction.Gain1Boundary[1] = 0;
-#endif
-
-#ifdef BORAD_Chao_I
-static Correction_data Correction;
-
-Correction.ADC_volt.coeff = (-627);
-Correction.ADC_volt.offset = 15122868;
-
-Correction.ADC_current_200k.coeff = 3091;
-Correction.ADC_current_200k.offset = (-74147760);
-
-Correction.ADC_current_10K.coeff = 66127;
-Correction.ADC_current_10K.offset = (-1586449560);
-
-Correction.ADC_current_200R.coeff = 3118;
-Correction.ADC_current_200R.offset = (74817847);
-
-Correction.Gain0Boundary[0] = 0x5D96;
-Correction.Gain0Boundary[1] = 0x5DD9;
-
-Correction.Gain1Boundary[0] = 0x57CD;
-Correction.Gain1Boundary[1] = 0x639F;
-#endif
-
-#ifdef BOARD_TWENTY_ONE
-static Correction_data Correction;
-
-Correction.ADC_volt.coeff = (-625);
-Correction.ADC_volt.offset = 15221058;
-
-Correction.ADC_current[0].coeff = 3002;
-Correction.ADC_current[0].offset = -72955265;
-
-Correction.ADC_current[1].coeff = 65840;
-Correction.ADC_current[1].offset = -1600149874;
-
-Correction.ADC_current[2].coeff = 3090;
-Correction.ADC_current[2].offset = -75102578;
-
-Correction.Gain0Boundary[0] = 0x5ECD;
-Correction.Gain0Boundary[1] = 0x5F0D;
-
-Correction.Gain1Boundary[0] = 0x5900;
-Correction.Gain1Boundary[1] = 0x64DD;
-#endif
-
-
-// this function turn ADC measure value (0xXXXX) into real voltage
-// unit should be mV
-static int32_t DecodeADCVolt(uint16_t ADC_measure){
-    int32_t ADCRealVolt = 0;
-
-    ADCRealVolt = (Correction.ADC_volt.coeff * ADC_measure + Correction.ADC_volt.offset);
-    ADCRealVolt = ADCRealVolt / 1000;
-    return ADCRealVolt;
-}
-
-// this function turn ADC measure value (0xXXXX) into real current
-// unit should be pA
-/* Decode ADC current for twenty-one */
-static int32_t DecodeADCCurrent(uint8_t ADCGain, uint16_t ADC_measure){
-    int32_t ADCRealCurrent = 0;
-    int32_t coeff[3] = {0}, offset[3] = {0};
-
-    ADCRealCurrent = (Correction.ADC_current[ADCGain].coeff * ADC_measure + Correction.ADC_current[ADCGain].offset)/1000;
-    return ADCRealCurrent;
-}
-
-// Decode ADC measure value (could be a volt or current) and put it into notify buffer
-static int32_t DecodeADCValue(uint8_t ADCGain, uint8_t ADCChannel, uint8_t *ADC_raw){
-
-    uint16_t ADC_measure = (uint16_t) (ADC_raw[0] << 8) | (uint16_t) (ADC_raw[1]);
-    int32_t ADCRealVolt = 0, ret = 0;
-
-    // return real volt to controller
-    if(ADCChannel == ADC_CH_VOLT){
-        ADCRealVolt = DecodeADCVolt(ADC_measure);
-        NotifyVolt[0] = (uint8_t) (ADCRealVolt >> 24);
-        NotifyVolt[1] = (uint8_t) ((ADCRealVolt & 0x00FF0000) >> 16);
-        NotifyVolt[2] = (uint8_t) ((ADCRealVolt & 0x0000FF00) >> 8);
-        NotifyVolt[3] = (uint8_t) (ADCRealVolt & 0x000000FF);
-        ret = ADCRealVolt;
-    }
-
-    // return real current to controller
-    else if(ADCChannel == ADC_CH_CURRENT){
-        
-        if (INSTRUCTION.eliteFxn == IVCurve) {
-            ADCRealCurrent += DecodeADCCurrent(ADCGain, ADC_measure);
-
-            if ((SampleRate_counter % 10) == 0) {
-                ADCRealCurrent = ADCRealCurrent / 10;
-                
-                if (avg_number > 2) {       // to discard the first 20 current sample data
-                    ADCRealCurrent_avg = (ADCRealCurrent + ADCRealCurrent_avg*(avg_number - 3)) / (avg_number - 2);
-                }
-                avg_number ++;
-                ADCRealCurrent = 0;
-            }
-            if (StepTimeCounter == StepTime - 1) {
-                NotifyCurrent[0] = (uint8_t) (ADCRealCurrent_avg >> 24);
-                NotifyCurrent[1] = (uint8_t) ((ADCRealCurrent_avg & 0x00FF0000) >> 16);
-                NotifyCurrent[2] = (uint8_t) ((ADCRealCurrent_avg & 0x0000FF00) >> 8);
-                NotifyCurrent[3] = (uint8_t) (ADCRealCurrent_avg & 0x000000FF);
-                avg_number = 1;
-                ADCRealCurrent_avg = 0;
-            }
-        }
-        else {
-            ADCRealCurrent = DecodeADCCurrent(ADCGain, ADC_measure);
-            NotifyCurrent[0] = (uint8_t) (ADCRealCurrent >> 24);
-            NotifyCurrent[1] = (uint8_t) ((ADCRealCurrent & 0x00FF0000) >> 16);
-            NotifyCurrent[2] = (uint8_t) ((ADCRealCurrent & 0x0000FF00) >> 8);
-            NotifyCurrent[3] = (uint8_t) (ADCRealCurrent & 0x000000FF);
-            ret = ADCRealCurrent;
-        }
-        
-    }
-
-    else{
-        // not support AIN2 / AIN3 yet
-    }
-    return ret;
-}
-
-// #0 board, (0x5f75 <= rawdata) && (rawdata <= 0x5fb2)
-//           ((0x5f97 < rawdata) && (rawdata < 0x6589)) || ((0x5999 < rawdata) && (rawdata < 0x5f93))
-
-static void ADC_overflow(uint8_t gain, uint8_t *rawdata){
-
-    // Gain boundary defines different ADC gain level working area
-    // Gain0Boundary = {lowerbound, upperbound}, is the lower and upper bound of gain level 0 working area.
-
-    uint16_t U16Rawdata = 0;
-    U16Rawdata = (((uint16_t) (rawdata[0]))<<8) | ((uint16_t) (rawdata[1]));
-
-    if(gain == GAIN_200K){
-        if( U16Rawdata <= Correction.Gain0Boundary[0]){
-            rawdata[0] = Correction.Gain0Boundary[0] >> 4;
-            rawdata[1] = (uint8_t) (Correction.Gain0Boundary[0] & 0x00FF);
-        }
-        else if(U16Rawdata >= Correction.Gain0Boundary[1]){
-            rawdata[0] = (uint8_t) (Correction.Gain0Boundary[1] >> 4);
-            rawdata[1] = (uint8_t) (Correction.Gain0Boundary[1] & 0x00FF);
-        }
-    }
-    else if(gain == GAIN_10K){
-        if( U16Rawdata <= Correction.Gain1Boundary[0]){
-            rawdata[0] = Correction.Gain1Boundary[0] >> 4;
-            rawdata[1] = (uint8_t) (Correction.Gain1Boundary[0] & 0x00FF);
-        }
-        else if(U16Rawdata >= Correction.Gain1Boundary[1]){
-            rawdata[0] = (uint8_t) (Correction.Gain1Boundary[1] >> 4);
-            rawdata[1] = (uint8_t) (Correction.Gain1Boundary[1] & 0x00FF);
-        }
-    }
-}
-
-// User will enter -5V~+5V in UI.
-// websever and controler use 0~50000 represent -5~+5V
-// this function should turn 0~50000 into DACcode which output the exactly voltage user want
-
-static uint16_t Usercode_Correction_to_DAC(uint16_t usercode)
-{
-    // DACcode to real_voltage correction function
-    //DACcode = -1.0548523(usercode) + 60597.718
-    int32_t usercode_32;
-    uint16_t DACcode = 0;
-    int32_t coeff = (-1054), offset = 60597718;
-
-    usercode_32 = (int32_t)(usercode);
-
-    DACcode = (uint16_t) ((coeff * usercode_32 + offset)/1000);
-
-    return DACcode;
-}
-
-static int32_t DAC_to_realV(uint16_t DACcode)
-{
-    //volt = (DAC -6.4893275)/(-0.0001896)
-
-    int32_t RealV = 0;
-    int32_t volt_32 = 0;
-    int32_t coeff = (-1896), offset = 64893275;//*10e7
-
-    volt_32 = DACcode;
-//    RealV = (volt_32 - offset) / coeff;
-    RealV = (-1896) * volt_32 + offset;
-    RealV = RealV / 10e3; //(mV)
-
-    return RealV;
-}
-
-
-#endif

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

@@ -1,95 +0,0 @@
-
-#ifndef ELITE_I2C
-#define ELITE_I2C
-
-/*
-* Read I2C example in
-* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
-*        exports/tirtos_full_2_14_02_22/docs/doxygen/html/_i2_c_c_c26_x_x_8h.html
-*
-*/
-
-#include <ti/drivers/I2C.h>
-#include <ti/drivers/Power.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-// I2C
-static I2C_Handle I2Chandle;
-static I2C_Params I2Cparams;
-static I2C_Transaction i2cTrans;
-
-#define I2CBufSize 4
-static uint8_t I2CtxBuf[I2CBufSize];      // Transmit buffer
-static uint8_t I2CrxBuf[I2CBufSize];      // Receive buffer
-bool transferDone = false;
-
-static void I2CCallbackFunction(I2C_Handle handle, I2C_Transaction *msg, bool transfer) {
-    if(transfer){
-        transferDone = true;
-    }
-}
-
-static void I2Cinit(){
-    I2C_init();
-
-    // Configure I2C parameters.
-    I2C_Params_init(&I2Cparams);
-
-    I2Cparams.transferMode  = I2C_MODE_CALLBACK;
-    I2Cparams.transferCallbackFxn = I2CCallbackFunction;
-    I2Cparams.bitRate  = I2C_100kHz;
-
-    // Initialize master I2C transaction structure
-    i2cTrans.writeCount   = I2CBufSize;
-    i2cTrans.writeBuf     = I2CtxBuf;
-    i2cTrans.readCount    = I2CBufSize;
-    i2cTrans.readBuf      = I2CrxBuf;
-    i2cTrans.slaveAddress = 0xA0;
-
-    for(int i=0 ; i<10 ; i++){
-        I2CtxBuf[i] = 0;
-        I2CrxBuf[i] = 0;
-    }
-
-    // Open I2C
-    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
-
-}
-#define WriteMem 0b10100001
-#define ReadMem  0b10100000
-
-static void I2CWrite(uint8_t addr, uint8_t data){
-    for(int i=0 ; i<I2CBufSize ; i++){
-        I2CtxBuf[i] = 0;
-        I2CrxBuf[i] = 0;
-    }
-
-    I2CtxBuf[0] = WriteMem;
-    I2CtxBuf[1] = addr;
-    I2CtxBuf[2] = data;
-
-//    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
-    I2C_transfer(I2Chandle, &i2cTrans);
-//    I2C_close(I2Chandle);
-}
-
-
-static void I2CRead(uint8_t addr){
-    for(int i=0 ; i<I2CBufSize ; i++){
-        I2CtxBuf[i] = 0;
-        I2CrxBuf[i] = 0;
-    }
-
-    I2CtxBuf[0] = ReadMem;
-    I2CtxBuf[1] = addr;
-
-//    I2Chandle = I2C_open(Board_I2C, &I2Cparams);
-    I2C_transfer(I2Chandle, &i2cTrans);
-//    I2C_close(I2Chandle);
-}
-
-
-#endif  // ELITE_I2C
-

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

@@ -1,60 +0,0 @@
-
-#ifndef ELITENOTIFY
-#define ELITENOTIFY
-
-#include "headstage.h"
-
-/**
- * notify data buffer.
- * the length equals to the characteristic 4 which value is 20 bytes.
- *
- */
-
-
-#define NOT_BUF_OFFSET_INIT 8
-
-/**
- * the index where to start insert data into buffer.
- * start from 6.
- */
-static size_t not_buf_offset = NOT_BUF_OFFSET_INIT;
-
-static uint32_t not_time_stamp;
-
-static uint8_t NotifyCurrent[4] = {0};
-static uint8_t NotifyVolt[4] = {0};
-static uint8_t NotifyImpedance[4] = {0};
-
-/**
- * counter of notify send.
- */
-static uint32_t notify_counter = 0;
-
-
-/*
- * Notify format
- *
- *
-         |               |   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
-         -----------------------------------------------------------------
-         |    header     |
-         |    current                                                    |
-         |    voltage                                                    |
-         |    impedance                                                  |
-         |    time stamp                                                 |
-         |  cycle number |
-
-     cycle number
-         for cyclic voltammetry use, we save it as channel number.
-         0xFF
-
-  * header = device ID
-  * I = current (0.001nA), V = voltage (mV),
-  * Z = impedance (k ohm), T = time (ms)
-  *
-  *
-*/
-
-
-#endif

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

@@ -1,88 +0,0 @@
-
-#ifndef ELITE_SPI
-#define ELITE_SPI
-
-/*
-* Read SPI example in
-* http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/tirtos/2_14_02_22/
-*        exports/tirtos_full_2_14_02_22/docs/doxygen/html/_s_p_i_c_c26_x_x_d_m_a_8h.html
-*/
-
-#include <Board.h>
-#include <ti/drivers/SPI.h>
-#include <ti/drivers/dma/UDMACC26XX.h>
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-#include "Elite_PIN.h"
-
-/* application use SPI parameters and buffers */
-#define SPI_LED_SIZE 28
-#define SPI_DAC_SIZE 3
-#define SPI_ADC_SIZE 4
-
-static uint16_t spi_LEDtxbuf[SPI_LED_SIZE] = {0};
-static uint16_t spi_LEDrxbuf[SPI_LED_SIZE] = {0};
-
-static uint8_t spi_DACtxbuf[SPI_DAC_SIZE] = {0};
-static uint8_t spi_rxbuf[SPI_DAC_SIZE]    = {0};
-
-static uint8_t spi_ADC_txbuf[SPI_ADC_SIZE] = {0};
-static uint8_t spi_ADC_rxbuf[SPI_ADC_SIZE] = {0};
-
-/* system use SPI parameters */
-static SPI_Handle      spiHandle0 = NULL;  // SPI0  = LED
-static SPI_Handle      spiHandle1 = NULL;  // SPI1  = ADC +DAC
-static SPI_Params      spiParams0;
-static SPI_Params      spiParams1;
-static SPI_Transaction LED_transaction;
-static SPI_Transaction ADC_DAC_transaction;
-
-
-static void Elite_SPI_init(){
-    SPI_init();
-    SPI_Params_init(&spiParams0);
-    spiParams0.bitRate     = 2000;  // 12k
-    spiParams0.mode        = SPI_MASTER;
-    spiParams0.dataSize    = 16;
-    spiParams0.frameFormat = SPI_POL0_PHA1;
-    spiHandle0 = SPI_open(Board_SPI0, &spiParams0);  // LED SPI
-
-    SPI_Params_init(&spiParams1);
-    spiParams1.bitRate     = 1000000;  // 1M
-    spiParams1.mode        = SPI_MASTER;
-    spiParams1.dataSize    = 8;
-    spiParams1.frameFormat = SPI_POL0_PHA1;
-    spiHandle1 = SPI_open(Board_SPI1, &spiParams1);  // ADC DAC SPI
-}
-
-static void LED_SPI(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
-    LED_transaction.count = length;
-    LED_transaction.txBuf = spi_txbuf;
-    LED_transaction.rxBuf = spi_rxbuf;
-
-    SPI_transfer(spiHandle0, &LED_transaction);
-}
-
-static void ADC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-    ADC_DAC_transaction.count = length;
-    ADC_DAC_transaction.txBuf = spi_txbuf;
-    ADC_DAC_transaction.rxBuf = spi_rxbuf;
-
-    PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
-    PIN_setOutputValue(pin_handle, ADC_CS, 0);  // ADC_CS LOW
-    SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-    PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-
-}
-
-static void DAC_SPI(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf) {
-   ADC_DAC_transaction.count = length;
-   ADC_DAC_transaction.txBuf = spi_txbuf;
-   ADC_DAC_transaction.rxBuf = spi_rxbuf;
-
-   PIN_setOutputValue(pin_handle, ADC_CS, 1);  // ADC_CS HIGH
-   PIN_setOutputValue(pin_handle, DAC_CS, 0);  // DAC_CS LOW
-   SPI_transfer(spiHandle1, &ADC_DAC_transaction);
-   PIN_setOutputValue(pin_handle, DAC_CS, 1);  // DAC_CS HIGH
-}
-
-#endif // ELITE_SPI

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

@@ -1,190 +0,0 @@
-
-#ifndef Elite_PIN
-#define Elite_PIN
-
-#include <ti/drivers/pin/PINCC26XX.h>
-#include <Board.h>
-#include <ti/drivers/PIN.h>
-
-/* SPI Board */
-#define Board_SPI0_MISO                 PIN_UNASSIGNED
-#define Board_SPI0_MOSI                 IOID_1
-#define Board_SPI0_CLK                  IOID_0
-#define Board_SPI0_CS                   PIN_UNASSIGNED
-
-#define Board_SPI1_MISO                 IOID_3
-#define Board_SPI1_MOSI                 IOID_2
-#define Board_SPI1_CLK                  IOID_4
-#define Board_SPI1_CS                   PIN_UNASSIGNED
-
-#define ADC_CS                          IOID_8
-#define DAC_CS                          IOID_9
-
-#define Turnon100R                      IOID_5
-#define Turnon10K                       IOID_6
-
-/* I2C */
-#ifdef ELITE_VERSION_1_4
-#define Board_I2C0_SCL0                 IOID_7
-#define Board_I2C0_SDA0                 IOID_1
-#endif
-
-#define shutdown_6994                   IOID_10
-#define switch_on                       IOID_11
-#define enable_10v                      IOID_12
-#define enable_5v                       IOID_13
-
-PIN_Handle       pin_handle;
-static PIN_State ZM_rst;
-
-const PIN_Config BLE_IO[] = {
-    //
-    ADC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // ADC_CS
-    DAC_CS | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // DAC_CS
-
-    enable_10v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,     // 10V_enable
-    enable_5v | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,      // 5V_enable
-    shutdown_6994 | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,  // turn off power
-    Turnon100R | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    Turnon10K | PIN_GPIO_OUTPUT_EN | PIN_GPIO_LOW | PIN_PUSHPULL | PIN_DRVSTR_MAX,
-    switch_on | PIN_INPUT_EN | PIN_PULLDOWN,
-
-    PIN_TERMINATE
-};
-
-/*!
- *  @def    BOOSTXL_CC2650MA_SPIName
- *  @brief  Enum of SPI names on the CC2650 Booster Pack
- */
-typedef enum BOOSTXL_CC2650MA_SPIName {
-    BOOSTXL_CC2650MA_SPI0 = 0,
-    BOOSTXL_CC2650MA_SPI1 = 1,
-
-    BOOSTXL_CC2650MA_SPICOUNT
-} BOOSTXL_CC2650MA_SPIName;
-
-/*
- *  ========================== SPI DMA begin ===================================
- */
-/* Place into subsections to allow the TI linker to remove items properly */
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(SPI_config, ".const:SPI_config")
-#pragma DATA_SECTION(spiCC26XXDMAHWAttrs, ".const:spiCC26XXDMAHWAttrs")
-#endif
-
-/* Include drivers */
-#include <ti/drivers/spi/SPICC26XXDMA.h>
-
-/* SPI objects */
-SPICC26XXDMA_Object spiCC26XXDMAObjects[BOOSTXL_CC2650MA_SPICOUNT];
-
-/* SPI configuration structure, describing which pins are to be used */
-const SPICC26XXDMA_HWAttrsV1 spiCC26XXDMAHWAttrs[BOOSTXL_CC2650MA_SPICOUNT] = {
-    {
-        .baseAddr           = SSI0_BASE,
-        .intNum             = INT_SSI0_COMB,
-        .intPriority        = ~0,
-        .swiPriority        = 0,
-        .powerMngrId        = PowerCC26XX_PERIPH_SSI0,
-        .defaultTxBufValue  = 0,
-        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI0_RX,
-        .txChannelBitMask   = 1<<UDMA_CHAN_SSI0_TX,
-        .mosiPin            = Board_SPI0_MOSI,
-        .misoPin            = Board_SPI0_MISO,
-        .clkPin             = Board_SPI0_CLK,
-        .csnPin             = Board_SPI0_CS
-    },
-    {
-        .baseAddr           = SSI1_BASE,
-        .intNum             = INT_SSI1_COMB,
-        .intPriority        = ~0,
-        .swiPriority        = 0,
-        .powerMngrId        = PowerCC26XX_PERIPH_SSI1,
-        .defaultTxBufValue  = 0,
-        .rxChannelBitMask   = 1<<UDMA_CHAN_SSI1_RX,
-        .txChannelBitMask   = 1<<UDMA_CHAN_SSI1_TX,
-        .mosiPin            = Board_SPI1_MOSI,
-        .misoPin            = Board_SPI1_MISO,
-        .clkPin             = Board_SPI1_CLK,
-        .csnPin             = Board_SPI1_CS
-    },
-};
-
-/* SPI configuration structure */
-const SPI_Config SPI_config[] = {
-    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[0],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[0]
-    },
-    {
-         .fxnTablePtr = &SPICC26XXDMA_fxnTable,
-         .object      = &spiCC26XXDMAObjects[1],
-         .hwAttrs     = &spiCC26XXDMAHWAttrs[1]
-    },
-    {NULL, NULL, NULL}
-};
-/*
- *  ========================== SPI DMA end =====================================
-*/
-
-
-/*
- *  ============================= I2C Begin=====================================
-*/
-
-#ifdef ELITE_VERSION_1_4
-
-/* Generic I2C instance identifiers */
-#define Board_I2C                   CC2650_MA_I2C0
-/*!
- *  @def    CC2650_LAUNCHXL_I2CName
- *  @brief  Enum of I2C names on the CC2650 dev board
- */
-typedef enum CC2650_MA_I2CName {
-    CC2650_MA_I2C0 = 0,
-
-    CC2650_MA_I2CCOUNT
-} CC2650_MA_I2CName;
-
-/* Place into subsections to allow the TI linker to remove items properly */
-#if defined(__TI_COMPILER_VERSION__)
-#pragma DATA_SECTION(I2C_config, ".const:I2C_config")
-#pragma DATA_SECTION(i2cCC26xxHWAttrs, ".const:i2cCC26xxHWAttrs")
-#endif
-
-/* Include drivers */
-#include <ti/drivers/i2c/I2CCC26XX.h>
-
-/* I2C objects */
-I2CCC26XX_Object i2cCC26xxObjects[CC2650_MA_I2CCOUNT];
-
-/* I2C configuration structure, describing which pins are to be used */
-const I2CCC26XX_HWAttrsV1 i2cCC26xxHWAttrs[CC2650_MA_I2CCOUNT] = {
-    {
-        .baseAddr = I2C0_BASE,
-        .powerMngrId = PowerCC26XX_PERIPH_I2C0,
-        .intNum = INT_I2C_IRQ,
-        .intPriority = ~0,
-        .swiPriority = 0,
-        .sdaPin = Board_I2C0_SDA0,
-        .sclPin = Board_I2C0_SCL0,
-    }
-};
-
-/* I2C configuration structure */
-const I2C_Config I2C_config[] = {
-    {
-        .fxnTablePtr = &I2CCC26XX_fxnTable,
-        .object = &i2cCC26xxObjects[0],
-        .hwAttrs = &i2cCC26xxHWAttrs[0]
-    },
-    {NULL, NULL, NULL}
-};
-/*
- *  ========================== I2C end =========================================
- */
-#endif
-
-#endif
-