summaryrefslogtreecommitdiff
path: root/keyboards/hhkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/hhkb')
-rw-r--r--keyboards/hhkb/ansi/post_rules.mk18
-rw-r--r--keyboards/hhkb/ansi/rules.mk22
-rw-r--r--keyboards/hhkb/jp/post_rules.mk18
-rw-r--r--keyboards/hhkb/jp/rules.mk22
-rw-r--r--keyboards/hhkb/rn42/battery.h5
-rw-r--r--keyboards/hhkb/rn42/rn42.h5
-rw-r--r--keyboards/hhkb/rn42/rn42_task.h5
7 files changed, 41 insertions, 54 deletions
diff --git a/keyboards/hhkb/ansi/post_rules.mk b/keyboards/hhkb/ansi/post_rules.mk
new file mode 100644
index 0000000000..bc6ad5cd4c
--- /dev/null
+++ b/keyboards/hhkb/ansi/post_rules.mk
@@ -0,0 +1,18 @@
+ifeq ($(strip $(HHKB_RN42_ENABLE)), yes)
+
+OPT_DEFS += -DHHKB_RN42_ENABLE
+
+# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
+# HHKB Alt controller.
+RN42_DIR = ../rn42
+
+SRC += serial_uart.c \
+ ../rn42/suart.S \
+ ../rn42/rn42.c \
+ ../rn42/rn42_task.c \
+ ../rn42/battery.c \
+ ../rn42/main.c
+
+VPATH += $(RN42_DIR)
+
+endif
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk
index 6e2e81b0cf..d9a69a5e38 100644
--- a/keyboards/hhkb/ansi/rules.mk
+++ b/keyboards/hhkb/ansi/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
# Build Options
# comment out to disable the options.
#
-BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
@@ -30,26 +30,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB
# project specific files
SRC = matrix.c
-ifeq ($(strip $(HHKB_RN42_ENABLE)), yes)
-
-OPT_DEFS += -DHHKB_RN42_ENABLE
-
-# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
-# HHKB Alt controller.
-RN42_DIR = ../rn42
-
-SRC += serial_uart.c \
- ../rn42/suart.S \
- ../rn42/rn42.c \
- ../rn42/rn42_task.c \
- ../rn42/battery.c \
- ../rn42/main.c
-
-VPATH += $(RN42_DIR)
-
-endif
-
-
# debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
# debug-on: all
diff --git a/keyboards/hhkb/jp/post_rules.mk b/keyboards/hhkb/jp/post_rules.mk
new file mode 100644
index 0000000000..bc6ad5cd4c
--- /dev/null
+++ b/keyboards/hhkb/jp/post_rules.mk
@@ -0,0 +1,18 @@
+ifeq ($(strip $(HHKB_RN42_ENABLE)), yes)
+
+OPT_DEFS += -DHHKB_RN42_ENABLE
+
+# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
+# HHKB Alt controller.
+RN42_DIR = ../rn42
+
+SRC += serial_uart.c \
+ ../rn42/suart.S \
+ ../rn42/rn42.c \
+ ../rn42/rn42_task.c \
+ ../rn42/battery.c \
+ ../rn42/main.c
+
+VPATH += $(RN42_DIR)
+
+endif
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index 56187bb331..f197cd9eef 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
# Build Options
# comment out to disable the options.
#
-BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
@@ -30,26 +30,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB
# project specific files
SRC = matrix.c
-ifeq ($(strip $(HHKB_RN42_ENABLE)), yes)
-
-OPT_DEFS += -DHHKB_RN42_ENABLE
-
-# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
-# HHKB Alt controller.
-RN42_DIR = ../rn42
-
-SRC += serial_uart.c \
- ../rn42/suart.S \
- ../rn42/rn42.c \
- ../rn42/rn42_task.c \
- ../rn42/battery.c \
- ../rn42/main.c
-
-VPATH += $(RN42_DIR)
-
-endif
-
-
# debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
# debug-on: all
diff --git a/keyboards/hhkb/rn42/battery.h b/keyboards/hhkb/rn42/battery.h
index 180d4dcfaa..c7f96d09a3 100644
--- a/keyboards/hhkb/rn42/battery.h
+++ b/keyboards/hhkb/rn42/battery.h
@@ -1,5 +1,4 @@
-#ifndef POWER_H
-#define POWER_H
+#pragma once
#include <stdint.h>
#include <stdbool.h>
@@ -31,5 +30,3 @@ battery_status_t battery_status(void);
// ADC offset:16, resolution:5mV
#define BATTERY_ADC_OFFSET 16
#define BATTERY_ADC_RESOLUTION 5
-
-#endif
diff --git a/keyboards/hhkb/rn42/rn42.h b/keyboards/hhkb/rn42/rn42.h
index dee214cc84..76bcef99bb 100644
--- a/keyboards/hhkb/rn42/rn42.h
+++ b/keyboards/hhkb/rn42/rn42.h
@@ -1,5 +1,4 @@
-#ifndef RN42_H
-#define RN42_H
+#pragma once
#include <stdbool.h>
#include "host_driver.h"
@@ -26,5 +25,3 @@ void rn42_send_str(const char *str);
void rn42_print_response(void);
#define SEND_STR(str) rn42_send_str(PSTR(str))
#define SEND_COMMAND(cmd) rn42_send_command(PSTR(cmd))
-
-#endif
diff --git a/keyboards/hhkb/rn42/rn42_task.h b/keyboards/hhkb/rn42/rn42_task.h
index ee00669ee5..05e80e9be2 100644
--- a/keyboards/hhkb/rn42/rn42_task.h
+++ b/keyboards/hhkb/rn42/rn42_task.h
@@ -1,5 +1,4 @@
-#ifndef RN42_TASK_H
-#define RN42_TASK_H
+#pragma once
#include <stdbool.h>
#include "rn42.h"
@@ -10,5 +9,3 @@ bool rn42_nkro_last;
void rn42_task_init(void);
void rn42_task(void);
-
-#endif