Merge branch 'master' into size_optimization

* master:
  version v1.8.1
  Fix for non-compiling unit tests because of m2mconstants.cpp removal.
  Changing const char* pointers to defines
  Increasing initial vector size from 4 to 12
  Optimization RAM by replacing String usage with const char *
  Remove direct references to Linux platform implementations
  Moving release notes from Docs to docs folder.
  Removing line breaks

Conflicts:
	source/m2mconstants.cpp

Author: TeroJaasko

docs/known-issues-mbed-client1511.md

@@ -14,12 +14,7 @@ We’re still very actively building mbed Client and the 15.11 release is a tech
 
 #### Important Note for Windows Users
 
-If you are using this release on Microsoft Windows, please be advised that
-because of the way Windows handles filename and paths, you may have problems
-if you attempt to use this in a deep directory hierarchy with a long
-path name (e.g. `c:\some\very\long\path`). If you experience problems
-unpacking or building this release, please try it in a location with a
-shorter path before filing a bug. Thanks.
+If you are using this release on Microsoft Windows, please be advised that because of the way Windows handles filename and paths, you may have problems if you attempt to use this in a deep directory hierarchy with a long path name (e.g. `c:\some\very\long\path`). If you experience problems unpacking or building this release, please try it in a location with a shorter path before filing a bug. Thanks.
 
 ***
 ### mbed Client API may not be fully interoperable with other LWM2M servers.

Docs/mbed_Client_Release_Note_16_03.md renamed to docs/mbed_Client_Release_Note_16_03.md

@@ -21,8 +21,7 @@
 
 const int MAX_VALUE_LENGTH = 256;
 const int BUFFER_LENGTH = 1152;
-extern const String COAP;
-extern const String COAPS;
+
 const int32_t MINIMUM_REGISTRATION_TIME = 60; //in seconds
 const uint64_t ONE_SECOND_TIMER = 1;
 const uint16_t MAX_ALLOWED_STRING_LENGTH = 64;
@@ -38,102 +37,99 @@ const int RETRY_INTERVAL = 5;
 #define START_OBSERVATION 0
 #define STOP_OBSERVATION 1
 
+#define COAP "coap://"
+#define COAPS  "coaps://"
 // PUT attributes to be checked from server
-extern const String EQUAL;
-extern const String AMP;
-extern const String PMIN;
-extern const String PMAX;
-extern const String GT;
-extern const String LT;
-extern const String ST;
-extern const String STP;
-extern const String CANCEL;
+#define EQUAL  "="
+#define AMP  "&"
+#define PMIN  "pmin"
+#define PMAX  "pmax"
+#define GT  "gt"
+#define LT  "lt"
+#define ST_SIZE  "st"
+#define STP  "stp"
+#define CANCEL  "cancel"
 
 // just a helper for "String default_value = "";" pattern
 extern const String EMPTY;
 
 //LWM2MOBJECT NAME/ID
-extern const String M2M_SECURITY_ID;
-extern const String M2M_SERVER_ID;
-extern const String M2M_ACCESS_CONTROL_ID;
-extern const String M2M_DEVICE_ID;
-
-extern const String M2M_CONNECTIVITY_MONITOR_ID;
-extern const String M2M_FIRMWARE_ID;
-extern const String M2M_LOCATION_ID;
-extern const String M2M_CONNECTIVITY_STATISTICS_ID;
-extern const String RESERVED_ID;
-
-//OBJECT RESOURCE TYPE
-extern const String OMA_RESOURCE_TYPE;
+#define M2M_SECURITY_ID  "0"
+#define M2M_SERVER_ID  "1"
+#define M2M_ACCESS_CONTROL_ID  "2"
+#define M2M_DEVICE_ID  "3"
+#define M2M_CONNECTIVITY_MONITOR_ID  "4"
+#define M2M_FIRMWARE_ID  "5"
+#define M2M_LOCATION_ID  "6"
+#define M2M_CONNECTIVITY_STATISTICS_ID  "7"
+#define RESERVED_ID  "8"
+
+//OMA RESOURCE TYPE
+#define OMA_RESOURCE_TYPE  "" //oma.lwm2m
 
 //DEVICE RESOURCES
-extern const String DEVICE_MANUFACTURER;
-extern const String DEVICE_DEVICE_TYPE;
-extern const String DEVICE_MODEL_NUMBER;
-extern const String DEVICE_SERIAL_NUMBER;
-extern const String DEVICE_HARDWARE_VERSION;
-extern const String DEVICE_FIRMWARE_VERSION;
-extern const String DEVICE_SOFTWARE_VERSION;
-extern const String DEVICE_REBOOT;
-extern const String DEVICE_FACTORY_RESET;
-extern const String DEVICE_AVAILABLE_POWER_SOURCES;
-extern const String DEVICE_POWER_SOURCE_VOLTAGE;
-extern const String DEVICE_POWER_SOURCE_CURRENT;
-extern const String DEVICE_BATTERY_LEVEL;
-extern const String DEVICE_BATTERY_STATUS;
-extern const String DEVICE_MEMORY_FREE;
-extern const String DEVICE_MEMORY_TOTAL;
-extern const String DEVICE_ERROR_CODE;
-extern const String DEVICE_RESET_ERROR_CODE;
-extern const String DEVICE_CURRENT_TIME;
-extern const String DEVICE_UTC_OFFSET;
-extern const String DEVICE_TIMEZONE;
-extern const String DEVICE_SUPPORTED_BINDING_MODE;
-
-extern const String BINDING_MODE_UDP;
-extern const String BINDING_MODE_UDP_QUEUE;
-extern const String BINDING_MODE_SMS;
-extern const String BINDING_MODE_SMS_QUEUE;
-
-extern const String ERROR_CODE_VALUE;
-
-
+#define DEVICE_MANUFACTURER  "0"
+#define DEVICE_DEVICE_TYPE  "17"
+#define DEVICE_MODEL_NUMBER  "1"
+#define DEVICE_SERIAL_NUMBER  "2"
+#define DEVICE_HARDWARE_VERSION  "18"
+#define DEVICE_FIRMWARE_VERSION  "3"
+#define DEVICE_SOFTWARE_VERSION  "19"
+#define DEVICE_REBOOT  "4"
+#define DEVICE_FACTORY_RESET  "5"
+#define DEVICE_AVAILABLE_POWER_SOURCES  "6"
+#define DEVICE_POWER_SOURCE_VOLTAGE  "7"
+#define DEVICE_POWER_SOURCE_CURRENT  "8"
+#define DEVICE_BATTERY_LEVEL  "9"
+#define DEVICE_BATTERY_STATUS  "20"
+#define DEVICE_MEMORY_FREE  "10"
+#define DEVICE_MEMORY_TOTAL  "21"
+#define DEVICE_ERROR_CODE  "11"
+#define DEVICE_RESET_ERROR_CODE  "12"
+#define DEVICE_CURRENT_TIME  "13"
+#define DEVICE_UTC_OFFSET  "14"
+#define DEVICE_TIMEZONE  "15"
+#define DEVICE_SUPPORTED_BINDING_MODE  "16"
+#define BINDING_MODE_UDP  "U"
+#define BINDING_MODE_UDP_QUEUE  "UQ"
+#define BINDING_MODE_SMS  "S"
+#define BINDING_MODE_SMS_QUEUE  "SQ"
+#define ERROR_CODE_VALUE  "0"
 
 //SECURITY RESOURCES
-extern const String SECURITY_M2M_SERVER_URI;
-extern const String SECURITY_BOOTSTRAP_SERVER;
-extern const String SECURITY_SECURITY_MODE;
-extern const String SECURITY_PUBLIC_KEY;
-extern const String SECURITY_SERVER_PUBLIC_KEY;
-extern const String SECURITY_SECRET_KEY;
-extern const String SECURITY_SMS_SECURITY_MODE;
-extern const String SECURITY_SMS_BINDING_KEY;
-extern const String SECURITY_SMS_BINDING_SECRET_KEY;
-extern const String SECURITY_M2M_SERVER_SMS_NUMBER;
-extern const String SECURITY_SHORT_SERVER_ID;
-extern const String SECURITY_CLIENT_HOLD_OFF_TIME;
+#define SECURITY_M2M_SERVER_URI  "0"
+#define SECURITY_BOOTSTRAP_SERVER  "1"
+#define SECURITY_SECURITY_MODE  "2"
+#define SECURITY_PUBLIC_KEY  "3"
+#define SECURITY_SERVER_PUBLIC_KEY  "4"
+#define SECURITY_SECRET_KEY  "5"
+#define SECURITY_SMS_SECURITY_MODE  "6"
+#define SECURITY_SMS_BINDING_KEY  "7"
+#define SECURITY_SMS_BINDING_SECRET_KEY  "8"
+#define SECURITY_M2M_SERVER_SMS_NUMBER  "9"
+#define SECURITY_SHORT_SERVER_ID  "10"
+#define SECURITY_CLIENT_HOLD_OFF_TIME  "11"
 
 //SERVER RESOURCES
-extern const String SERVER_SHORT_SERVER_ID;
-extern const String SERVER_LIFETIME;
-extern const String SERVER_DEFAULT_MIN_PERIOD;
-extern const String SERVER_DEFAULT_MAX_PERIOD;
-extern const String SERVER_DISABLE;
-extern const String SERVER_DISABLE_TIMEOUT;
-extern const String SERVER_NOTIFICATION_STORAGE;
-extern const String SERVER_BINDING;
-extern const String SERVER_REGISTRATION_UPDATE;
+#define SERVER_SHORT_SERVER_ID  "0"
+#define SERVER_LIFETIME  "1"
+#define SERVER_DEFAULT_MIN_PERIOD  "2"
+#define SERVER_DEFAULT_MAX_PERIOD  "3"
+#define SERVER_DISABLE  "4"
+#define SERVER_DISABLE_TIMEOUT  "5"
+#define SERVER_NOTIFICATION_STORAGE  "6"
+#define SERVER_BINDING  "7"
+#define SERVER_REGISTRATION_UPDATE  "8"
 
 //FIRMWARE RESOURCES
-extern const String FIRMWARE_PACKAGE;
-extern const String FIRMWARE_PACKAGE_URI;
-extern const String FIRMWARE_UPDATE;
-extern const String FIRMWARE_STATE;
-extern const String FIRMWARE_UPDATE_SUPPORTED_OBJECTS;
-extern const String FIRMWARE_UPDATE_RESULT;
-extern const String FIRMWARE_PACKAGE_NAME;
-extern const String FIRMWARE_PACKAGE_VERSION;
+#define FIRMWARE_PACKAGE  "0"
+#define FIRMWARE_PACKAGE_URI  "1"
+#define FIRMWARE_UPDATE  "2"
+#define FIRMWARE_STATE  "3"
+#define FIRMWARE_UPDATE_SUPPORTED_OBJECTS  "4"
+#define FIRMWARE_UPDATE_RESULT  "5"
+#define FIRMWARE_PACKAGE_NAME  "6"
+#define FIRMWARE_PACKAGE_VERSION  "7"
 
 // TLV serializer / deserializer
 const uint8_t TYPE_RESOURCE = 0xC0;

mbed-client/m2mconstants.h

@@ -230,7 +230,7 @@ friend class M2MInterfaceFactory;
     M2MResourceInstance* get_resource_instance(DeviceResource dev_res,
                                                uint16_t instance_id) const;
 
-    static const String& resource_name(DeviceResource resource);
+    static const String resource_name(DeviceResource resource);
 
     bool check_value_range(DeviceResource resource, const int64_t value) const;
 

mbed-client/m2mdevice.h

@@ -212,7 +212,7 @@ friend class M2MInterfaceFactory;
 
     M2MResource* get_resource(FirmwareResource resource) const;
 
-    static const String& resource_name(FirmwareResource resource);
+    static const String resource_name(FirmwareResource resource);
 
     void create_mandatory_resources();
 

mbed-client/m2mfirmware.h

@@ -157,7 +157,7 @@ class Vector
     }
 
     enum {
-        MORE_SIZE = 32
+        MORE_SIZE = 12
     };
 
   private:

mbed-client/m2mvector.h

@@ -1,6 +1,6 @@
 {
   "name": "mbed-client",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "mbed Client C++ API",
   "keywords": [],
   "author": "Yogesh Pande <[email protected]>",