aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--adb_usb/Makefile8
-rw-r--r--common.mk5
-rw-r--r--[-rwxr-xr-x]common/mousekey.c0
-rw-r--r--hbk/Makefile8
-rw-r--r--hhkb/Makefile.iwrap10
-rw-r--r--hhkb/Makefile.pjrc8
-rw-r--r--hhkb/Makefile.vusb8
-rw-r--r--[-rwxr-xr-x]hhkb/doc/Bluetooth_img/BT_circuit.jpgbin502118 -> 502118 bytes
-rw-r--r--m0110_usb/Makefile8
-rw-r--r--macway/Makefile8
-rw-r--r--protocol/iwrap.mk2
-rw-r--r--protocol/pjrc.mk2
-rw-r--r--protocol/vusb.mk2
-rw-r--r--ps2_usb/Makefile8
-rw-r--r--ps2_usb/Makefile.pjrc_usart8
-rw-r--r--ps2_usb/Makefile.vusb8
-rw-r--r--rules.mk12
-rw-r--r--sony_usb/Makefile.pjrc8
-rw-r--r--terminal_usb/Makefile.102_pjrc8
-rw-r--r--terminal_usb/Makefile.122_pjrc8
-rw-r--r--x68k_usb/Makefile8
21 files changed, 84 insertions, 53 deletions
diff --git a/adb_usb/Makefile b/adb_usb/Makefile
index f4c5031cb..97850b0e8 100644
--- a/adb_usb/Makefile
+++ b/adb_usb/Makefile
@@ -2,7 +2,7 @@
2TARGET = adb_usb 2TARGET = adb_usb
3 3
4# Directory common source filess exist 4# Directory common source filess exist
5COMMON_DIR = .. 5TOP_DIR = ..
6 6
7# Directory keyboard dependent files exist 7# Directory keyboard dependent files exist
8TARGET_DIR = . 8TARGET_DIR = .
@@ -48,5 +48,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
48 48
49 49
50 50
51include $(COMMON_DIR)/pjrc.mk 51include $(TOP_DIR)/protocol/pjrc.mk
52include $(COMMON_DIR)/common.mk 52include $(TOP_DIR)/protocol.mk
53include $(TOP_DIR)/common.mk
54include $(TOP_DIR)/rules.mk
diff --git a/common.mk b/common.mk
index 03cbc296d..d0e04df86 100644
--- a/common.mk
+++ b/common.mk
@@ -33,7 +33,4 @@ ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
33endif 33endif
34 34
35# Search Path 35# Search Path
36VPATH += $(COMMON_DIR) 36VPATH += $(TOP_DIR)/common
37
38
39include $(COMMON_DIR)/rules.mk
diff --git a/common/mousekey.c b/common/mousekey.c
index 76bd0fd36..76bd0fd36 100755..100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
diff --git a/hbk/Makefile b/hbk/Makefile
index e03b45e3a..c441e2d7a 100644
--- a/hbk/Makefile
+++ b/hbk/Makefile
@@ -2,7 +2,7 @@
2TARGET = hbk 2TARGET = hbk
3 3
4# Directory common source filess exist 4# Directory common source filess exist
5COMMON_DIR = .. 5TOP_DIR = ..
6 6
7# Directory keyboard dependent files exist 7# Directory keyboard dependent files exist
8TARGET_DIR = . 8TARGET_DIR = .
@@ -50,5 +50,7 @@ PROGRAM_CMD = /opt/dfu-programmer-0.5.2/bin/dfu-programmer $(MCU) erase && \
50 50
51 51
52 52
53include $(COMMON_DIR)/pjrc.mk 53include $(TOP_DIR)/protocol/pjrc.mk
54include $(COMMON_DIR)/common.mk 54include $(TOP_DIR)/protocol.mk
55include $(TOP_DIR)/common.mk
56include $(TOP_DIR)/rules.mk
diff --git a/hhkb/Makefile.iwrap b/hhkb/Makefile.iwrap
index cf020b94a..d922b0f50 100644
--- a/hhkb/Makefile.iwrap
+++ b/hhkb/Makefile.iwrap
@@ -7,7 +7,7 @@
7TARGET = hhkb_iwrap 7TARGET = hhkb_iwrap
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -85,7 +85,9 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
85# Search Path 85# Search Path
86VPATH = $(TARGET_DIR) 86VPATH = $(TARGET_DIR)
87 87
88include $(COMMON_DIR)/iwrap.mk 88include $(TOP_DIR)/protocol/iwrap.mk
89# To be swatchable btween Bluetooth and USB. Comment out if you don't need USB. 89# To be swatchable btween Bluetooth and USB. Comment out if you don't need USB.
90include $(COMMON_DIR)/vusb.mk 90include $(TOP_DIR)/protocol/vusb.mk
91include $(COMMON_DIR)/common.mk 91include $(TOP_DIR)/protocol.mk
92include $(TOP_DIR)/common.mk
93include $(TOP_DIR)/rules.mk
diff --git a/hhkb/Makefile.pjrc b/hhkb/Makefile.pjrc
index 17aa865dd..28b6b589d 100644
--- a/hhkb/Makefile.pjrc
+++ b/hhkb/Makefile.pjrc
@@ -7,7 +7,7 @@
7TARGET = hhkb_pjrc 7TARGET = hhkb_pjrc
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -54,5 +54,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
54# Search Path 54# Search Path
55VPATH = $(TARGET_DIR) 55VPATH = $(TARGET_DIR)
56 56
57include $(COMMON_DIR)/pjrc.mk 57include $(TOP_DIR)/protocol/pjrc.mk
58include $(COMMON_DIR)/common.mk 58include $(TOP_DIR)/protocol.mk
59include $(TOP_DIR)/common.mk
60include $(TOP_DIR)/rules.mk
diff --git a/hhkb/Makefile.vusb b/hhkb/Makefile.vusb
index 371b36690..734b73a02 100644
--- a/hhkb/Makefile.vusb
+++ b/hhkb/Makefile.vusb
@@ -7,7 +7,7 @@
7TARGET = hhkb_vusb 7TARGET = hhkb_vusb
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -85,5 +85,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
85# Search Path 85# Search Path
86VPATH = $(TARGET_DIR) 86VPATH = $(TARGET_DIR)
87 87
88include $(COMMON_DIR)/vusb.mk 88include $(TOP_DIR)/protocol/vusb.mk
89include $(COMMON_DIR)/common.mk 89include $(TOP_DIR)/protocol.mk
90include $(TOP_DIR)/common.mk
91include $(TOP_DIR)/rules.mk
diff --git a/hhkb/doc/Bluetooth_img/BT_circuit.jpg b/hhkb/doc/Bluetooth_img/BT_circuit.jpg
index 2e5a25e81..2e5a25e81 100755..100644
--- a/hhkb/doc/Bluetooth_img/BT_circuit.jpg
+++ b/hhkb/doc/Bluetooth_img/BT_circuit.jpg
Binary files differ
diff --git a/m0110_usb/Makefile b/m0110_usb/Makefile
index fccfaa521..e4fa526c5 100644
--- a/m0110_usb/Makefile
+++ b/m0110_usb/Makefile
@@ -2,7 +2,7 @@
2TARGET = m0110 2TARGET = m0110
3 3
4# Directory common source filess exist 4# Directory common source filess exist
5COMMON_DIR = .. 5TOP_DIR = ..
6 6
7# Directory keyboard dependent files exist 7# Directory keyboard dependent files exist
8TARGET_DIR = . 8TARGET_DIR = .
@@ -48,8 +48,10 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
48 48
49 49
50 50
51include $(COMMON_DIR)/pjrc.mk 51include $(TOP_DIR)/protocol/pjrc.mk
52include $(COMMON_DIR)/common.mk 52include $(TOP_DIR)/protocol.mk
53include $(TOP_DIR)/common.mk
54include $(TOP_DIR)/rules.mk
53 55
54hasu: EXTRAFLAGS += -DHASU 56hasu: EXTRAFLAGS += -DHASU
55hasu: all 57hasu: all
diff --git a/macway/Makefile b/macway/Makefile
index b8b0a85e1..83d31b674 100644
--- a/macway/Makefile
+++ b/macway/Makefile
@@ -2,7 +2,7 @@
2TARGET = macway 2TARGET = macway
3 3
4# Directory common source filess exist 4# Directory common source filess exist
5COMMON_DIR = .. 5TOP_DIR = ..
6 6
7# Directory keyboard dependent files exist 7# Directory keyboard dependent files exist
8TARGET_DIR = . 8TARGET_DIR = .
@@ -47,5 +47,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
47 47
48 48
49 49
50include $(COMMON_DIR)/pjrc.mk 50include $(TOP_DIR)/protocol/pjrc.mk
51include $(COMMON_DIR)/common.mk 51include $(TOP_DIR)/protocol.mk
52include $(TOP_DIR)/common.mk
53include $(TOP_DIR)/rules.mk
diff --git a/protocol/iwrap.mk b/protocol/iwrap.mk
index ea4a6e972..d9906fd1b 100644
--- a/protocol/iwrap.mk
+++ b/protocol/iwrap.mk
@@ -7,4 +7,4 @@ SRC += iwrap.c \
7 7
8 8
9# Search Path 9# Search Path
10VPATH += $(COMMON_DIR)/iwrap 10VPATH += $(TOP_DIR)/protocol/iwrap
diff --git a/protocol/pjrc.mk b/protocol/pjrc.mk
index e13a809a1..1ee45e9ec 100644
--- a/protocol/pjrc.mk
+++ b/protocol/pjrc.mk
@@ -8,7 +8,7 @@ SRC += pjrc.c \
8 8
9 9
10# Search Path 10# Search Path
11VPATH += $(COMMON_DIR):$(COMMON_DIR)/pjrc 11VPATH += $(TOP_DIR)/protocol/pjrc
12 12
13 13
14# Option modules 14# Option modules
diff --git a/protocol/vusb.mk b/protocol/vusb.mk
index 9426efb25..9e8e1fb39 100644
--- a/protocol/vusb.mk
+++ b/protocol/vusb.mk
@@ -16,4 +16,4 @@ endif
16 16
17 17
18# Search Path 18# Search Path
19VPATH += $(COMMON_DIR)/vusb:$(COMMON_DIR)/vusb/usbdrv 19VPATH += $(TOP_DIR)/protocol/vusb:$(TOP_DIR)/protocol/vusb/usbdrv
diff --git a/ps2_usb/Makefile b/ps2_usb/Makefile
index f003aea01..515e6899f 100644
--- a/ps2_usb/Makefile
+++ b/ps2_usb/Makefile
@@ -7,7 +7,7 @@
7TARGET = ps2_usb_pjrc 7TARGET = ps2_usb_pjrc
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
52 52
53 53
54 54
55include $(COMMON_DIR)/pjrc.mk 55include $(TOP_DIR)/protocol/pjrc.mk
56include $(COMMON_DIR)/common.mk 56include $(TOP_DIR)/protocol.mk
57include $(TOP_DIR)/common.mk
58include $(TOP_DIR)/rules.mk
diff --git a/ps2_usb/Makefile.pjrc_usart b/ps2_usb/Makefile.pjrc_usart
index e620e66c2..2e570e710 100644
--- a/ps2_usb/Makefile.pjrc_usart
+++ b/ps2_usb/Makefile.pjrc_usart
@@ -7,7 +7,7 @@
7TARGET = ps2_usb_pjrc_usart 7TARGET = ps2_usb_pjrc_usart
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
52 52
53 53
54 54
55include $(COMMON_DIR)/pjrc.mk 55include $(TOP_DIR)/protocol/pjrc.mk
56include $(COMMON_DIR)/common.mk 56include $(TOP_DIR)/protocol.mk
57include $(TOP_DIR)/common.mk
58include $(TOP_DIR)/rules.mk
diff --git a/ps2_usb/Makefile.vusb b/ps2_usb/Makefile.vusb
index 5b6978f01..d85f1d55d 100644
--- a/ps2_usb/Makefile.vusb
+++ b/ps2_usb/Makefile.vusb
@@ -7,7 +7,7 @@
7TARGET = ps2_usb_vusb 7TARGET = ps2_usb_vusb
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -86,5 +86,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
86 86
87 87
88 88
89include $(COMMON_DIR)/vusb.mk 89include $(TOP_DIR)/protocol/vusb.mk
90include $(COMMON_DIR)/common.mk 90include $(TOP_DIR)/protocol.mk
91include $(TOP_DIR)/common.mk
92include $(TOP_DIR)/rules.mk
diff --git a/rules.mk b/rules.mk
index 9143f9bcf..104031fbb 100644
--- a/rules.mk
+++ b/rules.mk
@@ -121,7 +121,9 @@ CFLAGS += -Wstrict-prototypes
121CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) 121CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
122CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) 122CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
123CFLAGS += $(CSTANDARD) 123CFLAGS += $(CSTANDARD)
124CFLAGS += -include $(CONFIG_H) 124ifdef CONFIG_H
125 CFLAGS += -include $(CONFIG_H)
126endif
125 127
126 128
127#---------------- Compiler Options C++ ---------------- 129#---------------- Compiler Options C++ ----------------
@@ -149,7 +151,9 @@ CPPFLAGS += -Wundef
149CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) 151CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
150CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) 152CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
151#CPPFLAGS += $(CSTANDARD) 153#CPPFLAGS += $(CSTANDARD)
152CPPFLAGS += -include $(CONFIG_H) 154ifdef CONFIG_H
155 CPPFLAGS += -include $(CONFIG_H)
156endif
153 157
154 158
155#---------------- Assembler Options ---------------- 159#---------------- Assembler Options ----------------
@@ -162,7 +166,9 @@ CPPFLAGS += -include $(CONFIG_H)
162# -listing-cont-lines: Sets the maximum number of continuation lines of hex 166# -listing-cont-lines: Sets the maximum number of continuation lines of hex
163# dump that will be displayed for a given single line of source input. 167# dump that will be displayed for a given single line of source input.
164ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 168ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
165ASFLAGS += -include $(CONFIG_H) 169ifdef CONFIG_H
170 ASFLAGS += -include $(CONFIG_H)
171endif
166 172
167 173
168#---------------- Library Options ---------------- 174#---------------- Library Options ----------------
diff --git a/sony_usb/Makefile.pjrc b/sony_usb/Makefile.pjrc
index 2a4eeff13..b7e22dfac 100644
--- a/sony_usb/Makefile.pjrc
+++ b/sony_usb/Makefile.pjrc
@@ -7,7 +7,7 @@
7TARGET = news_usb_pjrc 7TARGET = news_usb_pjrc
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
52 52
53 53
54 54
55include $(COMMON_DIR)/pjrc.mk 55include $(TOP_DIR)/protocol/pjrc.mk
56include $(COMMON_DIR)/common.mk 56include $(TOP_DIR)/protocol.mk
57include $(TOP_DIR)/common.mk
58include $(TOP_DIR)/rules.mk
diff --git a/terminal_usb/Makefile.102_pjrc b/terminal_usb/Makefile.102_pjrc
index c1fd397f6..a02877acf 100644
--- a/terminal_usb/Makefile.102_pjrc
+++ b/terminal_usb/Makefile.102_pjrc
@@ -7,7 +7,7 @@
7TARGET = terminal_usb_102_pjrc 7TARGET = terminal_usb_102_pjrc
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
52 52
53 53
54 54
55include $(COMMON_DIR)/pjrc.mk 55include $(TOP_DIR)/protocol/pjrc.mk
56include $(COMMON_DIR)/common.mk 56include $(TOP_DIR)/protocol.mk
57include $(TOP_DIR)/common.mk
58include $(TOP_DIR)/rules.mk
diff --git a/terminal_usb/Makefile.122_pjrc b/terminal_usb/Makefile.122_pjrc
index b91e484ff..1f21d4e6c 100644
--- a/terminal_usb/Makefile.122_pjrc
+++ b/terminal_usb/Makefile.122_pjrc
@@ -7,7 +7,7 @@
7TARGET = terminal_usb_122_pjrc 7TARGET = terminal_usb_122_pjrc
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
52 52
53 53
54 54
55include $(COMMON_DIR)/pjrc.mk 55include $(TOP_DIR)/protocol/pjrc.mk
56include $(COMMON_DIR)/common.mk 56include $(TOP_DIR)/protocol.mk
57include $(TOP_DIR)/common.mk
58include $(TOP_DIR)/rules.mk
diff --git a/x68k_usb/Makefile b/x68k_usb/Makefile
index c4b9b221b..0127c0bf8 100644
--- a/x68k_usb/Makefile
+++ b/x68k_usb/Makefile
@@ -7,7 +7,7 @@
7TARGET = x68k_usb_pjrc 7TARGET = x68k_usb_pjrc
8 8
9# Directory common source filess exist 9# Directory common source filess exist
10COMMON_DIR = .. 10TOP_DIR = ..
11 11
12# Directory keyboard dependent files exist 12# Directory keyboard dependent files exist
13TARGET_DIR = . 13TARGET_DIR = .
@@ -81,5 +81,7 @@ PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex
81 81
82 82
83 83
84include $(COMMON_DIR)/pjrc.mk 84include $(TOP_DIR)/protocol/pjrc.mk
85include $(COMMON_DIR)/common.mk 85include $(TOP_DIR)/protocol.mk
86include $(TOP_DIR)/common.mk
87include $(TOP_DIR)/rules.mk
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-24 03:59:24 +0000