diff options
| author | Ralf Schmitt <ralf@bunkertor.net> | 2014-03-22 12:41:45 +0100 |
|---|---|---|
| committer | Ralf Schmitt <ralf@bunkertor.net> | 2014-03-22 12:41:45 +0100 |
| commit | 498ea75d1b08071da5055165791daa70df679b75 (patch) | |
| tree | b6f650fd6319b53c3f325031b381841cf4898e3e | |
| parent | 526d988a0caadc1a48bea862f605c9cee90c3dd3 (diff) | |
| download | qmk_firmware-498ea75d1b08071da5055165791daa70df679b75.tar.gz qmk_firmware-498ea75d1b08071da5055165791daa70df679b75.zip | |
Lightsaber clean ups
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | keyboard/lightsaber/Makefile.lufa | 6 | ||||
| -rw-r--r-- | keyboard/lightsaber/Makefile.pjrc | 11 | ||||
| -rw-r--r-- | keyboard/lightsaber/README.md | 2 |
4 files changed, 7 insertions, 13 deletions
| @@ -52,6 +52,7 @@ You can find some keyboard specific projects under `converter` and `keyboard` di | |||
| 52 | * [IIgs_Standard](keyboard/IIgs/) - Apple [IIGS] keyboard mod(by JeffreySung) | 52 | * [IIgs_Standard](keyboard/IIgs/) - Apple [IIGS] keyboard mod(by JeffreySung) |
| 53 | * [macway](keyboard/macway/) - [Compact keyboard mod][GH_macway] [retired] | 53 | * [macway](keyboard/macway/) - [Compact keyboard mod][GH_macway] [retired] |
| 54 | * [KMAC](keyboard/kmac/) - Korean custom keyboard | 54 | * [KMAC](keyboard/kmac/) - Korean custom keyboard |
| 55 | * [Lightsaber](keyboard/lightsaber/) - Korean custom keyboard | ||
| 55 | 56 | ||
| 56 | [GH_macway]: http://geekhack.org/showwiki.php?title=Island:11930 | 57 | [GH_macway]: http://geekhack.org/showwiki.php?title=Island:11930 |
| 57 | [GH_hhkb]: http://geekhack.org/showwiki.php?title=Island:12047 | 58 | [GH_hhkb]: http://geekhack.org/showwiki.php?title=Island:12047 |
diff --git a/keyboard/lightsaber/Makefile.lufa b/keyboard/lightsaber/Makefile.lufa index 25816ac03..b430efd22 100644 --- a/keyboard/lightsaber/Makefile.lufa +++ b/keyboard/lightsaber/Makefile.lufa | |||
| @@ -49,10 +49,10 @@ TARGET_DIR = . | |||
| 49 | 49 | ||
| 50 | 50 | ||
| 51 | # List C source files here. (C dependencies are automatically generated.) | 51 | # List C source files here. (C dependencies are automatically generated.) |
| 52 | SRC += keymap.c \ | 52 | SRC = keymap.c \ |
| 53 | matrix.c \ | ||
| 53 | led.c \ | 54 | led.c \ |
| 54 | backlight.c \ | 55 | backlight.c |
| 55 | matrix.c | ||
| 56 | 56 | ||
| 57 | CONFIG_H = config.h | 57 | CONFIG_H = config.h |
| 58 | 58 | ||
diff --git a/keyboard/lightsaber/Makefile.pjrc b/keyboard/lightsaber/Makefile.pjrc index 1c5a9710f..58735a7ef 100644 --- a/keyboard/lightsaber/Makefile.pjrc +++ b/keyboard/lightsaber/Makefile.pjrc | |||
| @@ -56,12 +56,8 @@ SRC = keymap.c \ | |||
| 56 | CONFIG_H = config.h | 56 | CONFIG_H = config.h |
| 57 | 57 | ||
| 58 | 58 | ||
| 59 | # MCU name, you MUST set this to match the board you are using | 59 | # MCU name |
| 60 | # type "make clean" after changing this, so all files will be rebuilt | 60 | MCU = atmega32u4 |
| 61 | #MCU = at90usb162 # Teensy 1.0 | ||
| 62 | MCU = atmega32u4 # Teensy 2.0 | ||
| 63 | #MCU = at90usb646 # Teensy++ 1.0 | ||
| 64 | #MCU = at90usb1286 # Teensy++ 2.0 | ||
| 65 | 61 | ||
| 66 | 62 | ||
| 67 | # Processor frequency. | 63 | # Processor frequency. |
| @@ -96,6 +92,3 @@ include $(TOP_DIR)/rules.mk | |||
| 96 | 92 | ||
| 97 | winkey: OPT_DEFS += -DLAYOUT_WINKEY | 93 | winkey: OPT_DEFS += -DLAYOUT_WINKEY |
| 98 | winkey: all | 94 | winkey: all |
| 99 | |||
| 100 | winkeyless: OPT_DEFS += -DLAYOUT_WINKEYLESS | ||
| 101 | winkeyless: all | ||
diff --git a/keyboard/lightsaber/README.md b/keyboard/lightsaber/README.md index bd2b3fb52..9dcd69309 100644 --- a/keyboard/lightsaber/README.md +++ b/keyboard/lightsaber/README.md | |||
| @@ -13,7 +13,7 @@ Build | |||
| 13 | ----- | 13 | ----- |
| 14 | Move to this directory then just run `make` like: | 14 | Move to this directory then just run `make` like: |
| 15 | 15 | ||
| 16 | $ make -f Makefile.[pjrc|lufa] [winkey|winkeyless] | 16 | $ make -f Makefile.[pjrc|lufa] |
| 17 | 17 | ||
| 18 | Use `Makefile.pjrc` if you want to use PJRC stack or use `Makefile.lufa` for LUFA stack. | 18 | Use `Makefile.pjrc` if you want to use PJRC stack or use `Makefile.lufa` for LUFA stack. |
| 19 | 19 | ||
