CC2538: End device announce, RSSI capture

Hi,

I read this thread:

CC2530: Zigbee Broadcast msg for RSSI Location (AF_SKIP_ROUTING)

e2e.ti.com/.../cc2530-zigbee-broadcast-msg-for-rssi-location-af_skip_routing

I understand the problem. The end device is always routing via its parent and hence a broadcast is actually a relayed broadcast. However, mention was made of ZDP_DeviceAnnce. In fact, this works, I tested with 1 coordinator and 2 routers, an end device announce is received by both routers. So my question is, how do you extract the LQI & RSSI of this announce ? It seems that the structures for zdoIncoming message doesn't have these, but afIncomingMSGPacket_t does ?   I am using ZStack 3.0.2 and GenericApp to test. Are these values captured by the stack in this instance ? If they are, how do you extract them ?

typedef struct
{
  osal_event_hdr_t hdr;
  zAddrType_t      srcAddr;
  uint8            wasBroadcast;
  cId_t            clusterID;
  uint8            SecurityUse;
  uint8            TransSeq;
  uint8            asduLen;
  uint16           macDestAddr;
  uint8            *asdu;
  uint16           macSrcAddr;
} zdoIncomingMsg_t;



typedef struct
{
  osal_event_hdr_t hdr;     /* OSAL Message header */
  uint16 groupId;           /* Message's group ID - 0 if not set */
  uint16 clusterId;         /* Message's cluster ID */
  afAddrType_t srcAddr;     /* Source Address, if endpoint is STUBAPS_INTER_PAN_EP,
                               it's an InterPAN message */
  uint16 macDestAddr;       /* MAC header destination short address */
  uint8 endPoint;           /* destination endpoint */
  uint8 wasBroadcast;       /* TRUE if network destination was a broadcast address */
  uint8 LinkQuality;        /* The link quality of the received data frame */
  uint8 correlation;        /* The raw correlation value of the received data frame */
  int8  rssi;               /* The received RF power in units dBm */
  uint8 SecurityUse;        /* deprecated */
  uint32 timestamp;         /* receipt timestamp from MAC */
  uint8 nwkSeqNum;          /* network header frame sequence number */
  afMSGCommandFormat_t cmd; /* Application Data */
  uint16 macSrcAddr;        /* MAC header source short address */
  uint8 radius;
} afIncomingMSGPacket_t;

Regards,
Ian