Merge branch 'develop' into lwm2m-endpoint-fix
This commit is contained in:
commit
36deee9618
5
.gitignore
vendored
5
.gitignore
vendored
@ -17,8 +17,9 @@ Makefile.target
|
||||
Makefile.*.defines
|
||||
tools/doxygen/html
|
||||
patches-*
|
||||
tools/tunslip
|
||||
tools/tunslip6
|
||||
tools/serial-io/tunslip6
|
||||
tools/serial-io/serialdump
|
||||
serialdump-*
|
||||
build
|
||||
tools/coffee-manager/build/
|
||||
tools/coffee-manager/coffee.jar
|
||||
|
33
Makefile.embedded
Normal file
33
Makefile.embedded
Normal file
@ -0,0 +1,33 @@
|
||||
# This Makefile contains make variables and rules that are only applicable
|
||||
# to builds for embedded devices (i.e. excluding platforms native and cooja).
|
||||
# Future extensions to the build system that are of a similar nature (for
|
||||
# embedded devices only), can be achieved by extending this Makefile here.
|
||||
|
||||
RLWRAPGOALS = login serialdump serialview
|
||||
|
||||
.PHONY: $(RLWRAPGOALS)
|
||||
|
||||
BAUDRATE ?= 115200
|
||||
SERIALDUMP_TIME_FMT ?=
|
||||
|
||||
ifeq ($(HOST_OS),Windows)
|
||||
SERIALDUMP = $(SERIAL_DUMP_BIN)
|
||||
else
|
||||
RLWRAP = $(notdir $(shell which rlwrap))
|
||||
ifeq ($(RLWRAP),)
|
||||
ifneq ($(filter $(RLWRAPGOALS),$(MAKECMDGOALS)),)
|
||||
$(info Running serialdump without rlwrap support.)
|
||||
$(info Consider installing rlwarp in order to be able to use command history)
|
||||
endif
|
||||
endif
|
||||
SERIALDUMP = $(RLWRAP) $(SERIAL_DUMP_BIN)
|
||||
endif
|
||||
|
||||
serialdump: $(SERIAL_DUMP_BIN)
|
||||
$(SERIALDUMP) -b$(BAUDRATE) -T$(SERIALDUMP_TIME_FMT) $(PORT) | tee serialdump-`date +%Y%m%d-%H%M`
|
||||
|
||||
serialview: $(SERIAL_DUMP_BIN)
|
||||
$(SERIALDUMP) -b$(BAUDRATE) -T$(SERIALDUMP_TIME_FMT) $(PORT)
|
||||
|
||||
login: $(SERIAL_DUMP_BIN)
|
||||
$(SERIALDUMP) -b$(BAUDRATE) $(PORT)
|
@ -1,3 +1,8 @@
|
||||
# This Makefile can be used to identify the selected TARGET used for a
|
||||
# specific build. It can be included by example Makefiles that need to take
|
||||
# decisions based on TARGET. It is also automatically included by the
|
||||
# top-level Makefile.include.
|
||||
|
||||
ifeq ($(TARGET),)
|
||||
-include Makefile.target
|
||||
ifeq ($(TARGET),)
|
||||
|
@ -10,6 +10,9 @@ WERROR ?= 1
|
||||
|
||||
include $(CONTIKI)/Makefile.identify-target
|
||||
|
||||
### Include Makefile.tools to pull in targets that allow us to build tools dir
|
||||
include $(CONTIKI)/Makefile.tools
|
||||
|
||||
CONTIKI_NG_TARGET_LIB = contiki-ng-$(TARGET).a
|
||||
|
||||
ifeq ($(DEFINES),)
|
||||
@ -312,8 +315,8 @@ clean:
|
||||
|
||||
distclean:
|
||||
@for TARG in `ls $(CONTIKI)/arch/platform $(TARGETDIRS)`; do \
|
||||
echo Running: make TARGET=$$TARG clean; \
|
||||
make TARGET=$$TARG clean; \
|
||||
echo Running: $(MAKE) TARGET=$$TARG clean; \
|
||||
$(MAKE) TARGET=$$TARG clean; \
|
||||
done
|
||||
|
||||
-include $(CONTIKI)/arch/platform/$(TARGET)/Makefile.customrules-$(TARGET)
|
||||
@ -393,7 +396,7 @@ endif
|
||||
|
||||
usage:
|
||||
@echo "Usage:"
|
||||
@echo " make [TARGET=(TARGET)] [BOARD=(BOARD)] [DEFINES=(DEFINES)] [target]"
|
||||
@echo " make [TARGET=(TARGET)] [BOARD=(BOARD)] [DEFINES=(DEFINES)] [PORT=(PORT)] [target]"
|
||||
@echo ""
|
||||
@echo "Typical usage:"
|
||||
@echo " make [TARGET=(TARGET)] [BOARD=(BOARD)] [all]"
|
||||
@ -414,6 +417,9 @@ usage:
|
||||
@echo " %.o Produces an object file from a given source file (e.g. hello-world.o)"
|
||||
@echo " %.e Produces the pre-processed version of a given source file (e.g. hello-world.e)"
|
||||
@echo " %.s Produces an assembly file from a given source file (e.g. hello-world.s)"
|
||||
@echo " login View the serial output of the device connected to PORT"
|
||||
@echo " serialview Same as login, but prepend serial output with a unix timestamp"
|
||||
@echo " serialdump same as serialview, but also save the output to a file"
|
||||
|
||||
help: usage
|
||||
|
||||
@ -440,6 +446,7 @@ savedefines:
|
||||
@echo "saving Makefile.$(TARGET).defines"
|
||||
@echo >Makefile.$(TARGET).defines "DEFINES = $(DEFINES)"
|
||||
|
||||
VIEWCONF = $(CONTIKI)/tools/viewconf/viewconf.c
|
||||
viewconf:
|
||||
@echo "----------------- Make variables: --------------"
|
||||
@echo "##### \"TARGET\": ________________________________ $(TARGET)"
|
||||
@ -451,13 +458,19 @@ ifdef MAKE_COAP_DTLS_KEYSTORE
|
||||
@echo "##### \"MAKE_COAP_DTLS_KEYSTORE\": _______________ $(MAKE_COAP_DTLS_KEYSTORE)"
|
||||
endif
|
||||
@echo "----------------- C variables: -----------------"
|
||||
$(Q)$(CC) $(CFLAGS) -E $(CONTIKI)/tools/viewconf.c | grep \#\#\#\#\#
|
||||
$(Q)$(CC) $(CFLAGS) -E $(VIEWCONF) | grep \#\#\#\#\#
|
||||
@echo "------------------------------------------------"
|
||||
@echo "'==' Means the flag is set to a given a value"
|
||||
@echo "'->' Means the flag is unset, but will default to a given value"
|
||||
@echo "'><' Means the flag is unset and has no default value"
|
||||
@echo "To view more Make variables, edit $(CONTIKI)/Makefile.include, rule 'viewconf'"
|
||||
@echo "To view more C variables, edit $(CONTIKI)/tools/viewconf.c"
|
||||
@echo "To view more C variables, edit $(VIEWCONF)"
|
||||
|
||||
### Include Makefile.embedded for relevant platforms, in order to pull in
|
||||
### rules for login, serialview etc
|
||||
ifeq ($(findstring $(TARGET),native cooja),)
|
||||
include $(CONTIKI)/Makefile.embedded
|
||||
endif
|
||||
|
||||
# Don't treat %.$(TARGET) as an intermediate file because it is
|
||||
# in fact the primary target.
|
||||
|
17
Makefile.tools
Normal file
17
Makefile.tools
Normal file
@ -0,0 +1,17 @@
|
||||
# Some make rules in the main build system depend on the presence of utilities
|
||||
# under the tools/ dir. For those dependencies, we use this makefile here to
|
||||
# recursively invoke the respective build under tools/.
|
||||
|
||||
TOOLS_DIR = $(CONTIKI)/tools
|
||||
SERIAL_IO_TOOL_DIR = $(TOOLS_DIR)/serial-io
|
||||
|
||||
SERIAL_IO_TOOL_DEPS = $(addprefix $(SERIAL_IO_TOOL_DIR)/, tools-utils.c tools-utils.h)
|
||||
|
||||
TUNSLIP6 = $(SERIAL_IO_TOOL_DIR)/tunslip6
|
||||
SERIAL_DUMP_BIN = $(SERIAL_IO_TOOL_DIR)/serialdump
|
||||
|
||||
$(SERIAL_DUMP_BIN): $(SERIAL_IO_TOOL_DIR)/serialdump.c $(SERIAL_IO_TOOL_DEPS)
|
||||
$(MAKE) -C $(SERIAL_IO_TOOL_DIR) serialdump
|
||||
|
||||
$(TUNSLIP6): $(SERIAL_IO_TOOL_DIR)/tunslip6.c $(SERIAL_IO_TOOL_DEPS)
|
||||
$(MAKE) -C $(SERIAL_IO_TOOL_DIR) tunslip6
|
@ -88,21 +88,7 @@ else
|
||||
@echo "This board cannot be programmed through the ROM bootloader and therefore does not support the .upload target."
|
||||
endif
|
||||
|
||||
# Check if we are running under Windows
|
||||
ifeq ($(HOST_OS),Windows)
|
||||
SERIALDUMP ?= $(CONTIKI)/tools/sky/serialdump-windows
|
||||
else
|
||||
ifeq ($(HOST_OS),Darwin)
|
||||
SERIALDUMP ?= rlwrap $(CONTIKI)/tools/sky/serialdump-macos
|
||||
else
|
||||
# Else assume Linux
|
||||
SERIALDUMP ?= rlwrap $(CONTIKI)/tools/sky/serialdump-linux
|
||||
endif
|
||||
endif
|
||||
|
||||
UART_BAUDRATE = 115200
|
||||
|
||||
login:
|
||||
$(SERIALDUMP) -b$(UART_BAUDRATE) $(PORT)
|
||||
### For the login etc targets
|
||||
BAUDRATE = 115200
|
||||
|
||||
include $(CONTIKI)/arch/cpu/arm/cortex-m/cm3/Makefile.cm3
|
||||
|
@ -29,11 +29,11 @@
|
||||
*/
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
* \addtogroup sensortag-cc26xx-ext-flash
|
||||
* \addtogroup ext-flash
|
||||
* @{
|
||||
*
|
||||
* \file
|
||||
* Sensortag/LaunchPad External Flash Driver
|
||||
* Implementation of a generic external SPI flash driver
|
||||
*/
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#include "contiki.h"
|
||||
|
@ -29,14 +29,23 @@
|
||||
*/
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
* \addtogroup common-cc26xx-peripherals
|
||||
* \addtogroup dev
|
||||
* @{
|
||||
*
|
||||
* \defgroup sensortag-cc26xx-ext-flash SensorTag/LaunchPad External Flash
|
||||
* \defgroup ext-flash Generic external SPI flash driver
|
||||
*
|
||||
* This is a generic driver for external SPI flash memories. The driver has
|
||||
* been tested and works with multiple external SPI flash parts. The list of
|
||||
* parts the driver has been tested against is shown in the README in this
|
||||
* directory.
|
||||
*
|
||||
* If you successfully use this driver with a part that is not listed in the
|
||||
* README, please let us know so we can update it.
|
||||
*
|
||||
* @{
|
||||
*
|
||||
* \file
|
||||
* Header file for the Sensortag/LaunchPad External Flash Driver
|
||||
* Header file for the external SPI flash API
|
||||
*/
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#ifndef EXT_FLASH_H_
|
||||
|
@ -64,6 +64,7 @@
|
||||
#include "dev/button-sensor.h"
|
||||
#include "dev/pir-sensor.h"
|
||||
#include "dev/vib-sensor.h"
|
||||
#include "dev/moteid.h"
|
||||
|
||||
#include "sys/node-id.h"
|
||||
#include "services/rpl-border-router/rpl-border-router.h"
|
||||
@ -151,13 +152,13 @@ set_lladdr(void)
|
||||
{
|
||||
int i;
|
||||
for(i = 0; i < sizeof(uip_lladdr.addr); i += 2) {
|
||||
addr.u8[i + 1] = node_id & 0xff;
|
||||
addr.u8[i + 0] = node_id >> 8;
|
||||
addr.u8[i + 1] = simMoteID & 0xff;
|
||||
addr.u8[i + 0] = simMoteID >> 8;
|
||||
}
|
||||
}
|
||||
#else /* NETSTACK_CONF_WITH_IPV6 */
|
||||
addr.u8[0] = node_id & 0xff;
|
||||
addr.u8[1] = node_id >> 8;
|
||||
addr.u8[0] = simMoteID & 0xff;
|
||||
addr.u8[1] = simMoteID >> 8;
|
||||
#endif /* NETSTACK_CONF_WITH_IPV6 */
|
||||
linkaddr_set_node_addr(&addr);
|
||||
}
|
||||
@ -177,11 +178,6 @@ platform_init_stage_two()
|
||||
void
|
||||
platform_init_stage_three()
|
||||
{
|
||||
if(node_id > 0) {
|
||||
LOG_INFO("Node id is set to %u.\n", node_id);
|
||||
} else {
|
||||
LOG_INFO("Node id is not set.\n");
|
||||
}
|
||||
/* Initialize eeprom */
|
||||
eeprom_init();
|
||||
/* Start serial process */
|
||||
|
@ -82,7 +82,7 @@ OBJDUMP:=$(CROSS_COMPILE)-objdump
|
||||
|
||||
ARCH = jn516x-ccm-star.c exceptions.c rtimer-arch.c rtimer-arch-slow.c \
|
||||
slip_uart0.c clock.c micromac-radio.c int-master.c \
|
||||
node-id.c watchdog.c slip.c dbg.c
|
||||
watchdog.c slip.c dbg.c
|
||||
# Default uart0 for printf and slip
|
||||
TARGET_WITH_UART0 ?= 1
|
||||
TARGET_WITH_UART1 ?= 0
|
||||
@ -175,17 +175,14 @@ MOTELIST = python $(CONTIKI)/tools/jn516x/mote-list.py
|
||||
ifeq ($(HOST_OS),Windows)
|
||||
USBDEVPREFIX=/dev/com
|
||||
USBDEVBASENAME=COM
|
||||
SERIALDUMP ?= $(CONTIKI)/tools/jn516x/serialdump-windows
|
||||
else
|
||||
ifeq ($(HOST_OS),Darwin)
|
||||
USBDEVPREFIX=
|
||||
USBDEVBASENAME=/dev/tty.usbserial-
|
||||
SERIALDUMP ?= rlwrap $(CONTIKI)/tools/jn516x/serialdump-macos
|
||||
else
|
||||
# Else we assume Linux
|
||||
USBDEVPREFIX=
|
||||
USBDEVBASENAME=/dev/ttyUSB
|
||||
SERIALDUMP ?= rlwrap $(CONTIKI)/tools/jn516x/serialdump-linux
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -195,7 +192,7 @@ ifndef MOTE
|
||||
$(error MOTE not defined! You must specify which MOTE (serial port) to use)
|
||||
endif
|
||||
endif
|
||||
PORT = $(USBDEVBASENAME)$(MOTE)
|
||||
DEV_PORT = $(USBDEVBASENAME)$(MOTE)
|
||||
|
||||
#### make targets
|
||||
|
||||
@ -255,19 +252,19 @@ endif
|
||||
### Upload target to one jn516x mote specified by MOTE=portNumber
|
||||
ifeq ($(HOST_OS),Windows)
|
||||
%.upload: %.$(TARGET).bin
|
||||
${FLASH_PROGRAMMER} -a -c $(PORT) -B 1000000 -s -w -f $<
|
||||
${FLASH_PROGRAMMER} -a -c $(DEV_PORT) -B 1000000 -s -w -f $<
|
||||
else
|
||||
%.upload: %.$(TARGET).bin
|
||||
${FLASH_PROGRAMMER} -V 10 -v -s $(PORT) -I 38400 -P 1000000 -f $<
|
||||
${FLASH_PROGRAMMER} -V 10 -v -s $(DEV_PORT) -I 38400 -P 1000000 -f $<
|
||||
endif
|
||||
|
||||
### Flash the given file
|
||||
ifeq ($(HOST_OS),Windows)
|
||||
%.flash: ${FLASH_PROGRAMMER}
|
||||
${FLASH_PROGRAMMER} -a -c $(PORT) -B 1000000 -s -w -f $*.$(TARGET).bin
|
||||
${FLASH_PROGRAMMER} -a -c $(DEV_PORT) -B 1000000 -s -w -f $*.$(TARGET).bin
|
||||
else
|
||||
%.flash: ${FLASH_PROGRAMMER}
|
||||
${FLASH_PROGRAMMER} -V 10 -v -s $(PORT) -I 38400 -P 1000000 -s -f $*.$(TARGET).bin
|
||||
${FLASH_PROGRAMMER} -V 10 -v -s $(DEV_PORT) -I 38400 -P 1000000 -s -f $*.$(TARGET).bin
|
||||
endif
|
||||
|
||||
### List the ports with connected jn516x motes
|
||||
@ -297,19 +294,6 @@ serialdumpall:
|
||||
### UART_BAUDRATE: i.e., 115200. default is 1000000
|
||||
### example: make TARGET=jn516x UART_BAUDRATE=115200 login MOTE=1
|
||||
|
||||
UART_BAUDRATE ?= 1000000
|
||||
|
||||
$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
|
||||
($(MAKE) -C $(CONTIKI)/tools tunslip6 CFLAGS= LDFLAGS= LDLIBS= INCFLAGS=)
|
||||
|
||||
$(SERIALDUMP): $(CONTIKI)/tools/jn516x/serialdump.c
|
||||
(cd $(CONTIKI)/tools/jn516x; ${MAKE} $(notdir $(SERIALDUMP)))
|
||||
|
||||
login: $(SERIALDUMP)
|
||||
$(SERIALDUMP) -b${UART_BAUDRATE} $(USBDEVPREFIX)$(PORT)
|
||||
|
||||
serialview: $(SERIALDUMP)
|
||||
$(SERIALDUMP) -b${UART_BAUDRATE} $(USBDEVPREFIX)$(PORT) | $(CONTIKI)/tools/timestamp
|
||||
|
||||
serialdump: $(SERIALDUMP)
|
||||
$(SERIALDUMP) -b${UART_BAUDRATE} $(USBDEVPREFIX)$(PORT) | $(CONTIKI)/tools/timestamp | tee serialdump-$(notdir $(PORT))-`date +%Y%m%d-%H%M`
|
||||
### For the login etc targets
|
||||
BAUDRATE = 1000000
|
||||
PORT = $(USBDEVPREFIX)$(DEV_PORT)
|
||||
|
@ -113,8 +113,7 @@ static uint32_t sleep_start_ticks;
|
||||
#define LOG_LEVEL LOG_LEVEL_MAIN
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Reads MAC from SoC
|
||||
* Must be called before node_id_restore()
|
||||
* and network addresses initialization */
|
||||
* Must be called before network addresses initialization */
|
||||
static void
|
||||
init_node_mac(void)
|
||||
{
|
||||
@ -139,14 +138,9 @@ set_linkaddr(void)
|
||||
#if NETSTACK_CONF_WITH_IPV6
|
||||
memcpy(addr.u8, node_mac, sizeof(addr.u8));
|
||||
#else
|
||||
if(node_id == 0) {
|
||||
int i;
|
||||
for(i = 0; i < LINKADDR_SIZE; ++i) {
|
||||
addr.u8[i] = node_mac[LINKADDR_SIZE - 1 - i];
|
||||
}
|
||||
} else {
|
||||
addr.u8[0] = node_id & 0xff;
|
||||
addr.u8[1] = node_id >> 8;
|
||||
int i;
|
||||
for(i = 0; i < LINKADDR_SIZE; ++i) {
|
||||
addr.u8[i] = node_mac[LINKADDR_SIZE - 1 - i];
|
||||
}
|
||||
#endif
|
||||
linkaddr_set_node_addr(&addr);
|
||||
@ -164,10 +158,6 @@ xosc_init(void)
|
||||
return bAHI_Set32KhzClockMode(E_AHI_XTAL);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if WITH_TINYOS_AUTO_IDS
|
||||
uint16_t TOS_NODE_ID = 0x1234; /* non-zero */
|
||||
uint16_t TOS_LOCAL_ADDRESS = 0x1234; /* non-zero */
|
||||
#endif /* WITH_TINYOS_AUTO_IDS */
|
||||
void
|
||||
platform_init_stage_one(void)
|
||||
{
|
||||
@ -194,20 +184,6 @@ platform_init_stage_one(void)
|
||||
leds_init();
|
||||
leds_on(LEDS_ALL);
|
||||
init_node_mac();
|
||||
|
||||
node_id_restore();
|
||||
|
||||
#if WITH_TINYOS_AUTO_IDS
|
||||
node_id = TOS_NODE_ID;
|
||||
#endif /* WITH_TINYOS_AUTO_IDS */
|
||||
/* for setting "hardcoded" IEEE 802.15.4 MAC addresses */
|
||||
#ifdef IEEE_802154_MAC_ADDRESS
|
||||
{
|
||||
uint8_t ieee[] = IEEE_802154_MAC_ADDRESS;
|
||||
memcpy(node_mac, ieee, sizeof(uip_lladdr.addr));
|
||||
node_mac[7] = node_id & 0xff;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
@ -225,12 +201,6 @@ platform_init_stage_two(void)
|
||||
void
|
||||
platform_init_stage_three(void)
|
||||
{
|
||||
if(node_id > 0) {
|
||||
LOG_INFO("Node id is set to %u.\n", node_id);
|
||||
} else {
|
||||
LOG_INFO("Node id is not set.\n");
|
||||
}
|
||||
|
||||
#ifndef UIP_FALLBACK_INTERFACE
|
||||
uart0_set_input(serial_line_input_byte);
|
||||
serial_line_init();
|
||||
|
@ -120,9 +120,6 @@ static uint8_t mac_addr[] = PLATFORM_CONF_MAC_ADDR;
|
||||
static uint8_t mac_addr[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
|
||||
#endif /* PLATFORM_CONF_MAC_ADDR */
|
||||
|
||||
#if !NETSTACK_CONF_WITH_IPV6
|
||||
static uint16_t node_id = 0x0102;
|
||||
#endif /* !NETSTACK_CONF_WITH_IPV6 */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
select_set_callback(int fd, const struct select_callback *callback)
|
||||
@ -187,14 +184,9 @@ set_lladdr(void)
|
||||
#if NETSTACK_CONF_WITH_IPV6
|
||||
memcpy(addr.u8, mac_addr, sizeof(addr.u8));
|
||||
#else
|
||||
if(node_id == 0) {
|
||||
int i;
|
||||
for(i = 0; i < sizeof(linkaddr_t); ++i) {
|
||||
addr.u8[i] = mac_addr[7 - i];
|
||||
}
|
||||
} else {
|
||||
addr.u8[0] = node_id & 0xff;
|
||||
addr.u8[1] = node_id >> 8;
|
||||
int i;
|
||||
for(i = 0; i < sizeof(linkaddr_t); ++i) {
|
||||
addr.u8[i] = mac_addr[7 - i];
|
||||
}
|
||||
#endif
|
||||
linkaddr_set_node_addr(&addr);
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $Id: Makefile.common,v 1.3 2010/08/24 16:24:11 joxe Exp $
|
||||
|
||||
ARCH=spi-legacy.c ds2411.c xmem.c i2c.c node-id.c sensors.c cfs-coffee.c \
|
||||
ARCH=spi-legacy.c ds2411.c xmem.c i2c.c sensors.c cfs-coffee.c \
|
||||
cc2420.c cc2420-arch.c cc2420-arch-sfd.c \
|
||||
sky-sensors.c uip-ipchksum.c \
|
||||
uart1.c slip_uart1.c uart1-putchar.c platform.c
|
||||
@ -54,7 +54,6 @@ else
|
||||
ifeq ($(HOST_OS),Darwin)
|
||||
ifndef MOTELIST
|
||||
USBDEVPREFIX=
|
||||
SERIALDUMP = rlwrap $(CONTIKI)/tools/sky/serialdump-macos
|
||||
MOTELIST = $(CONTIKI)/tools/sky/motelist-macos
|
||||
TMOTE_BSL_FILE = tmote-bsl-linux
|
||||
TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)),1,0)
|
||||
@ -75,7 +74,6 @@ else
|
||||
# Else we assume Linux
|
||||
ifndef MOTELIST
|
||||
USBDEVPREFIX=
|
||||
SERIALDUMP = rlwrap $(CONTIKI)/tools/sky/serialdump-linux
|
||||
MOTELIST = $(CONTIKI)/tools/sky/motelist-linux
|
||||
TMOTE_BSL_FILE = tmote-bsl-linux
|
||||
TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)),1,0)
|
||||
@ -171,21 +169,7 @@ $(CONTIKI)/tools/tunslip:
|
||||
(cd $(CONTIKI)/tools; $(MAKE) tunslip)
|
||||
|
||||
ifdef MOTE
|
||||
serialdump:
|
||||
$(SERIALDUMP) -b115200 $(USBDEVPREFIX)$(word $(MOTE), $(CMOTES)) | $(CONTIKI)/tools/timestamp | tee serialdump-`date +%Y%m%d-%H%M`
|
||||
|
||||
serialview:
|
||||
$(SERIALDUMP) -b115200 $(USBDEVPREFIX)$(word $(MOTE), $(CMOTES)) | $(CONTIKI)/tools/timestamp
|
||||
|
||||
login:
|
||||
$(SERIALDUMP) -b115200 $(USBDEVPREFIX)$(word $(MOTE), $(CMOTES))
|
||||
PORT = $(USBDEVPREFIX)$(word $(MOTE), $(CMOTES))
|
||||
else
|
||||
serialdump:
|
||||
$(SERIALDUMP) -b115200 $(USBDEVPREFIX)$(firstword $(CMOTES)) | $(CONTIKI)/tools/timestamp | tee serialdump-`date +%Y%m%d-%H%M`
|
||||
|
||||
serialview:
|
||||
$(SERIALDUMP) -b115200 $(USBDEVPREFIX)$(firstword $(CMOTES)) | $(CONTIKI)/tools/timestamp
|
||||
|
||||
login:
|
||||
$(SERIALDUMP) -b115200 $(USBDEVPREFIX)$(firstword $(CMOTES))
|
||||
PORT = $(USBDEVPREFIX)$(firstword $(CMOTES))
|
||||
endif
|
||||
|
@ -103,23 +103,14 @@ set_lladdr(void)
|
||||
#if NETSTACK_CONF_WITH_IPV6
|
||||
memcpy(addr.u8, ds2411_id, sizeof(addr.u8));
|
||||
#else
|
||||
if(node_id == 0) {
|
||||
int i;
|
||||
for(i = 0; i < sizeof(linkaddr_t); ++i) {
|
||||
addr.u8[i] = ds2411_id[7 - i];
|
||||
}
|
||||
} else {
|
||||
addr.u8[0] = node_id & 0xff;
|
||||
addr.u8[1] = node_id >> 8;
|
||||
int i;
|
||||
for(i = 0; i < sizeof(linkaddr_t); ++i) {
|
||||
addr.u8[i] = ds2411_id[7 - i];
|
||||
}
|
||||
#endif
|
||||
linkaddr_set_node_addr(&addr);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if WITH_TINYOS_AUTO_IDS
|
||||
uint16_t TOS_NODE_ID = 0x1234; /* non-zero */
|
||||
uint16_t TOS_LOCAL_ADDRESS = 0x1234; /* non-zero */
|
||||
#endif /* WITH_TINYOS_AUTO_IDS */
|
||||
void
|
||||
platform_init_stage_one(void)
|
||||
{
|
||||
@ -153,23 +144,7 @@ platform_init_stage_two(void)
|
||||
* Hardware initialization done!
|
||||
*/
|
||||
|
||||
#if WITH_TINYOS_AUTO_IDS
|
||||
node_id = TOS_NODE_ID;
|
||||
#else /* WITH_TINYOS_AUTO_IDS */
|
||||
/* Restore node id if such has been stored in external mem */
|
||||
node_id_restore();
|
||||
#endif /* WITH_TINYOS_AUTO_IDS */
|
||||
|
||||
/* for setting "hardcoded" IEEE 802.15.4 MAC addresses */
|
||||
#ifdef IEEE_802154_MAC_ADDRESS
|
||||
{
|
||||
uint8_t ieee[] = IEEE_802154_MAC_ADDRESS;
|
||||
memcpy(ds2411_id, ieee, sizeof(uip_lladdr.addr));
|
||||
ds2411_id[7] = node_id & 0xff;
|
||||
}
|
||||
#endif
|
||||
|
||||
random_init(ds2411_id[0] + node_id);
|
||||
random_init(ds2411_id[0]);
|
||||
|
||||
leds_off(LEDS_BLUE);
|
||||
|
||||
@ -198,12 +173,6 @@ platform_init_stage_three(void)
|
||||
|
||||
cc2420_set_pan_addr(IEEE802154_PANID, shortaddr, longaddr);
|
||||
|
||||
if(node_id > 0) {
|
||||
LOG_INFO("Node id: %u\n", node_id);
|
||||
} else {
|
||||
LOG_INFO("Node id: N/A\n");
|
||||
}
|
||||
|
||||
LOG_INFO("CC2420 CCA threshold %i\n", CC2420_CONF_CCA_THRESH);
|
||||
|
||||
#if !NETSTACK_CONF_WITH_IPV6
|
||||
|
@ -81,8 +81,6 @@
|
||||
#define LOG_MODULE "CC26xx/CC13xx"
|
||||
#define LOG_LEVEL LOG_LEVEL_MAIN
|
||||
/*---------------------------------------------------------------------------*/
|
||||
unsigned short node_id = 0;
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/** \brief Board specific iniatialisation */
|
||||
void board_init(void);
|
||||
/*---------------------------------------------------------------------------*/
|
||||
@ -130,9 +128,6 @@ set_rf_params(void)
|
||||
NETSTACK_RADIO.set_value(RADIO_PARAM_16BIT_ADDR, short_addr);
|
||||
NETSTACK_RADIO.set_value(RADIO_PARAM_CHANNEL, IEEE802154_DEFAULT_CHANNEL);
|
||||
NETSTACK_RADIO.set_object(RADIO_PARAM_64BIT_ADDR, ext_addr, 8);
|
||||
|
||||
/* also set the global node id */
|
||||
node_id = short_addr;
|
||||
#endif
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
@ -227,8 +222,6 @@ platform_init_stage_three()
|
||||
}
|
||||
LOG_INFO_("\n");
|
||||
|
||||
LOG_INFO(" Node ID: %d\n", node_id);
|
||||
|
||||
#if BOARD_HAS_SENSORS
|
||||
process_start(&sensors_process, NULL);
|
||||
#endif
|
||||
|
@ -56,11 +56,9 @@ ifeq ($(HOST_OS),Darwin)
|
||||
USBDEVPREFIX=
|
||||
MOTELIST := $(CONTIKI)/tools/zolertia/motelist-zolertia-macos
|
||||
MOTES := $(shell $(MOTELIST) -c 2>&- | cut -f 2 -d ,)
|
||||
SERIALDUMP := rlwrap $(CONTIKI)/tools/sky/serialdump-macos
|
||||
else
|
||||
### If we are not running under Mac, we assume Linux
|
||||
USBDEVPREFIX=
|
||||
SERIALDUMP := rlwrap $(CONTIKI)/tools/sky/serialdump-linux
|
||||
MOTELIST := $(CONTIKI)/tools/zolertia/motelist-zolertia
|
||||
MOTES := $(shell $(MOTELIST) -b $(MOTELIST_ZOLERTIA) -c 2>&- | cut -f 2 -d , | \
|
||||
perl -ne 'print $$1 . " " if(m-(/dev/\w+)-);')
|
||||
@ -103,8 +101,6 @@ zoul-motelist:
|
||||
zoul-motes:
|
||||
@echo $(MOTES)
|
||||
|
||||
serialview:
|
||||
$(SERIALDUMP) -b115200 $(USBDEVPREFIX)$(firstword $(MOTES)) | $(CONTIKI)/tools/timestamp
|
||||
|
||||
login:
|
||||
$(SERIALDUMP) -b115200 $(USBDEVPREFIX)$(firstword $(MOTES))
|
||||
### For the login etc targets
|
||||
BAUDRATE = 115200
|
||||
PORT = $(USBDEVPREFIX)$(firstword $(MOTES))
|
||||
|
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include "contiki.h"
|
||||
#include "node-id.h"
|
||||
#include "sys/node-id.h"
|
||||
#include "sys/log.h"
|
||||
#include "net/ipv6/uip-ds6-route.h"
|
||||
#include "net/mac/tsch/tsch.h"
|
||||
|
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include "contiki.h"
|
||||
#include "node-id.h"
|
||||
#include "sys/node-id.h"
|
||||
#include "sys/log.h"
|
||||
#include "net/ipv6/uip-ds6-route.h"
|
||||
#include "net/ipv6/uip-sr.h"
|
||||
|
@ -38,7 +38,7 @@
|
||||
*/
|
||||
|
||||
#include "contiki.h"
|
||||
#include "node-id.h"
|
||||
#include "sys/node-id.h"
|
||||
#include "sys/log.h"
|
||||
#include "net/ipv6/uip-ds6-route.h"
|
||||
#include "net/mac/tsch/tsch.h"
|
||||
|
9
examples/libs/shell/Makefile
Normal file
9
examples/libs/shell/Makefile
Normal file
@ -0,0 +1,9 @@
|
||||
CONTIKI_PROJECT = example
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
MODULES += os/services/shell
|
||||
CONTIKI = ../../..
|
||||
|
||||
PLATFORMS_EXCLUDE = sky
|
||||
|
||||
include $(CONTIKI)/Makefile.include
|
1
examples/libs/shell/README.md
Normal file
1
examples/libs/shell/README.md
Normal file
@ -0,0 +1 @@
|
||||
This is a minimal example for the shell.
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2014, SICS Swedish ICT.
|
||||
* Copyright (c) 2018, Swedish Institute of Computer Science.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -32,30 +32,25 @@
|
||||
|
||||
/**
|
||||
* \file
|
||||
* For compatibility with Contiki node-id interface
|
||||
*
|
||||
* A very simple example using the shell
|
||||
* \author
|
||||
* Beshr Al Nahas <beshr@sics.se>
|
||||
* Simon Duquennoy <simon.duquennoy@ri.se>
|
||||
*/
|
||||
|
||||
#include "contiki.h"
|
||||
#include "sys/node-id.h"
|
||||
#include "contiki.h"
|
||||
|
||||
#include <stdio.h> /* For printf() */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
extern unsigned char node_mac[8];
|
||||
unsigned short node_id = 0;
|
||||
PROCESS(example_process, "Example process: shell");
|
||||
AUTOSTART_PROCESSES(&example_process);
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
node_id_restore(void)
|
||||
PROCESS_THREAD(example_process, ev, data)
|
||||
{
|
||||
/* base node-id on MAC address */
|
||||
node_id = (node_mac[6] << 8) | node_mac[7];
|
||||
PROCESS_BEGIN();
|
||||
|
||||
/* This process does nothing. Connect to the node with `make login`
|
||||
* to use the shell. */
|
||||
|
||||
PROCESS_END();
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
node_id_burn(unsigned short id)
|
||||
{
|
||||
/* does not burn anything */
|
||||
node_id = id;
|
||||
}
|
6
examples/libs/simple-energest/Makefile
Normal file
6
examples/libs/simple-energest/Makefile
Normal file
@ -0,0 +1,6 @@
|
||||
CONTIKI_PROJECT = example
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
MODULES += os/services/simple-energest
|
||||
CONTIKI = ../../..
|
||||
include $(CONTIKI)/Makefile.include
|
1
examples/libs/simple-energest/README.md
Normal file
1
examples/libs/simple-energest/README.md
Normal file
@ -0,0 +1 @@
|
||||
This is a minimal example for the module simple-energest.
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2006, Swedish Institute of Computer Science.
|
||||
* Copyright (c) 2018, Swedish Institute of Computer Science.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -32,40 +32,25 @@
|
||||
|
||||
/**
|
||||
* \file
|
||||
* Utility to store a node id in the external flash
|
||||
* A very simple example of simple-energest
|
||||
* \author
|
||||
* Adam Dunkels <adam@sics.se>
|
||||
* Simon Duquennoy <simon.duquennoy@ri.se>
|
||||
*/
|
||||
|
||||
#include "sys/node-id.h"
|
||||
#include "contiki.h"
|
||||
#include "dev/xmem.h"
|
||||
|
||||
unsigned short node_id = 0;
|
||||
|
||||
#include <stdio.h> /* For printf() */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
node_id_restore(void)
|
||||
PROCESS(example_process, "Example process: simple-energest");
|
||||
AUTOSTART_PROCESSES(&example_process);
|
||||
/*---------------------------------------------------------------------------*/
|
||||
PROCESS_THREAD(example_process, ev, data)
|
||||
{
|
||||
unsigned char buf[4];
|
||||
xmem_pread(buf, 4, NODE_ID_XMEM_OFFSET);
|
||||
if(buf[0] == 0xad &&
|
||||
buf[1] == 0xde) {
|
||||
node_id = (buf[2] << 8) | buf[3];
|
||||
} else {
|
||||
node_id = 0;
|
||||
}
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
node_id_burn(unsigned short id)
|
||||
{
|
||||
unsigned char buf[4];
|
||||
buf[0] = 0xad;
|
||||
buf[1] = 0xde;
|
||||
buf[2] = id >> 8;
|
||||
buf[3] = id & 0xff;
|
||||
xmem_erase(XMEM_ERASE_UNIT_SIZE, NODE_ID_XMEM_OFFSET);
|
||||
xmem_pwrite(buf, 4, NODE_ID_XMEM_OFFSET);
|
||||
PROCESS_BEGIN();
|
||||
|
||||
/* Do nothing, just let simple-energest write its summary
|
||||
* at a period of SIMPLE_ENERGEST_CONF_PERIOD */
|
||||
|
||||
PROCESS_END();
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
@ -11,4 +11,7 @@ MODULES += os/services/lwm2m
|
||||
MODULES += os/services/ipso-objects
|
||||
|
||||
CONTIKI=../..
|
||||
include $(CONTIKI)/Makefile.identify-target
|
||||
MODULES_REL += $(TARGET)
|
||||
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
@ -30,9 +30,6 @@
|
||||
#ifndef PROJECT_CONF_H_
|
||||
#define PROJECT_CONF_H_
|
||||
|
||||
/* No sleep on CC2538 to enable full 32 KiB RAM */
|
||||
#define LPM_CONF_ENABLE 0
|
||||
|
||||
#ifdef BOARD_STRING
|
||||
#define LWM2M_DEVICE_MODEL_NUMBER BOARD_STRING
|
||||
#elif defined(CONTIKI_TARGET_WISMOTE)
|
||||
@ -62,4 +59,12 @@
|
||||
/* Enable client-side support for COAP observe */
|
||||
#define COAP_OBSERVE_CLIENT 1
|
||||
|
||||
/* Definitions to enable Queue Mode, include the dynamic adaptation and change the default parameters */
|
||||
/* #define LWM2M_QUEUE_MODE_CONF_ENABLED 1
|
||||
#define LWM2M_QUEUE_MODE_CONF_INCLUDE_DYNAMIC_ADAPTATION 1
|
||||
#define LWM2M_QUEUE_MODE_CONF_DEFAULT_CLIENT_AWAKE_TIME 2000
|
||||
#define LWM2M_QUEUE_MODE_CONF_DEFAULT_CLIENT_SLEEP_TIME 10000
|
||||
#define LWM2M_QUEUE_MODE_CONF_DEFAULT_DYNAMIC_ADAPTATION_FLAG 1
|
||||
#define LWM2M_QUEUE_MODE_OBJECT_CONF_ENABLED 0 */
|
||||
|
||||
#endif /* PROJECT_CONF_H_ */
|
||||
|
48
examples/lwm2m-ipso-objects/zoul/module-macros.h
Normal file
48
examples/lwm2m-ipso-objects/zoul/module-macros.h
Normal file
@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Copyright (c) 2018, RISE SICS AB.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the copyright holder nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Only sleep mode 1 on Zoul to enable full 32 KiB RAM */
|
||||
#define LPM_CONF_MAX_PM 1
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Macros to enter sleep mode and wake up in the Zoul module. Sleep consists
|
||||
* on turn off the radio and start a RTIMER to wake up, and wake up consists on
|
||||
* turn on the radio again
|
||||
*/
|
||||
#define LWM2M_Q_MODE_WAKE_UP() do { \
|
||||
NETSTACK_MAC.on(); \
|
||||
} while(0)
|
||||
|
||||
#define LWM2M_Q_MODE_SLEEP_MS(TIME_MS) do { \
|
||||
uint64_t aux = TIME_MS * RTIMER_SECOND; \
|
||||
NETSTACK_MAC.off(); \
|
||||
rtimer_arch_schedule(RTIMER_NOW() + (rtimer_clock_t)(aux / 1000)); \
|
||||
} while(0)
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
||||
#include "net/routing/routing.h"
|
||||
#include "net/ipv6/uip-debug.h"
|
||||
#include "lib/random.h"
|
||||
#include "node-id.h"
|
||||
#include "sys/node-id.h"
|
||||
#include "waveform.h"
|
||||
#include "leds.h"
|
||||
#include "net/ipv6/uiplib.h"
|
||||
|
@ -42,6 +42,7 @@
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#include "contiki.h"
|
||||
#include "contiki-net.h"
|
||||
#include "sys/node-id.h"
|
||||
#include "sys/platform.h"
|
||||
#include "sys/energest.h"
|
||||
#include "sys/stack-check.h"
|
||||
@ -51,6 +52,7 @@
|
||||
#include "services/rpl-border-router/rpl-border-router.h"
|
||||
#include "services/orchestra/orchestra.h"
|
||||
#include "services/shell/serial-shell.h"
|
||||
#include "services/simple-energest/simple-energest.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
@ -86,6 +88,9 @@ main(void)
|
||||
|
||||
platform_init_stage_two();
|
||||
|
||||
netstack_init();
|
||||
node_id_init();
|
||||
|
||||
LOG_INFO("Starting " CONTIKI_VERSION_STRING "\n");
|
||||
LOG_INFO("- Routing: %s\n", NETSTACK_ROUTING.name);
|
||||
LOG_INFO("- Net: %s\n", NETSTACK_NETWORK.name);
|
||||
@ -97,9 +102,8 @@ main(void)
|
||||
LOG_INFO("- 802.15.4 Default channel: %u\n", IEEE802154_DEFAULT_CHANNEL);
|
||||
#endif /* MAC_CONF_WITH_TSCH */
|
||||
|
||||
netstack_init();
|
||||
|
||||
LOG_INFO("Link-layer address ");
|
||||
LOG_INFO("Node ID: %u\n", node_id);
|
||||
LOG_INFO("Link-layer address: ");
|
||||
LOG_INFO_LLADDR(&linkaddr_node_addr);
|
||||
LOG_INFO_("\n");
|
||||
|
||||
@ -110,7 +114,7 @@ main(void)
|
||||
process_start(&tcpip_process, NULL);
|
||||
|
||||
lladdr = uip_ds6_get_link_local(-1);
|
||||
LOG_INFO("Tentative link-local IPv6 address ");
|
||||
LOG_INFO("Tentative link-local IPv6 address: ");
|
||||
LOG_INFO_6ADDR(lladdr != NULL ? &lladdr->ipaddr : NULL);
|
||||
LOG_INFO_("\n");
|
||||
}
|
||||
@ -138,6 +142,10 @@ main(void)
|
||||
LOG_DBG("With CoAP\n");
|
||||
#endif /* BUILD_WITH_SHELL */
|
||||
|
||||
#if BUILD_WITH_SIMPLE_ENERGEST
|
||||
simple_energest_init();
|
||||
#endif /* BUILD_WITH_SIMPLE_ENERGEST */
|
||||
|
||||
autostart_start(autostart_processes);
|
||||
|
||||
watchdog_start();
|
||||
|
@ -353,4 +353,18 @@ coap_observe_handler(coap_resource_t *resource, coap_message_t *coap_req,
|
||||
}
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
uint8_t
|
||||
coap_has_observers(char *path)
|
||||
{
|
||||
coap_observer_t *obs = NULL;
|
||||
|
||||
for(obs = (coap_observer_t *)list_head(observers_list); obs;
|
||||
obs = obs->next) {
|
||||
if((strncmp(obs->url, path, strlen(path))) == 0) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/** @} */
|
||||
|
@ -80,5 +80,7 @@ void coap_notify_observers_sub(coap_resource_t *resource, const char *subpath);
|
||||
void coap_observe_handler(coap_resource_t *resource, coap_message_t *request,
|
||||
coap_message_t *response);
|
||||
|
||||
uint8_t coap_has_observers(char *path);
|
||||
|
||||
#endif /* COAP_OBSERVE_H_ */
|
||||
/** @} */
|
||||
|
@ -41,6 +41,7 @@
|
||||
|
||||
#include "contiki.h"
|
||||
#include "net/ipv6/uip-sr.h"
|
||||
#include "net/ipv6/uiplib.h"
|
||||
#include "net/routing/routing.h"
|
||||
#include "lib/list.h"
|
||||
#include "lib/memb.h"
|
||||
@ -246,4 +247,49 @@ uip_sr_free_all(void)
|
||||
num_nodes--;
|
||||
}
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
uip_sr_link_snprint(char *buf, int buflen, uip_sr_node_t *link)
|
||||
{
|
||||
int index = 0;
|
||||
uip_ipaddr_t child_ipaddr;
|
||||
uip_ipaddr_t parent_ipaddr;
|
||||
|
||||
NETSTACK_ROUTING.get_sr_node_ipaddr(&child_ipaddr, link);
|
||||
NETSTACK_ROUTING.get_sr_node_ipaddr(&parent_ipaddr, link->parent);
|
||||
|
||||
index += uiplib_ipaddr_snprint(buf+index, buflen-index, &child_ipaddr);
|
||||
if(index >= buflen) {
|
||||
return index;
|
||||
}
|
||||
|
||||
if(link->parent == NULL) {
|
||||
index += snprintf(buf+index, buflen-index, " (DODAG root)");
|
||||
if(index >= buflen) {
|
||||
return index;
|
||||
}
|
||||
} else {
|
||||
index += snprintf(buf+index, buflen-index, " to ");
|
||||
if(index >= buflen) {
|
||||
return index;
|
||||
}
|
||||
index += uiplib_ipaddr_snprint(buf+index, buflen-index, &parent_ipaddr);
|
||||
if(index >= buflen) {
|
||||
return index;
|
||||
}
|
||||
}
|
||||
if(link->lifetime != UIP_SR_INFINITE_LIFETIME) {
|
||||
index += snprintf(buf+index, buflen-index,
|
||||
" (lifetime: %lu seconds)", (unsigned long)link->lifetime);
|
||||
if(index >= buflen) {
|
||||
return index;
|
||||
}
|
||||
} else {
|
||||
index += snprintf(buf+index, buflen-index, " (lifetime: infinite)");
|
||||
if(index >= buflen) {
|
||||
return index;
|
||||
}
|
||||
}
|
||||
return index;
|
||||
}
|
||||
/** @} */
|
||||
|
@ -180,6 +180,17 @@ void uip_sr_init(void);
|
||||
*/
|
||||
void uip_sr_free_all(void);
|
||||
|
||||
/**
|
||||
* Print a textual description of a source routing link
|
||||
*
|
||||
* \param buf The buffer where to write content
|
||||
* \param buflen The buffer len
|
||||
* \param link A pointer to the source routing link
|
||||
* \return Identical to snprintf: number of bytes written excluding ending null
|
||||
* byte. A value >= buflen if the buffer was too small.
|
||||
*/
|
||||
int uip_sr_link_snprint(char *buf, int buflen, uip_sr_node_t *link);
|
||||
|
||||
/** @} */
|
||||
|
||||
#endif /* UIP_SR_H */
|
||||
|
@ -33,8 +33,11 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup uip-addr-lib
|
||||
* @{
|
||||
*
|
||||
* \file
|
||||
* Various uIP library functions.
|
||||
* Implementation of the IP address manipulation library
|
||||
* \author
|
||||
* Nicolas Tsiftes <nvt@sics.se>
|
||||
* Niclas Finne <nfi@sics.se>
|
||||
@ -223,3 +226,6 @@ uiplib_ipaddr_snprint(char *buf, size_t size, const uip_ipaddr_t *addr)
|
||||
return n;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
@ -31,23 +31,24 @@
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* Various uIP library functions.
|
||||
* \author
|
||||
* Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef UIPLIB_H_
|
||||
#define UIPLIB_H_
|
||||
|
||||
#include "net/ipv6/uip.h"
|
||||
|
||||
/**
|
||||
* \addtogroup uipconvfunc
|
||||
* \addtogroup uip
|
||||
* @{
|
||||
*
|
||||
* \defgroup uip-addr-lib uIP address manipulation library
|
||||
*
|
||||
* A library with various IP address manipulation functions
|
||||
* @{
|
||||
*
|
||||
* \file
|
||||
* Header file for the IP address manipulation library
|
||||
* \author
|
||||
* Adam Dunkels <adam@sics.se>
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -77,10 +78,6 @@ int uiplib_ip4addrconv(const char *addrstr, uip_ip4addr_t *addr);
|
||||
int uiplib_ip6addrconv(const char *addrstr, uip_ip6addr_t *addr);
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* \addtogroup uiplib
|
||||
* @{
|
||||
*/
|
||||
|
||||
/* The maxium length of an IPv6 string, including terminating null bytes
|
||||
* fd01:0002:0003:0004:0005:0006:0007:0008 => 39 + 1 bytes */
|
||||
@ -103,6 +100,8 @@ void uiplib_ipaddr_print(const uip_ipaddr_t *addr);
|
||||
*/
|
||||
int uiplib_ipaddr_snprint(char *buffer, size_t size, const uip_ipaddr_t *addr);
|
||||
|
||||
/** @} */
|
||||
|
||||
#endif /* UIPLIB_H_ */
|
||||
/**
|
||||
* @}
|
||||
* @}
|
||||
*/
|
||||
|
@ -42,12 +42,35 @@
|
||||
|
||||
#include "net/routing/rpl-lite/rpl.h"
|
||||
#include "net/ipv6/uip-ds6-route.h"
|
||||
#include "net/ipv6/uip-sr.h"
|
||||
|
||||
/* Log configuration */
|
||||
#include "sys/log.h"
|
||||
#define LOG_MODULE "RPL"
|
||||
#define LOG_LEVEL LOG_LEVEL_RPL
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
rpl_dag_root_print_links(const char *str)
|
||||
{
|
||||
if(rpl_dag_root_is_root()) {
|
||||
if(uip_sr_num_nodes() > 0) {
|
||||
uip_sr_node_t *link;
|
||||
/* Our routing links */
|
||||
LOG_INFO("links: %u routing links in total (%s)\n", uip_sr_num_nodes(), str);
|
||||
link = uip_sr_node_head();
|
||||
while(link != NULL) {
|
||||
char buf[100];
|
||||
uip_sr_link_snprint(buf, sizeof(buf), link);
|
||||
LOG_INFO("links: %s\n", buf);
|
||||
link = uip_sr_node_next(link);
|
||||
}
|
||||
LOG_INFO("links: end of list\n");
|
||||
} else {
|
||||
LOG_INFO("No routing links\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
set_global_address(uip_ipaddr_t *prefix, uip_ipaddr_t *iid)
|
||||
@ -71,11 +94,12 @@ set_global_address(uip_ipaddr_t *prefix, uip_ipaddr_t *iid)
|
||||
|
||||
uip_ds6_addr_add(&root_ipaddr, 0, ADDR_AUTOCONF);
|
||||
|
||||
LOG_INFO("IPv6 addresses: ");
|
||||
LOG_INFO("IPv6 addresses:\n");
|
||||
for(i = 0; i < UIP_DS6_ADDR_NB; i++) {
|
||||
state = uip_ds6_if.addr_list[i].state;
|
||||
if(uip_ds6_if.addr_list[i].isused &&
|
||||
(state == ADDR_TENTATIVE || state == ADDR_PREFERRED)) {
|
||||
LOG_INFO("-- ");
|
||||
LOG_INFO_6ADDR(&uip_ds6_if.addr_list[i].ipaddr);
|
||||
LOG_INFO_("\n");
|
||||
}
|
||||
|
@ -63,6 +63,12 @@ int rpl_dag_root_start(void);
|
||||
* \return 1 if we are dag root, 0 otherwise
|
||||
*/
|
||||
int rpl_dag_root_is_root(void);
|
||||
/**
|
||||
* Prints a summary of all routing links
|
||||
*
|
||||
* \param str A descriptive text on the caller
|
||||
*/
|
||||
void rpl_dag_root_print_links(const char *str);
|
||||
|
||||
/** @} */
|
||||
|
||||
|
@ -104,7 +104,7 @@ update_state(void)
|
||||
/* how many more IP neighbors can be have? */
|
||||
num_free = NBR_TABLE_MAX_NEIGHBORS - num_used;
|
||||
|
||||
LOG_INFO("nbr-policy: free: %d, parents: %d\n", num_free, num_parents);
|
||||
LOG_DBG("nbr-policy: free: %d, parents: %d\n", num_free, num_parents);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static const linkaddr_t *
|
||||
@ -127,12 +127,12 @@ find_removable_dio(uip_ipaddr_t *from, rpl_dio_t *dio)
|
||||
/* Add the new neighbor only if it is better than the current worst. */
|
||||
if(dio->rank + curr_instance.min_hoprankinc < worst_rank - curr_instance.min_hoprankinc / 2) {
|
||||
/* Found *great* neighbor - add! */
|
||||
LOG_INFO("nbr-policy: DIO rank %u, worse_rank %u -- add to cache\n",
|
||||
LOG_DBG("nbr-policy: DIO rank %u, worst_rank %u -- add to cache\n",
|
||||
dio->rank, worst_rank);
|
||||
return worst_rank_nbr_lladdr;
|
||||
}
|
||||
|
||||
LOG_INFO("nbr-policy: DIO rank %u, worse_rank %u -- do not add to cache\n",
|
||||
LOG_DBG("nbr-policy: DIO rank %u, worst_rank %u -- do not add to cache\n",
|
||||
dio->rank, worst_rank);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -94,10 +94,6 @@ rpl_neighbor_snprint(char *buf, int buflen, rpl_nbr_t *nbr)
|
||||
const struct link_stats *stats = rpl_neighbor_get_link_stats(nbr);
|
||||
clock_time_t clock_now = clock_time();
|
||||
|
||||
index += snprintf(buf+index, buflen-index, "nbr: ");
|
||||
if(index >= buflen) {
|
||||
return index;
|
||||
}
|
||||
index += uiplib_ipaddr_snprint(buf+index, buflen-index, rpl_neighbor_get_ipaddr(nbr));
|
||||
if(index >= buflen) {
|
||||
return index;
|
||||
@ -157,7 +153,7 @@ rpl_neighbor_print_list(const char *str)
|
||||
while(nbr != NULL) {
|
||||
char buf[120];
|
||||
rpl_neighbor_snprint(buf, sizeof(buf), nbr);
|
||||
LOG_INFO("%s\n", buf);
|
||||
LOG_INFO("nbr: %s\n", buf);
|
||||
nbr = nbr_table_next(rpl_neighbors, nbr);
|
||||
}
|
||||
LOG_INFO("nbr: end of list\n");
|
||||
@ -409,9 +405,9 @@ rpl_neighbor_select_best(void)
|
||||
/* The best is not fresh. Probe it (unless there is already an urgent
|
||||
probing target). We will be called back after the probing anyway. */
|
||||
if(curr_instance.dag.urgent_probing_target == NULL) {
|
||||
LOG_WARN("best parent is not fresh, schedule urgent probing to ");
|
||||
LOG_WARN_6ADDR(rpl_neighbor_get_ipaddr(best));
|
||||
LOG_WARN_("\n");
|
||||
LOG_INFO("best parent is not fresh, schedule urgent probing to ");
|
||||
LOG_INFO_6ADDR(rpl_neighbor_get_ipaddr(best));
|
||||
LOG_INFO_("\n");
|
||||
curr_instance.dag.urgent_probing_target = best;
|
||||
rpl_schedule_probing_now();
|
||||
}
|
||||
|
@ -521,6 +521,7 @@ handle_periodic_timer(void *ptr)
|
||||
|
||||
if(LOG_INFO_ENABLED) {
|
||||
rpl_neighbor_print_list("Periodic");
|
||||
rpl_dag_root_print_links("Periodic");
|
||||
}
|
||||
|
||||
ctimer_reset(&periodic_timer);
|
||||
|
@ -39,6 +39,7 @@
|
||||
* \author
|
||||
* Joakim Eriksson <joakime@sics.se>
|
||||
* Niclas Finne <nfi@sics.se>
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#include "lwm2m-engine.h"
|
||||
@ -56,7 +57,6 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#ifndef LWM2M_ENGINE_CLIENT_ENDPOINT_NAME
|
||||
#include "net/ipv6/uip-ds6.h"
|
||||
#endif /* LWM2M_ENGINE_CLIENT_ENDPOINT_NAME */
|
||||
@ -80,10 +80,24 @@
|
||||
#define USE_RD_CLIENT 1
|
||||
#endif /* LWM2M_ENGINE_CONF_USE_RD_CLIENT */
|
||||
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
/* Queue Mode is handled using the RD Client and the Q-Mode object */
|
||||
#define USE_RD_CLIENT 1
|
||||
#endif
|
||||
|
||||
#if USE_RD_CLIENT
|
||||
#include "lwm2m-rd-client.h"
|
||||
#endif
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
#include "lwm2m-queue-mode.h"
|
||||
#include "lwm2m-notification-queue.h"
|
||||
#if LWM2M_QUEUE_MODE_OBJECT_ENABLED
|
||||
#include "lwm2m-queue-mode-object.h"
|
||||
#endif /* LWM2M_QUEUE_MODE_OBJECT_ENABLED */
|
||||
#endif /* LWM2M_QUEUE_MODE_ENABLED */
|
||||
|
||||
/* MACRO for getting out resource ID from resource array ID + flags */
|
||||
#define RSC_ID(x) ((uint16_t)(x & 0xffff))
|
||||
#define RSC_READABLE(x) ((x & LWM2M_RESOURCE_READ) > 0)
|
||||
@ -129,7 +143,6 @@ static struct {
|
||||
/* in the future also a timeout */
|
||||
} created;
|
||||
|
||||
|
||||
COAP_HANDLER(lwm2m_handler, lwm2m_handler_callback);
|
||||
LIST(object_list);
|
||||
LIST(generic_object_list);
|
||||
@ -554,6 +567,10 @@ lwm2m_engine_init(void)
|
||||
#if USE_RD_CLIENT
|
||||
lwm2m_rd_client_init(endpoint);
|
||||
#endif
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED && LWM2M_QUEUE_MODE_OBJECT_ENABLED
|
||||
lwm2m_queue_mode_object_init();
|
||||
#endif
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/*
|
||||
@ -1373,6 +1390,10 @@ lwm2m_handler_callback(coap_message_t *request, coap_message_t *response,
|
||||
context.inbuf->size = coap_get_payload(request, (const uint8_t **)&context.inbuf->buffer);
|
||||
context.inbuf->pos = 0;
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
lwm2m_queue_mode_request_received();
|
||||
#endif /* LWM2M_QUEUE_MODE_ENABLED */
|
||||
|
||||
/* Maybe this should be part of CoAP itself - this seems not to be working
|
||||
with the leshan server */
|
||||
#define LWM2M_CONF_ENTITY_TOO_LARGE_BLOCK1 0
|
||||
@ -1632,14 +1653,46 @@ lwm2m_handler_callback(coap_message_t *request, coap_message_t *response,
|
||||
return COAP_HANDLER_STATUS_PROCESSED;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void lwm2m_notify_object_observers(lwm2m_object_instance_t *obj,
|
||||
static void
|
||||
lwm2m_send_notification(char* path)
|
||||
{
|
||||
#if LWM2M_QUEUE_MODE_ENABLED && LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
if(lwm2m_queue_mode_get_dynamic_adaptation_flag()) {
|
||||
lwm2m_queue_mode_set_handler_from_notification();
|
||||
}
|
||||
#endif
|
||||
coap_notify_observers_sub(NULL, path);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_notify_object_observers(lwm2m_object_instance_t *obj,
|
||||
uint16_t resource)
|
||||
{
|
||||
char path[20]; /* 60000/60000/60000 */
|
||||
if(obj != NULL) {
|
||||
snprintf(path, 20, "%d/%d/%d", obj->object_id, obj->instance_id, resource);
|
||||
coap_notify_observers_sub(NULL, path);
|
||||
}
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
|
||||
if(coap_has_observers(path)) {
|
||||
/* Client is sleeping -> add the notification to the list */
|
||||
if(!lwm2m_rd_client_is_client_awake()) {
|
||||
lwm2m_notification_queue_add_notification_path(obj->object_id, obj->instance_id, resource);
|
||||
|
||||
/* if it is the first notification -> wake up and send update */
|
||||
if(!lwm2m_queue_mode_is_waked_up_by_notification()) {
|
||||
lwm2m_queue_mode_set_waked_up_by_notification();
|
||||
lwm2m_rd_client_fsm_execute_queue_mode_update();
|
||||
}
|
||||
/* Client is awake -> send the notification */
|
||||
} else {
|
||||
lwm2m_send_notification(path);
|
||||
}
|
||||
}
|
||||
#else
|
||||
lwm2m_send_notification(path);
|
||||
#endif
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/** @} */
|
||||
|
@ -39,12 +39,14 @@
|
||||
* \author
|
||||
* Joakim Eriksson <joakime@sics.se>
|
||||
* Niclas Finne <nfi@sics.se>
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#ifndef LWM2M_ENGINE_H
|
||||
#define LWM2M_ENGINE_H
|
||||
|
||||
#include "lwm2m-object.h"
|
||||
#include "lwm2m-queue-mode-conf.h"
|
||||
|
||||
#define LWM2M_FLOAT32_BITS 10
|
||||
#define LWM2M_FLOAT32_FRAC (1L << LWM2M_FLOAT32_BITS)
|
||||
@ -114,6 +116,5 @@ void lwm2m_notify_object_observers(lwm2m_object_instance_t *obj,
|
||||
|
||||
void lwm2m_engine_set_opaque_callback(lwm2m_context_t *ctx, lwm2m_write_opaque_callback cb);
|
||||
|
||||
|
||||
#endif /* LWM2M_ENGINE_H */
|
||||
/** @} */
|
||||
|
159
os/services/lwm2m/lwm2m-notification-queue.c
Normal file
159
os/services/lwm2m/lwm2m-notification-queue.c
Normal file
@ -0,0 +1,159 @@
|
||||
/*
|
||||
* Copyright (c) 2017, RISE SICS AB.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the copyright holder nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup lwm2m
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* Implementation of functions to manage the queue to store notifications
|
||||
when waiting for the response to the update message in Queue Mode.
|
||||
* \author
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#include "lwm2m-notification-queue.h"
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
|
||||
#include "lwm2m-queue-mode.h"
|
||||
#include "lwm2m-engine.h"
|
||||
#include "coap-engine.h"
|
||||
#include "lib/memb.h"
|
||||
#include "lib/list.h"
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
/* Log configuration */
|
||||
#include "coap-log.h"
|
||||
#define LOG_MODULE "lwm2m-notification-queue"
|
||||
#define LOG_LEVEL LOG_LEVEL_LWM2M
|
||||
|
||||
#ifdef LWM2M_NOTIFICATION_QUEUE_CONF_LENGTH
|
||||
#define LWM2M_NOTIFICATION_QUEUE_LENGTH LWM2M_NOTIFICATION_QUEUE_CONF_LENGTH
|
||||
#else
|
||||
#define LWM2M_NOTIFICATION_QUEUE_LENGTH COAP_MAX_OBSERVERS
|
||||
#endif
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/* Queue to store the notifications in the period when the client has woken up, sent the update and it's waiting for the server response*/
|
||||
MEMB(notification_memb, notification_path_t, LWM2M_NOTIFICATION_QUEUE_LENGTH); /* Length + 1 to allocate the new path to add */
|
||||
LIST(notification_paths_queue);
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_notification_queue_init(void)
|
||||
{
|
||||
list_init(notification_paths_queue);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
extend_path(notification_path_t *path_object, char *path, int path_size)
|
||||
{
|
||||
switch(path_object->level) {
|
||||
case 1:
|
||||
snprintf(path, path_size, "%u", path_object->reduced_path[0]);
|
||||
break;
|
||||
case 2:
|
||||
snprintf(path, path_size, "%u/%u", path_object->reduced_path[0], path_object->reduced_path[1]);
|
||||
break;
|
||||
case 3:
|
||||
snprintf(path, path_size, "%u/%u/%u", path_object->reduced_path[0], path_object->reduced_path[1], path_object->reduced_path[2]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static int
|
||||
is_notification_path_present(uint16_t object_id, uint16_t instance_id, uint16_t resource_id)
|
||||
{
|
||||
notification_path_t *iteration_path = (notification_path_t *)list_head(notification_paths_queue);
|
||||
while(iteration_path != NULL) {
|
||||
if(iteration_path->reduced_path[0] == object_id && iteration_path->reduced_path[1] == instance_id
|
||||
&& iteration_path->reduced_path[2] == resource_id) {
|
||||
return 1;
|
||||
}
|
||||
iteration_path = iteration_path->next;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
remove_notification_path(notification_path_t *path)
|
||||
{
|
||||
list_remove(notification_paths_queue, path);
|
||||
memb_free(¬ification_memb, path);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_notification_queue_add_notification_path(uint16_t object_id, uint16_t instance_id, uint16_t resource_id)
|
||||
{
|
||||
if(is_notification_path_present(object_id, instance_id, resource_id)) {
|
||||
LOG_DBG("Notification path already present, not queueing it\n");
|
||||
return;
|
||||
}
|
||||
notification_path_t *path_object = memb_alloc(¬ification_memb);
|
||||
if(path_object == NULL) {
|
||||
LOG_DBG("Queue is full, could not allocate new notification\n");
|
||||
return;
|
||||
}
|
||||
path_object->reduced_path[0] = object_id;
|
||||
path_object->reduced_path[1] = instance_id;
|
||||
path_object->reduced_path[2] = resource_id;
|
||||
path_object->level = 3;
|
||||
list_add(notification_paths_queue, path_object);
|
||||
LOG_DBG("Notification path added to the list: %u/%u/%u\n", object_id, instance_id, resource_id);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_notification_queue_send_notifications()
|
||||
{
|
||||
char path[20];
|
||||
notification_path_t *iteration_path = (notification_path_t *)list_head(notification_paths_queue);
|
||||
notification_path_t *aux = iteration_path;
|
||||
|
||||
while(iteration_path != NULL) {
|
||||
extend_path(iteration_path, path, sizeof(path));
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
if(lwm2m_queue_mode_get_dynamic_adaptation_flag()) {
|
||||
lwm2m_queue_mode_set_handler_from_notification();
|
||||
}
|
||||
#endif
|
||||
LOG_DBG("Sending stored notification with path: %s\n", path);
|
||||
coap_notify_observers_sub(NULL, path);
|
||||
aux = iteration_path;
|
||||
iteration_path = iteration_path->next;
|
||||
remove_notification_path(aux);
|
||||
}
|
||||
}
|
||||
#endif /* LWM2M_QUEUE_MODE_ENABLED */
|
||||
/** @} */
|
65
os/services/lwm2m/lwm2m-notification-queue.h
Normal file
65
os/services/lwm2m/lwm2m-notification-queue.h
Normal file
@ -0,0 +1,65 @@
|
||||
/*
|
||||
* Copyright (c) 2017, RISE SICS AB.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the copyright holder nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup lwm2m
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* Header file for functions to manage the queue to store notifications
|
||||
when waiting for the response to the update message in Queue Mode.
|
||||
* \author
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#ifndef LWM2M_NOTIFICATION_QUEUE_H
|
||||
#define LWM2M_NOTIFICATION_QUEUE_H
|
||||
|
||||
#include "contiki.h"
|
||||
#include "lwm2m-queue-mode-conf.h"
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
typedef struct notification_path {
|
||||
struct notification_path *next;
|
||||
uint16_t reduced_path[3];
|
||||
uint8_t level; /* The depth level of the path: 1. object, 2. object/instance, 3. object/instance/resource */
|
||||
} notification_path_t;
|
||||
|
||||
void lwm2m_notification_queue_init(void);
|
||||
|
||||
void lwm2m_notification_queue_add_notification_path(uint16_t object_id, uint16_t instance_id, uint16_t resource_id);
|
||||
|
||||
void lwm2m_notification_queue_send_notifications();
|
||||
|
||||
#endif /* LWM2M_NOTIFICATION_QUEUE_H */
|
||||
/** @} */
|
96
os/services/lwm2m/lwm2m-queue-mode-conf.h
Normal file
96
os/services/lwm2m/lwm2m-queue-mode-conf.h
Normal file
@ -0,0 +1,96 @@
|
||||
/*
|
||||
* Copyright (c) 2017, RISE SICS AB.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the copyright holder nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup lwm2m
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* Queue Mode Configuration Parameters
|
||||
* \author
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#ifndef LWM2M_QUEUE_MODE_CONF_H
|
||||
#define LWM2M_QUEUE_MODE_CONF_H
|
||||
|
||||
#include "contiki.h"
|
||||
|
||||
/* Enable the Queue Mode */
|
||||
#ifdef LWM2M_QUEUE_MODE_CONF_ENABLED
|
||||
#define LWM2M_QUEUE_MODE_ENABLED LWM2M_QUEUE_MODE_CONF_ENABLED
|
||||
#else
|
||||
#define LWM2M_QUEUE_MODE_ENABLED 0
|
||||
#endif /* LWM2M_QUEUE_MODE_CONF_ENABLED */
|
||||
|
||||
/* Default Sleeping Time */
|
||||
#ifdef LWM2M_QUEUE_MODE_CONF_DEFAULT_CLIENT_SLEEP_TIME
|
||||
#define LWM2M_QUEUE_MODE_DEFAULT_CLIENT_SLEEP_TIME LWM2M_QUEUE_MODE_CONF_DEFAULT_CLIENT_SLEEP_TIME
|
||||
#else
|
||||
#define LWM2M_QUEUE_MODE_DEFAULT_CLIENT_SLEEP_TIME 10000 /* msec */
|
||||
#endif /* LWM2M_QUEUE_MODE_DEFAULT_CLIENT_SLEEPING_TIME */
|
||||
|
||||
/* Default Awake Time */
|
||||
#ifdef LWM2M_QUEUE_MODE_CONF_DEFAULT_CLIENT_AWAKE_TIME
|
||||
#define LWM2M_QUEUE_MODE_DEFAULT_CLIENT_AWAKE_TIME LWM2M_QUEUE_MODE_CONF_DEFAULT_CLIENT_AWAKE_TIME
|
||||
#else
|
||||
#define LWM2M_QUEUE_MODE_DEFAULT_CLIENT_AWAKE_TIME 5000 /* msec */
|
||||
#endif /* LWM2M_QUEUE_MODE_DEFAULT_CLIENT_AWAKE_TIME */
|
||||
|
||||
/* Include the possibility to do the dynamic adaptation of the client awake time */
|
||||
#ifdef LWM2M_QUEUE_MODE_CONF_INCLUDE_DYNAMIC_ADAPTATION
|
||||
#define LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION LWM2M_QUEUE_MODE_CONF_INCLUDE_DYNAMIC_ADAPTATION
|
||||
#else
|
||||
#define LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION 0 /* not included */
|
||||
#endif /* LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION */
|
||||
|
||||
/* Default value for the dynamic adaptation flag */
|
||||
#ifdef LWM2M_QUEUE_MODE_CONF_DEFAULT_DYNAMIC_ADAPTATION_FLAG
|
||||
#define LWM2M_QUEUE_MODE_DEFAULT_DYNAMIC_ADAPTATION_FLAG LWM2M_QUEUE_MODE_CONF_DEFAULT_DYNAMIC_ADAPTATION_FLAG
|
||||
#else
|
||||
#define LWM2M_QUEUE_MODE_DEFAULT_DYNAMIC_ADAPTATION_FLAG 0 /* disabled */
|
||||
#endif /* LWM2M_QUEUE_MODE_DEFAULT_DYNAMIC_ADAPTATION_FLAG */
|
||||
|
||||
/* Length of the list of times for the dynamic adaptation */
|
||||
#define LWM2M_QUEUE_MODE_DYNAMIC_ADAPTATION_WINDOW_LENGTH 10
|
||||
|
||||
/* Enable and disable the Queue Mode Object */
|
||||
#ifdef LWM2M_QUEUE_MODE_OBJECT_CONF_ENABLED
|
||||
#define LWM2M_QUEUE_MODE_OBJECT_ENABLED LWM2M_QUEUE_MODE_OBJECT_CONF_ENABLED
|
||||
#else
|
||||
#define LWM2M_QUEUE_MODE_OBJECT_ENABLED 0 /* not included */
|
||||
#endif /* LWM2M_QUEUE_MODE_OBJECT_ENABLED */
|
||||
|
||||
|
||||
|
||||
#endif /* LWM2M_QUEUE_MODE_CONF_H */
|
||||
/** @} */
|
152
os/services/lwm2m/lwm2m-queue-mode-object.c
Normal file
152
os/services/lwm2m/lwm2m-queue-mode-object.c
Normal file
@ -0,0 +1,152 @@
|
||||
/*
|
||||
* Copyright (c) 2017, RISE SICS AB.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the copyright holder nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup lwm2m
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* Implementation of the Contiki OMA LWM2M Queue Mode object
|
||||
to manage the parameters from the server side
|
||||
* \author
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#include "lwm2m-object.h"
|
||||
#include "lwm2m-queue-mode.h"
|
||||
|
||||
/* Log configuration */
|
||||
#include "coap-log.h"
|
||||
#define LOG_MODULE "lwm2m-qmode-object"
|
||||
#define LOG_LEVEL LOG_LEVEL_LWM2M
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED && LWM2M_QUEUE_MODE_OBJECT_ENABLED
|
||||
|
||||
#define LWM2M_QUEUE_MODE_OBJECT_ID 30000
|
||||
#define LWM2M_AWAKE_TIME_ID 30000
|
||||
#define LWM2M_SLEEP_TIME_ID 30001
|
||||
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
#define LWM2M_DYNAMIC_ADAPTATION_FLAG_ID 30002
|
||||
#define UPDATE_WITH_MEAN 0 /* 1-mean time 0-maximum time */
|
||||
#endif
|
||||
|
||||
static const lwm2m_resource_id_t resources[] =
|
||||
{ RW(LWM2M_AWAKE_TIME_ID),
|
||||
RW(LWM2M_SLEEP_TIME_ID),
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
RW(LWM2M_DYNAMIC_ADAPTATION_FLAG_ID),
|
||||
#endif
|
||||
};
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static lwm2m_status_t
|
||||
lwm2m_callback(lwm2m_object_instance_t *object, lwm2m_context_t *ctx)
|
||||
{
|
||||
if(ctx->operation == LWM2M_OP_READ) {
|
||||
switch(ctx->resource_id) {
|
||||
case LWM2M_AWAKE_TIME_ID:
|
||||
lwm2m_object_write_int(ctx, (int32_t)lwm2m_queue_mode_get_awake_time());
|
||||
return LWM2M_STATUS_OK;
|
||||
case LWM2M_SLEEP_TIME_ID:
|
||||
lwm2m_object_write_int(ctx, (int32_t)lwm2m_queue_mode_get_sleep_time());
|
||||
return LWM2M_STATUS_OK;
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
case LWM2M_DYNAMIC_ADAPTATION_FLAG_ID:
|
||||
lwm2m_object_write_int(ctx, (int32_t)lwm2m_queue_mode_get_dynamic_adaptation_flag());
|
||||
return LWM2M_STATUS_OK;
|
||||
#endif
|
||||
}
|
||||
} else if(ctx->operation == LWM2M_OP_WRITE) {
|
||||
switch(ctx->resource_id) {
|
||||
int32_t value_read;
|
||||
size_t len;
|
||||
|
||||
case LWM2M_AWAKE_TIME_ID:
|
||||
|
||||
len = lwm2m_object_read_int(ctx, ctx->inbuf->buffer, ctx->inbuf->size,
|
||||
&value_read);
|
||||
LOG_DBG("Client Awake Time write request value: %d\n", (int)value_read);
|
||||
if(len == 0) {
|
||||
LOG_WARN("FAIL: could not write awake time\n");
|
||||
return LWM2M_STATUS_WRITE_ERROR;
|
||||
} else {
|
||||
lwm2m_queue_mode_set_awake_time(value_read);
|
||||
return LWM2M_STATUS_OK;
|
||||
}
|
||||
|
||||
case LWM2M_SLEEP_TIME_ID:
|
||||
len = lwm2m_object_read_int(ctx, ctx->inbuf->buffer, ctx->inbuf->size,
|
||||
&value_read);
|
||||
LOG_DBG("Client Sleep Time write request value: %d\n", (int)value_read);
|
||||
if(len == 0) {
|
||||
LOG_WARN("FAIL: could not write sleep time\n");
|
||||
return LWM2M_STATUS_WRITE_ERROR;
|
||||
} else {
|
||||
lwm2m_queue_mode_set_sleep_time(value_read);
|
||||
return LWM2M_STATUS_OK;
|
||||
}
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
case LWM2M_DYNAMIC_ADAPTATION_FLAG_ID:
|
||||
len = lwm2m_object_read_int(ctx, ctx->inbuf->buffer, ctx->inbuf->size,
|
||||
&value_read);
|
||||
LOG_DBG("Dynamic Adaptation Flag request value: %d\n", (int)value_read);
|
||||
if(len == 0) {
|
||||
LOG_WARN("FAIL: could not write dynamic flag\n");
|
||||
return LWM2M_STATUS_WRITE_ERROR;
|
||||
} else {
|
||||
lwm2m_queue_mode_set_dynamic_adaptation_flag(value_read);
|
||||
return LWM2M_STATUS_OK;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
return LWM2M_STATUS_OPERATION_NOT_ALLOWED;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static lwm2m_object_instance_t queue_object = {
|
||||
.object_id = LWM2M_QUEUE_MODE_OBJECT_ID,
|
||||
.instance_id = 0,
|
||||
.resource_ids = resources,
|
||||
.resource_count = sizeof(resources) / sizeof(lwm2m_resource_id_t),
|
||||
.resource_dim_callback = NULL,
|
||||
.callback = lwm2m_callback,
|
||||
};
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_queue_mode_object_init(void)
|
||||
{
|
||||
lwm2m_engine_add_object(&queue_object);
|
||||
}
|
||||
#endif /* LWM2M_QUEUE_MODE_ENABLED && LWM2M_QUEUE_MODE_OBJECT_ENABLED */
|
||||
/** @} */
|
52
os/services/lwm2m/lwm2m-queue-mode-object.h
Normal file
52
os/services/lwm2m/lwm2m-queue-mode-object.h
Normal file
@ -0,0 +1,52 @@
|
||||
/*
|
||||
* Copyright (c) 2017, RISE SICS AB.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the copyright holder nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup oma-lwm2m
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* Header file for the Contiki OMA LWM2M Queue Mode object
|
||||
to manage the parameters from the server side
|
||||
* \author
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#ifndef LWM2M_QUEUE_MODE_OBJECT_H_
|
||||
#define LWM2M_QUEUE_MODE_OBJECT_H_
|
||||
|
||||
#include "lwm2m-queue-mode-conf.h"
|
||||
|
||||
void lwm2m_queue_mode_object_init(void);
|
||||
|
||||
#endif /* LWM2M_Q_OBJECT_H_ */
|
||||
/** @} */
|
270
os/services/lwm2m/lwm2m-queue-mode.c
Normal file
270
os/services/lwm2m/lwm2m-queue-mode.c
Normal file
@ -0,0 +1,270 @@
|
||||
/*
|
||||
* Copyright (c) 2017, RISE SICS AB.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the copyright holder nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup lwm2m
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* Implementation of the Contiki OMA LWM2M Queue Mode for managing the parameters
|
||||
* \author
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#include "lwm2m-queue-mode.h"
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
|
||||
#include "lwm2m-engine.h"
|
||||
#include "lwm2m-rd-client.h"
|
||||
#include "lib/memb.h"
|
||||
#include "lib/list.h"
|
||||
#include <string.h>
|
||||
|
||||
/* Log configuration */
|
||||
#include "coap-log.h"
|
||||
#define LOG_MODULE "lwm2m-queue-mode"
|
||||
#define LOG_LEVEL LOG_LEVEL_LWM2M
|
||||
|
||||
/* Queue Mode dynamic adaptation masks */
|
||||
#define FIRST_REQUEST_MASK 0x01
|
||||
#define HANDLER_FROM_NOTIFICATION_MASK 0x02
|
||||
|
||||
static uint16_t queue_mode_awake_time = LWM2M_QUEUE_MODE_DEFAULT_CLIENT_AWAKE_TIME;
|
||||
static uint32_t queue_mode_sleep_time = LWM2M_QUEUE_MODE_DEFAULT_CLIENT_SLEEP_TIME;
|
||||
|
||||
/* Flag for notifications */
|
||||
static uint8_t waked_up_by_notification;
|
||||
|
||||
/* For the dynamic adaptation of the awake time */
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
static uint8_t queue_mode_dynamic_adaptation_flag = LWM2M_QUEUE_MODE_DEFAULT_DYNAMIC_ADAPTATION_FLAG;
|
||||
|
||||
/* Window to save the times and do the dynamic adaptation of the awake time*/
|
||||
uint16_t times_window[LWM2M_QUEUE_MODE_DYNAMIC_ADAPTATION_WINDOW_LENGTH] = { 0 };
|
||||
uint8_t times_window_index = 0;
|
||||
static uint8_t dynamic_adaptation_params = 0x00; /* bit0: first_request, bit1: handler from notification */
|
||||
static uint64_t previous_request_time;
|
||||
static inline void clear_first_request();
|
||||
static inline uint8_t is_first_request();
|
||||
static inline void clear_handler_from_notification();
|
||||
static inline uint8_t get_handler_from_notification();
|
||||
#endif /* LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
uint16_t
|
||||
lwm2m_queue_mode_get_awake_time()
|
||||
{
|
||||
LOG_DBG("Client Awake Time: %d ms\n", (int)queue_mode_awake_time);
|
||||
return queue_mode_awake_time;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_queue_mode_set_awake_time(uint16_t time)
|
||||
{
|
||||
queue_mode_awake_time = time;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
uint32_t
|
||||
lwm2m_queue_mode_get_sleep_time()
|
||||
{
|
||||
LOG_DBG("Client Sleep Time: %d ms\n", (int)queue_mode_sleep_time);
|
||||
return queue_mode_sleep_time;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_queue_mode_set_sleep_time(uint32_t time)
|
||||
{
|
||||
queue_mode_sleep_time = time;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
uint8_t
|
||||
lwm2m_queue_mode_get_dynamic_adaptation_flag()
|
||||
{
|
||||
LOG_DBG("Dynamic Adaptation Flag: %d ms\n", (int)queue_mode_dynamic_adaptation_flag);
|
||||
return queue_mode_dynamic_adaptation_flag;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_queue_mode_set_dynamic_adaptation_flag(uint8_t flag)
|
||||
{
|
||||
queue_mode_dynamic_adaptation_flag = flag;
|
||||
}
|
||||
#endif
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if !UPDATE_WITH_MEAN
|
||||
static uint16_t
|
||||
get_maximum_time()
|
||||
{
|
||||
uint16_t max_time = 0;
|
||||
uint8_t i;
|
||||
for(i = 0; i < LWM2M_QUEUE_MODE_DYNAMIC_ADAPTATION_WINDOW_LENGTH; i++) {
|
||||
if(times_window[i] > max_time) {
|
||||
max_time = times_window[i];
|
||||
}
|
||||
}
|
||||
return max_time;
|
||||
}
|
||||
#endif
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if UPDATE_WITH_MEAN
|
||||
static uint16_t
|
||||
get_mean_time()
|
||||
{
|
||||
uint16_t mean_time = 0;
|
||||
uint8_t i;
|
||||
for(i = 0; i < LWM2M_QUEUE_MODE_DYNAMIC_ADAPTATION_WINDOW_LENGTH; i++) {
|
||||
if(mean_time == 0) {
|
||||
mean_time = times_window[i];
|
||||
} else {
|
||||
if(times_window[i] != 0) {
|
||||
mean_time = (mean_time + times_window[i]) / 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
return mean_time;
|
||||
}
|
||||
#endif
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
update_awake_time()
|
||||
{
|
||||
#if UPDATE_WITH_MEAN
|
||||
uint16_t mean_time = get_mean_time();
|
||||
LOG_DBG("Dynamic Adaptation: updated awake time: %d ms\n", (int)mean_time);
|
||||
lwm2m_queue_mode_set_awake_time(mean_time + (mean_time >> 1)); /* 50% margin */
|
||||
return;
|
||||
#else
|
||||
uint16_t max_time = get_maximum_time();
|
||||
LOG_DBG("Dynamic Adaptation: updated awake time: %d ms\n", (int)max_time);
|
||||
lwm2m_queue_mode_set_awake_time(max_time + (max_time >> 1)); /* 50% margin */
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_queue_mode_add_time_to_window(uint16_t time)
|
||||
{
|
||||
if(times_window_index == LWM2M_QUEUE_MODE_DYNAMIC_ADAPTATION_WINDOW_LENGTH) {
|
||||
times_window_index = 0;
|
||||
}
|
||||
times_window[times_window_index] = time;
|
||||
times_window_index++;
|
||||
update_awake_time();
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
uint8_t
|
||||
lwm2m_queue_mode_is_waked_up_by_notification()
|
||||
{
|
||||
return waked_up_by_notification;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_queue_mode_clear_waked_up_by_notification()
|
||||
{
|
||||
waked_up_by_notification = 0;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_queue_mode_set_waked_up_by_notification()
|
||||
{
|
||||
waked_up_by_notification = 1;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_queue_mode_request_received()
|
||||
{
|
||||
if(lwm2m_rd_client_is_client_awake()) {
|
||||
lwm2m_rd_client_restart_client_awake_timer();
|
||||
}
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
if(lwm2m_queue_mode_get_dynamic_adaptation_flag() && !get_handler_from_notification()) {
|
||||
if(is_first_request()) {
|
||||
previous_request_time = coap_timer_uptime();
|
||||
clear_first_request();
|
||||
} else {
|
||||
if(coap_timer_uptime() - previous_request_time >= 0) {
|
||||
if(coap_timer_uptime() - previous_request_time > 0xffff) {
|
||||
lwm2m_queue_mode_add_time_to_window(0xffff);
|
||||
} else {
|
||||
lwm2m_queue_mode_add_time_to_window(coap_timer_uptime() - previous_request_time);
|
||||
}
|
||||
}
|
||||
previous_request_time = coap_timer_uptime();
|
||||
}
|
||||
}
|
||||
if(get_handler_from_notification()) {
|
||||
clear_handler_from_notification();
|
||||
}
|
||||
#endif /* LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION */
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
void
|
||||
lwm2m_queue_mode_set_first_request()
|
||||
{
|
||||
dynamic_adaptation_params |= FIRST_REQUEST_MASK;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_queue_mode_set_handler_from_notification()
|
||||
{
|
||||
dynamic_adaptation_params |= HANDLER_FROM_NOTIFICATION_MASK;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static inline uint8_t
|
||||
is_first_request()
|
||||
{
|
||||
return dynamic_adaptation_params & FIRST_REQUEST_MASK;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static inline uint8_t
|
||||
get_handler_from_notification()
|
||||
{
|
||||
return (dynamic_adaptation_params & HANDLER_FROM_NOTIFICATION_MASK) != 0;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static inline void
|
||||
clear_first_request()
|
||||
{
|
||||
dynamic_adaptation_params &= ~FIRST_REQUEST_MASK;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static inline void
|
||||
clear_handler_from_notification()
|
||||
{
|
||||
dynamic_adaptation_params &= ~HANDLER_FROM_NOTIFICATION_MASK;
|
||||
}
|
||||
#endif /* LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION */
|
||||
#endif /* LWM2M_QUEUE_MODE_ENABLED */
|
||||
/** @} */
|
||||
|
71
os/services/lwm2m/lwm2m-queue-mode.h
Normal file
71
os/services/lwm2m/lwm2m-queue-mode.h
Normal file
@ -0,0 +1,71 @@
|
||||
/*
|
||||
* Copyright (c) 2017, RISE SICS AB.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the copyright holder nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup oma-lwm2m
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* Header file for the Contiki OMA LWM2M Queue Mode implementation
|
||||
to manage the parameters
|
||||
* \author
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#ifndef LWM2M_QUEUE_MODE_H_
|
||||
#define LWM2M_QUEUE_MODE_H_
|
||||
|
||||
#include "lwm2m-queue-mode-conf.h"
|
||||
#include <inttypes.h>
|
||||
|
||||
uint16_t lwm2m_queue_mode_get_awake_time();
|
||||
void lwm2m_queue_mode_set_awake_time(uint16_t time);
|
||||
uint32_t lwm2m_queue_mode_get_sleep_time();
|
||||
void lwm2m_queue_mode_set_sleep_time(uint32_t time);
|
||||
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
uint8_t lwm2m_queue_mode_get_dynamic_adaptation_flag();
|
||||
void lwm2m_queue_mode_set_dynamic_adaptation_flag(uint8_t flag);
|
||||
void lwm2m_queue_mode_add_time_to_window(uint16_t time);
|
||||
#endif
|
||||
|
||||
uint8_t lwm2m_queue_mode_is_waked_up_by_notification();
|
||||
void lwm2m_queue_mode_clear_waked_up_by_notification();
|
||||
void lwm2m_queue_mode_set_waked_up_by_notification();
|
||||
|
||||
void lwm2m_queue_mode_set_first_request();
|
||||
void lwm2m_queue_mode_set_handler_from_notification();
|
||||
|
||||
void lwm2m_queue_mode_request_received();
|
||||
|
||||
#endif /* LWM2M_QUEUE_MODE_H_ */
|
||||
/** @} */
|
@ -41,8 +41,8 @@
|
||||
* Joakim Eriksson <joakime@sics.se>
|
||||
* Niclas Finne <nfi@sics.se>
|
||||
* Joel Hoglund <joel@sics.se>
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#include "lwm2m-engine.h"
|
||||
#include "lwm2m-object.h"
|
||||
#include "lwm2m-device.h"
|
||||
@ -62,6 +62,11 @@
|
||||
#include "rpl.h"
|
||||
#endif /* UIP_CONF_IPV6_RPL */
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
#include "lwm2m-queue-mode.h"
|
||||
#include "lwm2m-notification-queue.h"
|
||||
#endif /* LWM2M_QUEUE_MODE_ENABLED */
|
||||
|
||||
/* Log configuration */
|
||||
#include "coap-log.h"
|
||||
#define LOG_MODULE "lwm2m-rd"
|
||||
@ -100,6 +105,10 @@ static coap_message_t request[1]; /* This way the message can be treated as
|
||||
#define DEREGISTER_SENT 11
|
||||
#define DEREGISTER_FAILED 12
|
||||
#define DEREGISTERED 13
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
#define QUEUE_MODE_AWAKE 14
|
||||
#define QUEUE_MODE_SEND_UPDATE 15
|
||||
#endif
|
||||
|
||||
#define FLAG_RD_DATA_DIRTY 0x01
|
||||
#define FLAG_RD_DATA_UPDATE_TRIGGERED 0x02
|
||||
@ -121,6 +130,18 @@ static void (*rd_callback)(coap_request_state_t *state);
|
||||
|
||||
static coap_timer_t block1_timer;
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
static coap_timer_t queue_mode_client_awake_timer; /* Timer to control the client's
|
||||
* awake time
|
||||
*/
|
||||
static uint8_t queue_mode_client_awake; /* 1 - client is awake,
|
||||
* 0 - client is sleeping
|
||||
*/
|
||||
static uint16_t queue_mode_client_awake_time; /* The time to be awake */
|
||||
/* Callback for the client awake timer */
|
||||
static void queue_mode_awake_timer_callback(coap_timer_t *timer);
|
||||
#endif
|
||||
|
||||
static void check_periodic_observations();
|
||||
static void update_callback(coap_request_state_t *state);
|
||||
|
||||
@ -147,7 +168,8 @@ set_rd_data(coap_message_t *request)
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
prepare_update(coap_message_t *request, int triggered) {
|
||||
prepare_update(coap_message_t *request, int triggered)
|
||||
{
|
||||
coap_init_message(request, COAP_TYPE_CON, COAP_POST, 0);
|
||||
coap_set_header_uri_path(request, session_info.assigned_ep);
|
||||
|
||||
@ -423,7 +445,16 @@ registration_callback(coap_request_state_t *state)
|
||||
state->response->location_path_len);
|
||||
session_info.assigned_ep[state->response->location_path_len] = 0;
|
||||
/* if we decide to not pass the lt-argument on registration, we should force an initial "update" to register lifetime with server */
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
if(lwm2m_queue_mode_get_dynamic_adaptation_flag()) {
|
||||
lwm2m_queue_mode_set_first_request();
|
||||
}
|
||||
#endif
|
||||
lwm2m_rd_client_fsm_execute_queue_mode_awake(); /* Avoid 500 ms delay and move directly to the state*/
|
||||
#else
|
||||
rd_state = REGISTRATION_DONE;
|
||||
#endif
|
||||
/* remember the last reg time */
|
||||
last_update = coap_timer_uptime();
|
||||
LOG_DBG_("Done (assigned EP='%s')!\n", session_info.assigned_ep);
|
||||
@ -468,8 +499,23 @@ update_callback(coap_request_state_t *state)
|
||||
LOG_DBG_("Done!\n");
|
||||
/* remember the last reg time */
|
||||
last_update = coap_timer_uptime();
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
/* If it has been waked up by a notification, send the stored notifications in queue */
|
||||
if(lwm2m_queue_mode_is_waked_up_by_notification()) {
|
||||
|
||||
lwm2m_queue_mode_clear_waked_up_by_notification();
|
||||
lwm2m_notification_queue_send_notifications();
|
||||
}
|
||||
#if LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION
|
||||
if(lwm2m_queue_mode_get_dynamic_adaptation_flag()) {
|
||||
lwm2m_queue_mode_set_first_request();
|
||||
}
|
||||
#endif /* LWM2M_QUEUE_MODE_INCLUDE_DYNAMIC_ADAPTATION */
|
||||
lwm2m_rd_client_fsm_execute_queue_mode_awake(); /* Avoid 500 ms delay and move directly to the state*/
|
||||
#else
|
||||
rd_state = REGISTRATION_DONE;
|
||||
rd_flags &= ~FLAG_RD_DATA_UPDATE_TRIGGERED;
|
||||
#endif /* LWM2M_QUEUE_MODE_ENABLED */
|
||||
} else {
|
||||
/* Possible error response codes are 4.00 Bad request & 4.04 Not Found */
|
||||
LOG_DBG_("Failed with code %d. Retrying registration\n",
|
||||
@ -516,7 +562,15 @@ periodic_process(coap_timer_t *timer)
|
||||
uint64_t now;
|
||||
|
||||
/* reschedule the CoAP timer */
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
/* In Queue Mode, the machine is not executed periodically, but with the awake/sleeping times */
|
||||
if(!((rd_state & 0xF) == 0xE)) {
|
||||
coap_timer_reset(&rd_timer, STATE_MACHINE_UPDATE_INTERVAL);
|
||||
}
|
||||
#else
|
||||
coap_timer_reset(&rd_timer, STATE_MACHINE_UPDATE_INTERVAL);
|
||||
#endif
|
||||
|
||||
now = coap_timer_uptime();
|
||||
|
||||
LOG_DBG("RD Client - state: %d, ms: %lu\n", rd_state,
|
||||
@ -685,6 +739,27 @@ periodic_process(coap_timer_t *timer)
|
||||
rd_state = UPDATE_SENT;
|
||||
}
|
||||
break;
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
case QUEUE_MODE_AWAKE:
|
||||
LOG_DBG("Queue Mode: Client is AWAKE at %lu\n", (unsigned long)coap_timer_uptime());
|
||||
queue_mode_client_awake = 1;
|
||||
queue_mode_client_awake_time = lwm2m_queue_mode_get_awake_time();
|
||||
coap_timer_set(&queue_mode_client_awake_timer, queue_mode_client_awake_time);
|
||||
break;
|
||||
case QUEUE_MODE_SEND_UPDATE:
|
||||
/* Define this macro to make the necessary actions for waking up,
|
||||
* depending on the platform
|
||||
*/
|
||||
#ifdef LWM2M_QUEUE_MODE_WAKE_UP
|
||||
LWM2M_QUEUE_MODE_WAKE_UP();
|
||||
#endif /* LWM2M_QUEUE_MODE_WAKE_UP */
|
||||
prepare_update(request, rd_flags & FLAG_RD_DATA_UPDATE_TRIGGERED);
|
||||
coap_send_request(&rd_request_state, &session_info.server_ep, request,
|
||||
update_callback);
|
||||
last_rd_progress = coap_timer_uptime();
|
||||
rd_state = UPDATE_SENT;
|
||||
break;
|
||||
#endif /* LWM2M_QUEUE_MODE_ENABLED */
|
||||
|
||||
case UPDATE_SENT:
|
||||
/* just wait until the callback kicks us to the next state... */
|
||||
@ -718,15 +793,27 @@ lwm2m_rd_client_init(const char *ep)
|
||||
{
|
||||
session_info.ep = ep;
|
||||
/* default binding U = UDP, UQ = UDP Q-mode*/
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
session_info.binding = "UQ";
|
||||
/* Enough margin to ensure that the client is not unregistered (we
|
||||
* do not know the time it can stay awake)
|
||||
*/
|
||||
session_info.lifetime = (LWM2M_QUEUE_MODE_DEFAULT_CLIENT_SLEEP_TIME / 1000) * 2;
|
||||
#else
|
||||
session_info.binding = "U";
|
||||
if(session_info.lifetime == 0) {
|
||||
session_info.lifetime = LWM2M_DEFAULT_CLIENT_LIFETIME;
|
||||
}
|
||||
#endif
|
||||
|
||||
rd_state = INIT;
|
||||
|
||||
/* call the RD client periodically */
|
||||
coap_timer_set_callback(&rd_timer, periodic_process);
|
||||
coap_timer_set(&rd_timer, STATE_MACHINE_UPDATE_INTERVAL);
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
coap_timer_set_callback(&queue_mode_client_awake_timer, queue_mode_awake_timer_callback);
|
||||
#endif
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
@ -735,4 +822,54 @@ check_periodic_observations(void)
|
||||
/* TODO */
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/*
|
||||
*Queue Mode Support
|
||||
*/
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_rd_client_restart_client_awake_timer(void)
|
||||
{
|
||||
coap_timer_set(&queue_mode_client_awake_timer, queue_mode_client_awake_time);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
uint8_t
|
||||
lwm2m_rd_client_is_client_awake(void)
|
||||
{
|
||||
return queue_mode_client_awake;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
queue_mode_awake_timer_callback(coap_timer_t *timer)
|
||||
{
|
||||
/* Timer has expired, no requests has been received, client can go to sleep */
|
||||
LOG_DBG("Queue Mode: Client is SLEEPING at %lu\n", (unsigned long)coap_timer_uptime());
|
||||
queue_mode_client_awake = 0;
|
||||
|
||||
/* Define this macro to enter sleep mode depending on the platform */
|
||||
#ifdef LWM2M_QUEUE_MODE_SLEEP_MS
|
||||
LWM2M_QUEUE_MODE_SLEEP_MS(lwm2m_queue_mode_get_sleep_time());
|
||||
#endif /* LWM2M_QUEUE_MODE_SLEEP_MS */
|
||||
rd_state = QUEUE_MODE_SEND_UPDATE;
|
||||
coap_timer_set(&rd_timer, lwm2m_queue_mode_get_sleep_time());
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_rd_client_fsm_execute_queue_mode_awake()
|
||||
{
|
||||
coap_timer_stop(&rd_timer);
|
||||
rd_state = QUEUE_MODE_AWAKE;
|
||||
periodic_process(&rd_timer);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
lwm2m_rd_client_fsm_execute_queue_mode_update()
|
||||
{
|
||||
coap_timer_stop(&rd_timer);
|
||||
rd_state = QUEUE_MODE_SEND_UPDATE;
|
||||
periodic_process(&rd_timer);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#endif /* LWM2M_QUEUE_MODE_ENABLED */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/** @} */
|
||||
|
@ -40,6 +40,7 @@
|
||||
* \author
|
||||
* Joakim Eriksson <joakime@sics.se>
|
||||
* Niclas Finne <nfi@sics.se>
|
||||
* Carlos Gonzalo Peces <carlosgp143@gmail.com>
|
||||
*/
|
||||
|
||||
#ifndef LWM2M_RD_CLIENT_H_
|
||||
@ -52,6 +53,7 @@
|
||||
#define LWM2M_RD_CLIENT_DISCONNECTED 5
|
||||
|
||||
#include "lwm2m-object.h"
|
||||
#include "lwm2m-queue-mode-conf.h"
|
||||
|
||||
struct lwm2m_session_info;
|
||||
typedef void (*session_callback_t)(struct lwm2m_session_info *session, int status);
|
||||
@ -75,6 +77,13 @@ void lwm2m_rd_client_init(const char *ep);
|
||||
|
||||
void lwm2m_rd_client_set_session_callback(session_callback_t cb);
|
||||
|
||||
#if LWM2M_QUEUE_MODE_ENABLED
|
||||
uint8_t lwm2m_rd_client_is_client_awake(void);
|
||||
void lwm2m_rd_client_restart_client_awake_timer(void);
|
||||
void lwm2m_rd_client_fsm_execute_queue_mode_awake();
|
||||
void lwm2m_rd_client_fsm_execute_queue_mode_update();
|
||||
#endif
|
||||
|
||||
#ifndef LWM2M_RD_CLIENT_ASSIGNED_ENDPOINT_MAX_LEN
|
||||
#define LWM2M_RD_CLIENT_ASSIGNED_ENDPOINT_MAX_LEN 15
|
||||
#endif /* LWM2M_RD_CLIENT_ASSIGNED_ENDPOINT_MAX_LEN */
|
||||
|
@ -1,9 +1,7 @@
|
||||
$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
|
||||
(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
|
||||
|
||||
PREFIX ?= fd00::1/64
|
||||
connect-router: $(CONTIKI)/tools/tunslip6
|
||||
sudo $(CONTIKI)/tools/tunslip6 $(PREFIX)
|
||||
|
||||
connect-router-cooja: $(CONTIKI)/tools/tunslip6
|
||||
sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 $(PREFIX)
|
||||
connect-router: $(TUNSLIP6)
|
||||
sudo $(TUNSLIP6) $(PREFIX)
|
||||
|
||||
connect-router-cooja: $(TUNSLIP6)
|
||||
sudo $(TUNSLIP6) -a 127.0.0.1 $(PREFIX)
|
||||
|
@ -615,24 +615,9 @@ PT_THREAD(cmd_routes(struct pt *pt, shell_output_func output, char *args))
|
||||
SHELL_OUTPUT(output, "Routing links (%u in total):\n", uip_sr_num_nodes());
|
||||
link = uip_sr_node_head();
|
||||
while(link != NULL) {
|
||||
uip_ipaddr_t child_ipaddr;
|
||||
uip_ipaddr_t parent_ipaddr;
|
||||
NETSTACK_ROUTING.get_sr_node_ipaddr(&child_ipaddr, link);
|
||||
NETSTACK_ROUTING.get_sr_node_ipaddr(&parent_ipaddr, link->parent);
|
||||
SHELL_OUTPUT(output, "-- ");
|
||||
shell_output_6addr(output, &child_ipaddr);
|
||||
if(link->parent == NULL) {
|
||||
memset(&parent_ipaddr, 0, sizeof(parent_ipaddr));
|
||||
SHELL_OUTPUT(output, " (DODAG root)");
|
||||
} else {
|
||||
SHELL_OUTPUT(output, " to ");
|
||||
shell_output_6addr(output, &parent_ipaddr);
|
||||
}
|
||||
if(link->lifetime != UIP_SR_INFINITE_LIFETIME) {
|
||||
SHELL_OUTPUT(output, " (lifetime: %lu seconds)\n", (unsigned long)link->lifetime);
|
||||
} else {
|
||||
SHELL_OUTPUT(output, " (lifetime: infinite)\n");
|
||||
}
|
||||
char buf[100];
|
||||
uip_sr_link_snprint(buf, sizeof(buf), link);
|
||||
SHELL_OUTPUT(output, "-- %s\n", buf);
|
||||
link = uip_sr_node_next(link);
|
||||
}
|
||||
} else {
|
||||
|
2
os/services/simple-energest/module-macros.h
Normal file
2
os/services/simple-energest/module-macros.h
Normal file
@ -0,0 +1,2 @@
|
||||
#define BUILD_WITH_SIMPLE_ENERGEST 1
|
||||
#define ENERGEST_CONF_ON 1
|
132
os/services/simple-energest/simple-energest.c
Normal file
132
os/services/simple-energest/simple-energest.c
Normal file
@ -0,0 +1,132 @@
|
||||
/*
|
||||
* Copyright (c) 2018, RISE SICS.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup simple-energest
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* A process that periodically prints out the time spent in
|
||||
* radio tx, radio rx, total time and duty cycle.
|
||||
*
|
||||
* \author Simon Duquennoy <simon.duquennoy@ri.se>
|
||||
*/
|
||||
|
||||
#include "contiki.h"
|
||||
#include "sys/energest.h"
|
||||
#include "simple-energest.h"
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
|
||||
/* Log configuration */
|
||||
#include "sys/log.h"
|
||||
#define LOG_MODULE "Energest"
|
||||
#define LOG_LEVEL LOG_LEVEL_INFO
|
||||
|
||||
static unsigned long last_tx, last_rx, last_time, last_cpu, last_lpm, last_deep_lpm;
|
||||
static unsigned long delta_tx, delta_rx, delta_time, delta_cpu, delta_lpm, delta_deep_lpm;
|
||||
static unsigned long curr_tx, curr_rx, curr_time, curr_cpu, curr_lpm, curr_deep_lpm;
|
||||
|
||||
PROCESS(simple_energest_process, "Simple Energest");
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static unsigned long
|
||||
to_permil(unsigned long delta_metric, unsigned long delta_time)
|
||||
{
|
||||
return (1000ul * (delta_metric)) / delta_time;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
simple_energest_step(void)
|
||||
{
|
||||
static unsigned count = 0;
|
||||
|
||||
energest_flush();
|
||||
|
||||
curr_time = ENERGEST_GET_TOTAL_TIME();
|
||||
curr_cpu = energest_type_time(ENERGEST_TYPE_CPU);
|
||||
curr_lpm = energest_type_time(ENERGEST_TYPE_LPM);
|
||||
curr_deep_lpm = energest_type_time(ENERGEST_TYPE_DEEP_LPM);
|
||||
curr_tx = energest_type_time(ENERGEST_TYPE_TRANSMIT);
|
||||
curr_rx = energest_type_time(ENERGEST_TYPE_LISTEN);
|
||||
|
||||
delta_time = curr_time - last_time;
|
||||
delta_cpu = curr_cpu - last_cpu;
|
||||
delta_lpm = curr_lpm - last_lpm;
|
||||
delta_deep_lpm = curr_deep_lpm - last_deep_lpm;
|
||||
delta_tx = curr_tx - last_tx;
|
||||
delta_rx = curr_rx - last_rx;
|
||||
|
||||
last_time = curr_time;
|
||||
last_cpu = curr_cpu;
|
||||
last_lpm = curr_lpm;
|
||||
last_deep_lpm = curr_deep_lpm;
|
||||
last_tx = curr_tx;
|
||||
last_rx = curr_rx;
|
||||
|
||||
LOG_INFO("--- Period summary #%u (%lu seconds)\n", count++, delta_time/ENERGEST_SECOND);
|
||||
LOG_INFO("Total time : %10lu\n", delta_time);
|
||||
LOG_INFO("CPU : %10lu/%10lu (%lu permil)\n", delta_cpu, delta_time, to_permil(delta_cpu, delta_time));
|
||||
LOG_INFO("LPM : %10lu/%10lu (%lu permil)\n", delta_lpm, delta_time, to_permil(delta_lpm, delta_time));
|
||||
LOG_INFO("Deep LPM : %10lu/%10lu (%lu permil)\n", delta_deep_lpm, delta_time, to_permil(delta_deep_lpm, delta_time));
|
||||
LOG_INFO("Radio Tx : %10lu/%10lu (%lu permil)\n", delta_tx, delta_time, to_permil(delta_tx, delta_time));
|
||||
LOG_INFO("Radio Rx : %10lu/%10lu (%lu permil)\n", delta_rx, delta_time, to_permil(delta_rx, delta_time));
|
||||
LOG_INFO("Radio total : %10lu/%10lu (%lu permil)\n", delta_tx+delta_rx, delta_time, to_permil(delta_tx+delta_rx, delta_time));
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
PROCESS_THREAD(simple_energest_process, ev, data)
|
||||
{
|
||||
static struct etimer periodic_timer;
|
||||
PROCESS_BEGIN();
|
||||
|
||||
etimer_set(&periodic_timer, SIMPLE_ENERGEST_PERIOD);
|
||||
while(1) {
|
||||
PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&periodic_timer));
|
||||
etimer_reset(&periodic_timer);
|
||||
simple_energest_step();
|
||||
}
|
||||
PROCESS_END();
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void
|
||||
simple_energest_init(void)
|
||||
{
|
||||
energest_flush();
|
||||
last_time = ENERGEST_GET_TOTAL_TIME();
|
||||
last_cpu = energest_type_time(ENERGEST_TYPE_CPU);
|
||||
last_lpm = energest_type_time(ENERGEST_TYPE_LPM);
|
||||
curr_tx = energest_type_time(ENERGEST_TYPE_TRANSMIT);
|
||||
last_deep_lpm = energest_type_time(ENERGEST_TYPE_DEEP_LPM);
|
||||
last_rx = energest_type_time(ENERGEST_TYPE_LISTEN);
|
||||
process_start(&simple_energest_process, NULL);
|
||||
}
|
||||
|
||||
/** @} */
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2006, Swedish Institute of Computer Science.
|
||||
* Copyright (c) 2018, RISE SICS.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -26,55 +26,35 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup simple-energest
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file
|
||||
* A process that periodically prints out the time spent in
|
||||
* radio tx, radio rx, total time and duty cycle.
|
||||
*
|
||||
* \author Simon Duquennoy <simon.duquennoy@ri.se>
|
||||
*/
|
||||
|
||||
#ifndef SIMPLE_ENERGEST_H_
|
||||
#define SIMPLE_ENERGEST_H_
|
||||
|
||||
/** \brief The period at which Energest statistics will be logged */
|
||||
#ifdef SIMPLE_ENERGEST_CONF_PERIOD
|
||||
#define SIMPLE_ENERGEST_PERIOD SIMPLE_ENERGEST_CONF_PERIOD
|
||||
#else /* SIMPLE_ENERGEST_CONF_PERIOD */
|
||||
#define SIMPLE_ENERGEST_PERIOD (CLOCK_SECOND * 60)
|
||||
#endif /* SIMPLE_ENERGEST_CONF_PERIOD */
|
||||
|
||||
/**
|
||||
* \file
|
||||
* A program for burning a node ID into the flash ROM of a Tmote Sky node.
|
||||
* \author
|
||||
* Adam Dunkels <adam@sics.se>
|
||||
* Initialize the deployment module
|
||||
*/
|
||||
void simple_energest_init(void);
|
||||
|
||||
#include "dev/leds.h"
|
||||
#include "dev/watchdog.h"
|
||||
#include "sys/node-id.h"
|
||||
#include "contiki.h"
|
||||
#include "sys/etimer.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
static struct etimer etimer;
|
||||
|
||||
PROCESS(burn_process, "Burn node id");
|
||||
AUTOSTART_PROCESSES(&burn_process);
|
||||
/*---------------------------------------------------------------------------*/
|
||||
PROCESS_THREAD(burn_process, ev, data)
|
||||
{
|
||||
PROCESS_BEGIN();
|
||||
|
||||
etimer_set(&etimer, 5*CLOCK_SECOND);
|
||||
PROCESS_WAIT_UNTIL(etimer_expired(&etimer));
|
||||
|
||||
watchdog_stop();
|
||||
leds_on(LEDS_RED);
|
||||
#if NODEID
|
||||
printf("Burning node id %d\n", NODEID);
|
||||
node_id_burn(NODEID);
|
||||
leds_on(LEDS_BLUE);
|
||||
node_id_restore();
|
||||
printf("Restored node id %d\n", node_id);
|
||||
#else
|
||||
#error "burn-nodeid must be compiled with nodeid=<the ID of the node>"
|
||||
node_id_restore();
|
||||
printf("Restored node id %d\n", node_id);
|
||||
#endif
|
||||
leds_off(LEDS_RED + LEDS_BLUE);
|
||||
watchdog_start();
|
||||
while(1) {
|
||||
PROCESS_WAIT_EVENT();
|
||||
}
|
||||
PROCESS_END();
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#endif /* SIMPLE_ENERGEST_H_ */
|
||||
/** @} */
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2005, Swedish Institute of Computer Science.
|
||||
* Copyright (c) 2018, RISE SICS.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -26,14 +26,26 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef NODE_ID_H_
|
||||
#define NODE_ID_H_
|
||||
/**
|
||||
* \file
|
||||
* Node-id management
|
||||
* \author
|
||||
* Simon Duquennoy <simon.duquennoy@ri.se>
|
||||
*/
|
||||
|
||||
#include "dev/moteid.h"
|
||||
#include "contiki.h"
|
||||
#include "sys/node-id.h"
|
||||
#include "net/linkaddr.h"
|
||||
|
||||
#define node_id simMoteID
|
||||
uint16_t node_id = 0;
|
||||
|
||||
#endif /* NODE_ID_H_ */
|
||||
void
|
||||
node_id_init(void) {
|
||||
/* Initialize with a default value derived from linkaddr */
|
||||
node_id = linkaddr_node_addr.u8[LINKADDR_SIZE - 1]
|
||||
+ (linkaddr_node_addr.u8[LINKADDR_SIZE - 2] << 8);
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2006, Swedish Institute of Computer Science.
|
||||
* Copyright (c) 2018, RISE SICS.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -28,16 +28,28 @@
|
||||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup node-id
|
||||
* @{
|
||||
*
|
||||
* \file
|
||||
* Node-id (simple 16-bit identifiers) handling
|
||||
* \author Simon Duquennoy <simon.duquennoy@ri.se>
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef NODE_ID_H_
|
||||
#define NODE_ID_H_
|
||||
|
||||
void node_id_restore(void);
|
||||
void node_id_burn(unsigned short node_id);
|
||||
|
||||
extern unsigned short node_id;
|
||||
/* A global variable that hosts the node ID */
|
||||
extern uint16_t node_id;
|
||||
/**
|
||||
* Initialize the node ID. Must be called after initialized of linkaddr
|
||||
*/
|
||||
void node_id_init(void);
|
||||
|
||||
#endif /* NODE_ID_H_ */
|
||||
/** @} */
|
||||
|
||||
|
@ -30,7 +30,7 @@ DOCDIR=../../tools/doxygen
|
||||
all: clean summary
|
||||
|
||||
doxygen:
|
||||
@make -C $(DOCDIR) 2> doxygen.err > /dev/null
|
||||
-@$(MAKE) -C $(DOCDIR) 2> doxygen.err > /dev/null
|
||||
|
||||
summary: doxygen
|
||||
@( \
|
||||
@ -55,4 +55,4 @@ summary: doxygen
|
||||
|
||||
clean:
|
||||
@rm -f summary doxygen.err
|
||||
@make -C $(DOCDIR) clean
|
||||
@$(MAKE) -C $(DOCDIR) clean
|
||||
|
@ -15,6 +15,8 @@ libs/data-structures/sky \
|
||||
libs/stack-check/sky \
|
||||
lwm2m-ipso-objects/native \
|
||||
lwm2m-ipso-objects/native:MAKE_WITH_DTLS=1 \
|
||||
lwm2m-ipso-objects/native:DEFINES=LWM2M_Q_MODE_CONF_ENABLED=1 \
|
||||
lwm2m-ipso-objects/native:DEFINES=LWM2M_Q_MODE_CONF_ENABLED=1,LWM2M_Q_MODE_CONF_INCLUDE_DYNAMIC_ADAPTATION=1\
|
||||
rpl-udp/sky \
|
||||
rpl-border-router/native \
|
||||
rpl-border-router/native:MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC \
|
||||
|
@ -43,6 +43,8 @@ coap/coap-example-client/cc2538dk \
|
||||
coap/coap-example-server/cc2538dk \
|
||||
slip-radio/cc2538dk \
|
||||
lwm2m-ipso-objects/cc2538dk \
|
||||
lwm2m-ipso-objects/cc2538dk:DEFINES=LWM2M_Q_MODE_CONF_ENABLED=1 \
|
||||
lwm2m-ipso-objects/native:DEFINES=LWM2M_Q_MODE_CONF_ENABLED=1,LWM2M_Q_MODE_CONF_INCLUDE_DYNAMIC_ADAPTATION=1\
|
||||
multicast/cc2538dk \
|
||||
dev/gpio-hal/cc2538dk \
|
||||
dev/leds/cc2538dk \
|
||||
|
@ -17,6 +17,8 @@ coap/coap-example-server/zoul \
|
||||
multicast/zoul \
|
||||
lwm2m-ipso-objects/zoul \
|
||||
lwm2m-ipso-objects/zoul:MAKE_WITH_DTLS=1 \
|
||||
lwm2m-ipso-objects/zoul:DEFINES=LWM2M_Q_MODE_CONF_ENABLED=1 \
|
||||
lwm2m-ipso-objects/zoul:DEFINES=LWM2M_Q_MODE_CONF_ENABLED=1,LWM2M_Q_MODE_CONF_INCLUDE_DYNAMIC_ADAPTATION=1\
|
||||
hello-world/zoul \
|
||||
sensniff/zoul \
|
||||
sensniff/zoul:ZOUL_CONF_SUB_GHZ_SNIFFER=1 \
|
||||
@ -62,6 +64,8 @@ dev/gpio-hal/openmote-cc2538 \
|
||||
dev/leds/openmote-cc2538 \
|
||||
rpl-border-router/openmote-cc2538 \
|
||||
libs/ipv6-hooks/openmote-cc2538 \
|
||||
libs/shell/openmote-cc2538 \
|
||||
libs/simple-energest/openmote-cc2538 \
|
||||
|
||||
TOOLS=
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
|
||||
TOOLS=tools tools/sky tools/jn516x
|
||||
TOOLS=tools/serial-io
|
||||
BASEDIR=../../
|
||||
TESTLOGS=$(subst /,__,$(patsubst %,%.testlog, $(TOOLS)))
|
||||
|
||||
|
@ -8,7 +8,7 @@ while(1) {
|
||||
YIELD();
|
||||
log.log(time + " " + id + " "+ msg + "\n");
|
||||
|
||||
if(msg.contains("Node id is set to")) {
|
||||
if(msg.contains("Node ID: ")) {
|
||||
if(id == 1) {
|
||||
write(sim.getMoteWithID(1), "rpl-set-root 1");
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ while(1) {
|
||||
YIELD();
|
||||
log.log(time + " " + id + " "+ msg + "\n");
|
||||
|
||||
if(msg.contains("Node id is set to")) {
|
||||
if(msg.contains("Node ID: ")) {
|
||||
if(id == 1) {
|
||||
write(sim.getMoteWithID(1), "rpl-set-root 1");
|
||||
}
|
||||
|
@ -22,10 +22,9 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
|
||||
JPID=$!
|
||||
sleep 20
|
||||
|
||||
# Connect to the simlation
|
||||
# Connect to the simulation
|
||||
echo "Starting tunslip6"
|
||||
make -C $CONTIKI/tools tunslip6
|
||||
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip.log 2>&1 &
|
||||
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip6.log 2>&1 &
|
||||
MPID=$!
|
||||
printf "Waiting for network formation (%d seconds)\n" "$WAIT_TIME"
|
||||
sleep $WAIT_TIME
|
||||
@ -49,7 +48,7 @@ if [ $STATUS -eq 0 ] && [ $HOPS -eq $TARGETHOPS ] ; then
|
||||
printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog;
|
||||
else
|
||||
echo "==== $BASENAME.coojalog ====" ; cat $BASENAME.coojalog;
|
||||
echo "==== $BASENAME.tunslip.log ====" ; cat $BASENAME.tunslip.log;
|
||||
echo "==== $BASENAME.tunslip6.log ====" ; cat $BASENAME.tunslip6.log;
|
||||
echo "==== $BASENAME.scriptlog ====" ; cat $BASENAME.scriptlog;
|
||||
|
||||
printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;
|
||||
|
@ -28,10 +28,9 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
|
||||
JPID=$!
|
||||
sleep 20
|
||||
|
||||
# Connect to the simlation
|
||||
# Connect to the simulation
|
||||
echo "Starting tunslip6"
|
||||
make -C $CONTIKI/tools tunslip6
|
||||
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip.log 2>&1 &
|
||||
make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=zoul >> $BASENAME.tunslip6.log 2>&1 &
|
||||
MPID=$!
|
||||
printf "Waiting for network formation (%d seconds)\n" "$WAIT_TIME"
|
||||
sleep $WAIT_TIME
|
||||
@ -55,7 +54,7 @@ if [ $STATUS -eq 0 ] && [ $REPLIES -eq $COUNT ] ; then
|
||||
printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog;
|
||||
else
|
||||
echo "==== $BASENAME.coojalog ====" ; cat $BASENAME.coojalog;
|
||||
echo "==== $BASENAME.tunslip.log ====" ; cat $BASENAME.tunslip.log;
|
||||
echo "==== $BASENAME.tunslip6.log ====" ; cat $BASENAME.tunslip6.log;
|
||||
echo "==== $BASENAME.scriptlog ====" ; cat $BASENAME.scriptlog;
|
||||
|
||||
printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;
|
||||
|
@ -28,7 +28,7 @@ java -Xshare:on -jar $CONTIKI/tools/cooja/dist/cooja.jar -nogui=$BASENAME.csc -c
|
||||
JPID=$!
|
||||
sleep 20
|
||||
|
||||
# Connect to the simlation
|
||||
# Connect to the simulation
|
||||
echo "Starting native border-router"
|
||||
nohup make -C $CONTIKI/examples/rpl-border-router/ connect-router-cooja TARGET=native >> $BASENAME.nbr.log 2>&1 &
|
||||
MPID=$!
|
||||
|
69
tests/18-coap-lwm2m/08-lwm2m-qmode-ipso-test.sh
Executable file
69
tests/18-coap-lwm2m/08-lwm2m-qmode-ipso-test.sh
Executable file
@ -0,0 +1,69 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Contiki directory
|
||||
CONTIKI=$1
|
||||
# Test basename
|
||||
BASENAME=08-lwm2m-qmode-ipso-test
|
||||
|
||||
IPADDR=fd00::302:304:506:708
|
||||
|
||||
# Starting Contiki-NG native node
|
||||
echo "Starting native node - lwm2m/ipso objects with Q-Mode"
|
||||
make -C $CONTIKI/examples/lwm2m-ipso-objects clean >/dev/null
|
||||
make -C $CONTIKI/examples/lwm2m-ipso-objects DEFINES=LWM2M_QUEUE_MODE_CONF_ENABLED=1,LWM2M_QUEUE_MODE_CONF_INCLUDE_DYNAMIC_ADAPTATION=1,LWM2M_QUEUE_MODE_OBJECT_CONF_ENABLED=1 > make.log 2> make.err
|
||||
sudo $CONTIKI/examples/lwm2m-ipso-objects/example-ipso-objects.native > node.log 2> node.err &
|
||||
CPID=$!
|
||||
sleep 10
|
||||
|
||||
echo "Downloading leshan with Q-Mode support"
|
||||
wget -nc https://carlosgp143.github.io/resources/leshan-server-demo-qmode-support1.0.0-SNAPSHOT-jar-with-dependencies.jar
|
||||
echo "Starting leshan server with Q-Mode enabled"
|
||||
java -jar leshan-server-demo-qmode-support1.0.0-SNAPSHOT-jar-with-dependencies.jar >leshan.log 2>leshan.err &
|
||||
LESHID=$!
|
||||
|
||||
COUNTER=10
|
||||
while [ $COUNTER -gt 0 ]; do
|
||||
sleep 5
|
||||
aux=$(grep -c 'OK' leshan.err)
|
||||
if [ $aux -eq 2 ] ; then
|
||||
break
|
||||
fi
|
||||
let COUNTER-=1
|
||||
done
|
||||
|
||||
echo "Closing native node"
|
||||
sleep 1
|
||||
pgrep ipso | sudo xargs kill -9
|
||||
|
||||
echo "Closing leshan"
|
||||
sleep 1
|
||||
pgrep java | sudo xargs kill -9
|
||||
|
||||
#Two OKs needed: awake and sleeping
|
||||
aux=$(grep -c 'OK' leshan.err)
|
||||
if [ $aux -eq 2 ]
|
||||
then
|
||||
cp leshan.err $BASENAME.testlog;
|
||||
printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog;
|
||||
else
|
||||
echo "==== make.log ====" ; cat make.log;
|
||||
echo "==== make.err ====" ; cat make.err;
|
||||
echo "==== node.log ====" ; cat node.log;
|
||||
echo "==== node.err ====" ; cat node.err;
|
||||
echo "==== leshan.log ====" ; cat leshan.log;
|
||||
echo "==== leshan.err ====" ; cat leshan.err;
|
||||
echo "==== $BASENAME.log ====" ; cat $BASENAME.log;
|
||||
|
||||
printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;
|
||||
fi
|
||||
|
||||
rm make.log
|
||||
rm make.err
|
||||
rm node.log
|
||||
rm node.err
|
||||
rm leshan.log
|
||||
rm leshan.err
|
||||
|
||||
# We do not want Make to stop -> Return 0
|
||||
# The Makefile will check if a log contains FAIL at the end
|
||||
exit 0
|
68
tests/18-coap-lwm2m/09-lwm2m-qmode-standalone-test.sh
Executable file
68
tests/18-coap-lwm2m/09-lwm2m-qmode-standalone-test.sh
Executable file
@ -0,0 +1,68 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Contiki directory
|
||||
CONTIKI=$1
|
||||
# Test basename
|
||||
BASENAME=09-lwm2m-qmode-standalone-test
|
||||
|
||||
# Building standalone posix example
|
||||
echo "Compiling standalone posix example"
|
||||
make CONTIKI_NG=../../$CONTIKI -C example-lwm2m-standalone/lwm2m clean >/dev/null
|
||||
make CONTIKI_NG=../../$CONTIKI -C example-lwm2m-standalone/lwm2m DEFINES=LWM2M_QUEUE_MODE_CONF_ENABLED=1,LWM2M_QUEUE_MODE_CONF_INCLUDE_DYNAMIC_ADAPTATION=1,LWM2M_QUEUE_MODE_OBJECT_CONF_ENABLED=1 >make.log 2>make.err
|
||||
|
||||
echo "Downloading leshan with Q-Mode support"
|
||||
wget -nc https://carlosgp143.github.io/resources/leshan-server-demo-qmode-support1.0.0-SNAPSHOT-jar-with-dependencies.jar
|
||||
echo "Starting leshan server with Q-Mode enabled"
|
||||
java -jar leshan-server-demo-1.0.0-SNAPSHOT-jar-with-dependencies.jar -lp 5686 -slp 5687 >leshan.log 2>leshan.err &
|
||||
LESHID=$!
|
||||
|
||||
echo "Starting lwm2m standalone example"
|
||||
example-lwm2m-standalone/lwm2m/lwm2m-example coap://127.0.0.1:5686 > node.log 2> node.err &
|
||||
|
||||
CPID=$!
|
||||
|
||||
COUNTER=10
|
||||
while [ $COUNTER -gt 0 ]; do
|
||||
sleep 5
|
||||
aux=$(grep -c 'OK' leshan.err)
|
||||
if [ $aux -eq 2 ] ; then
|
||||
break
|
||||
fi
|
||||
let COUNTER-=1
|
||||
done
|
||||
|
||||
echo "Closing standalone example"
|
||||
sleep 1
|
||||
pgrep lwm2m-example | sudo xargs kill -9
|
||||
|
||||
echo "Closing leshan"
|
||||
sleep 1
|
||||
pgrep java | sudo xargs kill -9
|
||||
|
||||
aux=$(grep -c 'OK' leshan.err)
|
||||
if [ $aux -eq 2 ]
|
||||
then
|
||||
cp leshan.err $BASENAME.testlog;
|
||||
printf "%-32s TEST OK\n" "$BASENAME" | tee $BASENAME.testlog;
|
||||
else
|
||||
echo "==== make.log ====" ; cat make.log;
|
||||
echo "==== make.err ====" ; cat make.err;
|
||||
echo "==== node.log ====" ; cat node.log;
|
||||
echo "==== node.err ====" ; cat node.err;
|
||||
echo "==== leshan.log ====" ; cat leshan.log;
|
||||
echo "==== leshan.err ====" ; cat leshan.err;
|
||||
echo "==== $BASENAME.log ====" ; cat $BASENAME.log;
|
||||
|
||||
printf "%-32s TEST FAIL\n" "$BASENAME" | tee $BASENAME.testlog;
|
||||
fi
|
||||
|
||||
rm make.log
|
||||
rm make.err
|
||||
rm node.log
|
||||
rm node.err
|
||||
rm leshan.log
|
||||
rm leshan.err
|
||||
|
||||
# We do not want Make to stop -> Return 0
|
||||
# The Makefile will check if a log contains FAIL at the end
|
||||
exit 0
|
20
tests/18-coap-lwm2m/pytests/test-qmode-awake.py
Normal file
20
tests/18-coap-lwm2m/pytests/test-qmode-awake.py
Normal file
@ -0,0 +1,20 @@
|
||||
import unittest, array, time
|
||||
|
||||
class TestQueueModeAwake(unittest.TestCase):
|
||||
global respAwakeTime
|
||||
global respSleepTime
|
||||
|
||||
def test_read_awake_time(self):
|
||||
self.assertEqual(respAwakeTime.getCode().getName(), "CONTENT")
|
||||
|
||||
def test_read_sleep_time(self):
|
||||
self.assertEqual(respSleepTime.getCode().getName(), "CONTENT")
|
||||
|
||||
|
||||
print "----------------------------------------"
|
||||
print "LWM2M Queue Mode Awake State Tester"
|
||||
print "----------------------------------------"
|
||||
|
||||
|
||||
suite = unittest.TestLoader().loadTestsFromTestCase(TestQueueModeAwake)
|
||||
unittest.TextTestRunner(verbosity=2).run(suite)
|
19
tests/18-coap-lwm2m/pytests/test-qmode-sleep.py
Normal file
19
tests/18-coap-lwm2m/pytests/test-qmode-sleep.py
Normal file
@ -0,0 +1,19 @@
|
||||
from __future__ import with_statement
|
||||
import unittest, array, time
|
||||
|
||||
class TestQueueModeSleep(unittest.TestCase):
|
||||
global client
|
||||
|
||||
def test_read_awake_time(self):
|
||||
self.assertIsNone(client.read("30000/0/30000"))
|
||||
|
||||
def test_read_sleep_time(self):
|
||||
self.assertIsNone(client.read("30000/0/30001"))
|
||||
|
||||
|
||||
print "----------------------------------------"
|
||||
print "LWM2M Queue Mode Sleep State Tester - name of client: ", client.endpoint
|
||||
print "----------------------------------------"
|
||||
|
||||
suite = unittest.TestLoader().loadTestsFromTestCase(TestQueueModeSleep)
|
||||
unittest.TextTestRunner(verbosity=2).run(suite)
|
@ -36,7 +36,7 @@ summary: $(SUMMARIES)
|
||||
@cat $(SUMMARIES) > $@
|
||||
|
||||
%/summary:
|
||||
@make -C $* summary || true
|
||||
@$(MAKE) -C $* summary || true
|
||||
|
||||
clean:
|
||||
rm -f $(SUMMARIES) summary
|
||||
|
@ -40,7 +40,7 @@ get_target_vars = $(wordlist 2,15,$(subst :, ,$1))
|
||||
define dooneexample
|
||||
@echo -n Building example $(3): $(1) $(4) for target $(2)
|
||||
@((cd $(EXAMPLESDIR)/$(1); \
|
||||
make $(4) TARGET=$(2) clean && make -j $(4) TARGET=$(2) WERROR=1) > \
|
||||
$(MAKE) $(4) TARGET=$(2) clean && make -j $(4) TARGET=$(2) WERROR=1) > \
|
||||
/dev/null 2>make.err && \
|
||||
(echo " -> OK" && printf "%-75s %-40s %-20s TEST OK\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog) || \
|
||||
(echo " -> FAIL" && printf "%-75s %-40s %-20s TEST FAIL\n" "$(1)" "$(4)" "$(2)" > $(3)-$(subst /,-,$(1))$(2).testlog ; cat make.err))
|
||||
@ -65,4 +65,4 @@ clean:
|
||||
@rm -f *.testlog summary
|
||||
@$(foreach example, $(EXAMPLES), \
|
||||
$(foreach target, $(EXAMPLESTARGETS), \
|
||||
(cd $(EXAMPLESDIR)/$(example); make TARGET=$(target) clean);))
|
||||
(cd $(EXAMPLESDIR)/$(example); $(MAKE) TARGET=$(target) clean);))
|
||||
|
@ -1,8 +0,0 @@
|
||||
all: tunslip6
|
||||
|
||||
CFLAGS += -Wall -Werror
|
||||
|
||||
tunslip6: tools-utils.c tunslip6.c
|
||||
|
||||
clean:
|
||||
rm -f *.o tunslip6
|
@ -1,30 +0,0 @@
|
||||
ifndef HOST_OS
|
||||
ifeq ($(OS),Windows_NT)
|
||||
HOST_OS := Windows
|
||||
else
|
||||
HOST_OS := $(shell uname)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(HOST_OS),Windows)
|
||||
SERIALDUMP = serialdump-windows
|
||||
endif
|
||||
|
||||
ifeq ($(HOST_OS),Darwin)
|
||||
SERIALDUMP = serialdump-macos
|
||||
endif
|
||||
|
||||
ifndef SERIALDUMP
|
||||
# Assume Linux
|
||||
SERIALDUMP = serialdump-linux
|
||||
endif
|
||||
|
||||
all: $(SERIALDUMP)
|
||||
|
||||
CFLAGS += -Wall -Werror
|
||||
|
||||
$(SERIALDUMP): serialdump.c
|
||||
$(CC) -O2 -o $@ $<
|
||||
|
||||
clean:
|
||||
rm -f $(SERIALDUMP)
|
Binary file not shown.
@ -1,396 +0,0 @@
|
||||
#define _GNU_SOURCE
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <termios.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <sys/time.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
#define BAUDRATE B115200
|
||||
#define BAUDRATE_S "115200"
|
||||
#ifdef linux
|
||||
#define MODEMDEVICE "/dev/ttyS0"
|
||||
#else
|
||||
#define MODEMDEVICE "/dev/com1"
|
||||
#endif /* linux */
|
||||
|
||||
#define SLIP_END 0300
|
||||
#define SLIP_ESC 0333
|
||||
#define SLIP_ESC_END 0334
|
||||
#define SLIP_ESC_ESC 0335
|
||||
|
||||
#define CSNA_INIT 0x01
|
||||
|
||||
#define BUFSIZE 40
|
||||
#define HCOLS 20
|
||||
#define ICOLS 18
|
||||
|
||||
#define MODE_START_DATE 0
|
||||
#define MODE_DATE 1
|
||||
#define MODE_START_TEXT 2
|
||||
#define MODE_TEXT 3
|
||||
#define MODE_INT 4
|
||||
#define MODE_HEX 5
|
||||
#define MODE_SLIP_AUTO 6
|
||||
#define MODE_SLIP 7
|
||||
#define MODE_SLIP_HIDE 8
|
||||
|
||||
static unsigned char rxbuf[2048];
|
||||
|
||||
static int
|
||||
usage(int result)
|
||||
{
|
||||
printf("Usage: serialdump [-x] [-s[on]] [-i] [-bSPEED] [SERIALDEVICE]\n");
|
||||
printf(" -x for hexadecimal output\n");
|
||||
printf(" -i for decimal output\n");
|
||||
printf(" -s for automatic SLIP mode\n");
|
||||
printf(" -so for SLIP only mode (all data is SLIP packets)\n");
|
||||
printf(" -sn to hide SLIP packages\n");
|
||||
printf(" -T[format] to add time for each text line\n");
|
||||
printf(" (see man page for strftime() for format description)\n");
|
||||
return result;
|
||||
}
|
||||
|
||||
static void
|
||||
print_hex_line(unsigned char *prefix, unsigned char *outbuf, int index)
|
||||
{
|
||||
int i;
|
||||
|
||||
printf("\r%s", prefix);
|
||||
for(i = 0; i < index; i++) {
|
||||
if((i % 4) == 0) {
|
||||
printf(" ");
|
||||
}
|
||||
printf("%02X", outbuf[i] & 0xFF);
|
||||
}
|
||||
printf(" ");
|
||||
for(i = index; i < HCOLS; i++) {
|
||||
if((i % 4) == 0) {
|
||||
printf(" ");
|
||||
}
|
||||
printf(" ");
|
||||
}
|
||||
for(i = 0; i < index; i++) {
|
||||
if(outbuf[i] < 30 || outbuf[i] > 126) {
|
||||
printf(".");
|
||||
} else {
|
||||
printf("%c", outbuf[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
struct termios options;
|
||||
fd_set mask, smask;
|
||||
int fd;
|
||||
speed_t speed = BAUDRATE;
|
||||
char *speedname = BAUDRATE_S;
|
||||
char *device = MODEMDEVICE;
|
||||
char *timeformat = NULL;
|
||||
unsigned char buf[BUFSIZE], outbuf[HCOLS];
|
||||
unsigned char mode = MODE_START_TEXT;
|
||||
int nfound, flags = 0;
|
||||
unsigned char lastc = '\0';
|
||||
|
||||
int index = 1;
|
||||
while(index < argc) {
|
||||
if(argv[index][0] == '-') {
|
||||
switch(argv[index][1]) {
|
||||
case 'b':
|
||||
/* set speed */
|
||||
if(strcmp(&argv[index][2], "38400") == 0) {
|
||||
speed = B38400;
|
||||
speedname = "38400";
|
||||
} else if(strcmp(&argv[index][2], "19200") == 0) {
|
||||
speed = B19200;
|
||||
speedname = "19200";
|
||||
} else if(strcmp(&argv[index][2], "57600") == 0) {
|
||||
speed = B57600;
|
||||
speedname = "57600";
|
||||
} else if(strcmp(&argv[index][2], "115200") == 0) {
|
||||
speed = B115200;
|
||||
speedname = "115200";
|
||||
} else if(strcmp(&argv[index][2], "230400") == 0) {
|
||||
speed = B230400;
|
||||
speedname = "230400";
|
||||
} else if(strcmp(&argv[index][2], "460800") == 0) {
|
||||
speed = B460800;
|
||||
speedname = "460800";
|
||||
} else if(strcmp(&argv[index][2], "500000") == 0) {
|
||||
speed = B500000;
|
||||
speedname = "500000";
|
||||
} else if(strcmp(&argv[index][2], "576000") == 0) {
|
||||
speed = B576000;
|
||||
speedname = "576000";
|
||||
} else if(strcmp(&argv[index][2], "921600") == 0) {
|
||||
speed = B921600;
|
||||
speedname = "921600";
|
||||
} else if(strcmp(&argv[index][2], "1000000") == 0) {
|
||||
speed = B1000000;
|
||||
speedname = "1000000";
|
||||
} else {
|
||||
fprintf(stderr, "unsupported speed: %s\n", &argv[index][2]);
|
||||
return usage(1);
|
||||
}
|
||||
break;
|
||||
case 'x':
|
||||
mode = MODE_HEX;
|
||||
break;
|
||||
case 'i':
|
||||
mode = MODE_INT;
|
||||
break;
|
||||
case 's':
|
||||
switch(argv[index][2]) {
|
||||
case 'n':
|
||||
mode = MODE_SLIP_HIDE;
|
||||
break;
|
||||
case 'o':
|
||||
mode = MODE_SLIP;
|
||||
break;
|
||||
default:
|
||||
mode = MODE_SLIP_AUTO;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 'T':
|
||||
if(strlen(&argv[index][2]) == 0) {
|
||||
timeformat = "%Y-%m-%d %H:%M:%S";
|
||||
} else {
|
||||
timeformat = &argv[index][2];
|
||||
}
|
||||
mode = MODE_START_DATE;
|
||||
break;
|
||||
case 'h':
|
||||
return usage(0);
|
||||
default:
|
||||
fprintf(stderr, "unknown option '%c'\n", argv[index][1]);
|
||||
return usage(1);
|
||||
}
|
||||
index++;
|
||||
} else {
|
||||
device = argv[index++];
|
||||
if(index < argc) {
|
||||
fprintf(stderr, "too many arguments\n");
|
||||
return usage(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
fprintf(stderr, "connecting to %s (%s)", device, speedname);
|
||||
|
||||
#ifdef O_SYNC
|
||||
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY /*| O_DIRECT*/ | O_SYNC);
|
||||
if(fd < 0 && errno == EINVAL){ // O_SYNC not supported (e.g. raspberian)
|
||||
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_DIRECT);
|
||||
}
|
||||
#else
|
||||
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC );
|
||||
#endif
|
||||
if(fd < 0) {
|
||||
fprintf(stderr, "\n");
|
||||
perror("open");
|
||||
exit(-1);
|
||||
}
|
||||
fprintf(stderr, " [OK]\n");
|
||||
|
||||
if(fcntl(fd, F_SETFL, 0) < 0) {
|
||||
perror("could not set fcntl");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if(tcgetattr(fd, &options) < 0) {
|
||||
perror("could not get options");
|
||||
exit(-1);
|
||||
}
|
||||
/* fprintf(stderr, "serial options set\n"); */
|
||||
cfsetispeed(&options, speed);
|
||||
cfsetospeed(&options, speed);
|
||||
/* Enable the receiver and set local mode */
|
||||
options.c_cflag |= (CLOCAL | CREAD);
|
||||
/* Mask the character size bits and turn off (odd) parity */
|
||||
options.c_cflag &= ~(CSIZE | PARENB | PARODD);
|
||||
/* Select 8 data bits */
|
||||
options.c_cflag |= CS8;
|
||||
|
||||
/* Raw input */
|
||||
options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
|
||||
/* Raw output */
|
||||
options.c_oflag &= ~OPOST;
|
||||
|
||||
if(tcsetattr(fd, TCSANOW, &options) < 0) {
|
||||
perror("could not set options");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
/* Make read() return immediately */
|
||||
/* if (fcntl(fd, F_SETFL, FNDELAY) < 0) { */
|
||||
/* perror("\ncould not set fcntl"); */
|
||||
/* exit(-1); */
|
||||
/* } */
|
||||
|
||||
FD_ZERO(&mask);
|
||||
FD_SET(fd, &mask);
|
||||
FD_SET(fileno(stdin), &mask);
|
||||
|
||||
index = 0;
|
||||
for(;;) {
|
||||
smask = mask;
|
||||
nfound = select(FD_SETSIZE, &smask, (fd_set *) 0, (fd_set *) 0, (struct timeval *) 0);
|
||||
if(nfound < 0) {
|
||||
if(errno == EINTR) {
|
||||
fprintf(stderr, "interrupted system call\n");
|
||||
continue;
|
||||
}
|
||||
/* something is very wrong! */
|
||||
perror("select");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if(FD_ISSET(fileno(stdin), &smask)) {
|
||||
/* data from standard in */
|
||||
int n = read(fileno(stdin), buf, sizeof(buf));
|
||||
if(n < 0) {
|
||||
perror("could not read");
|
||||
exit(-1);
|
||||
} else if(n > 0) {
|
||||
/* because commands might need parameters, lines needs to be
|
||||
separated which means the terminating LF must be sent */
|
||||
/* while(n > 0 && buf[n - 1] < 32) { */
|
||||
/* n--; */
|
||||
/* } */
|
||||
if(n > 0) {
|
||||
int i;
|
||||
/* fprintf(stderr, "SEND %d bytes\n", n);*/
|
||||
/* write slowly */
|
||||
for(i = 0; i < n; i++) {
|
||||
if(write(fd, &buf[i], 1) <= 0) {
|
||||
perror("write");
|
||||
exit(1);
|
||||
} else {
|
||||
fflush(NULL);
|
||||
usleep(6000);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* End of input, exit. */
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
if(FD_ISSET(fd, &smask)) {
|
||||
int i, j, n = read(fd, buf, sizeof(buf));
|
||||
if(n < 0) {
|
||||
perror("could not read");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
for(i = 0; i < n; i++) {
|
||||
switch(mode) {
|
||||
case MODE_START_TEXT:
|
||||
case MODE_TEXT:
|
||||
printf("%c", buf[i]);
|
||||
break;
|
||||
case MODE_START_DATE: {
|
||||
time_t t;
|
||||
t = time(&t);
|
||||
strftime(outbuf, HCOLS, timeformat, localtime(&t));
|
||||
printf("%s|", outbuf);
|
||||
mode = MODE_DATE;
|
||||
}
|
||||
/* continue into the MODE_DATE */
|
||||
case MODE_DATE:
|
||||
printf("%c", buf[i]);
|
||||
if(buf[i] == '\n') {
|
||||
mode = MODE_START_DATE;
|
||||
}
|
||||
break;
|
||||
case MODE_INT:
|
||||
printf("%03d ", buf[i]);
|
||||
if(++index >= ICOLS) {
|
||||
index = 0;
|
||||
printf("\n");
|
||||
}
|
||||
break;
|
||||
case MODE_HEX:
|
||||
rxbuf[index++] = buf[i];
|
||||
if(index >= HCOLS) {
|
||||
print_hex_line("", rxbuf, index);
|
||||
index = 0;
|
||||
printf("\n");
|
||||
}
|
||||
break;
|
||||
|
||||
case MODE_SLIP_AUTO:
|
||||
case MODE_SLIP_HIDE:
|
||||
if(!flags && (buf[i] != SLIP_END)) {
|
||||
/* Not a SLIP packet? */
|
||||
printf("%c", buf[i]);
|
||||
break;
|
||||
}
|
||||
/* continue to slip only mode */
|
||||
case MODE_SLIP:
|
||||
switch(buf[i]) {
|
||||
case SLIP_ESC:
|
||||
lastc = SLIP_ESC;
|
||||
break;
|
||||
|
||||
case SLIP_END:
|
||||
if(index > 0) {
|
||||
if(flags != 2 && mode != MODE_SLIP_HIDE) {
|
||||
/* not overflowed: show packet */
|
||||
print_hex_line("SLIP: ", rxbuf, index > HCOLS ? HCOLS : index);
|
||||
printf("\n");
|
||||
}
|
||||
lastc = '\0';
|
||||
index = 0;
|
||||
flags = 0;
|
||||
} else {
|
||||
flags = !flags;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if(lastc == SLIP_ESC) {
|
||||
lastc = '\0';
|
||||
|
||||
/* Previous read byte was an escape byte, so this byte will be
|
||||
interpreted differently from others. */
|
||||
switch(buf[i]) {
|
||||
case SLIP_ESC_END:
|
||||
buf[i] = SLIP_END;
|
||||
break;
|
||||
case SLIP_ESC_ESC:
|
||||
buf[i] = SLIP_ESC;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
rxbuf[index++] = buf[i];
|
||||
if(index >= sizeof(rxbuf)) {
|
||||
fprintf(stderr, "**** slip overflow\n");
|
||||
index = 0;
|
||||
flags = 2;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* after processing for some output modes */
|
||||
if(index > 0) {
|
||||
switch(mode) {
|
||||
case MODE_HEX:
|
||||
print_hex_line("", rxbuf, index);
|
||||
break;
|
||||
}
|
||||
}
|
||||
fflush(stdout);
|
||||
}
|
||||
}
|
||||
}
|
375
tools/makefsdata
375
tools/makefsdata
@ -1,375 +0,0 @@
|
||||
#!/usr/bin/perl
|
||||
#Generate a .c source that preinitializes a file system
|
||||
#David Kopf <dak664@embarqmail.com> July 2009
|
||||
#Extended from the existing non-coffee tool
|
||||
|
||||
#The simplest format is used with httpd-fs.c. It contains a linked
|
||||
#list pointing to file names and file contents.
|
||||
|
||||
#An extension uses the same linked list that points to a the file names
|
||||
#and contents within a coffee file system having fixed file sizes.
|
||||
#This allows the content to be rewritten by coffee while still being
|
||||
#readable by httpd-fs.c New files or sector extension of existing files
|
||||
#is not possible, but a larger initial sector allocation could be given
|
||||
#to some files to allow a limited size increase. Since this would leave the
|
||||
#wrong file size in the linked list, httpd-fs would have to terminate on
|
||||
#a reverse zero scan like coffee does. Rewriting the linked list would
|
||||
#probably be OK if in eeprom, but not if in program flash. Suggestions
|
||||
#for a workaround would be welcome!
|
||||
|
||||
#Lastly a full coffee file system can be preinitialized. File reads must
|
||||
#then be done using coffee.
|
||||
|
||||
#Assumes the coffee file_header structure is
|
||||
#struct file_header {
|
||||
# coffee_page_t log_page;
|
||||
# uint16_t log_records;
|
||||
# uint16_t log_record_size;
|
||||
# coffee_page_t max_pages;
|
||||
# uint8_t deprecated_eof_hint;
|
||||
# uint8_t flags=3 for the initial value;
|
||||
# char name[COFFEE_NAME_LENGTH];
|
||||
# } __attribute__((packed));
|
||||
|
||||
goto DEFAULTS;
|
||||
START:$version="1.1";
|
||||
|
||||
#Process options
|
||||
for($n=0;$n<=$#ARGV;$n++) {
|
||||
$arg=$ARGV[$n];
|
||||
if ($arg eq "-v") {
|
||||
print "makefsdata Version $version\n";
|
||||
} elsif ($arg eq "-A") {
|
||||
$n++;$attribute=$ARGV[$n];
|
||||
} elsif ($arg eq "-C") {
|
||||
$coffee=1;
|
||||
} elsif ($arg eq "-c") {
|
||||
$complement=1;
|
||||
} elsif ($arg eq "-i") {
|
||||
$n++;$includefile=$ARGV[$n];
|
||||
# } elsif ($arg eq "-p") {
|
||||
# $n++;$coffee_page_length=$ARGV[$n];
|
||||
} elsif ($arg eq "-s") {
|
||||
$n++;$coffee_sector_size=$ARGV[$n];
|
||||
} elsif ($arg eq "-t") {
|
||||
$n++;$coffee_page_t =$ARGV[$n];
|
||||
} elsif ($arg eq "-f") {
|
||||
$n++;$coffee_name_length=$ARGV[$n];
|
||||
} elsif ($arg eq "-S") {
|
||||
$n++;$sectionname=$ARGV[$n];
|
||||
} elsif ($arg eq "-l") {
|
||||
$linkedlist=1;
|
||||
} elsif ($arg eq "-d") {
|
||||
$n++;$directory=$ARGV[$n];
|
||||
} elsif ($arg eq "-o") {
|
||||
$n++;$outputfile=$ARGV[$n];
|
||||
$coffeefile=$outputfile;
|
||||
} else {
|
||||
DEFAULTS:
|
||||
#Set up defaults
|
||||
$coffee=0;
|
||||
#$coffee_page_length=256;
|
||||
$coffee_sector_size=256;
|
||||
$coffee_page_t=1;
|
||||
$coffee_name_length=16;
|
||||
$complement=0;
|
||||
$directory="";
|
||||
$outputfile="httpd-fsdata.c";
|
||||
$coffeefile="httpd-coffeedata.c";
|
||||
$includefile="makefsdata.h";
|
||||
$linkedlist=0;
|
||||
$attribute="";
|
||||
$sectionname=".coffeefiles";
|
||||
if (!$version) {goto START;}
|
||||
print "\n";
|
||||
print "Usage: makefsdata <option(s)> <-d input_directory> <-o output_file>\n\n";
|
||||
print " Generates c source file to pre-initialize a contiki file system.\n";
|
||||
print " The default output is a simple linked list readable by httpd-fs.c\n";
|
||||
print " and written to $outputfile.\n\n";
|
||||
print " The -C option makes a coffee file system to default output $coffeefile.\n";
|
||||
print " A linked list can be still be generated for use with httpd-fs.c so long\n";
|
||||
print " as coffee does not extend, delete, or add any files.\n\n";
|
||||
print " The input directory structure is copied. If input_directory is specified\n";
|
||||
print " it becomes the root \"/\". If no input_directory is specified the first\n";
|
||||
print " subdirectory found in the current directory is used as the root.\n\n";
|
||||
print " WARNING : If the output file exists it will be overwritten without confirmation!\n\n";
|
||||
print " Options are:\n";
|
||||
print " -v Display the version number\n";
|
||||
print " -A attribute Append \"attribute\" to the declaration, e.g. PROGMEM to put data in AVR program flash memory\n";
|
||||
print " -C Use coffee file system format\n";
|
||||
print " -c Complement the data, useful for obscurity or fast page erases for coffee\n";
|
||||
print " -i filename Treat any input files with name \"filename\" as include files.\n";
|
||||
print " Useful for giving a server a name and ip address associated with the web content.\n";
|
||||
print " The default is $includefile.\n\n";
|
||||
print " The following apply only to coffee file system\n";
|
||||
# print " -p pagesize Page size in bytes (default $coffee_page_length)\n";
|
||||
print " -s sectorsize Sector size in bytes (default $coffee_sector_size)\n";
|
||||
print " -t page_t Number of bytes in coffee_page_t (1,2,or 4, default $coffee_page_t)\n";
|
||||
print " -f namesize File name field size in bytes (default $coffee_name_length)\n";
|
||||
print " -S section Section name for data (default $sectionname)\n";
|
||||
print " -l Append a linked list for use with httpd-fs\n";
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
#--------------------Configure parameters-----------------------
|
||||
if ($coffee) {
|
||||
$outputfile=$coffeefile;
|
||||
$coffee_header_length=2*$coffee_page_t+$coffee_name_length+6;
|
||||
if ($coffee_page_t==1) {
|
||||
$coffeemax=0xff;
|
||||
} elsif ($coffee_page_t==2) {
|
||||
$coffeemax=0xffff;
|
||||
} elsif ($coffee_page_t==4) {
|
||||
$coffeemax=0xffffffff;
|
||||
} else {
|
||||
die "Unsupported coffee_page_t $coffee_page_t\n";
|
||||
}
|
||||
} else {
|
||||
# $coffee_page_length=1;
|
||||
$coffee_sector_size=1;
|
||||
$linkedlist=1;
|
||||
$coffee_name_length=256;
|
||||
$coffee_max=0xffffffff;
|
||||
$coffee_header_length=0;
|
||||
}
|
||||
$null="0x00";if ($complement) {$null="0xff";}
|
||||
$tab=" "; #optional tabs or spaces at beginning of line, e.g. "\t\t"
|
||||
|
||||
#--------------------Create output file-------------------------
|
||||
#awkward but could not figure out how to compare paths later unless the file exists -- dak
|
||||
if (!open(OUTPUT, "> $outputfile")) {die "Aborted: Could not create output file $outputfile";}
|
||||
print(OUTPUT "\n");
|
||||
close($outputfile);
|
||||
use Cwd qw(abs_path);
|
||||
if (!open(OUTPUT, "> $outputfile")) {die "Aborted: Could not create output file $outputfile";}
|
||||
$outputfile=abs_path($outputfile);
|
||||
|
||||
#--------------------Get a list of input files------------------
|
||||
if ($directory eq "") {
|
||||
opendir(DIR, ".");
|
||||
@files = grep { !/^\./ && !/(CVS|~)/ } readdir(DIR);
|
||||
closedir(DIR);
|
||||
foreach $file (@files) {
|
||||
if(-d $file && $file !~ /^\./) {
|
||||
$directory=$file;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($directory eq "") {die "Aborted: No subdirectory in current directory";}
|
||||
if (!chdir("$directory")) {die "Aborted: Directory \"$directory\" does not exist!";}
|
||||
|
||||
if ($coffee) {
|
||||
print "Processing directory $directory as root of coffee file system\n";
|
||||
} else {
|
||||
print "Processing directory $directory as root of packed httpd-fs file system\n";
|
||||
}
|
||||
opendir(DIR, ".");
|
||||
@files = grep { !/^\./ && !/(CVS|~)/ && !/(makefsdata.ignore)/ } readdir(DIR);
|
||||
closedir(DIR);
|
||||
|
||||
foreach $file (@files) {
|
||||
if(-d $file && $file !~ /^\./) {
|
||||
print "Adding subdirectory $file\n";
|
||||
opendir(DIR, $file);
|
||||
@newfiles = grep { !/^\./ && !/(CVS|~)/ } readdir(DIR);
|
||||
closedir(DIR);
|
||||
# printf "Adding files @newfiles\n";
|
||||
@files = (@files, map { $_ = "$file/$_" } @newfiles);
|
||||
next;
|
||||
}
|
||||
}
|
||||
#--------------------Write the output file-------------------
|
||||
print "Writing to $outputfile\n";
|
||||
($DAY, $MONTH, $YEAR) = (localtime)[3,4,5];
|
||||
printf(OUTPUT "/*********Generated by contiki/tools/makefsdata on %04d-%02d-%02d*********/\n", $YEAR+1900, $MONTH+1, $DAY);
|
||||
if ($coffee) {
|
||||
print(OUTPUT "/*For coffee filesystem of sector size $coffee_sector_size and header length $coffee_header_length bytes*/\n");
|
||||
}
|
||||
print(OUTPUT "\n");
|
||||
#--------------------Process include file-------------------
|
||||
foreach $file (@files) {if ($file eq $includefile) {
|
||||
open(FILE, $file) || die "Aborted: Could not open include file $file\n";
|
||||
print "Including text from $file\n";
|
||||
$file_length= -s FILE;
|
||||
read(FILE, $data, $file_length);
|
||||
print OUTPUT ($data);
|
||||
close(FILE);
|
||||
next; #include all include file matches
|
||||
# break; #include only first include file match
|
||||
}}
|
||||
|
||||
#--------------------Process data files-------------------
|
||||
$n=0;$coffeesize=0;$coffeesectors=0;
|
||||
foreach $file (@files) {if(-f $file) {
|
||||
if (length($file)>=($coffee_name_length-1)) {die "Aborted: File name $file is too long";}
|
||||
if (abs_path("$file") eq abs_path("$outputfile")) {
|
||||
print "Skipping output file $outputfile - recursive input NOT allowed\n";
|
||||
next;
|
||||
}
|
||||
if ($file eq $includefile) {next;}
|
||||
open(FILE, $file) || die "Aborted: Could not open file $file\n";
|
||||
print "Adding /$file\n";
|
||||
if (grep /.png/||/.jpg/||/jpeg/||/.pdf/||/.gif/||/.bin/||/.zip/,$file) {binmode FILE;}
|
||||
|
||||
$file_length= -s FILE;
|
||||
$file =~ s-^-/-;
|
||||
$fvar = $file;
|
||||
$fvar =~ s-/-_-g;
|
||||
$fvar =~ s-\.-_-g;
|
||||
|
||||
if ($coffee) {
|
||||
$coffee_sectors=int(($coffee_header_length+$file_length+$coffee_sector_size-1)/$coffee_sector_size);
|
||||
# $coffee_sectors=sprintf("%.0f",($coffee_header_length+$file_length+$coffee_sector_size-1)/$coffee_sector_size)-1;
|
||||
$coffee_length=$coffee_sectors*$coffee_sector_size;
|
||||
} else {
|
||||
$coffee_length=$file_length+length($file)+1;
|
||||
}
|
||||
$flen[$n]=$file_length;
|
||||
$clen[$n]=$coffee_length;
|
||||
$n++;$coffeesectors+=$coffee_sectors;$coffeesize+=$coffee_length;
|
||||
if ($coffee) {
|
||||
if ($coffeesectors>$coffeemax) {
|
||||
print "Warning: sector number $coffeesectors overflows allocated sector size in coffee header\n";
|
||||
}
|
||||
print(OUTPUT "\n__attribute__ ((section (\"$sectionname\")))\n");
|
||||
print(OUTPUT "volatile const char data".$fvar."[$coffee_length] = {\n");
|
||||
} else {
|
||||
print(OUTPUT "\nconst char data".$fvar."[$coffee_length] $attribute = {\n");
|
||||
}
|
||||
print(OUTPUT "$tab/* $file */\n$tab");
|
||||
#--------------------Header-----------------------------
|
||||
#log_page
|
||||
if ($coffee) {
|
||||
print (OUTPUT " ");
|
||||
for($j=0;$j<$coffee_page_t;$j++) {print (OUTPUT "$ null ,");}
|
||||
#log_records, log_record_size
|
||||
for($j=0;$j<4;$j++) {print (OUTPUT "$null, ");}
|
||||
#max_pages
|
||||
if ($complement) {$coffee_sectors=$coffee_sectors^0xffffffff;}
|
||||
if ($coffee_page_t==1) {
|
||||
printf(OUTPUT "0x%2.2x, ",($coffee_sectors )&0xff);
|
||||
} elsif ($coffee_page_t==2) {
|
||||
printf(OUTPUT "0x%2.2x, ",($coffee_sectors>> 8)&0xff);
|
||||
printf(OUTPUT "0x%2.2x, ",($coffee_sectors )&0xff);
|
||||
} elsif ($coffee_page_t==4) {
|
||||
printf(OUTPUT "0x%2.2x, ",($coffee_sectors>>24)&0xff);
|
||||
printf(OUTPUT "0x%2.2x, ",($coffee_sectors>>16)&0xff);
|
||||
printf(OUTPUT "0x%2.2x, ",($coffee_sectors>> 8)&0xff);
|
||||
printf(OUTPUT "0x%2.2x, ",($coffee_sectors )&0xff);
|
||||
}
|
||||
if ($complement) {$coffee_sectors=$coffee_sectors^0xffffffff;}
|
||||
#eof hint and flags
|
||||
if ($complement) {
|
||||
print(OUTPUT "0xff, 0xfc,\n$tab");
|
||||
} else {
|
||||
print(OUTPUT "0x00, 0x03,\n$tab");
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------File name--------------------------
|
||||
for($j = 0; $j < length($file); $j++) {
|
||||
$temp=unpack("C", substr($file, $j, 1));
|
||||
if ($complement) {$temp=$temp^0xff;}
|
||||
printf(OUTPUT " %#02.2x,", $temp);
|
||||
}
|
||||
if ($coffee) {
|
||||
for(; $j < $coffee_name_length-1; $j++) {printf(OUTPUT " $null,");}
|
||||
{print(OUTPUT " $null");}
|
||||
} else {
|
||||
{printf(OUTPUT " $null");}
|
||||
}
|
||||
#------------------File Data---------------------------
|
||||
$coffee_length-=$coffee_header_length;
|
||||
$i = 10;
|
||||
while(read(FILE, $data, 1)) {
|
||||
$temp=unpack("C", $data);
|
||||
if ($complement) {$temp=$temp^0xff;}
|
||||
if($i == 10) {
|
||||
printf(OUTPUT ",\n$tab 0x%2.2x", $temp);
|
||||
$i = 0;
|
||||
} else {
|
||||
printf(OUTPUT ", 0x%2.2x", $temp)
|
||||
}
|
||||
$i++;$coffee_length--;
|
||||
}
|
||||
|
||||
if ($coffee) {
|
||||
print (OUTPUT ",");
|
||||
while (--$coffee_length) {
|
||||
if($i==9) {
|
||||
print(OUTPUT " $null,\n$tab");
|
||||
$i = 0;
|
||||
} else {
|
||||
print (OUTPUT " $null,");
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
print (OUTPUT " $null");
|
||||
}
|
||||
print (OUTPUT "};\n");
|
||||
close(FILE);
|
||||
push(@fvars, $fvar);
|
||||
push(@pfiles, $file);
|
||||
}}
|
||||
|
||||
if ($linkedlist) {
|
||||
#-------------------httpd_fsdata_file links-------------------
|
||||
#The non-coffee PROGMEM flash file system for the Raven webserver uses a linked flash list as follows:
|
||||
print(OUTPUT "\n\n/* Structure of linked list (all offsets relative to start of section):\n");
|
||||
print(OUTPUT "struct httpd_fsdata_file {\n");
|
||||
print(OUTPUT "$tab const struct httpd_fsdata_file *next; //actual flash address of next link\n");
|
||||
print(OUTPUT "$tab const char *name; //offset to coffee file name\n");
|
||||
print(OUTPUT "$tab const char *data; //offset to coffee file data\n");
|
||||
print(OUTPUT "$tab const int len; //length of file data\n");
|
||||
print(OUTPUT "#if HTTPD_FS_STATISTICS == 1 //not enabled since list is in PROGMEM\n");
|
||||
print(OUTPUT "$tab uint16_t count; //storage for file statistics\n");
|
||||
print(OUTPUT "#endif\n");
|
||||
print(OUTPUT "}\n*/\n");
|
||||
|
||||
# For the static httpd-fs.c file system the file name and data addresses in the linked list
|
||||
# point to the actual memory locations.
|
||||
# For the coffee file system the addresses start from zero. The starting address must be added
|
||||
# in the coffee read routine.
|
||||
|
||||
for($i = 0; $i < @fvars; $i++) {
|
||||
$file = $pfiles[$i];
|
||||
$fvar = $fvars[$i];
|
||||
if($i == 0) {
|
||||
$prevfile = "NULL";
|
||||
$data_offset=0;
|
||||
} else {
|
||||
$data_offset=$data_offset+$clen[$i-1];
|
||||
$prevfile = "file" . $fvars[$i - 1];
|
||||
}
|
||||
$filename_offset=$data_offset+6+2*$coffee_page_t;
|
||||
$coffee_offset=$data_offset+$coffee_header_length;
|
||||
if ($coffee_offset>0xffff) {print "Warning : Linked list offset field overflow\n";}
|
||||
print(OUTPUT "const struct httpd_fsdata_file");
|
||||
for ($t=length($file);$t<16;$t++) {print(OUTPUT " ")};
|
||||
print(OUTPUT " file".$fvar."[] ");
|
||||
if ($attribute) {print(OUTPUT "$attribute ");}
|
||||
print(OUTPUT "={{");
|
||||
for ($t=length($prevfile);$t<20;$t++) {print(OUTPUT " ")};
|
||||
print(OUTPUT "$prevfile, ");
|
||||
if ($coffee) {
|
||||
printf(OUTPUT "(const char *)0x%4.4x, ",$filename_offset);
|
||||
printf(OUTPUT "(const char *)0x%4.4x, ",$coffee_offset);
|
||||
printf(OUTPUT "%5u}};\n",$flen[$i]);
|
||||
} else {
|
||||
print(OUTPUT "data$fvar");
|
||||
for ($t=length($file);$t<15;$t++) {print(OUTPUT " ")};
|
||||
print(OUTPUT ", data$fvar");
|
||||
for ($t=length($file);$t<15;$t++) {print(OUTPUT " ")};
|
||||
print(OUTPUT " +".(length($file)+1).", sizeof(data$fvar)");
|
||||
for ($t=length($file);$t<16;$t++) {print(OUTPUT " ")};
|
||||
print(OUTPUT " -".(length($file)+1)."}};\n");
|
||||
}
|
||||
}
|
||||
print(OUTPUT "\n#define HTTPD_FS_ROOT file$fvars[$n-1]\n");
|
||||
print(OUTPUT "#define HTTPD_FS_NUMFILES $n\n");
|
||||
print(OUTPUT "#define HTTPD_FS_SIZE $coffeesize\n");
|
||||
}
|
||||
print "All done, files occupy $coffeesize bytes\n";
|
||||
|
13
tools/serial-io/Makefile
Normal file
13
tools/serial-io/Makefile
Normal file
@ -0,0 +1,13 @@
|
||||
APPS = tunslip6 serialdump
|
||||
LIB_SRCS = tools-utils.c
|
||||
DEPEND = tools-utils.h
|
||||
|
||||
all: $(APPS)
|
||||
|
||||
CFLAGS += -Wall -Werror -O2
|
||||
|
||||
$(APPS) : % : %.c $(LIB_SRCS) $(DEPEND)
|
||||
$(CC) $(CFLAGS) $< $(LIB_SRCS) -o $@
|
||||
|
||||
clean:
|
||||
rm -f $(APPS)
|
@ -1,4 +1,7 @@
|
||||
#define _GNU_SOURCE
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#include "tools-utils.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <termios.h>
|
||||
@ -9,15 +12,18 @@
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <signal.h>
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#define BAUDRATE B115200
|
||||
#define BAUDRATE_S "115200"
|
||||
|
||||
speed_t b_rate = BAUDRATE;
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#ifdef linux
|
||||
#define MODEMDEVICE "/dev/ttyS0"
|
||||
#else
|
||||
#define MODEMDEVICE "/dev/com1"
|
||||
#endif /* linux */
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#define SLIP_END 0300
|
||||
#define SLIP_ESC 0333
|
||||
#define SLIP_ESC_END 0334
|
||||
@ -38,13 +44,19 @@
|
||||
#define MODE_SLIP_AUTO 6
|
||||
#define MODE_SLIP 7
|
||||
#define MODE_SLIP_HIDE 8
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#ifndef O_SYNC
|
||||
#define O_SYNC 0
|
||||
#endif
|
||||
|
||||
#define OPEN_FLAGS (O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC)
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static unsigned char rxbuf[2048];
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static int
|
||||
usage(int result)
|
||||
{
|
||||
printf("Usage: serialdump [-x] [-s[on]] [-i] [-bSPEED] [SERIALDEVICE]\n");
|
||||
printf("Usage: serialdump [-x] [-s[on]] [-i] [-bSPEED] T[format] [SERIALDEVICE]\n");
|
||||
printf(" -x for hexadecimal output\n");
|
||||
printf(" -i for decimal output\n");
|
||||
printf(" -s for automatic SLIP mode\n");
|
||||
@ -54,7 +66,7 @@ usage(int result)
|
||||
printf(" (see man page for strftime() for format description)\n");
|
||||
return result;
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
print_hex_line(char *prefix, unsigned char *outbuf, int index)
|
||||
{
|
||||
@ -82,13 +94,13 @@ print_hex_line(char *prefix, unsigned char *outbuf, int index)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static void
|
||||
intHandler(int sig)
|
||||
{
|
||||
exit(0);
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
@ -97,8 +109,7 @@ main(int argc, char **argv)
|
||||
struct termios options;
|
||||
fd_set mask, smask;
|
||||
int fd;
|
||||
speed_t speed = BAUDRATE;
|
||||
char *speedname = BAUDRATE_S;
|
||||
int baudrate = BUNKNOWN;
|
||||
char *device = MODEMDEVICE;
|
||||
char *timeformat = NULL;
|
||||
unsigned char buf[BUFSIZE];
|
||||
@ -111,57 +122,41 @@ main(int argc, char **argv)
|
||||
while(index < argc) {
|
||||
if(argv[index][0] == '-') {
|
||||
switch(argv[index][1]) {
|
||||
case 'b':
|
||||
/* set speed */
|
||||
if(strcmp(&argv[index][2], "38400") == 0) {
|
||||
speed = B38400;
|
||||
speedname = "38400";
|
||||
} else if(strcmp(&argv[index][2], "19200") == 0) {
|
||||
speed = B19200;
|
||||
speedname = "19200";
|
||||
} else if(strcmp(&argv[index][2], "57600") == 0) {
|
||||
speed = B57600;
|
||||
speedname = "57600";
|
||||
} else if(strcmp(&argv[index][2], "115200") == 0) {
|
||||
speed = B115200;
|
||||
speedname = "115200";
|
||||
} else {
|
||||
fprintf(stderr, "unsupported speed: %s\n", &argv[index][2]);
|
||||
return usage(1);
|
||||
}
|
||||
case 'b':
|
||||
baudrate = atoi(&argv[index][2]);
|
||||
break;
|
||||
case 'x':
|
||||
mode = MODE_HEX;
|
||||
break;
|
||||
case 'i':
|
||||
mode = MODE_INT;
|
||||
break;
|
||||
case 's':
|
||||
switch(argv[index][2]) {
|
||||
case 'n':
|
||||
mode = MODE_SLIP_HIDE;
|
||||
break;
|
||||
case 'x':
|
||||
mode = MODE_HEX;
|
||||
case 'o':
|
||||
mode = MODE_SLIP;
|
||||
break;
|
||||
case 'i':
|
||||
mode = MODE_INT;
|
||||
break;
|
||||
case 's':
|
||||
switch(argv[index][2]) {
|
||||
case 'n':
|
||||
mode = MODE_SLIP_HIDE;
|
||||
break;
|
||||
case 'o':
|
||||
mode = MODE_SLIP;
|
||||
break;
|
||||
default:
|
||||
mode = MODE_SLIP_AUTO;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 'T':
|
||||
if(strlen(&argv[index][2]) == 0) {
|
||||
timeformat = "%Y-%m-%d %H:%M:%S";
|
||||
} else {
|
||||
timeformat = &argv[index][2];
|
||||
}
|
||||
mode = MODE_START_DATE;
|
||||
break;
|
||||
case 'h':
|
||||
return usage(0);
|
||||
default:
|
||||
fprintf(stderr, "unknown option '%c'\n", argv[index][1]);
|
||||
return usage(1);
|
||||
mode = MODE_SLIP_AUTO;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 'T':
|
||||
if(strlen(&argv[index][2]) == 0) {
|
||||
timeformat = "%Y-%m-%d %H:%M:%S";
|
||||
} else {
|
||||
timeformat = &argv[index][2];
|
||||
}
|
||||
mode = MODE_START_DATE;
|
||||
break;
|
||||
case 'h':
|
||||
return usage(0);
|
||||
default:
|
||||
fprintf(stderr, "unknown option '%c'\n", argv[index][1]);
|
||||
return usage(1);
|
||||
}
|
||||
index++;
|
||||
} else {
|
||||
@ -172,24 +167,19 @@ main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
}
|
||||
fprintf(stderr, "connecting to %s (%s)", device, speedname);
|
||||
|
||||
|
||||
|
||||
#ifndef O_SYNC
|
||||
#define O_SYNC 0
|
||||
#endif
|
||||
#ifdef O_DIRECT
|
||||
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_DIRECT | O_SYNC);
|
||||
/* Some systems do not support certain parameters (e.g. raspbian)
|
||||
* Just do some random testing. Not sure whether there is a better way
|
||||
* of doing this. */
|
||||
if(fd < 0 && errno == EINVAL){
|
||||
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC);
|
||||
if(baudrate != BUNKNOWN) {
|
||||
b_rate = select_baudrate(baudrate);
|
||||
if(b_rate == 0) {
|
||||
fprintf(stderr, "unknown baudrate %d\n", baudrate);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
#else
|
||||
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY | O_SYNC);
|
||||
#endif
|
||||
|
||||
fprintf(stderr, "connecting to %s", device);
|
||||
|
||||
fd = open(device, OPEN_FLAGS);
|
||||
|
||||
if(fd < 0) {
|
||||
fprintf(stderr, "\n");
|
||||
perror("open");
|
||||
@ -206,9 +196,10 @@ main(int argc, char **argv)
|
||||
perror("could not get options");
|
||||
exit(-1);
|
||||
}
|
||||
/* fprintf(stderr, "serial options set\n"); */
|
||||
cfsetispeed(&options, speed);
|
||||
cfsetospeed(&options, speed);
|
||||
|
||||
cfsetispeed(&options, b_rate);
|
||||
cfsetospeed(&options, b_rate);
|
||||
|
||||
/* Enable the receiver and set local mode */
|
||||
options.c_cflag |= (CLOCAL | CREAD);
|
||||
/* Mask the character size bits and turn off (odd) parity */
|
||||
@ -228,12 +219,6 @@ main(int argc, char **argv)
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
/* Make read() return immediately */
|
||||
/* if (fcntl(fd, F_SETFL, FNDELAY) < 0) { */
|
||||
/* perror("\ncould not set fcntl"); */
|
||||
/* exit(-1); */
|
||||
/* } */
|
||||
|
||||
FD_ZERO(&mask);
|
||||
FD_SET(fd, &mask);
|
||||
FD_SET(fileno(stdin), &mask);
|
||||
@ -241,7 +226,7 @@ main(int argc, char **argv)
|
||||
index = 0;
|
||||
for(;;) {
|
||||
smask = mask;
|
||||
nfound = select(FD_SETSIZE, &smask, (fd_set *) 0, (fd_set *) 0, (struct timeval *) 0);
|
||||
nfound = select(FD_SETSIZE, &smask, (fd_set *)0, (fd_set *)0, (struct timeval *)0);
|
||||
if(nfound < 0) {
|
||||
if(errno == EINTR) {
|
||||
fprintf(stderr, "interrupted system call\n");
|
||||
@ -260,7 +245,7 @@ main(int argc, char **argv)
|
||||
exit(-1);
|
||||
} else if(n > 0) {
|
||||
/* because commands might need parameters, lines needs to be
|
||||
separated which means the terminating LF must be sent */
|
||||
separated which means the terminating LF must be sent */
|
||||
/* while(n > 0 && buf[n - 1] < 32) { */
|
||||
/* n--; */
|
||||
/* } */
|
||||
@ -298,103 +283,103 @@ main(int argc, char **argv)
|
||||
|
||||
for(i = 0; i < n; i++) {
|
||||
switch(mode) {
|
||||
case MODE_START_TEXT:
|
||||
case MODE_TEXT:
|
||||
printf("%c", buf[i]);
|
||||
break;
|
||||
case MODE_START_DATE: {
|
||||
time_t t;
|
||||
t = time(&t);
|
||||
strftime(outbuf, HCOLS, timeformat, localtime(&t));
|
||||
printf("%s|", outbuf);
|
||||
mode = MODE_DATE;
|
||||
case MODE_START_TEXT:
|
||||
case MODE_TEXT:
|
||||
printf("%c", buf[i]);
|
||||
break;
|
||||
case MODE_START_DATE: {
|
||||
time_t t;
|
||||
t = time(&t);
|
||||
strftime(outbuf, HCOLS, timeformat, localtime(&t));
|
||||
printf("[%s] ", outbuf);
|
||||
mode = MODE_DATE;
|
||||
}
|
||||
/* continue into the MODE_DATE */
|
||||
case MODE_DATE:
|
||||
printf("%c", buf[i]);
|
||||
if(buf[i] == '\n') {
|
||||
mode = MODE_START_DATE;
|
||||
}
|
||||
/* continue into the MODE_DATE */
|
||||
case MODE_DATE:
|
||||
break;
|
||||
case MODE_INT:
|
||||
printf("%03d ", buf[i]);
|
||||
if(++index >= ICOLS) {
|
||||
index = 0;
|
||||
printf("\n");
|
||||
}
|
||||
break;
|
||||
case MODE_HEX:
|
||||
rxbuf[index++] = buf[i];
|
||||
if(index >= HCOLS) {
|
||||
print_hex_line("", rxbuf, index);
|
||||
index = 0;
|
||||
printf("\n");
|
||||
}
|
||||
break;
|
||||
|
||||
case MODE_SLIP_AUTO:
|
||||
case MODE_SLIP_HIDE:
|
||||
if(!flags && (buf[i] != SLIP_END)) {
|
||||
/* Not a SLIP packet? */
|
||||
printf("%c", buf[i]);
|
||||
if(buf[i] == '\n') {
|
||||
mode = MODE_START_DATE;
|
||||
}
|
||||
break;
|
||||
case MODE_INT:
|
||||
printf("%03d ", buf[i]);
|
||||
if(++index >= ICOLS) {
|
||||
}
|
||||
/* continue to slip only mode */
|
||||
case MODE_SLIP:
|
||||
switch(buf[i]) {
|
||||
case SLIP_ESC:
|
||||
lastc = SLIP_ESC;
|
||||
break;
|
||||
|
||||
case SLIP_END:
|
||||
if(index > 0) {
|
||||
if(flags != 2 && mode != MODE_SLIP_HIDE) {
|
||||
/* not overflowed: show packet */
|
||||
print_hex_line("SLIP: ", rxbuf, index > HCOLS ? HCOLS : index);
|
||||
printf("\n");
|
||||
}
|
||||
lastc = '\0';
|
||||
index = 0;
|
||||
printf("\n");
|
||||
flags = 0;
|
||||
} else {
|
||||
flags = !flags;
|
||||
}
|
||||
break;
|
||||
case MODE_HEX:
|
||||
|
||||
default:
|
||||
if(lastc == SLIP_ESC) {
|
||||
lastc = '\0';
|
||||
|
||||
/* Previous read byte was an escape byte, so this byte will be
|
||||
interpreted differently from others. */
|
||||
switch(buf[i]) {
|
||||
case SLIP_ESC_END:
|
||||
buf[i] = SLIP_END;
|
||||
break;
|
||||
case SLIP_ESC_ESC:
|
||||
buf[i] = SLIP_ESC;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
rxbuf[index++] = buf[i];
|
||||
if(index >= HCOLS) {
|
||||
print_hex_line("", rxbuf, index);
|
||||
if(index >= sizeof(rxbuf)) {
|
||||
fprintf(stderr, "**** slip overflow\n");
|
||||
index = 0;
|
||||
printf("\n");
|
||||
}
|
||||
break;
|
||||
|
||||
case MODE_SLIP_AUTO:
|
||||
case MODE_SLIP_HIDE:
|
||||
if(!flags && (buf[i] != SLIP_END)) {
|
||||
/* Not a SLIP packet? */
|
||||
printf("%c", buf[i]);
|
||||
break;
|
||||
}
|
||||
/* continue to slip only mode */
|
||||
case MODE_SLIP:
|
||||
switch(buf[i]) {
|
||||
case SLIP_ESC:
|
||||
lastc = SLIP_ESC;
|
||||
break;
|
||||
|
||||
case SLIP_END:
|
||||
if(index > 0) {
|
||||
if(flags != 2 && mode != MODE_SLIP_HIDE) {
|
||||
/* not overflowed: show packet */
|
||||
print_hex_line("SLIP: ", rxbuf, index > HCOLS ? HCOLS : index);
|
||||
printf("\n");
|
||||
}
|
||||
lastc = '\0';
|
||||
index = 0;
|
||||
flags = 0;
|
||||
} else {
|
||||
flags = !flags;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if(lastc == SLIP_ESC) {
|
||||
lastc = '\0';
|
||||
|
||||
/* Previous read byte was an escape byte, so this byte will be
|
||||
interpreted differently from others. */
|
||||
switch(buf[i]) {
|
||||
case SLIP_ESC_END:
|
||||
buf[i] = SLIP_END;
|
||||
break;
|
||||
case SLIP_ESC_ESC:
|
||||
buf[i] = SLIP_ESC;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
rxbuf[index++] = buf[i];
|
||||
if(index >= sizeof(rxbuf)) {
|
||||
fprintf(stderr, "**** slip overflow\n");
|
||||
index = 0;
|
||||
flags = 2;
|
||||
}
|
||||
break;
|
||||
flags = 2;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* after processing for some output modes */
|
||||
if(index > 0) {
|
||||
switch(mode) {
|
||||
case MODE_HEX:
|
||||
print_hex_line("", rxbuf, index);
|
||||
break;
|
||||
case MODE_HEX:
|
||||
print_hex_line("", rxbuf, index);
|
||||
break;
|
||||
}
|
||||
}
|
||||
fflush(stdout);
|
@ -159,4 +159,3 @@ select_baudrate(int baudrate) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@ -35,6 +35,9 @@
|
||||
|
||||
#include <termios.h>
|
||||
|
||||
/* The unspecified baudrate */
|
||||
#define BUNKNOWN -2
|
||||
|
||||
#if __APPLE__
|
||||
#ifndef B460800
|
||||
#define B460800 460800
|
@ -1,30 +0,0 @@
|
||||
ifndef HOST_OS
|
||||
ifeq ($(OS),Windows_NT)
|
||||
HOST_OS := Windows
|
||||
else
|
||||
HOST_OS := $(shell uname)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(HOST_OS),Windows)
|
||||
SERIALDUMP = serialdump-windows
|
||||
endif
|
||||
|
||||
ifeq ($(HOST_OS),Darwin)
|
||||
SERIALDUMP = serialdump-macos
|
||||
endif
|
||||
|
||||
ifndef SERIALDUMP
|
||||
# Assume Linux
|
||||
SERIALDUMP = serialdump-linux
|
||||
endif
|
||||
|
||||
all: $(SERIALDUMP)
|
||||
|
||||
CFLAGS += -Wall -Werror
|
||||
|
||||
$(SERIALDUMP): serialdump.c
|
||||
$(CC) -O2 -o $@ $<
|
||||
|
||||
clean:
|
||||
rm -f $(SERIALDUMP)
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
#!/bin/sh
|
||||
# We run perl through a shell to avoid having to hard-code the path to perl
|
||||
perl -e '$|=1; while(<>) {print time . " $_";}'
|
Loading…
Reference in New Issue
Block a user