Skip to content

Commit 07ef6ec

Browse files
committed
Update firmware makefile, remove QMK git module
1 parent e2a0af9 commit 07ef6ec

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*.zip
2-
.vscode
2+
.vscode
3+
firmware/qmk_firmware

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "firmware/qmk_firmware"]
2-
path = firmware/qmk_firmware
3-
url = https://github.com/qmk/qmk_firmware/

firmware/Makefile

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
QMK_PATH := ./qmk_firmware
2-
KEYBOARD_PATH := $(QMK_PATH)/keyboards/42
2+
KEYBOARD_PATH := $(QMK_PATH)/keyboards/handwired/42
33

4-
all:
5-
if [ -d $(KEYBOARD_PATH) ]; then rm -r $(KEYBOARD_PATH); fi
4+
build: clean
65
mkdir $(KEYBOARD_PATH)
76
cp -r 42.h config.h keymaps rules.mk $(KEYBOARD_PATH)
8-
cd $(QMK_PATH) && sudo make 42:default:avrdude
7+
cd $(QMK_PATH) && make handwired/42:default:flash
98

109
clean:
11-
rm -r $(KEYBOARD_PATH)
10+
if [ -d $(KEYBOARD_PATH) ]; then rm -r $(KEYBOARD_PATH); fi
1211
cd $(QMK_PATH) && make clean
1312

14-
update-qmk:
15-
git submodule foreach git pull origin master
13+
init:
14+
git clone https://github.com/qmk/qmk_firmware || true
1615
cd $(QMK_PATH) && make git-submodule
1716

17+
update-qmk:
18+
cd $(QMK_PATH) && git pull

firmware/qmk_firmware

-1
This file was deleted.

firmware/rules.mk

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# MCU name
22
MCU = atmega32u4
33

4-
# Processor frequency
5-
F_CPU = 8000000
6-
74
# Bootloader selection
8-
BOOTLOADER = caterina
5+
BOOTLOADER = atmel-dfu
96

107
# Build Options
118
# change yes to no to disable

0 commit comments

Comments
 (0)