Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

Connection testing - first milestone #90

Merged
merged 39 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
04407ee
border router working, lw2m not yet
moritzholzer Apr 23, 2024
f6aa4df
border router working, lw2m not yet
moritzholzer Apr 23, 2024
f7f302f
border router and lwm2m example are running
moritzholzer Apr 24, 2024
3538491
border router and lwm2m example are running
moritzholzer Apr 24, 2024
816c680
deactivated wakamaa logging
moritzholzer Apr 24, 2024
cc10cc0
deactivated wakamaa logging
moritzholzer Apr 24, 2024
1482566
Merge remote-tracking branch 'origin/main' into connectionTesting
moritzholzer May 9, 2024
1a7ebb2
Merge remote-tracking branch 'origin/main' into connectionTesting
moritzholzer May 9, 2024
8cc4944
startet own impl
moritzholzer May 10, 2024
5384c0a
startet own impl
moritzholzer May 10, 2024
2df8648
own code and makefile working
moritzholzer May 10, 2024
792f956
own code and makefile working
moritzholzer May 10, 2024
171e726
startet impl. of pet object
moritzholzer May 10, 2024
ebae35a
startet impl. of pet object
moritzholzer May 10, 2024
6f43238
makefile
moritzholzer May 13, 2024
b3df791
makefile
moritzholzer May 13, 2024
2b58168
changed pet object
moritzholzer May 13, 2024
d06f6af
merge
moritzholzer May 13, 2024
513d732
first impl of pet object
moritzholzer May 16, 2024
52a182f
pet model working
moritzholzer May 16, 2024
23b07e1
added right start command for demo
moritzholzer May 16, 2024
c810c03
merge conflict
AmberGl0W May 17, 2024
2796da2
read write implemented
moritzholzer May 17, 2024
eaf1969
read, write working
moritzholzer May 17, 2024
341e633
added update method
moritzholzer May 17, 2024
54e0fe6
added prototypes and cli command
moritzholzer May 17, 2024
a26ffcb
compiles now
moritzholzer May 17, 2024
6736ec9
not just comiling, working
moritzholzer May 17, 2024
3105b19
restructered, but lwm2m ist not showing on server
moritzholzer May 18, 2024
6334ce3
fixed some decoding, main of main still not working
moritzholzer May 18, 2024
ed41ff8
Merge branch 'connectionTesting' of github.com:smartuni/teamagochi in…
moritzholzer May 18, 2024
fd206b9
added decoding
moritzholzer May 21, 2024
8e750d9
changed pet object
moritzholzer May 22, 2024
adccfee
object working
moritzholzer May 22, 2024
b2909d0
changed to lab ip and encoding
moritzholzer May 28, 2024
27c0640
Merge branch 'main' into connectionTesting
moritzholzer May 30, 2024
da19713
Merge branch 'main' into connectionTesting
moritzholzer May 30, 2024
dff93fd
delete redundant files
moritzholzer May 30, 2024
62b4561
fixed compiling issues
moritzholzer May 30, 2024
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
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
"ili9341.h": "c",
"ili9341_params.h": "c",
"lvgl_riot.h": "c",
"shell.h": "c"
"shell.h": "c",
"msg.h": "c"
},
"[shellscript][c][cpp]": {
"editor.tabSize": 4,
Expand Down
70 changes: 59 additions & 11 deletions node/code/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ BOARD = feather-nrf52840-sense

# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/RIOT
TEAMAGOTCHI_NODES_BASE = $(CURDIR)

# Comment this out to disable code in RIOT that does safety checking
# which is not needed in a production environment but helps in the
Expand All @@ -16,25 +17,21 @@ FEATURES_REQUIRED += cpp
FEATURES_REQUIRED += libstdcpp

# Internal Modules
EXTERNAL_MODULE_DIRS += modules
USEMODULE += external_module
EXTERNAL_MODULE_DIRS += $(CURDIR)/modules
#USEMODULE += external_module

#USEMODULE += display

# External modules
USEMODULE += cpp11-compat
USEMODULE += ili9341
USEMODULE += ztimer
USEMODULE += ztimer_msec
USEMODULE += shell
USEMODULE += xtimer


# Lvgl Related Modules
DISABLE_MODULE += test_utils_interactive_sync
USEPKG += lvgl
USEMODULE += lvgl_contrib
USEMODULE += lvgl_extra_widget_chart
USEMODULE += lvgl_extra_widget_win
USEMODULE += lvgl_extra_layout_flex
USEMODULE += lvgl_extra_theme_default
USEMODULE += lvgl_extra_theme_default_dark
USEMODULE += lwm2m_handler

# As there is an 'Kconfig' we want to explicitly disable Kconfig by setting
# the variable to empty
Expand All @@ -56,11 +53,35 @@ CXXEXFLAGS += -std=c++20 -Wall -Wextra
# reverted in C++23 because it wasn't thought through
CXXEXFLAGS += -Wno-volatile

#include $(CURDIR)/modules/lwm2m/Makefile.include
include $(RIOTBASE)/Makefile.include


BOARD_BLACKLIST += native64

## DEBUG
CFLAGS += -DDEBUG_ASSERT_VERBOSE

##### LWM2M #####
#SERVER_URI = '"coap://[2001:db8:1::1]:5684"'
LWM2M_SERVER_SHORT_ID ?= 1
CFLAGS += -DEVENT_THREAD_MEDIUM_STACKSIZE='(3*1024)'
# Uncomment to enable Wakaama debug log
#CFLAGS += -DCONFIG_LWM2M_WITH_LOGS=1
# Specific the server URI address (NOTE: Domain names not supported yet)
#LWM2M_SERVER_URI ?= '"coap://[2001:db8:1::1]:5683"'
LWM2M_SERVER_URI ?= '"coap://[fd00:dead:beef::1]:5683"'
# Configure via CFLAGS only if not done via Kconfig
ifndef CONFIG_LWM2M_SERVER_URI
CFLAGS += -DCONFIG_LWM2M_SERVER_URI=$(LWM2M_SERVER_URI)
CFLAGS += -DCONFIG_LWM2M_SERVER_SHORT_ID=$(LWM2M_SERVER_SHORT_ID)
CFLAGS += -DCONFIG_DTLS_PEER_MAX=2
CFLAGS += -DCONFIG_MAX_BUF=1024
# Uncomment to enable Wakaama debug log
CFLAGS += -DCONFIG_LWM2M_WITH_LOGS=1
endif
##### /LWM2M #####


# SDL requires more stack
ifneq (,$(filter native native64,$(BOARD)))
Expand All @@ -71,6 +92,33 @@ else
CFLAGS += -DTHREAD_STACKSIZE_MAIN=2*1024
endif




























# Note that this will probably only work for me <3
windows: all
@echo "Creating UF2"
Expand Down
2 changes: 1 addition & 1 deletion node/code/RIOT
Submodule RIOT updated 230 files
7 changes: 7 additions & 0 deletions node/code/dev/border_router/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
BOARD ?= feather-nrf52840-sense
UPLINK ?= cdc-ecm
PREFIX_CONF ?= uhcpd
# This has to be the absolute path to the RIOT base directory:
RIOTBASE ?= $(CURDIR)/../../RIOT

include $(RIOTBASE)/examples/gnrc_border_router/Makefile
14 changes: 14 additions & 0 deletions node/code/dev/border_router/Makefile.cdc-ecm.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# USB Modules
USEMODULE += auto_init_usbus
USEMODULE += usbus_cdc_ecm

ifeq (dhcpv6,$(PREFIX_CONF))
FLAGS_EXTRAS += --use-dhcpv6
else ifeq (auto_subnets,$(PREFIX_CONF))
FLAGS_EXTRAS += --use-radvd
endif

# Configure terminal parameters for UHCP
TERMDEPS += host-tools
TERMPROG ?= sudo sh $(RIOTTOOLS)/usb-cdc-ecm/start_network.sh
TERMFLAGS ?= $(FLAGS_EXTRAS) $(IPV6_PREFIX) $(PORT)
10 changes: 10 additions & 0 deletions node/code/dev/border_router/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- Build the border router
- flash the border router
- connect the dongle to the VM or linux machine

- start start.sh there with whole project cloned as root


it will:
- set ub the usb network card of the border router
- set an dummy network adapter with the ip of the coap server
Binary file not shown.
Loading