Merge https://github.com/ARMmbed/mbed-os

Author: paul-szczepanek-arm

.github/pull_request_template.md

@@ -1,11 +1,21 @@
-# Description
+### Description
 
-> Detailed changes summary | testing | dependencies
-> Good example: https://os.mbed.com/docs/latest/reference/guidelines.html#workflow (Pull request template)
+<!-- 
+    Required
+    Add here detailed changes summary, testing results, dependencies 
+    Good example: https://os.mbed.com/docs/latest/reference/guidelines.html#workflow (Pull request template)
+-->
 
-# Pull request type
+
+### Pull request type
+
+<!-- 
+    Required
+    Please tick one of the following types 
+-->
 
 - [ ] Fix
 - [ ] Refactor
-- [ ] New Target
+- [ ] New target
 - [ ] Feature
+- [ ] Breaking change

.travis.yml

@@ -10,7 +10,7 @@ env:
       --data @- << DATA\n{
       "state": "$0",
       "description": "$1",
-      "context": "travis-ci/$NAME/$(python --version)",
+      "context": "travis-ci/$NAME",
       "target_url": "https://travis-ci.org/$TRAVIS_REPO_SLUG/jobs/$TRAVIS_JOB_ID"
       }\nDATA'
 
@@ -74,10 +74,6 @@ matrix:
 
     - env:
         - NAME=tools
-      python:
-        - '2.7'
-        - '3.5'
-        - '3.6'
       install:
         # Install dependencies
         - sudo apt-get install gcc-arm-embedded
@@ -89,7 +85,7 @@ matrix:
       script:
         # Run local testing on tools
         - PYTHONPATH=. coverage run -a -m pytest tools/test
-        - python2 tools/test/pylint.py
+        - python tools/test/pylint.py
         - coverage run -a tools/project.py -S | sed -n '/^Total/p'
         - coverage html
       after_success:
@@ -199,8 +195,3 @@ matrix:
       env: NAME=mbed2-NUVOTON
     - <<: *mbed-2
       env: NAME=mbed2-RENESAS
-      # Change python version here only because 3x the other jobs does not add any more coverage
-      python:
-        - '2.7'
-        - '3.5'
-        - '3.6'

TESTS/host_tests/system_reset.py

@@ -0,0 +1,76 @@
+"""
+Copyright (c) 2018 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 time
+from mbed_host_tests import BaseHostTest
+from mbed_host_tests.host_tests_runner.host_test_default import DefaultTestSelector
+
+DEFAULT_CYCLE_PERIOD = 1.0
+
+MSG_VALUE_DUMMY = '0'
+
+MSG_KEY_DEVICE_READY = 'ready'
+MSG_KEY_DEVICE_RESET = 'reset'
+MSG_KEY_SYNC = '__sync'
+
+class SystemResetTest(BaseHostTest):
+    """Test for the system_reset API.
+
+    Given a device running code
+    When the device is restarted using @a system_reset()
+    Then the device is restarted
+    """
+
+    def __init__(self):
+        super(SystemResetTest, self).__init__()
+        self.reset = False
+        cycle_s = self.get_config_item('program_cycle_s')
+        self.program_cycle_s = cycle_s if cycle_s is not None else DEFAULT_CYCLE_PERIOD
+
+        self.test_steps_sequence = self.test_steps()
+        # Advance the coroutine to it's first yield statement.
+        self.test_steps_sequence.send(None)
+
+    def setup(self):
+        self.register_callback(MSG_KEY_DEVICE_READY, self.cb_device_ready)
+
+    def cb_device_ready(self, key, value, timestamp):
+        """Acknowledge device rebooted correctly and feed the test execution
+        """
+        self.reset = True
+
+        try:
+            if self.test_steps_sequence.send(value):
+                self.notify_complete(True)
+        except (StopIteration, RuntimeError) as exc:
+            self.notify_complete(False)
+
+    def test_steps(self):
+        """Reset the device and check the status
+        """
+        system_reset = yield
+
+        self.reset = False
+        self.send_kv(MSG_KEY_DEVICE_RESET, MSG_VALUE_DUMMY)
+        time.sleep(self.program_cycle_s)
+        self.send_kv(MSG_KEY_SYNC, MSG_VALUE_DUMMY)
+
+        system_reset = yield
+
+        if self.reset == False:
+            raise RuntimeError('Platform did not reset as expected.')
+
+        # The sequence is correct -- test passed.
+        yield True

TESTS/mbed_hal/flash/functional_tests/main.cpp

@@ -27,8 +27,8 @@
 
 using namespace utest::v1;
 
-#define TEST_CYCLES         1000000
-#define ALLOWED_DRIFT_PPM   5000         //0.5%
+#define TEST_CYCLES         10000000
+#define ALLOWED_DRIFT_PPM   (1000000/5000)    //0.5%
 
 /*
     return values to be checked are documented at:
@@ -269,7 +269,7 @@ void flash_buffer_alignment_test()
 void flash_clock_and_cache_test()
 {
     const int timer_diff_end = time_cpu_cycles(TEST_CYCLES);
-    const int acceptable_range = timer_diff_start / (1000000 / ALLOWED_DRIFT_PPM);
+    const int acceptable_range = timer_diff_start / (ALLOWED_DRIFT_PPM);
     TEST_ASSERT_UINT32_WITHIN(acceptable_range, timer_diff_start, timer_diff_end);
 }
 

TESTS/mbed_platform/system_reset/main.cpp

@@ -0,0 +1,51 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2018 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.
+ */
+#include "mbed.h"
+#include "greentea-client/test_env.h"
+#include "unity/unity.h"
+
+#define MSG_VALUE_DUMMY "0"
+#define MSG_VALUE_LEN 16
+#define MSG_KEY_LEN 16
+
+#define MSG_KEY_DEVICE_READY "ready"
+#define MSG_KEY_DEVICE_RESET "reset"
+
+void test_system_reset()
+{
+    // Report readiness
+    greentea_send_kv(MSG_KEY_DEVICE_READY, MSG_VALUE_DUMMY);
+
+    static char _key[MSG_KEY_LEN + 1] = { };
+    static char _value[MSG_VALUE_LEN + 1] = { };
+
+    greentea_parse_kv(_key, _value, MSG_KEY_LEN, MSG_VALUE_LEN);
+    if (strcmp(_key, MSG_KEY_DEVICE_RESET) == 0) {
+        system_reset();
+        TEST_ASSERT_MESSAGE(0, "system_reset() did not reset the device as expected.");
+    }
+
+    TEST_ASSERT_MESSAGE(0, "Unexpected message key.");
+}
+
+int main(void)
+{
+    GREENTEA_SETUP(2, "system_reset");
+    test_system_reset();
+    GREENTEA_TESTSUITE_RESULT(0); // Fail on any error.
+
+    return 0;
+}