change FIX2ETX -> NEIGHBOR_INFO_FIX2ETX in some debug prints.

This commit is contained in:
Mariano Alvira 2011-02-17 20:54:57 -05:00
parent 2e331b51e8
commit bb1baffc79
2 changed files with 4 additions and 2 deletions

View File

@ -72,7 +72,9 @@ update_etx(const rimeaddr_t *dest, int packet_etx)
new_etx = ((uint16_t)recorded_etx * ETX_ALPHA +
(uint16_t)packet_etx * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE;
PRINTF("neighbor-info: ETX changed from %d to %d (packet ETX = %d) %d\n",
FIX2ETX(recorded_etx), FIX2ETX(new_etx), FIX2ETX(packet_etx),
NEIGHBOR_INFO_FIX2ETX(recorded_etx),
NEIGHBOR_INFO_FIX2ETX(new_etx),
NEIGHBOR_INFO_FIX2ETX(packet_etx),
dest->u8[7]);
if(neighbor_attr_has_neighbor(dest)) {

View File

@ -130,7 +130,7 @@ rpl_link_neighbor_callback(const rimeaddr_t *addr, int known, int etx)
uip_ds6_set_addr_iid(&ipaddr, (uip_lladdr_t *)addr);
PRINTF("RPL: Neighbor ");
PRINT6ADDR(&ipaddr);
PRINTF(" is %sknown. ETX = %u\n", known ? "" : "no longer ", FIX2ETX(etx));
PRINTF(" is %sknown. ETX = %u\n", known ? "" : "no longer ", NEIGHBOR_INFO_FIX2ETX(etx));
dag = rpl_get_dag(RPL_DEFAULT_INSTANCE);
if(dag == NULL) {