Commit Graph

463 Commits

Author SHA1 Message Date
Henry Gabryjelski
8ab4774c93 Manual merge?
Pickup a couple changes that don't seem to be propagating?
Possible that there's some git merge I missed, but it's simple enough to fix manually.
2019-03-19 00:57:24 -07:00
Henry Gabryjelski
1b54f0457d PR review requested changes.
Per hathach's request, remove built-in test option.
Per hathach's request, remote __TIME__ from info file.
2019-03-19 00:37:53 -07:00
Henry Gabryjelski
a004b7619e Add trailing newline 2019-03-18 22:14:52 -07:00
Henry Gabryjelski
04fc396fd8 Put macros into new file, rather than uf2.h. 2019-03-13 23:49:52 -07:00
Henry Gabryjelski
04e0df1c18 prepare to split file 2019-03-13 23:40:18 -07:00
Henry Gabryjelski
6d58633db0 Merge branch 'master' of https://github.com/adafruit/Adafruit_nRF52_Bootloader into patch-6
# Conflicts:
#	src/usb/uf2/ghostfat.c
2019-03-13 22:39:12 -07:00
Henry Gabryjelski
15ca75d10d Merge branch 'master' of https://github.com/adafruit/Adafruit_nRF52_Bootloader into patch-5 2019-03-13 22:23:08 -07:00
Henry Gabryjelski
174e6e9724 Fix Directory entries
The media would show as corrupt in CMD.EXE in Windows.
This is because the date/time fields were invalid.
Since this needed to be fixed anyways, update so that
the date and time correspond to the time that the
preprocessor parsed the source file.
2019-03-13 22:05:57 -07:00
Henry Gabryjelski
53a99195bf Raises file limit from 14 to 62 files.
Enable all four sectors of root directory to contain files.
2019-03-13 21:38:59 -07:00
Henry Gabryjelski
8def8aee53 Safer code
Add additional compile-time assertions
Add additional comments to define limitations future maintainers should be aware of.
2019-03-13 18:28:43 -07:00
Henry Gabryjelski
c51a227fd9 Add static assert
This guards against future increase in number of files
causing buffer overflow when reading the first root directory sector.
2019-03-13 15:24:42 -07:00
Henry Gabryjelski
f3e3cefb23 Ignore additional SES and J-Link files 2019-03-13 13:10:49 -07:00
hathach
73456ac80e
Merge pull request #54 from henrygab/patch-2
Avoid returning uninitialized memory
2019-03-13 01:08:06 -07:00
hathach
113195eabd
Merge branch 'master' into patch-2 2019-03-13 00:58:21 -07:00
hathach
0eeff3e679
Merge pull request #53 from henrygab/patch-3
Fix signed/unsigned bug.
2019-03-13 00:55:54 -07:00
hathach
be5a925f72
Merge pull request #55 from henrygab/patch-4
Use local variable to store partially-calculated size.
2019-03-13 00:53:37 -07:00
hathach
ae28f5b425
Merge pull request #52 from henrygab/patch-1
Fix media type mismatch
2019-03-13 00:46:49 -07:00
Henry Gabryjelski
b8a0551678 Use local variable to store partially-calculated size.
This avoid re-entrancy problems, such as if this is ever
interrupted mid-execution, and called a second time before
the initial execution completes.
2019-03-12 13:41:33 -07:00
Henry Gabryjelski
0f216b8618 Fix spacing 2019-03-12 13:13:58 -07:00
Henry Gabryjelski
52cfdaa2d2 Fix signed/unsigned bug. 2019-03-12 13:05:21 -07:00
Henry Gabryjelski
a258c6d988 Avoid returning uninitialized memory 2019-03-12 12:57:51 -07:00
Henry Gabryjelski
e0251415e7 Add some additional comments. 2019-03-12 12:29:05 -07:00
Henry Gabryjelski
12bb62eadd Per request, keep hard drive type in boot block.
Update the .PhysicalDrive in boot block.
Update the first fat entries to match MediaDescriptor of boot block.
2019-03-12 12:09:49 -07:00
Henry Gabryjelski
e2afc36dae
Fix media type mismatch
Fix the boot sector media descriptor to match the first FAT entries.
2019-03-10 20:02:56 -07:00
hathach
4ea74d4600
Update README.md 2019-03-06 00:52:07 +07:00
hathach
9bc01fb061
Merge pull request #49 from gpshead/mdk_dongle
Support the MDK nrf52840 USB Dongle.
2019-03-05 09:49:36 -08:00
Gregory P. Smith
01492634b6 Use RGB red and blue as primary and secondary.
The code currently expects a primary LED no matter what so the
RGB led support combined with that clobbers the nice pulsing primary.
2019-03-03 21:12:30 -08:00
Gregory P. Smith
05726e2575 Initial MakerDiary MDK nrf52840 USB dongle support.
Many TODOs to address but it builds and appears at first glance to work...
2019-03-03 18:58:34 -08:00
Dan Halbert
14f87f61e6
Add 0.2.0 to changelog
@hathach Tested, so making a new release.
2019-02-22 15:52:57 -05:00
Dan Halbert
7df44a5425
Merge pull request #47 from adafruit/develop
fix #46 issue with windows 10 build 18.09
2019-02-22 15:41:58 -05:00
hathach
0cc0289c60 update dfu-flash for upgrading bootloader
clean up makefile
2019-02-22 23:55:01 +07:00
hathach
992229cf2f Merge branch 'master' into develop 2019-02-22 23:06:07 +07:00
hathach
57aa554430 update tinyusb to latest for scsi write10 complete fix 2019-02-22 14:46:16 +07:00
hathach
9ed3f5ea32 fix #46 complete uf2 writing using tud_msc_write10_complete_cb 2019-02-22 00:21:34 +07:00
hathach
158c284423
update changelog 2019-02-15 23:07:42 +07:00
hathach
2aefebaf00
Merge pull request #45 from adafruit/develop
increase buffer depth to fix OTA issue with nrfConnect on iOS
2019-02-15 23:04:38 +07:00
hathach
d9b275c321
increase buffer depth to fix OTA issue with nrfConnect on iOS
- also add optional debug helper
- increase led conn cycle when ble connected for easier recognition
2019-02-15 12:12:11 +07:00
hathach
a3de7e8f04
remove SD 6.1.0 files 2019-02-15 01:55:07 +07:00
hathach
6338794c61
Merge pull request #44 from adafruit/develop
merge from Develop
2019-01-31 23:45:31 +07:00
hathach
641d9fe811 added changelog 2019-01-31 22:51:12 +07:00
hathach
981a6976e2 change HCI_RX_BUF_QUEUE_SIZE back to 4 2019-01-31 22:50:42 +07:00
hathach
7ec0ff51f0
Merge pull request #40 from se7ensong/OTA_fix
Fix OTA using nRF toolbox on iPhone (tested on SE and XS)
2019-01-31 22:35:12 +07:00
hathach
3737d4bc12 update segger project, cleanup 2019-01-31 21:39:02 +07:00
hathach
7279bd9b32 added metro nrf52840 revA
clean up makefile
2019-01-31 18:01:41 +07:00
hathach
2f1eec7118
fix #41 use RXD,TXD in board header 2019-01-14 12:50:20 +07:00
hathach
3611a0579e
minor clean up for pca10059 2019-01-11 11:36:42 +07:00
Song Luan
04f05dac64 Fix OTA using nRF toolbox on iPhone (tested on SE and XS) 2019-01-10 13:09:24 +00:00
hathach
95cbe3b129
fix PWM psel[1] is not reset to 0xffffffff when teardown
also move neopixel to pwm1
2019-01-10 15:55:03 +07:00
hathach
9ece5f64a9
clean up makefile 2019-01-04 07:00:45 +07:00
Dan Halbert
61b4ca3354
Merge pull request #38 from adafruit/devlocal
fix current.uf2 related issue
2018-12-21 10:31:33 -05:00