[参考译文] CC1310：TI15.4：在传感器断开连接和收集器复位后复制了短地址

您好、Shayolin、  

正如您所指出的，devShortAddr 的管理方式发生了变化。 需要进行3次更改、所有更改都位于 cllc.c 中、如下所示：

1.更换

uint16_t Cllc_devShortAddr = 0x0001;

使用

uint16_t Cllc_devShortAddr = CLLC_ASSOC_DEVICE_STARTING_NUMBER;

2.在 Cllc_restoreNetwork 中的 maintainAssetTable 调用之后，需要添加两个 if 块。  我在此处添加了整个 cllc_restoreNetwork：

/*!
 Restore network

 Public function defined in cllc.h
 */
void Cllc_restoreNetwork(Llc_netInfo_t *pNetworkInfo, uint8_t numDevices,
		Llc_deviceListItem_t *pDevList)
{
    uint8_t i = 0;

    /* set state */
    updateState(Cllc_states_initRestoringCoordinator);

    coordInfoBlock.panID = pNetworkInfo->devInfo.panID;

    /* Populate network info according to type of network */
    if(pNetworkInfo->fh == true)
    {
        ApiMac_mlmeSetReqArray(ApiMac_attribute_extendedAddress,
    			(uint8_t*)(pNetworkInfo->devInfo.extAddress));
    }
    else
    {
        coordInfoBlock.channel = pNetworkInfo->channel;
    }

    ApiMac_mlmeSetReqUint16(ApiMac_attribute_shortAddress,
                             pNetworkInfo->devInfo.shortAddress);

    sendStartReq(pNetworkInfo->fh);

    if (pDevList)
    {
        /* repopulate association table */
        for(i = 0; i < numDevices; i++, pDevList++)
        {
            /* Add to association table */
            maintainAssocTable(&pDevList->devInfo, &pDevList->capInfo, 1, 0,
                               (false));
            /* Get the address for assigning to new devices */
            if( pDevList->devInfo.shortAddress >= Cllc_devShortAddr)
            {
                Cllc_devShortAddr = pDevList->devInfo.shortAddress + 1;
            }
        }
    }
    else
    {
        Llc_deviceListItem_t item;
        /* repopulate association table */
        for(i = 0; i < numDevices; i++)
        {
            Csf_getDeviceItem(i, &item);
#ifdef FEATURE_MAC_SECURITY
            /* Add device to security device table */
            Cllc_addSecDevice(item.devInfo.panID,
                              item.devInfo.shortAddress,
                              &item.devInfo.extAddress,
                              item.rxFrameCounter);
#endif /* FEATURE_MAC_SECURITY */
            /* Add to association table */
            maintainAssocTable(&item.devInfo, &item.capInfo, 1, 0,
                               (false));
            /* Get the address for assigning to new devices */
            if( item.devInfo.shortAddress >= Cllc_devShortAddr)
            {
                Cllc_devShortAddr = item.devInfo.shortAddress + 1;
            }
#ifdef FEATURE_SECURE_COMMISSIONING
            {
                /* Mark the devices that need to be re-commissioned */
                Cllc_associated_devices_t *pExistingDevice;
                pExistingDevice = findDevice(item.devInfo.shortAddress);
                if((pExistingDevice != NULL)&&(!CONFIG_FH_ENABLE))
                {
                    pExistingDevice->reCM_status = SM_CM_REQUIRED;
                    /* Do not update key refresh info here. It should be done when CM is done */
                }
            }
#endif

        }
    }
}

3.在 assocIndCb 中，在"新建设备，创建短地址"之后有一个更改。

更换

        /* New device, make a new short address */
        assocRsp.status = ApiMac_assocStatus_panAccessDenied;
        devInfo.shortAddress = Cllc_numOfDevices + CLLC_ASSOC_DEVICE_STARTING_NUMBER;

使用  

        /* New device, make a new short address */
        assocRsp.status = ApiMac_assocStatus_panAccessDenied;
        devInfo.shortAddress = Cllc_devShortAddr;
        Cllc_devShortAddr++;

我测试了这些更改、似乎已经解决了这个问题。  

请测试修复。  

此致、

SID