summaryrefslogtreecommitdiff
path: root/macway
diff options
context:
space:
mode:
Diffstat (limited to 'macway')
-rw-r--r--macway/Makefile16
-rw-r--r--macway/config.h4
-rw-r--r--[-rwxr-xr-x]macway/doc/back.jpgbin122135 -> 122135 bytes
-rw-r--r--[-rwxr-xr-x]macway/doc/case.jpgbin146003 -> 146003 bytes
-rw-r--r--[-rwxr-xr-x]macway/doc/keys.jpgbin116365 -> 116365 bytes
-rw-r--r--[-rwxr-xr-x]macway/doc/side.jpgbin109755 -> 109755 bytes
-rw-r--r--[-rwxr-xr-x]macway/doc/switch.jpgbin115526 -> 115526 bytes
-rw-r--r--[-rwxr-xr-x]macway/doc/teensy.jpgbin165814 -> 165814 bytes
-rw-r--r--[-rwxr-xr-x]macway/doc/wiring.jpgbin165569 -> 165569 bytes
-rw-r--r--[-rwxr-xr-x]macway/doc/withHHKB.jpgbin152832 -> 152832 bytes
-rw-r--r--[-rwxr-xr-x]macway/doc/withThinkPad.jpgbin118993 -> 118993 bytes
11 files changed, 10 insertions, 10 deletions
diff --git a/macway/Makefile b/macway/Makefile
index 6e7fa7fd9f..b8b0a85e1e 100644
--- a/macway/Makefile
+++ b/macway/Makefile
@@ -8,10 +8,10 @@ COMMON_DIR = ..
TARGET_DIR = .
# keyboard dependent files
-TARGET_SRC = main_pjrc.c \
- keymap.c \
- matrix.c \
- led.c
+SRC = main.c \
+ keymap.c \
+ matrix.c \
+ led.c
CONFIG_H = config.h
@@ -37,8 +37,8 @@ F_CPU = 16000000
#
MOUSEKEY_ENABLE = yes # Mouse keys
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
-USB_EXTRA_ENABLE = yes # Audio control and System control
-#USB_NKRO_ENABLE = yes # USB Nkey Rollover
+EXTRAKEY_ENABLE = yes # Audio control and System control
+#NKRO_ENABLE = yes # USB Nkey Rollover
@@ -47,5 +47,5 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
-include $(COMMON_DIR)/Makefile.pjrc
-include $(COMMON_DIR)/Makefile.common
+include $(COMMON_DIR)/pjrc.mk
+include $(COMMON_DIR)/common.mk
diff --git a/macway/config.h b/macway/config.h
index ff62bfdb0f..546067beb1 100644
--- a/macway/config.h
+++ b/macway/config.h
@@ -37,8 +37,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key combination for command */
#define IS_COMMAND() ( \
- keyboard_report->mods == (BIT_LSHIFT | BIT_RSHIFT) || \
- keyboard_report->mods == (BIT_LCTRL | BIT_RSHIFT) \
+ keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_LCTRL) | MOD_BIT(KB_LALT) | MOD_BIT(KB_LGUI)) || \
+ keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT)) \
)
diff --git a/macway/doc/back.jpg b/macway/doc/back.jpg
index 0774401f69..0774401f69 100755..100644
--- a/macway/doc/back.jpg
+++ b/macway/doc/back.jpg
Binary files differ
diff --git a/macway/doc/case.jpg b/macway/doc/case.jpg
index c776d5e054..c776d5e054 100755..100644
--- a/macway/doc/case.jpg
+++ b/macway/doc/case.jpg
Binary files differ
diff --git a/macway/doc/keys.jpg b/macway/doc/keys.jpg
index f340ebe8e4..f340ebe8e4 100755..100644
--- a/macway/doc/keys.jpg
+++ b/macway/doc/keys.jpg
Binary files differ
diff --git a/macway/doc/side.jpg b/macway/doc/side.jpg
index bdf8268f25..bdf8268f25 100755..100644
--- a/macway/doc/side.jpg
+++ b/macway/doc/side.jpg
Binary files differ
diff --git a/macway/doc/switch.jpg b/macway/doc/switch.jpg
index a1500d707d..a1500d707d 100755..100644
--- a/macway/doc/switch.jpg
+++ b/macway/doc/switch.jpg
Binary files differ
diff --git a/macway/doc/teensy.jpg b/macway/doc/teensy.jpg
index 07207475d5..07207475d5 100755..100644
--- a/macway/doc/teensy.jpg
+++ b/macway/doc/teensy.jpg
Binary files differ
diff --git a/macway/doc/wiring.jpg b/macway/doc/wiring.jpg
index 0f3490f105..0f3490f105 100755..100644
--- a/macway/doc/wiring.jpg
+++ b/macway/doc/wiring.jpg
Binary files differ
diff --git a/macway/doc/withHHKB.jpg b/macway/doc/withHHKB.jpg
index 9921856e7b..9921856e7b 100755..100644
--- a/macway/doc/withHHKB.jpg
+++ b/macway/doc/withHHKB.jpg
Binary files differ
diff --git a/macway/doc/withThinkPad.jpg b/macway/doc/withThinkPad.jpg
index 231c61d036..231c61d036 100755..100644
--- a/macway/doc/withThinkPad.jpg
+++ b/macway/doc/withThinkPad.jpg
Binary files differ