Merge remote-tracking branch 'upstream/master' into microbit_features

# Conflicts:
#	records/tools/version.yaml

Resolved using DAPLink version 256 from master

Author: gerargz

docs/README.md

@@ -24,4 +24,8 @@ Porting DAPLink to new systems:
 * [Adding a new target device](PORT_TARGET_FAMILY.md)
 * [Adding a new HIC](PORT_HIC.md)
 
+### Troubleshooting
+
+* [micro:bit maintenence mode](TROUBLESHOOTING.md)
+
 

docs/TROUBLESHOOTING.md

@@ -0,0 +1,15 @@
+# Troubleshooting DAPLink
+
+## Maintenence mode on micro:bit (KL26Z)
+
+If you have a BBC micro:bit, or other Mbed hardware, and it is connecting as a drive called MAINTENANCE instead of MICROBIT, then you are in the maintenance mode provided for updating the DAPLink software (see below).
+
+The way you access maintenance mode is by pluging in your board to your computer's USB port while holding down the reset button. If you are in maintenance mode by mistake, this might be how it happened.
+
+![Microbit button press](images/daplink_pressed.0ff1832a4c87.png)
+
+To leave maintenance mode, unplug the board from USB, make sure the Reset button is not pressed, and plug the board back in.
+
+![Microbit unplug](images/daplink_unpressed.9fa419e5fc93.png)
+
+The board should now show up with the correct name (for example, MICROBIT). If this fails to work, please follow the [firmware update steps](https://microbit.org/get-started/user-guide/firmware/) outlined on the micro:bit website.

docs/images/daplink_pressed.0ff1832a4c87.png

@@ -178,6 +178,10 @@ projects:
         - *module_if
         - *module_hic_kl26z
         - records/board/nina_b1.yaml
+    kl26z_artemis_dk_if:
+        - *module_if
+        - *module_hic_kl26z
+        - records/board/artemis_dk.yaml
     k20dx_frdmk20dx_if:
         - *module_if
         - *module_hic_k20dx
@@ -298,6 +302,10 @@ projects:
         - *module_if
         - *module_hic_k20dx
         - records/board/ep_agora.yaml
+    k20dx_ep_kairos_if:
+        - *module_if
+        - *module_hic_k20dx
+        - records/board/ep_kairos.yaml
     k26f_frdmk32w042_if:
         - *module_if
         - *module_hic_k26f

docs/images/daplink_unpressed.9fa419e5fc93.png

@@ -0,0 +1,15 @@
+common:
+    macros:
+        - IO_CONFIG_OVERRIDE
+        - HID_LED_DEF=GPIO_LED_ON
+        - CDC_LED_DEF=GPIO_LED_ON
+        - MSC_LED_DEF=GPIO_LED_ON
+        - USB_PROD_STR="SparkFun Artemis Dev Kit CMSIS-DAP"
+    includes:
+        - source/board/override_mkl26z_reset
+    sources:
+        board:
+            - source/board/artemis_dk.c
+        family:
+            - source/family/ambiq/ama3b1kk/target.c
+            - source/family/ambiq/ama3b1kk/target_reset.c

projects.yaml

@@ -0,0 +1,7 @@
+common:
+    sources:
+        board:
+            - source/board/ep_kairos.c
+        family:
+            - source/family/nxp/lpc55S6X/target.c
+            - source/family/nxp/lpc55S6X/target_reset.c

records/board/artemis_dk.yaml

@@ -1,3 +1,3 @@
 common:
     macros:
-        - DAPLINK_VERSION=255
+        - DAPLINK_VERSION=256

records/board/ep_kairos.yaml

@@ -1,7 +1,7 @@
-project_generator==0.9.13
+project_generator==0.10.*
 mbed-ls==1.6.2
 pyserial
-pyOCD==0.16.0
+pyOCD==0.28.*
 requests
 intelhex
 six

records/tools/version.yaml

@@ -0,0 +1,72 @@
+/**
+ * @file    microbit.c
+ * @brief   board ID for the BBC Microbit board
+ *
+ * DAPLink Interface Firmware
+ * Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * 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 "fsl_device_registers.h"
+#include "IO_Config.h"
+#include "DAP.h"
+#include "target_family.h"
+#include "target_board.h"
+
+const char *const board_id_artemis_dk_v10 = "A127";
+
+typedef enum
+{
+    BOARD_VERSION_v10 = 0,
+} artemis_dk_version_t;
+
+static void set_board_id(artemis_dk_version_t board_version)
+{
+    switch (board_version)
+    {
+    case BOARD_VERSION_v10:
+        target_device.rt_board_id = board_id_artemis_dk_v10;
+        break;
+    default:
+        target_device.rt_board_id = board_id_artemis_dk_v10;
+        break;
+    }
+}
+
+// Called in main_task() to init before USB and files are configured
+static void prerun_board_config(void)
+{
+    // in the future you could auto-detect board version here
+    artemis_dk_version_t board_version = (artemis_dk_version_t)BOARD_VERSION_v10;
+    set_board_id(board_version);
+}
+
+// USB HID override function return 1 if the activity is trivial or response is null
+uint8_t usbd_hid_no_activity(uint8_t *buf)
+{
+    if (buf[0] == ID_DAP_Vendor3 && buf[1] == 0)
+        return 1;
+    else
+        return 0;
+}
+
+const board_info_t g_board_info = {
+    .info_version = 0x1,
+    .family_id = kAmbiq_ama3b1kk_FamilyID,
+    .daplink_url_name = "ARTEMIS_HTM",
+    .daplink_drive_name = "ARTEMIS    ",
+    .daplink_target_url = "https://www.sparkfun.com/artemis",
+    .prerun_board_config = prerun_board_config,
+    .target_cfg = &target_device,
+};