From f1ce76edc2908d0bce7480a37a70174505b360bd Mon Sep 17 00:00:00 2001 From: Adam BZH <424778940z@gmail.com> Date: Fri, 8 Jan 2021 15:45:40 -0600 Subject: [PATCH 1/3] rename Makerdiary board files, added usb dongle support --- ..._mdk.json => makerdiary_nrf52832_mdk.json} | 81 ++++++++++--------- ..._mdk.json => makerdiary_nrf52840_mdk.json} | 81 ++++++++++--------- boards/makerdiary_nrf52840_mdk_dongle.json | 39 +++++++++ 3 files changed, 123 insertions(+), 78 deletions(-) rename boards/{nrf52832_mdk.json => makerdiary_nrf52832_mdk.json} (85%) rename boards/{nrf52840_mdk.json => makerdiary_nrf52840_mdk.json} (85%) create mode 100644 boards/makerdiary_nrf52840_mdk_dongle.json diff --git a/boards/nrf52832_mdk.json b/boards/makerdiary_nrf52832_mdk.json similarity index 85% rename from boards/nrf52832_mdk.json rename to boards/makerdiary_nrf52832_mdk.json index 79bad373..c1b034a6 100644 --- a/boards/nrf52832_mdk.json +++ b/boards/makerdiary_nrf52832_mdk.json @@ -1,39 +1,42 @@ -{ - "build": { - "cpu": "cortex-m4", - "f_cpu": "64000000L", - "mcu": "nrf52832" - }, - "connectivity": [ - "bluetooth" - ], - "debug": { - "default_tools": [ - "cmsis-dap" - ], - "jlink_device": "nRF52832_xxAA", - "onboard_tools": [ - "cmsis-dap" - ], - "svd_path": "nrf52.svd" - }, - "frameworks": [ - "zephyr" - ], - "name": "Makerdiary nRF52832-MDK", - "upload": { - "maximum_ram_size": 65536, - "maximum_size": 524288, - "protocol": "cmsis-dap", - "protocols": [ - "jlink", - "nrfjprog", - "stlink", - "blackmagic", - "cmsis-dap", - "mbed" - ] - }, - "url": "https://wiki.makerdiary.com/nrf52832-mdk/", - "vendor": "Makerdiary" -} +{ + "build": { + "cpu": "cortex-m4", + "f_cpu": "64000000L", + "mcu": "nrf52832", + "zephyr": { + "variant": "nrf52832_mdk" + } + }, + "connectivity": [ + "bluetooth" + ], + "debug": { + "default_tools": [ + "cmsis-dap" + ], + "jlink_device": "nRF52832_xxAA", + "onboard_tools": [ + "cmsis-dap" + ], + "svd_path": "nrf52.svd" + }, + "frameworks": [ + "zephyr" + ], + "name": "Makerdiary nRF52832-MDK", + "upload": { + "maximum_ram_size": 65536, + "maximum_size": 524288, + "protocol": "cmsis-dap", + "protocols": [ + "jlink", + "nrfjprog", + "stlink", + "blackmagic", + "cmsis-dap", + "mbed" + ] + }, + "url": "https://wiki.makerdiary.com/nrf52832-mdk/", + "vendor": "Makerdiary" +} diff --git a/boards/nrf52840_mdk.json b/boards/makerdiary_nrf52840_mdk.json similarity index 85% rename from boards/nrf52840_mdk.json rename to boards/makerdiary_nrf52840_mdk.json index aa67a13a..7ab293bd 100644 --- a/boards/nrf52840_mdk.json +++ b/boards/makerdiary_nrf52840_mdk.json @@ -1,39 +1,42 @@ -{ - "build": { - "cpu": "cortex-m4", - "f_cpu": "64000000L", - "mcu": "nrf52840" - }, - "connectivity": [ - "bluetooth" - ], - "debug": { - "default_tools": [ - "cmsis-dap" - ], - "jlink_device": "nRF52840_xxAA", - "onboard_tools": [ - "cmsis-dap" - ], - "svd_path": "nrf52840.svd" - }, - "frameworks": [ - "zephyr" - ], - "name": "Makerdiary nRF52840-MDK", - "upload": { - "maximum_ram_size": 262144, - "maximum_size": 1048576, - "protocol": "cmsis-dap", - "protocols": [ - "jlink", - "nrfjprog", - "stlink", - "blackmagic", - "cmsis-dap", - "mbed" - ] - }, - "url": "https://wiki.makerdiary.com/nrf52840-mdk", - "vendor": "Makerdiary" -} +{ + "build": { + "cpu": "cortex-m4", + "f_cpu": "64000000L", + "mcu": "nrf52840", + "zephyr": { + "variant": "nrf52840_mdk" + } + }, + "connectivity": [ + "bluetooth" + ], + "debug": { + "default_tools": [ + "cmsis-dap" + ], + "jlink_device": "nRF52840_xxAA", + "onboard_tools": [ + "cmsis-dap" + ], + "svd_path": "nrf52840.svd" + }, + "frameworks": [ + "zephyr" + ], + "name": "Makerdiary nRF52840-MDK", + "upload": { + "maximum_ram_size": 262144, + "maximum_size": 1048576, + "protocol": "cmsis-dap", + "protocols": [ + "jlink", + "nrfjprog", + "stlink", + "blackmagic", + "cmsis-dap", + "mbed" + ] + }, + "url": "https://wiki.makerdiary.com/nrf52840-mdk", + "vendor": "Makerdiary" +} diff --git a/boards/makerdiary_nrf52840_mdk_dongle.json b/boards/makerdiary_nrf52840_mdk_dongle.json new file mode 100644 index 00000000..6bec0b83 --- /dev/null +++ b/boards/makerdiary_nrf52840_mdk_dongle.json @@ -0,0 +1,39 @@ +{ + "build": { + "cpu": "cortex-m4", + "f_cpu": "64000000L", + "mcu": "nrf52840", + "zephyr": { + "variant": "nrf52840_mdk_dongle" + } + }, + "connectivity": [ + "bluetooth" + ], + "debug": { + "default_tools": [ + "jlink" + ], + "jlink_device": "nRF52840_xxAA", + "svd_path": "nrf52840.svd" + }, + "frameworks": [ + "zephyr" + ], + "name": "Makerdiary nRF52840-MDK USB Dongle", + "upload": { + "maximum_ram_size": 262144, + "maximum_size": 1048576, + "protocol": "jlink", + "protocols": [ + "jlink", + "nrfjprog", + "stlink", + "blackmagic", + "cmsis-dap", + "mbed" + ] + }, + "url": "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/", + "vendor": "Makerdiary" +} From 4b78392035306bf568d1035120b03f73c3f62569 Mon Sep 17 00:00:00 2001 From: Adam BZH <424778940z@gmail.com> Date: Sat, 9 Jan 2021 16:59:12 -0600 Subject: [PATCH 2/3] Fixed line ending style --- boards/makerdiary_nrf52832_mdk.json | 84 +++++++++++----------- boards/makerdiary_nrf52840_mdk.json | 84 +++++++++++----------- boards/makerdiary_nrf52840_mdk_dongle.json | 78 ++++++++++---------- 3 files changed, 123 insertions(+), 123 deletions(-) diff --git a/boards/makerdiary_nrf52832_mdk.json b/boards/makerdiary_nrf52832_mdk.json index c1b034a6..c5d7c0bd 100644 --- a/boards/makerdiary_nrf52832_mdk.json +++ b/boards/makerdiary_nrf52832_mdk.json @@ -1,42 +1,42 @@ -{ - "build": { - "cpu": "cortex-m4", - "f_cpu": "64000000L", - "mcu": "nrf52832", - "zephyr": { - "variant": "nrf52832_mdk" - } - }, - "connectivity": [ - "bluetooth" - ], - "debug": { - "default_tools": [ - "cmsis-dap" - ], - "jlink_device": "nRF52832_xxAA", - "onboard_tools": [ - "cmsis-dap" - ], - "svd_path": "nrf52.svd" - }, - "frameworks": [ - "zephyr" - ], - "name": "Makerdiary nRF52832-MDK", - "upload": { - "maximum_ram_size": 65536, - "maximum_size": 524288, - "protocol": "cmsis-dap", - "protocols": [ - "jlink", - "nrfjprog", - "stlink", - "blackmagic", - "cmsis-dap", - "mbed" - ] - }, - "url": "https://wiki.makerdiary.com/nrf52832-mdk/", - "vendor": "Makerdiary" -} +{ + "build": { + "cpu": "cortex-m4", + "f_cpu": "64000000L", + "mcu": "nrf52832", + "zephyr": { + "variant": "nrf52832_mdk" + } + }, + "connectivity": [ + "bluetooth" + ], + "debug": { + "default_tools": [ + "cmsis-dap" + ], + "jlink_device": "nRF52832_xxAA", + "onboard_tools": [ + "cmsis-dap" + ], + "svd_path": "nrf52.svd" + }, + "frameworks": [ + "zephyr" + ], + "name": "Makerdiary nRF52832-MDK", + "upload": { + "maximum_ram_size": 65536, + "maximum_size": 524288, + "protocol": "cmsis-dap", + "protocols": [ + "jlink", + "nrfjprog", + "stlink", + "blackmagic", + "cmsis-dap", + "mbed" + ] + }, + "url": "https://wiki.makerdiary.com/nrf52832-mdk/", + "vendor": "Makerdiary" +} diff --git a/boards/makerdiary_nrf52840_mdk.json b/boards/makerdiary_nrf52840_mdk.json index 7ab293bd..1843e5ec 100644 --- a/boards/makerdiary_nrf52840_mdk.json +++ b/boards/makerdiary_nrf52840_mdk.json @@ -1,42 +1,42 @@ -{ - "build": { - "cpu": "cortex-m4", - "f_cpu": "64000000L", - "mcu": "nrf52840", - "zephyr": { - "variant": "nrf52840_mdk" - } - }, - "connectivity": [ - "bluetooth" - ], - "debug": { - "default_tools": [ - "cmsis-dap" - ], - "jlink_device": "nRF52840_xxAA", - "onboard_tools": [ - "cmsis-dap" - ], - "svd_path": "nrf52840.svd" - }, - "frameworks": [ - "zephyr" - ], - "name": "Makerdiary nRF52840-MDK", - "upload": { - "maximum_ram_size": 262144, - "maximum_size": 1048576, - "protocol": "cmsis-dap", - "protocols": [ - "jlink", - "nrfjprog", - "stlink", - "blackmagic", - "cmsis-dap", - "mbed" - ] - }, - "url": "https://wiki.makerdiary.com/nrf52840-mdk", - "vendor": "Makerdiary" -} +{ + "build": { + "cpu": "cortex-m4", + "f_cpu": "64000000L", + "mcu": "nrf52840", + "zephyr": { + "variant": "nrf52840_mdk" + } + }, + "connectivity": [ + "bluetooth" + ], + "debug": { + "default_tools": [ + "cmsis-dap" + ], + "jlink_device": "nRF52840_xxAA", + "onboard_tools": [ + "cmsis-dap" + ], + "svd_path": "nrf52840.svd" + }, + "frameworks": [ + "zephyr" + ], + "name": "Makerdiary nRF52840-MDK", + "upload": { + "maximum_ram_size": 262144, + "maximum_size": 1048576, + "protocol": "cmsis-dap", + "protocols": [ + "jlink", + "nrfjprog", + "stlink", + "blackmagic", + "cmsis-dap", + "mbed" + ] + }, + "url": "https://wiki.makerdiary.com/nrf52840-mdk", + "vendor": "Makerdiary" +} diff --git a/boards/makerdiary_nrf52840_mdk_dongle.json b/boards/makerdiary_nrf52840_mdk_dongle.json index 6bec0b83..2172c864 100644 --- a/boards/makerdiary_nrf52840_mdk_dongle.json +++ b/boards/makerdiary_nrf52840_mdk_dongle.json @@ -1,39 +1,39 @@ -{ - "build": { - "cpu": "cortex-m4", - "f_cpu": "64000000L", - "mcu": "nrf52840", - "zephyr": { - "variant": "nrf52840_mdk_dongle" - } - }, - "connectivity": [ - "bluetooth" - ], - "debug": { - "default_tools": [ - "jlink" - ], - "jlink_device": "nRF52840_xxAA", - "svd_path": "nrf52840.svd" - }, - "frameworks": [ - "zephyr" - ], - "name": "Makerdiary nRF52840-MDK USB Dongle", - "upload": { - "maximum_ram_size": 262144, - "maximum_size": 1048576, - "protocol": "jlink", - "protocols": [ - "jlink", - "nrfjprog", - "stlink", - "blackmagic", - "cmsis-dap", - "mbed" - ] - }, - "url": "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/", - "vendor": "Makerdiary" -} +{ + "build": { + "cpu": "cortex-m4", + "f_cpu": "64000000L", + "mcu": "nrf52840", + "zephyr": { + "variant": "nrf52840_mdk_dongle" + } + }, + "connectivity": [ + "bluetooth" + ], + "debug": { + "default_tools": [ + "jlink" + ], + "jlink_device": "nRF52840_xxAA", + "svd_path": "nrf52840.svd" + }, + "frameworks": [ + "zephyr" + ], + "name": "Makerdiary nRF52840-MDK USB Dongle", + "upload": { + "maximum_ram_size": 262144, + "maximum_size": 1048576, + "protocol": "jlink", + "protocols": [ + "jlink", + "nrfjprog", + "stlink", + "blackmagic", + "cmsis-dap", + "mbed" + ] + }, + "url": "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/", + "vendor": "Makerdiary" +} From bf03217e42e8d4f30d6022a87c194c459487a598 Mon Sep 17 00:00:00 2001 From: Adam <424778940z@users.noreply.github.com> Date: Sun, 12 Jun 2022 23:33:51 +0800 Subject: [PATCH 3/3] Matched Zephyr board name --- boards/makerdiary_nrf52840_mdk_dongle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/makerdiary_nrf52840_mdk_dongle.json b/boards/makerdiary_nrf52840_mdk_dongle.json index 2172c864..53c2f449 100644 --- a/boards/makerdiary_nrf52840_mdk_dongle.json +++ b/boards/makerdiary_nrf52840_mdk_dongle.json @@ -4,7 +4,7 @@ "f_cpu": "64000000L", "mcu": "nrf52840", "zephyr": { - "variant": "nrf52840_mdk_dongle" + "variant": "nrf52840_mdk_usb_dongle" } }, "connectivity": [