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

Merge branch 'develop' into contrib/coap-lwm2m-dtls

This commit is contained in:
Niclas Finne 2018-01-19 18:21:38 +01:00 committed by GitHub
parent 06e15563c0 c89d40590b
commit 7d5fe004f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/platform/sky/sky-def.h
View File

@ -52,6 +52,9 @@
/* Delay between the SFD finishes arriving and it is detected in software */
#define RADIO_DELAY_BEFORE_DETECT 0
/* Disable TSCH frame filtering */
#define TSCH_CONF_HW_FRAME_FILTERING 0
#define PLATFORM_HAS_LEDS 1
#define PLATFORM_HAS_BUTTON 1
#define PLATFORM_HAS_LIGHT 1

8
examples/nullnet/nullnet-broadcast.c
View File

@ -65,9 +65,11 @@ AUTOSTART_PROCESSES(&nullnet_example_process);
void input_callback(const void *data, uint16_t len,
const linkaddr_t *src, const linkaddr_t *dest)
{
LOG_INFO("Received %u from ", *(unsigned *)data);
LOG_INFO_LLADDR(src);
LOG_INFO_("\n");
if(len == sizeof(unsigned)) {
LOG_INFO("Received %u from ", *(unsigned *)data);
LOG_INFO_LLADDR(src);
LOG_INFO_("\n");
}
}
/*---------------------------------------------------------------------------*/
PROCESS_THREAD(nullnet_example_process, ev, data)

8
examples/nullnet/nullnet-unicast.c
View File

@ -67,9 +67,11 @@ AUTOSTART_PROCESSES(&nullnet_example_process);
void input_callback(const void *data, uint16_t len,
const linkaddr_t *src, const linkaddr_t *dest)
{
LOG_INFO("Received %u from ", *(unsigned *)data);
LOG_INFO_LLADDR(src);
LOG_INFO_("\n");
if(len == sizeof(unsigned)) {
LOG_INFO("Received %u from ", *(unsigned *)data);
LOG_INFO_LLADDR(src);
LOG_INFO_("\n");
}
}
/*---------------------------------------------------------------------------*/
PROCESS_THREAD(nullnet_example_process, ev, data)