diff --git a/Makefile b/Makefile index 0a3eb03..72d1434 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ MDLOADER_VERSION := 1.0.6 +QMK_FIRMWARE_COMMIT := af9c4d93ee EXECUTION_DATE := $(shell date +%FT%T%Z) TARGET_LAYOUTS := $(wildcard layout/*) @@ -16,7 +17,8 @@ help: .PHONY: update update: qmk_firmware qmk_firmware/patches_applied ## Update qmk_firmware - @git -C qmk_firmware pull + @git -C qmk_firmware fetch + @git -C qmk_firmware checkout $(QMK_FIRMWARE_COMMIT) .PHONY: write write: mdloader builds/$(WRITE_TARGET).bin ## Write a layout to the keyboard, pass WRITE_TARGET as variable to control the particular layout @@ -28,6 +30,7 @@ qmk_firmware/.git/HEAD: qmk_firmware qmk_firmware: @git clone https://github.com/Massdrop/qmk_firmware.git qmk_firmware + @git -C qmk_firmware checkout $(QMK_FIRMWARE_COMMIT) $(MAKE) qmk_firmware/patches_applied qmk_firmware/patches_applied: qmk_patches.diff