giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the logging module (CC2538DK)

Browse Source
This commit is contained in:
George Oikonomou 2017-10-18 00:19:07 +01:00 committed by George Oikonomou
parent 463230d739
commit 91afb507b4
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/platform/cc2538dk/contiki-conf.h
View File

@ -125,8 +125,8 @@ typedef uint32_t rtimer_clock_t;
* @{
*/
#ifndef PLATFORM_CONF_STARTUP_VERBOSE
#define PLATFORM_CONF_STARTUP_VERBOSE 1 /**< Set to 0 to decrease startup verbosity */
#ifndef LOG_CONF_LEVEL_MAIN
#define LOG_CONF_LEVEL_MAIN LOG_LEVEL_NONE /**< Set to 0 to decrease startup verbosity */
#endif
/** @} */
/*---------------------------------------------------------------------------*/
@ -221,8 +221,8 @@ typedef uint32_t rtimer_clock_t;
#undef UART_CONF_ENABLE
#define UART_CONF_ENABLE 0
#undef PLATFORM_CONF_STARTUP_VERBOSE
#define PLATFORM_CONF_STARTUP_VERBOSE 0
#undef LOG_CONF_LEVEL_MAIN
#define LOG_CONF_LEVEL_MAIN LOG_LEVEL_NONE
#endif /* CC2538_CONF_QUIET */
/**

30
arch/platform/cc2538dk/platform.c
View File

@ -68,17 +68,10 @@
#include <string.h>
#include <stdio.h>
/*---------------------------------------------------------------------------*/
#if PLATFORM_STARTUP_VERBOSE
#define PRINTF(...) printf(__VA_ARGS__)
#else
#define PRINTF(...)
#endif
#if UART_CONF_ENABLE
#define PUTS(s) puts(s)
#else
#define PUTS(s)
#endif
/* Log configuration */
#include "sys/log.h"
#define LOG_MODULE "CC2538DK"
#define LOG_LEVEL LOG_LEVEL_MAIN
/*---------------------------------------------------------------------------*/
static void
fade(unsigned char l)
@ -113,17 +106,6 @@ set_rf_params(void)
/* Populate linkaddr_node_addr. Maintain endianness */
memcpy(&linkaddr_node_addr, &ext_addr[8 - LINKADDR_SIZE], LINKADDR_SIZE);
#if PLATFORM_STARTUP_VERBOSE
{
int i;
printf("Contiki configured with address ");
for(i = 0; i < LINKADDR_SIZE - 1; i++) {
printf("%02x:", linkaddr_node_addr.u8[i]);
}
printf("%02x\n", linkaddr_node_addr.u8[i]);
}
#endif
NETSTACK_RADIO.set_value(RADIO_PARAM_PAN_ID, IEEE802154_PANID);
NETSTACK_RADIO.set_value(RADIO_PARAM_16BIT_ADDR, short_addr);
NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, CC2538_RF_CHANNEL);
@ -185,13 +167,11 @@ platform_init_stage_two()
void
platform_init_stage_three()
{
PUTS(BOARD_STRING);
LOG_INFO(BOARD_STRING);
set_rf_params();
#if PLATFORM_STARTUP_VERBOSE
soc_print_info();
#endif
adc_init();