Wakaama

Changed object files and fixed memory tracing

Author: Maksymilian Wojczuk

Makefile

@@ -208,6 +208,7 @@ WAKAAMA_INC = \
 
 WAKAAMA_SYMBOL = -DLWM2M_LITTLE_ENDIAN
 WAKAAMA_SYMBOL += -DLWM2M_CLIENT_MODE
+WAKAAMA_SYMBOL += -DLWM2M_MEMORY_TRACE
 #WAKAAMA_SYMBOL += -DCOAPLOG # download logs
 #WAKAAMA_SYMBOL += -DLWM2M_WITH_LOGS  # LOGS
 

Middlewares/Third_Party/wakaama/client/client_config.h

@@ -4,8 +4,13 @@
 
 #define DEVICE_NAME "Remote Programmer"
 
-#define SERVER_URI "coap://192.168.1.21:5683"
+#define SERVER_URI "coap://192.168.1.13:5683"
 #define LWM2M_PORT 5683 
 #define MAX_PACKET_SIZE 1024
 
+#define WAKAAMA_SHORT_ID 100  // 0 is forbidden
+#define WAKAAMA_BINDING  'U'
+#define WAKAAMA_COMPANY 'AGH'
+#define WAKAAMA_MODEL_NUMBER DEVICE_NAME
+
 #endif

Middlewares/Third_Party/wakaama/client/objects/object_device.c

@@ -64,12 +64,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include "client_config.h"
 
 
-#define PRV_MANUFACTURER      "Open Mobile Alliance"
-#define PRV_MODEL_NUMBER      "Lightweight M2M Client"
-#define PRV_BINDING_MODE      "U"
-
 // Resource Id's:
 #define RES_O_MANUFACTURER          0
 #define RES_O_MODEL_NUMBER          1
@@ -101,18 +98,18 @@ static uint8_t prv_set_value(lwm2m_data_t * dataP)
     switch (dataP->id)
     {
     case RES_O_MANUFACTURER:
-        lwm2m_data_encode_string(PRV_MANUFACTURER, dataP);
+        lwm2m_data_encode_string(WAKAAMA_COMPANY, dataP);
         return COAP_205_CONTENT;
 
     case RES_O_MODEL_NUMBER:
-        lwm2m_data_encode_string(PRV_MODEL_NUMBER, dataP);
+        lwm2m_data_encode_string(WAKAAMA_MODEL_NUMBER, dataP);
         return COAP_205_CONTENT;
 
     case RES_M_REBOOT:
         return COAP_405_METHOD_NOT_ALLOWED;
 
     case RES_M_BINDING_MODES:
-        lwm2m_data_encode_string(PRV_BINDING_MODE, dataP);
+        lwm2m_data_encode_string(WAKAAMA_BINDING, dataP);
         return COAP_205_CONTENT;
 
 
@@ -249,10 +246,12 @@ lwm2m_object_t * get_object_device()
      */
     lwm2m_object_t * deviceObj;
 
+    printf("ALLOC\n\r");
     deviceObj = (lwm2m_object_t *)lwm2m_malloc(sizeof(lwm2m_object_t));
-
+    printf("Alloced!\n\r");
     if (NULL != deviceObj)
     {
+        printf("NULL\n\r");
         memset(deviceObj, 0, sizeof(lwm2m_object_t));
 
         /*
@@ -286,6 +285,7 @@ lwm2m_object_t * get_object_device()
         deviceObj->discoverFunc = prv_device_discover;
 
      }
+     printf("GO on!\n\r");
 
     return deviceObj;
 }

Middlewares/Third_Party/wakaama/client/objects/objects.h

@@ -2,7 +2,10 @@
 #define __OBJECTS_H
 
 lwm2m_object_t * get_security_object();
-lwm2m_object_t * get_server_object();
+lwm2m_object_t * get_server_object(int serverId,
+                                   const char* binding,
+                                   int lifetime,
+                                   bool storing);
 lwm2m_object_t * get_object_device();
 lwm2m_object_t * get_test_object();
 

Middlewares/Third_Party/wakaama/platform/platform.c

@@ -14,41 +14,42 @@
 //       it with FreeRTOS is bad idea (as far as heared). 
 
 // Allocate a block of size bytes of memory, returning a pointer to the beginning of the block.
-void * lwm2m_malloc(size_t s
 #ifdef LWM2M_MEMORY_TRACE
-  , const char * file, const char * function, int lineno
-) {
+void * lwm2m_trace_malloc(size_t s, const char * file, const char * function, int lineno) {
   printf("lwm2m_malloc: \"%s\" : \"%s\" : %d \n", file, function, lineno);
-#else
-) {
-#endif
   return pvPortMalloc(s);
 }
+#else 
+void * lwm2m_malloc(size_t s){
+  return pvPortMalloc(s);
+}
+#endif
+
 // Deallocate a block of memory previously allocated by lwm2m_malloc() or lwm2m_strdup()
-void lwm2m_free(void * p
 #ifdef LWM2M_MEMORY_TRACE
-  , const char * file, const char * function, int lineno
-) {
-  printf("lwm2m_malloc: \"%s\" : \"%s\" : %d \n", file, function, lineno);
-#else
-) {
-#endif
+void lwm2m_trace_free(void * p, const char * file, const char * function, int lineno) {
+  printf("lwm2m_free: \"%s\" : \"%s\" : %d \n", file, function, lineno);
   return vPortFree(p);
 }
-
+#else 
+void lwm2m_free(void * p) {
+  return vPortFree(p);
+}
+#endif
 
 // Allocate a memory block, duplicate the string str in it and return a pointer to this new block.
-char * lwm2m_strdup(const char * str
 #ifdef LWM2M_MEMORY_TRACE
-  , const char * file, const char * function, int lineno
-) {
-  printf("lwm2m_malloc: \"%s\" : \"%s\" : %d \n", file, function, lineno);
+char * lwm2m_trace_strdup(const char * str, const char * file, const char * function, int lineno) {
+  printf("lwm2m_strdup: \"%s\" : \"%s\" : %d \n", file, function, lineno);
+  char *dup = pvPortMalloc(strlen(str) + 1);
+  return dup ? strcpy(dup, str) : dup;
+}
 #else
-) {
-#endif
+char * lwm2m_strdup(const char * str) {
   char *dup = pvPortMalloc(strlen(str) + 1);
   return dup ? strcpy(dup, str) : dup;
 }
+#endif
 
 // Compare at most the n first bytes of s1 and s2, return 0 if they match
 int lwm2m_strncmp(const char * s1, const char * s2, size_t n) {

Src/main.c

@@ -383,17 +383,19 @@ static void taskWakaama(void *socket) {
         printf("SecurityObject Created\n");
 
         if(objArray[1] == NULL) {
-          objArray[1] = get_server_object();
+          objArray[1] = get_server_object(WAKAAMA_SHORT_ID, WAKAAMA_BINDING, 300, false);
         }
 
         if (NULL == objArray[1]) {
             printf("Failed to create server object\r\n");
             result = -2;
             continue;
         }
-        printf("ServerObject Created\n");
+        printf("ServerObject Created\n\r");
+        printf("NEXT printf\n\r");
 
         if(objArray[2] == NULL) {
+          printf("Getting object device\n\r");
           objArray[2] = get_object_device();
         }
         if (NULL == objArray[2]) {
@@ -639,12 +641,16 @@ void StartDefaultTask(void const * argument)
   MX_FATFS_Init();
 
   /* USER CODE BEGIN 5 */
+  printf("\n\n\n-----------------------START-------------------------\n\n");
 
 // Initialize Wakaama LWM2M Client
   int socket = getUDPSocket(LWM2M_PORT, AF_INET);
     if(socket != -1){
-        int res = xTaskCreate(taskWakaama, "wakaama", 700, (void *) socket, 2, NULL);
-        printf("\r\ntaskWakaama xTaskCreate returned %d\n", res);
+        int res = xTaskCreate(taskWakaama, "wakaama", 10000, (void *) socket, 2, NULL);
+        if (res != pdPASS) {
+          printf("\r\ntaskWakaama xTaskCreate returned %d\n", res);  
+        }
+
     }