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

Merge branch 'release-4.1' into contrib/shell-refresh-routes-lite

This commit is contained in:
George Oikonomou 2018-05-04 12:16:56 +01:00 committed by GitHub
parent 57ad48ca40 2a1b4299b3
commit 684167cd91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/net/app-layer/coap/coap-block1.c
View File

@ -49,7 +49,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "coap-block1" #define LOG_MODULE "coap"
#define LOG_LEVEL LOG_LEVEL_COAP #define LOG_LEVEL LOG_LEVEL_COAP
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
os/net/app-layer/coap/coap-blocking-api.c
View File

@ -51,7 +51,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "coap-blocking-api" #define LOG_MODULE "coap"
#define LOG_LEVEL LOG_LEVEL_COAP #define LOG_LEVEL LOG_LEVEL_COAP
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
os/net/app-layer/coap/coap-callback-api.c
View File

@ -51,7 +51,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "coap-callback-api" #define LOG_MODULE "coap"
#define LOG_LEVEL LOG_LEVEL_COAP #define LOG_LEVEL LOG_LEVEL_COAP
/* These should go into the state struct so that we can have multiple /* These should go into the state struct so that we can have multiple

2
os/net/app-layer/coap/coap-observe-client.c
View File

@ -55,7 +55,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "coap-observe-client" #define LOG_MODULE "coap"
#define LOG_LEVEL LOG_LEVEL_COAP #define LOG_LEVEL LOG_LEVEL_COAP
MEMB(obs_subjects_memb, coap_observee_t, COAP_MAX_OBSERVEES); MEMB(obs_subjects_memb, coap_observee_t, COAP_MAX_OBSERVEES);

2
os/net/app-layer/coap/coap-observe.c
View File

@ -50,7 +50,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "coap-observe" #define LOG_MODULE "coap"
#define LOG_LEVEL LOG_LEVEL_COAP #define LOG_LEVEL LOG_LEVEL_COAP
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
os/net/app-layer/coap/coap-res-well-known-core.c
View File

@ -47,7 +47,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "coap-res-well-known-core" #define LOG_MODULE "coap"
#define LOG_LEVEL LOG_LEVEL_COAP #define LOG_LEVEL LOG_LEVEL_COAP
#define ADD_CHAR_IF_POSSIBLE(char) \ #define ADD_CHAR_IF_POSSIBLE(char) \

2
os/net/app-layer/coap/coap-separate.c
View File

@ -49,7 +49,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "coap-separate" #define LOG_MODULE "coap"
#define LOG_LEVEL LOG_LEVEL_COAP #define LOG_LEVEL LOG_LEVEL_COAP
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
os/net/app-layer/coap/coap-timer-default.c
View File

@ -52,7 +52,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "coap-timer-default" #define LOG_MODULE "coap-timer"
#define LOG_LEVEL LOG_LEVEL_NONE #define LOG_LEVEL LOG_LEVEL_NONE
PROCESS(coap_timer_process, "coap timer process"); PROCESS(coap_timer_process, "coap timer process");

2
os/net/app-layer/coap/coap-transactions.c
View File

@ -50,7 +50,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "coap-transactions" #define LOG_MODULE "coap"
#define LOG_LEVEL LOG_LEVEL_COAP #define LOG_LEVEL LOG_LEVEL_COAP
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
os/net/app-layer/coap/tinydtls-support/dtls-support.c
View File

@ -42,7 +42,7 @@
#include <stdarg.h> #include <stdarg.h>
/* Log configuration */ /* Log configuration */
#define LOG_MODULE "dtls-support" #define LOG_MODULE "dtls"
#define LOG_LEVEL LOG_LEVEL_DTLS #define LOG_LEVEL LOG_LEVEL_DTLS
#include "dtls-log.h" #include "dtls-log.h"
#include "coap-log.h" #include "coap-log.h"

2
os/net/routing/nullrouting/nullrouting.c
View File

@ -149,7 +149,7 @@ drop_route(uip_ds6_route_t *route)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const struct routing_driver nullrouting_driver = { const struct routing_driver nullrouting_driver = {
"Null Routing", "nullrouting",
init, init,
root_set_prefix, root_set_prefix,
root_start, root_start,

2
os/services/lwm2m/lwm2m-device.c
View File

@ -48,7 +48,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "lwm2m-device" #define LOG_MODULE "lwm2m-dev"
#define LOG_LEVEL LOG_LEVEL_LWM2M #define LOG_LEVEL LOG_LEVEL_LWM2M
static const lwm2m_resource_id_t resources[] = static const lwm2m_resource_id_t resources[] =

2
os/services/lwm2m/lwm2m-engine.c
View File

@ -63,7 +63,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "lwm2m-engine" #define LOG_MODULE "lwm2m-eng"
#define LOG_LEVEL LOG_LEVEL_LWM2M #define LOG_LEVEL LOG_LEVEL_LWM2M
#ifndef LWM2M_ENGINE_CLIENT_ENDPOINT_PREFIX #ifndef LWM2M_ENGINE_CLIENT_ENDPOINT_PREFIX

2
os/services/lwm2m/lwm2m-firmware.c
View File

@ -44,7 +44,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "lwm2m-firmware" #define LOG_MODULE "lwm2m-fw"
#define LOG_LEVEL LOG_LEVEL_LWM2M #define LOG_LEVEL LOG_LEVEL_LWM2M
#define UPDATE_PACKAGE 0 #define UPDATE_PACKAGE 0

2
os/services/lwm2m/lwm2m-plain-text.c
View File

@ -49,7 +49,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "lwm2m-plain-text" #define LOG_MODULE "lwm2m-text"
#define LOG_LEVEL LOG_LEVEL_NONE #define LOG_LEVEL LOG_LEVEL_NONE
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
os/services/lwm2m/lwm2m-rd-client.c
View File

@ -64,7 +64,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "lwm2m-rd-client" #define LOG_MODULE "lwm2m-rd"
#define LOG_LEVEL LOG_LEVEL_LWM2M #define LOG_LEVEL LOG_LEVEL_LWM2M
#ifndef LWM2M_DEFAULT_CLIENT_LIFETIME #ifndef LWM2M_DEFAULT_CLIENT_LIFETIME

2
os/services/lwm2m/lwm2m-security.c
View File

@ -54,7 +54,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "lwm2m-security" #define LOG_MODULE "lwm2m-sec"
#define LOG_LEVEL LOG_LEVEL_LWM2M #define LOG_LEVEL LOG_LEVEL_LWM2M
#define MAX_COUNT LWM2M_SERVER_MAX_COUNT #define MAX_COUNT LWM2M_SERVER_MAX_COUNT

2
os/services/lwm2m/lwm2m-server.c
View File

@ -51,7 +51,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "lwm2m-server" #define LOG_MODULE "lwm2m-srv"
#define LOG_LEVEL LOG_LEVEL_LWM2M #define LOG_LEVEL LOG_LEVEL_LWM2M
#define MAX_COUNT LWM2M_SERVER_MAX_COUNT #define MAX_COUNT LWM2M_SERVER_MAX_COUNT

2
os/services/lwm2m/lwm2m-tlv-writer.c
View File

@ -47,7 +47,7 @@
/* Log configuration */ /* Log configuration */
#include "coap-log.h" #include "coap-log.h"
#define LOG_MODULE "lwm2m-tlv-writer" #define LOG_MODULE "lwm2m-tlv"
#define LOG_LEVEL LOG_LEVEL_NONE #define LOG_LEVEL LOG_LEVEL_NONE
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/