Test merge of feature-emac with master

This is a dummy test merge - operation was actually performed as a
rebase, and will be pushed as such. This contains the same final
tree contents as my current proposed rebase, and hopefully gitk
will show a semi-legible diff for the bits touched in the merge
commit.

Author: kjbracey

.astyleignore

@@ -0,0 +1,17 @@
+BUILD
+cmsis
+features/mbedtls
+features/FEATURE_LWIP/lwip
+rtos/TARGET_CORTEX/rtx4
+features/filesystem/littlefs/littlefs
+features/filesystem/fat/ChaN
+features/frameworks
+features/FEATURE_BLE/targets
+features/FEATURE_LWIP/lwip-interface/lwip
+features/unsupported/
+features/FEATURE_COMMON_PAL/
+FEATURE_NANOSTACK/coap-service
+FEATURE_NANOSTACK/sal-stack-nanostack
+rtos/TARGET_CORTEX/rtx5
+targets
+tools

.astylerc

@@ -0,0 +1,34 @@
+# Mbed OS code style definition file for astyle
+
+# Don't create backup files, let git handle it
+suffix=none
+
+# K&R style
+style=kr
+
+# 1 TBS addition to k&r, add braces to one liners
+# Use -j as it was changed in astyle from brackets to braces, this way it is compatible with older astyle versions
+-j
+
+# 4 spaces, convert tabs to spaces
+indent=spaces=4
+convert-tabs
+
+# Indent switches and cases
+indent-switches
+indent-cases
+
+# Remove spaces in and around parentheses
+unpad-paren
+
+# Insert a space after if, while, for, and around operators
+pad-header
+pad-oper
+
+# Pointer/reference operators go next to the name (on the right)
+align-pointer=name
+align-reference=name
+
+# Attach { for classes and namespaces
+attach-namespaces
+attach-classes

.github/issue_template.md

@@ -1,48 +1,31 @@
-Note: This is just a template, so feel free to use/remove the unnecessary things
-
 ### Description
-- Type: Bug | Enhancement | Question
-- Related issue: `#abc`
-- Priority: Blocker | Major | Minor
-
----------------------------------------------------------------
-## Bug
-
-**Target**
-K64F|??
-
-**Toolchain:**
-GCC_ARM|ARM|IAR
-
-**Toolchain version:**
-
-**mbed-cli version:** 
-(`mbed --version`)
-
-**mbed-os sha:**
-(`git log -n1 --oneline`)
-
-**DAPLink version:**
-
-**Expected behavior**
-
-**Actual behavior**
-
-**Steps to reproduce**
-
-----------------------------------------------------------------
-## Enhancement
-
-**Reason to enhance or problem with existing solution**
-
-**Suggested enhancement**
-
-**Pros**
-
-**Cons**
-
------------------------------------------------------------------
-
-## Question
+<!-- 
+    Required
+    Add detailed description of what you are reporting.
+    Good example: https://os.mbed.com/docs/latest/reference/workflow.html
+    Things to consider sharing:
+    - What target does this relate to?
+    - What toolchain (name + version) are you using?
+    - What tools (name + version - is it mbed-cli, online compiler or IDE) are you using?
+    - What is the SHA of Mbed OS (git log -n1 --oneline)?
+    - Steps to reproduce. (Did you publish code or a test case that exhibits the problem?)
+-->
+
+
+### Issue request type
+<!-- 
+    Required
+    Please add only one X to one of the following types. Do not fill multiple types. (Split the issue otherwise.)
+    Please note this is not a GitHub task list; indenting the boxes or changing the format to add a '.' or '*' in front
+    of them changes the meaning incorrectly. The only changes to make are to add a description under the
+    description heading and to add an 'x' to the correct box.
+
+    [X] Question
+    [ ] Enhancement 
+    [ ] Bug 
+-->
+
+[ ] Question  
+[ ] Enhancement  
+[ ] Bug  
 
-**How to?**

.github/pull_request_template.md

@@ -3,26 +3,22 @@
 <!-- 
     Required
     Add here detailed changes summary, testing results, dependencies 
-    Good example: https://os.mbed.com/docs/latest/reference/guidelines.html#workflow (Pull request template)
+    Good example: https://os.mbed.com/docs/latest/reference/workflow.html (Pull request template)
 -->
 
 
 ### Pull request type
 
 <!-- 
     Required
-    Please add only one X to one of the following types. Do not fill multiple types (split the pull request otherwise) or
-    change the layout.
-
-    [X] Fix
+    Please add only one X to one of the following types. Do not fill multiple types (split the pull request otherwise).
+    Please note this is not a GitHub task list, indenting the boxes or changing the format to add a '.' or '*' in front
+    of them would change the meaning incorrectly. The only changes to be made are to add a description text under the
+    description heading and to add a 'x' to the correct box.
+-->
+    [ ] Fix
     [ ] Refactor
     [ ] New target
     [ ] Feature
     [ ] Breaking change
--->
 
-[ ] Fix  
-[ ] Refactor  
-[ ] New target  
-[ ] Feature  
-[ ] Breaking change

.travis.yml

@@ -94,6 +94,45 @@ matrix:
         # Report success since we have overridden default behaviour
         - bash -c "$STATUS" success "Local $NAME testing has passed"
 
+    - env:
+        - NAME=astyle
+      install:
+      - wget https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.1/astyle_3.1_linux.tar.gz;
+        mkdir -p BUILD && tar xf astyle_3.1_linux.tar.gz -C BUILD;
+        pushd BUILD/astyle/build/gcc;
+        make;
+        export PATH=$PWD/bin:$PATH;
+        popd;
+      - astyle --version
+      script:
+        # only changed files this time
+        - git diff --name-only $TRAVIS_BRANCH | grep '.*\.\(h\|c\|hpp\|cpp\)' | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-files-changed.out;
+          if [ $(cat astyle-files-changed.out | grep Formatted | wc -l) -ne 0 ]; then
+            git --no-pager diff;
+            echo "Please fix style issues as shown above";
+          else
+            echo "Coding style check OK";
+          fi
+      after_success:
+        # run astyle for all files on the branch
+        - git checkout -- .
+        - find -regex '.*\.\(h\|c\|hpp\|cpp\)' -type f | fgrep -v -f .astyleignore | xargs -n 100 -I {} bash -c "astyle -n --options=.astylerc \"{}\"" > astyle-branch.out;
+        # update status if we succeeded, compare with master if possible
+        - |
+          CURR=$(cat astyle-branch.out | grep Formatted | wc -l)
+          PREV=$(curl https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
+              | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
+                  | .statuses[] | select(.context == \"travis-ci/$NAME\").description
+                  | capture(\", (?<warnings>[0-9]+) warnings\").warnings" \
+              || echo 0)
+
+          STATUSM="Passed, ${CURR} warnings"
+          if [ "$PREV" -ne 0 ]
+          then
+              STATUSM="$STATUSM ($(python -c "print '%+d' % ($CURR-$PREV)") warnings)"
+          fi
+        - bash -c "$STATUS" success "$STATUSM"
+
     - env:
         - NAME=events
         - EVENTS=events
@@ -111,7 +150,7 @@ matrix:
         - python tools/make.py -t GCC_ARM -m K64F --source=. --build=BUILD/K64F/GCC_ARM -j0
         # Check that example compiles without rtos
         - sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' $EVENTS/README.md > main.cpp
-        - rm -r rtos features/cellular features/netsocket features/frameworks BUILD
+        - rm -r rtos features/cellular features/netsocket features/nanostack features/frameworks BUILD
         - python tools/make.py -t GCC_ARM -m DISCO_F401VC --source=. --build=BUILD/DISCO_F401VC/GCC_ARM -j0
         # Run local equeue tests
         - make -C $EVENTS/equeue test

TESTS/host_tests/device_echo.py

@@ -0,0 +1,32 @@
+"""
+mbed SDK
+Copyright (c) 2011-2016 ARM Limited
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+
+import uuid
+from mbed_host_tests import BaseHostTest
+
+class Device_Echo(BaseHostTest):
+
+    def _callback_repeat(self, key, value, _):
+        self.send_kv(key, value)
+
+    def setup(self):
+        self.register_callback("echo", self._callback_repeat)
+        self.register_callback("echo_count", self._callback_repeat)
+
+    def teardown(self):
+        pass

TESTS/mbed_drivers/echo/main.cpp

@@ -21,28 +21,49 @@
 #include "unity/unity.h"
 #include "utest/utest.h"
 
+#define PAYLOAD_LENGTH 36
+
 using namespace utest::v1;
 
+// Fill a buffer with a slice of the ASCII alphabet.
+void fill_buffer(char* buffer, unsigned int length, unsigned int index) {
+    unsigned int start = length * index;
+    for (int i = 0; i < length - 1; i++) {
+        buffer[i] = 'a' + ((start + i) % 26);
+    }
+    buffer[length - 1] = '\0';
+}
+
 // Echo server (echo payload to host)
 template<int N>
 void test_case_echo_server_x() {
     char _key[11] = {};
-    char _value[128] = {};
+    char _tx_value[PAYLOAD_LENGTH + 1] = {};
+    char _rx_value[PAYLOAD_LENGTH + 1] = {};
     const int echo_count = N;
-    const char _key_const[] = "echo_count";
+    const char _echo_count_key_const[] = "echo_count";
+    const char _echo_key_const[] = "echo";
     int expected_key = 1;
 
-    greentea_send_kv(_key_const, echo_count);
+    // Send up the echo count
+    greentea_send_kv(_echo_count_key_const, echo_count);
     // Handshake with host
     do {
-        greentea_parse_kv(_key, _value, sizeof(_key), sizeof(_value));
-        expected_key = strcmp(_key_const, _key);
+        greentea_parse_kv(_key, _rx_value, sizeof(_key), sizeof(_rx_value));
+        // Ensure the key received is "echo_count" and not some old data
+        expected_key = strcmp(_echo_count_key_const, _key);
     } while (expected_key);
-    TEST_ASSERT_EQUAL_INT(echo_count, atoi(_value));
+    TEST_ASSERT_EQUAL_INT(echo_count, atoi(_rx_value));
 
     for (int i=0; i < echo_count; ++i) {
-        greentea_parse_kv(_key, _value, sizeof(_key), sizeof(_value));
-        greentea_send_kv(_key, _value);
+        fill_buffer(_tx_value, PAYLOAD_LENGTH, i);
+        greentea_send_kv(_echo_key_const, _tx_value);
+        do {
+            greentea_parse_kv(_key, _rx_value, sizeof(_key), sizeof(_rx_value));
+            // Ensure the key received is "echo" and not some old data
+            expected_key = strcmp(_echo_key_const, _key);
+        } while (expected_key);
+        TEST_ASSERT(strncmp(_tx_value, _rx_value, PAYLOAD_LENGTH) == 0);
     }
 }
 
@@ -56,7 +77,7 @@ Case cases[] = {
 };
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {
-    GREENTEA_SETUP(30, "echo");
+    GREENTEA_SETUP(30, "device_echo");
     return greentea_test_setup_handler(number_of_cases);
 }
 

TESTS/mbed_hal/critical_section/main.cpp

@@ -20,7 +20,7 @@
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "cmsis.h"
-#ifdef TARGET_NRF5 // for all NRF5x targets
+#if defined(TARGET_NRF5) || defined(TARGET_NRF5x) // for all NRF5x targets
 #include "nrf_nvic.h" // for __NRF_NVIC_APP_IRQS_0 / __NRF_NVIC_APP_IRQS_1
 #endif
 
@@ -30,7 +30,7 @@ bool test_are_interrupts_enabled(void)
 {
     // NRF5x targets don't disable interrupts when in critical section, instead they mask application interrupts this is due to BLE stack
     // (BLE to be operational requires some interrupts to be always enabled)
-#ifdef TARGET_NRF52_DK
+#ifdef TARGET_NRF52
 	// check if APP interrupts are masked for NRF52_DK board
 	return (((NVIC->ISER[0] & __NRF_NVIC_APP_IRQS_0) != 0) || ((NVIC->ISER[1] & __NRF_NVIC_APP_IRQS_1) != 0));
 #elif TARGET_NRF5

TESTS/mbed_hal/flash/functional_tests/main.cpp

@@ -28,7 +28,13 @@
 using namespace utest::v1;
 
 #define TEST_CYCLES         10000000
+
+#ifdef TARGET_NRF52
+/* The increased tolerance is to account for the imprecise timers on the NRF52. */
+#define ALLOWED_DRIFT_PPM   (1000000/50000)   //5.0%
+#else
 #define ALLOWED_DRIFT_PPM   (1000000/5000)    //0.5%
+#endif
 
 /*
     return values to be checked are documented at:
@@ -279,9 +285,7 @@ Case cases[] = {
     Case("Flash - erase sector", flash_erase_sector_test),
     Case("Flash - program page", flash_program_page_test),
     Case("Flash - buffer alignment test", flash_buffer_alignment_test),
-#ifndef MCU_NRF52
     Case("Flash - clock and cache test", flash_clock_and_cache_test),
-#endif
 };
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {