Skip to content

Commit bc418d6

Browse files
authored
Merge pull request #68 from adafruit/develop
update changelog for 0.2.11 releasing
2 parents f19189c + ee199d7 commit bc418d6

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Adafruit Bluefruit nRF52 Bootloader
1+
# Adafruit nRF52 Bootloader
2+
3+
[![Build Status](https://travis-ci.com/adafruit/Adafruit_nRF52_Bootloader.svg?branch=master)](https://travis-ci.com/adafruit/Adafruit_nRF52_Bootloader)
24

35
This is a CDC/DFU/UF2 bootloader for nRF52 boards.
46

changelog.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# Adafruit nRF52 Bootloader Changelog
22

3-
## 0.2.10
3+
## 0.2.11
44

55
- Fixed various FAT issues, thanks to @henrygab
66
- Added MakerDiary MDK nrf52840 USB dongle support, thanks to @gpshead
77
- Fixed incorrect button mapping for Feather nRF52840
8+
- NFC pins are forced to GPIO mode by bootloader
9+
- Added Metro nRF52840 Express VID/PID
10+
- Enhance board management
11+
- Added electronut/papyr_support
812

913
## 0.2.9
1014

tools/build_all.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
subprocess.run("rm -rf _build*", shell=True)
88
subprocess.run("rm -rf bin/*", shell=True)
99

10-
PARALLEL = "-j 5"
1110
travis = False
1211
if "TRAVIS" in os.environ and os.environ["TRAVIS"] == "true":
13-
PARALLEL="-j 2"
1412
travis = True
1513

1614
exit_status = 0
@@ -21,12 +19,14 @@
2119

2220
#sha, version = build_info.get_version_info()
2321

22+
total_time = time.monotonic()
23+
2424
for board in all_boards:
2525
bin_directory = "bin/{}/".format(board)
2626
os.makedirs(bin_directory, exist_ok=True)
2727

2828
start_time = time.monotonic()
29-
make_result = subprocess.run("make BOARD={} combinehex genpkg".format(board), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
29+
make_result = subprocess.run("make -j 4 BOARD={} combinehex genpkg".format(board), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
3030
build_duration = time.monotonic() - start_time
3131
success = "\033[32msucceeded\033[0m"
3232
if make_result.returncode != 0:
@@ -48,4 +48,7 @@
4848

4949
print()
5050

51+
total_time = time.monotonic() - total_time
52+
print("Total build time took {:.2f}s".format(total_time))
53+
5154
sys.exit(exit_status)

0 commit comments

Comments
 (0)