Skip to content

Commit 764147d

Browse files
authored
Merge pull request #148 from adafruit/add-missing-license
add mising license for ghostfat
2 parents 4c9df5b + d790f4a commit 764147d

File tree

4 files changed

+58
-30
lines changed

4 files changed

+58
-30
lines changed

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,11 @@ endif
315315
# default target to build
316316
all: $(BUILD)/$(OUT_FILE).out $(BUILD)/$(OUT_FILE)-nosd.hex $(BUILD)/$(OUT_FILE)-nosd.uf2 $(BUILD)/$(MERGED_FILE).hex $(BUILD)/$(MERGED_FILE).zip
317317

318+
# Print out the value of a make variable.
319+
# https://stackoverflow.com/questions/16467718/how-to-print-out-a-variable-in-makefile
320+
print-%:
321+
@echo $* = $($*)
322+
318323
#------------------- Compile rules -------------------
319324

320325
# Create build directories

src/main.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,10 @@ void usb_teardown(void);
9797
*/
9898

9999
/* Magic that written to NRF_POWER->GPREGRET by application when it wish to go into DFU
100-
* - BOOTLOADER_DFU_OTA_MAGIC used by BLEDfu service : SD is already init
101-
* - BOOTLOADER_DFU_OTA_FULLRESET_MAGIC entered by soft reset : SD is not init
102-
* - BOOTLOADER_DFU_SERIAL_MAGIC entered by soft reset : SD is not init
100+
* - DFU_MAGIC_OTA_APPJUM used by BLEDfu service : SD is already init
101+
* - DFU_MAGIC_OTA_RESET entered by soft reset : SD is not init
102+
* - DFU_MAGIC_SERIAL_ONLY_RESET with CDC interface only
103+
* - DFU_MAGIC_UF2_RESET with CDC and MSC interfaces
103104
*
104105
* Note: for DFU_MAGIC_OTA_APPJUM Softdevice must not initialized.
105106
* since it is already in application. In all other case of OTA SD must be initialized

src/usb/uf2/compile_date.h

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
1-
/**
2-
3-
The MIT License (MIT)
4-
5-
Copyright (c)
6-
7-
All rights reserved.
8-
9-
Permission is hereby granted, free of charge, to any person obtaining a copy
10-
of this software and associated documentation files (the "Software"), to deal
11-
in the Software without restriction, including without limitation the rights
12-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13-
copies of the Software, and to permit persons to whom the Software is
14-
furnished to do so, subject to the following conditions:
15-
16-
The above copyright notice and this permission notice shall be included in all
17-
copies or substantial portions of the Software.
18-
19-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
25-
SOFTWARE.
26-
27-
*/
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) Henry Gabryjelski
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
2824

2925
#ifndef COMPILE_DATE_H
3026
#define COMPILE_DATE_H

src/usb/uf2/ghostfat.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) Microsoft Corporation
5+
* Copyright (c) 2020 Ha Thach for Adafruit Industries
6+
* Copyright (c) 2020 Henry Gabryjelski
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
127
#include "compile_date.h"
228

329
#include "uf2.h"

0 commit comments

Comments
 (0)