hathach 
							
						 
					 
					
						
						
							
						
						b1029c6ae5 
					 
					
						
						
							
							Merge branch 'master' of github.com:adafruit/Adafruit_nRF52_Bootloader into develop  
						
						 
						
						
						
						
					 
					
						2019-06-17 19:28:10 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ladyada 
							
						 
					 
					
						
						
							
						
						95325465cc 
					 
					
						
						
							
							add draft for cplay nrf52840  
						
						 
						
						
						
						
					 
					
						2019-06-14 22:18:58 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						580ae2e7fc 
					 
					
						
						
							
							Merge pull request  #71  from fanoush/patch-1  
						
						 
						
						... 
						
						
						
						fix for issue #70  
						
						
					 
					
						2019-06-05 12:17:13 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fanoush 
							
						 
					 
					
						
						
							
						
						4ce961f25b 
					 
					
						
						
							
							fix block alignment bug also in dfu_sd_image_validate  
						
						 
						
						
						
						
					 
					
						2019-05-24 13:22:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fanoush 
							
						 
					 
					
						
						
							
						
						90e3149050 
					 
					
						
						
							
							fix block alignment bug also in dfu_sd_image_validate  
						
						 
						
						
						
						
					 
					
						2019-05-24 13:07:32 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						fb847b942e 
					 
					
						
						
							
							Update issue templates  
						
						 
						
						
						
						
					 
					
						2019-05-10 21:24:33 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						dfc3db25c3 
					 
					
						
						
							
							Update issue templates  
						
						 
						
						
						
						
					 
					
						2019-05-10 21:22:08 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						bc40cd7c46 
					 
					
						
						
							
							add issue templates  
						
						 
						
						
						
						
					 
					
						2019-05-10 21:16:57 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Limor "Ladyada" Fried 
							
						 
					 
					
						
						
							
						
						bc418d6630 
					 
					
						
						
							
							Merge pull request  #68  from adafruit/develop  
						
						 
						
						... 
						
						
						
						update changelog for 0.2.11 releasing 
						
						
					 
					
						2019-05-03 13:20:21 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						ee199d797c 
					 
					
						
						
							
							update changelog  
						
						 
						
						
						
						
					 
					
						2019-05-03 17:54:58 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						31e21d8b38 
					 
					
						
						
							
							add travis badge, make with 4 thread  
						
						 
						
						
						
						
					 
					
						2019-05-03 14:05:14 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						f19189cd2f 
					 
					
						
						
							
							Create CODE_OF_CONDUCT.md  
						
						 
						
						
						
						
					 
					
						2019-04-29 20:27:47 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Halbert 
							
						 
					 
					
						
						
							
						
						7d47317e17 
					 
					
						
						
							
							Merge pull request  #66  from adafruit/develop  
						
						 
						
						... 
						
						
						
						Clean up board and makefile 
						
						
					 
					
						2019-04-28 23:17:26 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						da2de8d519 
					 
					
						
						
							
							update pid for metro nrf52840  
						
						 
						
						
						
						
					 
					
						2019-04-27 16:40:08 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						a7c19a4d99 
					 
					
						
						
							
							fix typo per PR discussion  
						
						 
						
						
						
						
					 
					
						2019-04-25 10:36:08 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						8f00fb9270 
					 
					
						
						
							
							update ses project  
						
						 
						
						
						
						
					 
					
						2019-04-24 18:31:26 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						01f854c3db 
					 
					
						
						
							
							correct MK_BOOTLOADER_VERSION to same as git tag version  
						
						 
						
						
						
						
					 
					
						2019-04-24 18:25:25 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						5eac387b5a 
					 
					
						
						
							
							clean up BLEDIS firmware version  
						
						 
						
						
						
						
					 
					
						2019-04-24 17:13:41 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						b3b9e089f4 
					 
					
						
						
							
							clean up  
						
						 
						
						
						
						
					 
					
						2019-04-24 16:51:31 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						6bbcab7f50 
					 
					
						
						
							
							update uf2 product name  
						
						 
						
						
						
						
					 
					
						2019-04-24 16:46:25 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						137785f2f0 
					 
					
						
						
							
							update uf2 index url, add UF2_ prefix for volume lable and index url  
						
						 
						
						
						
						
					 
					
						2019-04-24 16:31:08 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						4ec938230d 
					 
					
						
						
							
							update uf2 BOARD_ID  
						
						 
						
						
						
						
					 
					
						2019-04-24 16:17:00 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						9a0ee51d91 
					 
					
						
						
							
							rename macros.h to compile_date.h  
						
						 
						
						
						
						
					 
					
						2019-04-24 12:31:09 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						3fec038ed8 
					 
					
						
						
							
							remove ARRAY_SIZE2 since bootloader is only built with C  
						
						 
						
						
						
						
					 
					
						2019-04-24 12:26:26 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						69a1b555e4 
					 
					
						
						
							
							force NFC as GPIO  
						
						 
						
						
						
						
					 
					
						2019-04-24 12:23:11 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						ca400565b3 
					 
					
						
						
							
							clean up  
						
						 
						
						
						
						
					 
					
						2019-04-24 12:08:58 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						bcbd3fa089 
					 
					
						
						
							
							enhance board management  
						
						 
						
						
						
						
					 
					
						2019-04-24 12:03:26 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						44967695a4 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						
						
						
					 
					
						2019-04-24 10:16:39 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						2f314e1486 
					 
					
						
						
							
							Merge pull request  #64  from electronut/papyr_support  
						
						 
						
						... 
						
						
						
						Add support for Electronut Labs Papyr 
						
						
					 
					
						2019-04-19 22:00:36 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tavish Naruka 
							
						 
					 
					
						
						
							
						
						389c05b643 
					 
					
						
						
							
							Add support for Electronut Labs Papyr  
						
						 
						
						... 
						
						
						
						Signed-off-by: Tavish Naruka <tavishnaruka@gmail.com > 
						
						
					 
					
						2019-04-19 11:27:14 +05:30  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Limor "Ladyada" Fried 
							
						 
					 
					
						
						
							
						
						9d7de45aeb 
					 
					
						
						
							
							Merge pull request  #61  from Spegs21/master  
						
						 
						
						... 
						
						
						
						Add UF2 build/generation information to Readme 
						
						
					 
					
						2019-03-27 22:44:29 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Spegs21 
							
						 
					 
					
						
						
							
						
						4653c07f06 
					 
					
						
						
							
							Update README.md  
						
						 
						
						
						
						
					 
					
						2019-03-27 22:39:04 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Spegs21 
							
						 
					 
					
						
						
							
						
						d3f5249a61 
					 
					
						
						
							
							Add detail for using UF2  
						
						 
						
						
						
						
					 
					
						2019-03-27 22:37:35 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						d4cc11e132 
					 
					
						
						
							
							change in file license term from BSD to MIT  
						
						 
						
						
						
						
					 
					
						2019-03-27 13:38:36 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						f5b654eb5e 
					 
					
						
						
							
							update changelog  
						
						 
						
						
						
						
					 
					
						2019-03-27 13:14:54 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						60debfc217 
					 
					
						
						
							
							Merge pull request  #60  from adafruit/develop  
						
						 
						
						... 
						
						
						
						fix  #59  incorrect button mapping for feather nrf52840 
						
						
					 
					
						2019-03-26 23:09:27 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						2713069643 
					 
					
						
						
							
							fix   #59  incorrect button mapping for feather nrf52840  
						
						 
						
						
						
						
					 
					
						2019-03-27 13:03:41 +07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						8df909f0a8 
					 
					
						
						
							
							Merge pull request  #57  from henrygab/patch-6  
						
						 
						
						... 
						
						
						
						Fix FAT bugs and increase file count limit 
						
						
					 
					
						2019-03-19 04:50:52 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hathach 
							
						 
					 
					
						
						
							
						
						1d816c5cf3 
					 
					
						
						
							
							Merge pull request  #56  from henrygab/patch-5  
						
						 
						
						... 
						
						
						
						Ignore additional SES and J-Link files 
						
						
					 
					
						2019-03-19 03:02:06 -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 
							
						 
					 
					
						
						
							
						
						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