Commit Graph

293 Commits

Author SHA1 Message Date
hathach
d4cc11e132
change in file license term from BSD to MIT 2019-03-27 13:38:36 +07:00
hathach
2713069643 fix #59 incorrect button mapping for feather nrf52840 2019-03-27 13:03:41 +07:00
Henry Gabryjelski
66d1770407 manually add another lost comment 2019-03-19 01:01:50 -07:00
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
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
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
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
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
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
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
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
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
hathach
a316c8bd67 reduce delay to 50us 2018-12-21 15:04:48 +07:00
hathach
25f6d395bc fix neopixel didn't turn off after dfu cdc 2018-12-21 14:48:04 +07:00
hathach
89be1cf9f8 Merge branch 'master' into devlocal 2018-12-21 12:17:48 +07:00
hathach
d79fcb2ea5 fix #37
- dfu cdc write exact bytes of firmware which is not a muliplier of 256.
This cause incorrect section index with uf2 drive. Solution is round up
current flash size to 256
- also fix incorrect block number causing it is impossible to use old
current.uf2 to update
2018-12-21 12:17:14 +07:00
hathach
5c38bc8957
fix issue nrf52840 not reset properly when upgrading bootloader+sd combo
- root cause tusb_task()/cdc task is called when usb is not inited (in
case of sd upgrade)
2018-12-20 00:50:14 +07:00
hathach
19c3721151
clean up 2018-12-19 23:20:35 +07:00
hathach
c69ae13423 finished testing led pattern 2018-12-19 18:29:24 +07:00
hathach
87a0124cd9 add product link to feather nrf52840 2018-12-19 17:21:10 +07:00
hathach
64f2f671f6 fixed the incosnsitent led pattern by using systick to call led_tick() 2018-12-19 17:08:23 +07:00
hathach
90cf2e53cb clean up 2018-12-19 16:54:24 +07:00
Scott Shawcroft
73a9d50236
Review comments 2018-12-04 22:54:45 -08:00
Scott Shawcroft
42e1a0639c
Fix argon LED 2018-12-04 16:33:24 -08:00
Scott Shawcroft
f2b9422127
Use python2 2018-12-04 16:30:02 -08:00
Scott Shawcroft
57345c9928
Fix Particle and refine build names 2018-12-04 16:03:33 -08:00
Scott Shawcroft
1b35dbf643
Add build script and hook it into Travis 2018-12-04 15:18:49 -08:00
Scott Shawcroft
2ece2daf90
Rework LED flashing and add Particle's boards 2018-12-04 13:45:55 -08:00
hathach
f30199f503
change neopixel color 2018-11-24 01:27:37 +07:00
hathach
5e0195ddb4
update tinyusb, correct neopixel for usb enumeration
added binary for feather nrf52840
2018-11-23 15:54:02 +07:00
hathach
12d68f592c
add neopixel support 2018-11-23 15:00:59 +07:00
hathach
4f48b8b51a
rename led blink fast name 2018-11-23 11:46:21 +07:00
hathach
94e23a928c feed wdt in bootloader if enabled. Since it is impossible to disable wdt 2018-11-19 17:01:45 +07:00
hathach
37690823ac update segger project for SD 6.1.1 2018-11-09 22:29:59 +07:00
hathach
3925ef5872 add stop LF clock in board_init()
just in case we jump from application without reset
2018-11-08 20:17:36 +07:00
hathach
3de5afc067 Use RC as LF source for all board compatible 2018-10-30 15:24:57 +07:00
hathach
cb1ae6d947 add need_erase for flash_nrf5x. Only uf2 erase when flush, dfu serial (uart and cdc) will prepare erase in advance. 2018-10-02 20:41:53 +07:00
hathach
51411ff85d finally fix #31 using erasing in advance and skip erase on the fly for nrf52832.
Note A small amount of delay (10 ms) is also added by adafruit-nrfutil
after each 4KB to be safe.
2018-10-02 16:55:55 +07:00
hathach
f83e47c83b more clean up 2018-10-01 13:08:14 +07:00
hathach
59999d30d2 clean up 2018-09-30 23:42:40 +07:00
hathach
232bc3ab19 clean up 2018-09-30 23:01:20 +07:00
hathach
104a4713d0 clean up 2018-09-28 23:58:43 +07:00
hathach
f14aebba1d rename flash_ to flash_nrf5x_ 2018-09-28 23:45:27 +07:00
hathach
f9532acaf8 figure the line causing timeout issue 2018-09-28 23:43:27 +07:00
hathach
d5dcd3a564 rename flash to flash_nrf5x 2018-09-28 23:41:46 +07:00
hathach
50dec0e77a move uf2 led blink fast to ghostfat 2018-09-28 13:37:01 +07:00
hathach
7cbf14c5e9 add ses nrf52832 mem layout 2018-09-28 12:13:13 +07:00
hathach
2925c60a47 update ses for nrf52832 2018-09-28 12:06:56 +07:00
hathach
d4e616ff56 clean up 2018-09-28 11:02:46 +07:00
Dan Halbert
646838261c add pca10059 2018-09-06 13:46:11 -04:00
hathach
bb4891debc add build date to INFO_UF2.TXT 2018-08-31 02:35:59 +07:00
hathach
d8fb8bdbe1 add #26 double reset to DFU, only work with nrf52840 (won't work with nrf52832) 2018-08-31 02:25:47 +07:00
hathach
4924e6787f remove "Adafruit" in model with pca10056 board 2018-08-29 16:30:03 +07:00
hathach
d9209fdcdf usb serial string = device ID 2018-08-29 12:44:18 +07:00
hathach
633885aa51 fix OTA blinky pattern 2018-08-22 16:00:42 +07:00
hathach
8b30c417f8 fix adv issue with SD 6.1.0. Add binaries for 6.1.0r0 2018-08-22 13:28:29 +07:00
hathach
daa1b83144 implement #19 serial descriptor based on deviceid 2018-08-21 15:07:17 +07:00
hathach
6feea4e069 fix issue with dfu startup on nrf52832, change to adafruit-nrfutil
clean up dfu startup
2018-08-21 14:14:23 +07:00
hathach
3209ff4471 fix build error with nrf52832 2018-08-16 19:29:42 +07:00
hathach
8c66a55511 add CDC mode only for use with Arduino touch 1200
fix issue with reading current.uf2 size when flashed with jlink
2018-08-16 19:27:27 +07:00
hathach
0b3f49f4a1 change to dynamic descriptor for serial only mode 2018-08-16 18:17:42 +07:00
hathach
e585ffc26c clean up 2018-08-16 03:50:11 +07:00
hathach
ab8d24f935 OTA cannot start with SD v6.1.0, but start without issue with 6.0.0
force ota for testing.
2018-08-14 18:54:49 +07:00
hathach
600925740f clean up 2018-08-14 17:20:06 +07:00
hathach
85ad6e6b65 add boards.c , remove msc_uf2.h lots of clean up and refactor 2018-08-14 15:56:24 +07:00
hathach
e4716816c2 clean up 2018-08-14 14:16:09 +07:00
hathach
4eee219b5a use PWM0 & PWM1 for led blinky fix #14 2018-08-14 00:56:51 +07:00
hathach
1c2911a63c close #18, close #19
softdevice is only enabled with OTA mode
2018-08-13 21:50:55 +07:00
hathach
fe712fb588 resolve #18, dfu serial able to run without SD 2018-08-13 18:11:47 +07:00
hathach
e946aabd6d uf2 does not depend on softdevice 2018-08-11 11:43:57 +07:00
hathach
b47927f95c clean up 2018-08-11 10:50:40 +07:00
hathach
971619aa7e rename boards
feather52832 to feather_nrf52832
feather52840 to feather_nrf52840
2018-08-11 10:50:21 +07:00
hathach
4846bde987 clean up 2018-08-11 00:39:23 +07:00
hathach
433523b28a update ses 2018-08-11 00:19:09 +07:00
hathach
e06a35ce74 add family flag and value to read uf2 file 2018-08-11 00:19:01 +07:00
hathach
94a17d720c move flash_write and flush to seperate files for other usage 2018-08-11 00:09:17 +07:00