Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
b51cc6d67a
|
@ -14,8 +14,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef TESTS_TEST_COMMON_TEST_MATRIX_H_
|
#pragma once
|
||||||
#define TESTS_TEST_COMMON_TEST_MATRIX_H_
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -28,5 +27,3 @@ void clear_all_keys(void);
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* TESTS_TEST_COMMON_TEST_MATRIX_H_ */
|
|
||||||
|
|
|
@ -3,8 +3,7 @@ ALL_CONFIGS=$*
|
||||||
GREP="grep"
|
GREP="grep"
|
||||||
|
|
||||||
cat <<- EOF > lib/lufa/Bootloaders/DFU/Keyboard.h
|
cat <<- EOF > lib/lufa/Bootloaders/DFU/Keyboard.h
|
||||||
#ifndef QMK_KEYBOARD
|
#pragma once
|
||||||
#define QMK_KEYBOARD
|
|
||||||
|
|
||||||
$($GREP "MANUFACTURER[ \t]" $ALL_CONFIGS -h | tail -1)
|
$($GREP "MANUFACTURER[ \t]" $ALL_CONFIGS -h | tail -1)
|
||||||
$($GREP "PRODUCT[ \t]" $ALL_CONFIGS -h | tail -1 | tr -d '\r') Bootloader
|
$($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_ESC_INPUT[ \t]" $ALL_CONFIGS -h | tail -1)
|
||||||
$($GREP "QMK_LED[ \t]" $ALL_CONFIGS -h | tail -1)
|
$($GREP "QMK_LED[ \t]" $ALL_CONFIGS -h | tail -1)
|
||||||
$($GREP "QMK_SPEAKER[ \t]" $ALL_CONFIGS -h | tail -1)
|
$($GREP "QMK_SPEAKER[ \t]" $ALL_CONFIGS -h | tail -1)
|
||||||
#endif
|
|
||||||
EOF
|
EOF
|
||||||
|
|
Loading…
Reference in New Issue