From 3f246803afb0e6dc2c68d323cfdda56131dbc699 Mon Sep 17 00:00:00 2001 From: Christian Mehlis Date: Wed, 15 Jan 2014 18:55:49 +0100 Subject: [PATCH] ccnl: remove energy mesurement code This code causes some troubles with the heavy usage of hwtimer and foating point operations. Ref: https://github.com/RIOT-OS/RIOT/issues/495 --- examples/ccn-lite-client/Makefile | 1 - examples/ccn-lite-client/main.c | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/examples/ccn-lite-client/Makefile b/examples/ccn-lite-client/Makefile index 987d06bcbe..4d981d5359 100644 --- a/examples/ccn-lite-client/Makefile +++ b/examples/ccn-lite-client/Makefile @@ -41,7 +41,6 @@ USEMODULE += posix USEMODULE += ps USEMODULE += auto_init USEMODULE += hwtimer -USEMODULE += ltc4150 USEMODULE += transceiver ifeq ($(BOARD),msba2) diff --git a/examples/ccn-lite-client/main.c b/examples/ccn-lite-client/main.c index baa406ee77..93ba6acdce 100644 --- a/examples/ccn-lite-client/main.c +++ b/examples/ccn-lite-client/main.c @@ -92,10 +92,7 @@ static void riot_ccn_express_interest(char *str) DEBUG("in='%s'\n", small_buf); - ltc4150_start(); int content_len = ccnl_riot_client_get(relay_pid, small_buf, (char *) big_buf); // small_buf=name to request - ltc4150_stop(); - printf("mAh=%f\n", ltc4150_get_total_mAh()); if (content_len == 0) { puts("riot_get returned 0 bytes...aborting!"); @@ -294,21 +291,6 @@ static void riot_ccn_stat(char *str) msg_send(&m, relay_pid, 1); } -static void riot_ccn_columb(char *str) -{ - (void) str; /* unused */ - - ltc4150_start(); -} - -static void riot_ccn_columb_stop(char *str) -{ - (void) str; /* unused */ - - ltc4150_stop(); - printf("mAh=%lf\n", ltc4150_get_total_mAh()); -} - static const shell_command_t sc[] = { { "ccn", "starts ccn relay", riot_ccn_relay_start }, { "haltccn", "stops ccn relay", riot_ccn_relay_stop }, @@ -316,8 +298,6 @@ static const shell_command_t sc[] = { { "populate", "populate the cache of the relay with data", riot_ccn_populate }, { "prefix", "registers a prefix to a face", riot_ccn_register_prefix }, { "stat", "prints out forwarding statistics", riot_ccn_stat }, - { "columb", "starts the columb counter", riot_ccn_columb }, - { "columbstop", "stops the columb counter", riot_ccn_columb_stop }, #if RIOT_CCN_APPSERVER { "appserver", "starts an application server to reply to interests", riot_ccn_appserver }, #endif