Merge pull request #6352 from ARMmbed/release-candidate

0xc0170 · web-flow · commit ad284b28064b · 2018-03-14T11:29:48.000+01:00
Release candidate for mbed-os-5.8.0-rc2
diff --git a/features/cellular/TESTS/cellular/cellular_all/network.cpp b/features/cellular/TESTS/cellular/cellular_all/network.cpp
@@ -71,6 +71,7 @@ static bool wait_register()
 
 void test_attach()
 {
+    cellularDevice.set_timeout(120*1000); // 120 second timeout for at commands after power is up. It might take time to register, attach and connect
     tr_info("Register to network.");
     TEST_ASSERT(wait_register());
     tr_info("Attach to network.");
diff --git a/features/cellular/easy_cellular/CellularConnectionFSM.h b/features/cellular/easy_cellular/CellularConnectionFSM.h
@@ -19,7 +19,7 @@
 #define _CELLULAR_CONNECTION_UTIL_H
 
 #include "CellularTargets.h"
-#ifdef CELLULAR_DEVICE
+#if defined(CELLULAR_DEVICE) || defined(DOXYGEN_ONLY)
 
 #include "UARTSerial.h"
 #include "NetworkInterface.h"
@@ -171,6 +171,6 @@ class CellularConnectionFSM
 
 } // namespace
 
-#endif // CELLULAR_DEVICE
+#endif // CELLULAR_DEVICE || DOXYGEN
 
 #endif /* _CELLULAR_CONNECTION_UTIL_H */
diff --git a/features/cellular/easy_cellular/EasyCellularConnection.h b/features/cellular/easy_cellular/EasyCellularConnection.h
@@ -20,7 +20,7 @@
 #define EASY_CELLULAR_CONNECTION_H
 
 #include "CellularConnectionFSM.h"
-#ifdef CELLULAR_DEVICE
+#if defined(CELLULAR_DEVICE) || defined(DOXYGEN_ONLY)
 
 #include "netsocket/CellularBase.h"
 
@@ -158,7 +158,7 @@ class EasyCellularConnection: public CellularBase
 
 } // namespace
 
-#endif // CELLULAR_DEVICE
+#endif // CELLULAR_DEVICE || DOXYGEN
 
 #endif // EASY_CELLULAR_CONNECTION_H
 
diff --git a/features/filesystem/fat/FATFileSystem.cpp b/features/filesystem/fat/FATFileSystem.cpp
@@ -35,48 +35,39 @@
 static int fat_error_remap(FRESULT res)
 {
     switch(res) {
-        case FR_OK:                   // (0) Succeeded
-            return 0;
-        case FR_DISK_ERR:             // (1) A hard error occurred in the low level disk I/O layer
-            return -EIO;
-        case FR_INT_ERR:              // (2) Assertion failed
-            return -1;
-        case FR_NOT_READY:            // (3) The physical drive cannot work
-            return -EIO;
-        case FR_NO_FILE:              // (4) Could not find the file
-            return -ENOENT;
-        case FR_NO_PATH:              // (5) Could not find the path
-            return -ENOTDIR;
-        case FR_INVALID_NAME:         // (6) The path name format is invalid
-            return -EINVAL;
-        case FR_DENIED:               // (7) Access denied due to prohibited access or directory full
-            return -EACCES;
-        case FR_EXIST:                // (8) Access denied due to prohibited access
-            return -EEXIST;
-        case FR_INVALID_OBJECT:       // (9) The file/directory object is invalid
+        case FR_OK:                     /* (0) Succeeded */
+            return 0;                   /* no error */
+        case FR_DISK_ERR:               /* (1) A hard error occurred in the low level disk I/O layer */
+        case FR_NOT_READY:              /* (3) The physical drive cannot work */
+            return -EIO;                /* I/O error */
+        case FR_NO_FILE:                /* (4) Could not find the file */
+        case FR_NO_PATH:                /* (5) Could not find the path */
+        case FR_INVALID_NAME:           /* (6) The path name format is invalid */
+        case FR_INVALID_DRIVE:          /* (11) The logical drive number is invalid */
+        case FR_NO_FILESYSTEM:          /* (13) There is no valid FAT volume */
+            return -ENOENT;             /* No such file or directory */
+        case FR_DENIED:                 /* (7) Access denied due to prohibited access or directory full */
+            return -EACCES;             /* Permission denied */
+        case FR_EXIST:                  /* (8) Access denied due to prohibited access */
+            return -EEXIST;             /* File exists */
+        case FR_WRITE_PROTECTED:        /* (10) The physical drive is write protected */
+        case FR_LOCKED:                 /* (16) The operation is rejected according to the file sharing policy */
+            return -EACCES;             /* Permission denied */
+        case FR_INVALID_OBJECT:         /* (9) The file/directory object is invalid */
+            return -EFAULT;             /* Bad address */
+        case FR_NOT_ENABLED:            /* (12) The volume has no work area */
+            return -ENXIO;              /* No such device or address */
+        case FR_NOT_ENOUGH_CORE:        /* (17) LFN working buffer could not be allocated */
+            return -ENOMEM;             /* Not enough space */
+        case FR_TOO_MANY_OPEN_FILES:    /* (18) Number of open files > _FS_LOCK */
+            return -ENFILE;             /* Too many open files in system */
+        case FR_INVALID_PARAMETER:      /* (19) Given parameter is invalid */
+            return -ENOEXEC;            /* Exec format error */
+        case FR_INT_ERR:                /* (2) Assertion failed */
+        case FR_MKFS_ABORTED:           /* (14) The f_mkfs() aborted due to any parameter error */
+        case FR_TIMEOUT:                /* (15) Could not get a grant to access the volume within defined period */
+        default:                        /* Bad file number */
             return -EBADF;
-        case FR_WRITE_PROTECTED:      // (10) The physical drive is write protected
-            return -EACCES;
-        case FR_INVALID_DRIVE:        // (11) The logical drive number is invalid
-            return -ENODEV;
-        case FR_NOT_ENABLED:          // (12) The volume has no work area
-            return -ENODEV;
-        case FR_NO_FILESYSTEM:        // (13) There is no valid FAT volume
-            return -EINVAL;
-        case FR_MKFS_ABORTED:         // (14) The f_mkfs() aborted due to any problem
-            return -EIO;
-        case FR_TIMEOUT:              // (15) Could not get a grant to access the volume within defined period
-            return -ETIMEDOUT;
-        case FR_LOCKED:               // (16) The operation is rejected according to the file sharing policy
-            return -EBUSY;
-        case FR_NOT_ENOUGH_CORE:      // (17) LFN working buffer could not be allocated
-            return -ENOMEM;
-        case FR_TOO_MANY_OPEN_FILES:  // (18) Number of open files > FF_FS_LOCK
-            return -ENFILE;
-        case FR_INVALID_PARAMETER:    // (19) Given parameter is invalid
-            return -EINVAL;
-        default:
-            return -res;
     }
 }
 
diff --git a/features/nvstore/source/nvstore.h b/features/nvstore/source/nvstore.h
@@ -23,7 +23,7 @@
 #define NVSTORE_ENABLED 0
 #endif
 
-#if NVSTORE_ENABLED
+#if (NVSTORE_ENABLED) || defined(DOXYGEN_ONLY)
 #include <stdint.h>
 #include <stdio.h>
 #include "platform/NonCopyable.h"
@@ -286,8 +286,6 @@ class NVStore : private mbed::NonCopyable<NVStore> {
     /**
      * @brief Calculate addresses and sizes of areas (in case no user configuration is given),
      *        or validate user configuration (if given).
-     *
-     * @param[in]  area                   Area.
      */
     void calc_validate_area_params();
 
@@ -310,7 +308,7 @@ class NVStore : private mbed::NonCopyable<NVStore> {
      * @param[in]  buf                    Output Buffer.
      * @param[out] actual_size            Actual data size (bytes).
      * @param[in]  validate_only          Just validate (without reading to buffer).
-     * @param[out] validate               Is the record valid.
+     * @param[out] valid                  Is the record valid.
      * @param[out] key                    Record key.
      * @param[out] flags                  Record flags.
      * @param[out] next_offset            Offset of next record.
diff --git a/mbed.h b/mbed.h
@@ -16,7 +16,7 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 159
+#define MBED_LIBRARY_VERSION 160
 
 #if MBED_CONF_RTOS_PRESENT
 // RTOS present, this is valid only for mbed OS 5
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/PeripheralNames.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/PeripheralNames.h
@@ -45,8 +45,14 @@
 extern "C" {
 #endif
 
+#ifndef STDIO_UART_TX
 #define STDIO_UART_TX     TX_PIN_NUMBER
+#endif
+
+#ifndef STDIO_UART_RX
 #define STDIO_UART_RX     RX_PIN_NUMBER
+#endif
+
 #define STDIO_UART        UART_0
 
 typedef enum {
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/PeripheralNames.h b/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/PeripheralNames.h
@@ -45,8 +45,14 @@
 extern "C" {
 #endif
 
+#ifndef STDIO_UART_TX
 #define STDIO_UART_TX     TX_PIN_NUMBER
+#endif
+
+#ifndef STDIO_UART_RX
 #define STDIO_UART_RX     RX_PIN_NUMBER
+#endif
+
 #define STDIO_UART        UART_0
 
 typedef enum
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT1050/TARGET_EVK/PinNames.h b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MIMXRT1050/TARGET_EVK/PinNames.h
@@ -217,7 +217,8 @@ typedef enum {
     PullUp_47K  = 2,
     PullUp_100K = 3,
     PullUp_22K  = 4,
-    PullDefault = PullUp_47K
+    PullDefault = PullUp_47K,
+    PullUp = PullUp_47K
 } PinMode;
 
 #ifdef __cplusplus
diff --git a/tools/config/__init__.py b/tools/config/__init__.py
@@ -392,7 +392,7 @@ def format_validation_error(self, error, path):
             return self.format_validation_error(error.context[0], path)
         else:
             return "in {} element {}: {}".format(
-                path, str(".".join(error.absolute_path)), error.message)
+                path, str(".".join(str(p) for p in error.absolute_path)), error.message)
 
     def __init__(self, tgt, top_level_dirs=None, app_config=None):
         """Construct a mbed configuration
diff --git a/tools/config/definitions.json b/tools/config/definitions.json
@@ -11,7 +11,7 @@
     "type": "array",
     "items": {
       "type": "string",
-      "pattern": "(^[\\w]+$|^[\\w]+=.+$)"
+      "pattern": "(^[\\w()_]+$|^[\\w()_]+=.+$)"
     }
   },
   "config_definition": {
diff --git a/tools/test/examples/examples.json b/tools/test/examples/examples.json
@@ -238,6 +238,32 @@
       "compile" : true,
       "export": true,
       "auto-update" : true
-    }
+    },
+    {
+        "name": "mbed-os-example-lorawan",
+        "github":"https://github.com/ARMmbed/mbed-os-example-lorawan",
+        "mbed": [],
+        "test-repo-source": "github",
+        "features" : [],
+        "targets" : [],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": false,
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-nvstore",
+        "github":"https://github.com/ARMmbed/mbed-os-example-nvstore",
+        "mbed": [],
+        "test-repo-source": "github",
+        "features" : [],
+        "targets" : [],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "auto-update" : true
+    }      
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ static bool wait_register()`
`71`	`71`
`72`	`72`	`void test_attach()`
`73`	`73`	`{`
	`74`	`+ cellularDevice.set_timeout(120*1000); // 120 second timeout for at commands after power is up. It might take time to register, attach and connect`
`74`	`75`	`tr_info("Register to network.");`
`75`	`76`	`TEST_ASSERT(wait_register());`
`76`	`77`	`tr_info("Attach to network.");`