diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-30 15:45:24 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-30 15:45:24 +0000 |
| commit | b51cc6d67a16fa2f7b6bae7094b27c7ff58bb3a4 (patch) | |
| tree | dedc0f205218de34b85fe0d68f80dffaf5c64332 | |
| parent | d5c89c8ed549bb38b481204f9c8ce9435538674c (diff) | |
| parent | 70719004070731481ca71998ff9039e7747956ba (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | tests/test_common/test_matrix.h | 5 | ||||
| -rwxr-xr-x | tmk_core/make_dfu_header.sh | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tests/test_common/test_matrix.h b/tests/test_common/test_matrix.h index 174fc4f227..abfcc24048 100644 --- a/tests/test_common/test_matrix.h +++ b/tests/test_common/test_matrix.h @@ -14,8 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TESTS_TEST_COMMON_TEST_MATRIX_H_ -#define TESTS_TEST_COMMON_TEST_MATRIX_H_ +#pragma once #ifdef __cplusplus extern "C" { @@ -28,5 +27,3 @@ void clear_all_keys(void); #ifdef __cplusplus } #endif - -#endif /* TESTS_TEST_COMMON_TEST_MATRIX_H_ */ diff --git a/tmk_core/make_dfu_header.sh b/tmk_core/make_dfu_header.sh index 49ba66251a..7e2283dd70 100755 --- a/tmk_core/make_dfu_header.sh +++ b/tmk_core/make_dfu_header.sh @@ -3,8 +3,7 @@ ALL_CONFIGS=$* GREP="grep" cat <<- EOF > lib/lufa/Bootloaders/DFU/Keyboard.h -#ifndef QMK_KEYBOARD -#define QMK_KEYBOARD +#pragma once $($GREP "MANUFACTURER[ \t]" $ALL_CONFIGS -h | tail -1) $($GREP "PRODUCT[ \t]" $ALL_CONFIGS -h | tail -1 | tr -d '\r') Bootloader @@ -12,5 +11,4 @@ $($GREP "QMK_ESC_OUTPUT[ \t]" $ALL_CONFIGS -h | tail -1) $($GREP "QMK_ESC_INPUT[ \t]" $ALL_CONFIGS -h | tail -1) $($GREP "QMK_LED[ \t]" $ALL_CONFIGS -h | tail -1) $($GREP "QMK_SPEAKER[ \t]" $ALL_CONFIGS -h | tail -1) -#endif EOF |