riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnrc_gomach: enabling duty-cycle printing

Browse Source
This commit is contained in:
shuguo 2018-04-12 13:26:30 +08:00 committed by Martine Lenders
parent ed4a80db00
commit 4e7ff0df28
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/include/net/gnrc/mac/types.h
View File

@ -40,6 +40,13 @@
extern "C" { extern "C" {
#endif #endif
/**
* @brief MAC message type for getting radio's duty-cycle.
*/
#ifndef GNRC_MAC_TYPE_GET_DUTYCYCLE
#define GNRC_MAC_TYPE_GET_DUTYCYCLE (0x4401)
#endif
/** /**
* @brief definition for device transmission feedback types * @brief definition for device transmission feedback types
*/ */

29
sys/net/gnrc/link_layer/gomach/gomach.c
View File

@ -949,15 +949,6 @@ static void gomach_t2k_end(gnrc_netif_t *netif)
netif->mac.rx.listen_state = GNRC_GOMACH_LISTEN_SLEEP; netif->mac.rx.listen_state = GNRC_GOMACH_LISTEN_SLEEP;
gnrc_gomach_set_enter_new_cycle(netif, false); gnrc_gomach_set_enter_new_cycle(netif, false);
gnrc_gomach_set_update(netif, true); gnrc_gomach_set_update(netif, true);
#if (GNRC_GOMACH_ENABLE_DUTYCYLE_RECORD == 1)
/* Output duty-cycle ratio */
uint64_t duty;
duty = xtimer_now_usec64();
duty = (netif->mac.prot.gomach.awake_duration_sum_ticks) * 100 /
(duty - netif->mac.prot.gomach.system_start_time_ticks);
printf("[GoMacH]: achieved radio duty-cycle: %lu %% \n", (uint32_t)duty);
#endif
} }
static void gomach_t2k_update(gnrc_netif_t *netif) static void gomach_t2k_update(gnrc_netif_t *netif)
@ -1406,15 +1397,6 @@ static void gomach_t2u_end(gnrc_netif_t *netif)
netif->mac.rx.listen_state = GNRC_GOMACH_LISTEN_SLEEP; netif->mac.rx.listen_state = GNRC_GOMACH_LISTEN_SLEEP;
gnrc_gomach_set_enter_new_cycle(netif, false); gnrc_gomach_set_enter_new_cycle(netif, false);
gnrc_gomach_set_update(netif, true); gnrc_gomach_set_update(netif, true);
#if (GNRC_GOMACH_ENABLE_DUTYCYLE_RECORD == 1)
/* Output duty-cycle ratio */
uint64_t duty;
duty = xtimer_now_usec64();
duty = (netif->mac.prot.gomach.awake_duration_sum_ticks) * 100 /
(duty - netif->mac.prot.gomach.system_start_time_ticks);
printf("[GoMacH]: achieved radio duty-cycle: %lu %% \n", (uint32_t)duty);
#endif
} }
static void gomach_t2u_update(gnrc_netif_t *netif) static void gomach_t2u_update(gnrc_netif_t *netif)
@ -2004,6 +1986,17 @@ static void _gomach_msg_handler(gnrc_netif_t *netif, msg_t *msg)
gnrc_gomach_set_update(netif, true); gnrc_gomach_set_update(netif, true);
break; break;
} }
#if (GNRC_MAC_ENABLE_DUTYCYCLE_RECORD == 1)
case GNRC_MAC_TYPE_GET_DUTYCYCLE: {
/* Output GoMacH's current radio duty-cycle. */
uint64_t duty;
duty = xtimer_now_usec64();
duty = (netif->mac.prot.gomach.awake_duration_sum_ticks) * 100 /
(duty - netif->mac.prot.gomach.system_start_time_ticks);
printf("[GoMacH]: achieved radio duty-cycle: %lu %% \n", (uint32_t)duty);
break;
}
#endif
default: { default: {
DEBUG("[GoMacH]: Unknown command %" PRIu16 "\n", msg->type); DEBUG("[GoMacH]: Unknown command %" PRIu16 "\n", msg->type);
break; break;