Skip to content

LwM2M changes #1 #1421

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

Merged
merged 3 commits into from
Sep 12, 2017
Merged

LwM2M changes #1 #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4a83d0
net: lwm2m: select NET_APP_CLIENT automatically
Aug 24, 2017
f16a1cd
samples: lwm2m: remove extra .conf settings
Aug 24, 2017
9355862
samples: lwm2m: remove unused NET_L2_BT settings
Aug 24, 2017
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
2 changes: 0 additions & 2 deletions samples/net/lwm2m_client/prj_frdm_k64f.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ CONFIG_NET_CONTEXT_NET_PKT_POOL=y

CONFIG_NET_SHELL=y

CONFIG_NET_APP=y
CONFIG_NET_APP_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y
CONFIG_NET_APP_CLIENT=y
CONFIG_NET_APP_SETTINGS=y

CONFIG_LWM2M=y
Expand Down
2 changes: 0 additions & 2 deletions samples/net/lwm2m_client/prj_qemu_x86.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ CONFIG_NET_CONTEXT_NET_PKT_POOL=y

CONFIG_NET_SHELL=y

CONFIG_NET_APP=y
CONFIG_NET_APP_NEED_IPV6=y
CONFIG_NET_APP_NEED_IPV4=y
CONFIG_NET_APP_CLIENT=y
CONFIG_NET_APP_SETTINGS=y

CONFIG_LWM2M=y
Expand Down
14 changes: 0 additions & 14 deletions samples/net/lwm2m_client/src/lwm2m-client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
#include <net/net_app.h>
#include <net/lwm2m.h>

#if defined(CONFIG_NET_L2_BT)
#include <bluetooth/bluetooth.h>
#include <gatt/ipss.h>
#endif

#define APP_BANNER "Run LWM2M client"

#if !defined(CONFIG_NET_APP_PEER_IPV4_ADDR)
Expand Down Expand Up @@ -282,15 +277,6 @@ void main(void)

k_sem_init(&quit_lock, 0, UINT_MAX);

#if defined(CONFIG_NET_L2_BT)
if (bt_enable(NULL)) {
SYS_LOG_ERR("Bluetooth init failed");
return;
}
ipss_init();
ipss_advertise();
#endif

ret = lwm2m_setup();
if (ret < 0) {
SYS_LOG_ERR("Cannot setup LWM2M fields (%d)", ret);
Expand Down
1 change: 1 addition & 0 deletions subsys/net/lib/lwm2m/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ menuconfig LWM2M
bool "OMA LWM2M protocol stack"
default n
select ZOAP
select NET_APP_CLIENT
help
This option adds logic for managing OMA LWM2M data

Expand Down