Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ccnl: remove energy mesurement code #511

Merged
merged 1 commit into from
Jan 15, 2014
Merged

ccnl: remove energy mesurement code #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/ccn-lite-client/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ USEMODULE += posix
USEMODULE += ps
USEMODULE += auto_init
USEMODULE += hwtimer
USEMODULE += ltc4150

USEMODULE += transceiver
ifeq ($(BOARD),msba2)
Expand Down
20 changes: 0 additions & 20 deletions examples/ccn-lite-client/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!");
Expand Down Expand Up @@ -294,30 +291,13 @@ 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 },
{ "interest", "express an interest", riot_ccn_express_interest },
{ "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
Expand Down