example: update the lwm2m examples

* some code cleanup
* reduce the task size of lwm2m client/server
* allocate more memory for freertos

Signed-off-by: Wayne Ren <[email protected]>

Author: Wayne Ren

example/freertos/iot/lwm2m/lwm2m_client/FreeRTOSConfig.h

@@ -86,7 +86,7 @@
 #define configTICK_RATE_HZ                      ( ( TickType_t ) 1000 )
 #define configMAX_PRIORITIES                    ( 10 )
 #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 104 )
-#define configTOTAL_HEAP_SIZE                   ( ( size_t ) ( 10 * 1024 ) )
+#define configTOTAL_HEAP_SIZE                   ( ( size_t ) ( 16 * 1024 ) )
 #define configMAX_TASK_NAME_LEN                 ( 10 )
 #define configUSE_TRACE_FACILITY                0
 #define configUSE_16_BIT_TICKS                  0

example/freertos/iot/lwm2m/lwm2m_client/cmd_lwm2m.c

@@ -28,12 +28,6 @@
  *
 --------------------------------------------- */
 
-/**
- * \file
- * \ingroup	EMBARC_APP_LWIP_FREERTOS_LWM2M_CLIENT
- * \brief	NTShell Command:lwm2m_client implementation
- */
-
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -45,7 +39,7 @@
 #include "lwip_wifi.h"
 
 #ifndef USE_NTSHELL_EXTOBJ /* don't use ntshell extobj */
-#define CMD_DEBUG(fmt, ...)			EMBARC_PRINTF(fmt, ##__VA_ARGS__)
+#define CMD_DEBUG(fmt, ...)	EMBARC_PRINTF(fmt, ##__VA_ARGS__)
 #endif
 
 #define TSKPRI_LWM2M_CLIENT	(configMAX_PRIORITIES-2)	/**< lwm2m task priority */
@@ -60,21 +54,16 @@ static TaskHandle_t task_lwm2m_client_handle = NULL;
 #define BOOTLOADER_STARTADDRESS		0x17f00000
 typedef int (*fp_t)(void);
 
-void go_bootloader(){
+void go_bootloader(void)
+{
 	fp_t fp;
-	fp = (fp_t)(BOOTLOADER_STARTADDRESS+4);
+	fp = (fp_t)(*((uint32_t *)BOOTLOADER_STARTADDRESS));
 	cpu_lock();
 
 	for (int i = NUM_EXC_CPU; i < NUM_EXC_ALL; i++) {
 		int_disable(i);
 	}
-	 // set up an enviroment for application
-	if ((_arc_aux_read(AUX_BCR_I_CACHE) & 0x7) >= 0x2) {
-		//icache_invalidate();
-	}
-	if ((_arc_aux_read(AUX_BCR_D_CACHE) & 0x7) >= 0x2) {
-		//dcache_flush();
-	}
+
 	fp();
 
 }
@@ -91,17 +80,30 @@ void task_lwm2m_update(void *par)
 void task_lwm2m_client(void *par)
 {
 	unsigned int cpu_status;
+
 	while (1) {
 		lwm2m_client_conn_stat = 1;
+
 		if (lwm2mclient(&c_info) == 0) {
 			EMBARC_PRINTF("LwM2M client end successfully\r\n");
 		} else {
 			EMBARC_PRINTF("LwM2M client end failed\r\n");
 		}
+
 		cpu_status = cpu_lock_save();
-		if (c_info.server != NULL) free((void *)(c_info.server));
-		if (c_info.ep_name != NULL) free((void *)(c_info.ep_name));
-		if (c_info.serverPort != NULL) free((void *)(c_info.serverPort));
+
+		if (c_info.server != NULL) {
+			free((void *)(c_info.server));
+		}
+
+		if (c_info.ep_name != NULL) {
+			free((void *)(c_info.ep_name));
+		}
+
+		if (c_info.serverPort != NULL) {
+			free((void *)(c_info.serverPort));
+		}
+
 		lwm2m_client_conn_stat = 0;
 		cpu_unlock_restore(cpu_status);
 		vTaskSuspend(NULL);
@@ -122,11 +124,12 @@ static void cmd_lwm2m_client_help(char *cmd_name, void *extobj)
 		/* cmd_name not valid */
 		return;
 	}
+
 	CMD_DEBUG("usage: %s \r\n"
-	"	-q 			quit client\r\n"
-	"	-s <server_url>		set the lwM2M server URL\r\n"
-	"	-c <client_name>	set the lwM2M client endpoint name\r\n"
-	"	-p <server port>	set the LwM2M server port\r\n", cmd_name);
+	          "	-q 			quit client\r\n"
+	          "	-s <server_url>		set the lwM2M server URL\r\n"
+	          "	-c <client_name>	set the lwM2M client endpoint name\r\n"
+	          "	-p <server port>	set the LwM2M server port\r\n", cmd_name);
 
 error_exit:
 	return;
@@ -139,11 +142,13 @@ static char *malloc_and_copy(char *chr)
 
 	len = strlen(chr) + 1;
 	p_str = (char *)malloc(len);
+
 	if (p_str == NULL) {
 		EMBARC_PRINTF("Memory malloc failed.\r\n");
 	} else {
 		memcpy(p_str, chr, len);
 	}
+
 	return p_str;
 }
 
@@ -174,44 +179,56 @@ static int cmd_lwm2m_client(int argc, char **argv, void *extobj)
 		CMD_DEBUG("Wifi is not ready for lwM2M client.\r\n");
 		goto error_exit;
 	}
+
 	while ((opt=getopt(argc, argv, "s:c:p:qhH?")) != -1) {
 		opt_enter_cnt ++;
+
 		switch (opt) {
 			case 'h':
 			case '?':
 			case 'H':
 				cmd_lwm2m_client_help(argv[0], extobj);
 				goto error_exit;
 				break;
+
 			case 'q':
 				c_quit = 1;
 				break;
+
 			case 's':
 				if (p_server == NULL) {
 					p_server = malloc_and_copy(optarg);
 				}
+
 				break;
+
 			case 'c':
 				if (p_client_name == NULL) {
 					p_client_name = malloc_and_copy(optarg);
 				}
+
 				break;
+
 			case 'p':
 				if (p_port == NULL) {
 					p_port = malloc_and_copy(optarg);
 				}
+
 				break;
+
 			default:
 				opt_enter_cnt --;
 				CMD_DEBUG("unrecognized option:%c\r\n", opt);
 				break;
 		}
 	}
+
 	if (c_quit == 1) {
 		CMD_DEBUG("Try to exit existing client.\r\n");
 		handle_sigint(2);
 		goto error_exit;
 	}
+
 	if (lwm2m_client_conn_stat == 1) {
 		CMD_DEBUG("LwM2M client is already running.\r\n");
 		goto error_exit;
@@ -221,6 +238,7 @@ static int cmd_lwm2m_client(int argc, char **argv, void *extobj)
 		CMD_DEBUG("Server Url is not specified, please check it.\r\n");
 		goto error_exit;
 	}
+
 	c_info.server = p_server;
 	c_info.ep_name = p_client_name;
 	c_info.serverPort = p_port;
@@ -229,8 +247,8 @@ static int cmd_lwm2m_client(int argc, char **argv, void *extobj)
 	CMD_DEBUG("Start LwM2M client.");
 
 	if (task_lwm2m_client_handle == NULL) {
-		if (xTaskCreate(task_lwm2m_client, "lwm2m client", 20480, (void *)1,
-			TSKPRI_LWM2M_CLIENT, &task_lwm2m_client_handle) != pdPASS) {
+		if (xTaskCreate(task_lwm2m_client, "lwm2m client", 4096, (void *)1,
+		                TSKPRI_LWM2M_CLIENT, &task_lwm2m_client_handle) != pdPASS) {
 			EMBARC_PRINTF("create lwm2m client failed\r\n");
 		}
 	} else {
@@ -240,17 +258,27 @@ static int cmd_lwm2m_client(int argc, char **argv, void *extobj)
 	return E_OK;
 
 error_exit:
-	if (p_server != NULL) free((void *)p_server);
-	if (p_client_name != NULL) free((void *)p_client_name);
-	if (p_port != NULL) free((void *)p_port);
+
+	if (p_server != NULL) {
+		free((void *)p_server);
+	}
+
+	if (p_client_name != NULL) {
+		free((void *)p_client_name);
+	}
+
+	if (p_port != NULL) {
+		free((void *)p_port);
+	}
+
 	return ercd;
 }
 
 static CMD_TABLE_T lwm2m_client_cmd = {"lwm2m_client", "connect to LwM2M server", cmd_lwm2m_client, NULL};
 /**
  * register lwm2m_client command
  */
-CMD_TABLE_T * register_ntshell_cmd_lwm2m_client(CMD_TABLE_T *prev)
+CMD_TABLE_T *register_ntshell_cmd_lwm2m_client(CMD_TABLE_T *prev)
 {
 	return ntshell_usrcmd_register(&lwm2m_client_cmd, prev);
 }

example/freertos/iot/lwm2m/lwm2m_client/main.c

@@ -28,69 +28,10 @@
  *
 --------------------------------------------- */
 
-/**
- * \defgroup	EMBARC_APP_FREERTOS_IOT_LWM2M_LWM2M_CLIENT	embARC LwIP LwM2M Client Example
- * \ingroup	EMBARC_APPS_TOTAL
- * \ingroup	EMBARC_APPS_OS_FREERTOS
- * \ingroup	EMBARC_APPS_MID_LWIP
- * \ingroup	EMBARC_APPS_MID_LWM2M
- * \ingroup	EMBARC_APPS_MID_NTSHELL
- * \ingroup	EMBARC_APPS_MID_FATFS
- * \brief	embARC Example for LwM2M Client on LwIP and FreeRTOS
- *
- * \details
- * ### Extra Required Tools
- *
- * ### Extra Required Peripherals
- *     * Digilent PMOD WIFI(MRF24WG0MA)
- *
- * ### Design Concept
- *     This example is designed to show how to use LwM2M client in FreeRTOS.
- *
- * ### Usage Manual
- *     The Pmod modules should be connected to \ref EMBARC_BOARD_CONNECTION "EMSK".
- *     This is an example running OMA LightweightM2M(LwM2M) client, provides core device management features(device, connectivity, etc). It provides a ntshell command called *lwm2m_client* to show this demo.
- *     - About LwM2M provided in embARC
- *         + LwM2M features supported by [eclipse wakaama project](https://projects.eclipse.org/projects/technology.wakaama)
- *         + We only support FreeRTOS+LwIP
- *         + LwM2M use UDP connections to exchange data
- *     - First, you need to provide a LwM2M Server, here we take [Eclipse Leshan server](https://github.com/eclipse/leshan) for example.
- *         + Eclipse provide a sandbox leshan server:http://leshan.eclipse.org/
- *         + You can download a standalone leshan server binary from leshan website, and java environment(version >= 1.7.0_75) is required to run this binary
- *     - When leshan server is running on your local PC(connected to the same wifi network which your board will connect), then download program to the board, and run *lwm2m_client* ntshell command.
- *         + If you local PC IP is 192.168.43.4, then you need to run command *lwm2m_client -s 192.168.43.4* to connect to local leshan server.
- *         + If connected to local leshan server, you will see the connected LwM2M client in http://127.0.0.1:8080/#/clients.
- *         + Click on the client, then you will see many objects which the connected client provided.
- *         + On this website, you can do many operations on this objects.
- *         + Here you can read onboard switch and button value, and control onboard led using Object 1024.
- *             * First read the Instance 0, then 4 resources will show. Resource 0 is button value, Resource 1 is switch value, Resource 2 is led control, Resource 3 is a float variable.
- *             * Read Instance 0/1 will return the value of this resources in DEC format, you can press buttons or pull on/up the switches to see value changes.
- *             * Write on Resource 2 in DEC format such as 34 will change the onboard led with value 34.
- *             * Write on Resource 3 with a float value such as 1.45, then the float value is changed, you can read back to check it.
- *
- *     ![ScreenShot of lwm2m client under freertos](pic/images/example/emsk/emsk_lwip_freertos_lwm2m_client.jpg)
- *
- * ### Extra Comments
- *     - Sometimes the server may not respond to client, this may caused by the wifi connection is bad.
- *     - In the case above, you need to disconnect all the power of your board, reconnect PMOD WIFI module and wait for a while, then restart this application.
- *
- */
-
-/**
- * \file
- * \ingroup	EMBARC_APP_FREERTOS_IOT_LWM2M_LWM2M_CLIENT
- * \brief	main source of LwM2M client example
- */
-
-/**
- * \addtogroup	EMBARC_APP_FREERTOS_IOT_LWM2M_LWM2M_CLIENT
- * @{
- */
-
 #include "embARC.h"
 #include "embARC_debug.h"
 
-extern CMD_TABLE_T * register_ntshell_cmd_lwm2m_client(CMD_TABLE_T *prev);
+extern CMD_TABLE_T *register_ntshell_cmd_lwm2m_client(CMD_TABLE_T *prev);
 
 static volatile int main_run_flag = 0;
 
@@ -100,11 +41,12 @@ int main(void)
 	nt_io = get_ntshell_io(BOARD_ONBOARD_NTSHELL_ID);
 
 	EMBARC_PRINTF("Start FreeRTOS LwM2M Client Demo by run lwm2m_client command\r\n");
+
 	if (main_run_flag == 0) {
 		main_run_flag = 1;
 		register_ntshell_cmd_lwm2m_client(nt_io->cmd_tbl_head);
 	}
 
 	return 0;
 }
-/** @} */
+

example/freertos/iot/lwm2m/lwm2m_client/makefile

@@ -1,6 +1,8 @@
 # Application name
 APPL ?= freertos_iot_lwm2m_client
 
+BOARD ?= emsk
+
 EXT_DEV_LIST += wifi/mrf24g
 
 ##
@@ -10,8 +12,9 @@ EXT_DEV_LIST += wifi/mrf24g
 HEAPSZ ?= 8192
 STACKSZ ?= 2048
 
-
+ifeq ($(TOOLCHAIN), gnu)
 OLEVEL = Os
+endif
 
 #
 # root dir of embARC

example/freertos/iot/lwm2m/lwm2m_server/FreeRTOSConfig.h

@@ -86,7 +86,7 @@
 #define configTICK_RATE_HZ                      ( ( TickType_t ) 1000 )
 #define configMAX_PRIORITIES                    ( 10 )
 #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 104 )
-#define configTOTAL_HEAP_SIZE                   ( ( size_t ) ( 12 * 1024 ) )
+#define configTOTAL_HEAP_SIZE                   ( ( size_t ) ( 16 * 1024 ) )
 #define configMAX_TASK_NAME_LEN                 ( 10 )
 #define configUSE_TRACE_FACILITY                0
 #define configUSE_16_BIT_TICKS                  0

example/freertos/iot/lwm2m/lwm2m_server/cmd_lwm2m.c

@@ -163,7 +163,7 @@ static int cmd_lwm2m_server(int argc, char **argv, void *extobj)
 	CMD_DEBUG("Start LwM2M server.");
 
 	if (task_lwm2m_server_handle == NULL) {
-		if (xTaskCreate(task_lwm2m_server, "lwm2m server", 20480, \
+		if (xTaskCreate(task_lwm2m_server, "lwm2m server", 8192, \
 			(void *)1, TSKPRI_LWM2M_SERVER, &task_lwm2m_server_handle) != pdPASS) {
 			EMBARC_PRINTF("create lwm2m server failed\r\n");
 		}

example/freertos/iot/lwm2m/lwm2m_server/makefile

@@ -10,7 +10,9 @@ EXT_DEV_LIST += wifi/mrf24g
 HEAPSZ ?= 8192
 STACKSZ ?= 2048
 
+ifeq ($(TOOLCHAIN), gnu)
 OLEVEL = Os
+endif
 
 #
 # root dir of embARC