summaryrefslogtreecommitdiff
path: root/keyboards/hadron
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/hadron')
-rw-r--r--keyboards/hadron/config.h19
-rw-r--r--keyboards/hadron/keymaps/default/rules.mk4
-rw-r--r--keyboards/hadron/rules.mk32
-rw-r--r--keyboards/hadron/ver0/config.h7
-rw-r--r--keyboards/hadron/ver2/config.h7
-rw-r--r--keyboards/hadron/ver2/rules.mk2
6 files changed, 28 insertions, 43 deletions
diff --git a/keyboards/hadron/config.h b/keyboards/hadron/config.h
index 0c19d6c791..9111ad7279 100644
--- a/keyboards/hadron/config.h
+++ b/keyboards/hadron/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
#include "config_common.h"
@@ -30,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
-//#define AUDIO_VOICES
+//#define AUDIO_VOICES
//#define BACKLIGHT_PIN B7
@@ -71,13 +70,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-#ifdef SUBPROJECT_ver0
- #include "ver0/config.h"
-#endif
-#ifdef SUBPROJECT_ver2
- #include "ver2/config.h"
-#endif
-
-#endif
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+
diff --git a/keyboards/hadron/keymaps/default/rules.mk b/keyboards/hadron/keymaps/default/rules.mk
index 1f3975255a..4d08544f3a 100644
--- a/keyboards/hadron/keymaps/default/rules.mk
+++ b/keyboards/hadron/keymaps/default/rules.mk
@@ -21,6 +21,4 @@ SWAP_HANDS_ENABLE = no # Enable one-hand typing
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif \ No newline at end of file
+EXTRAFLAGS += -flto
diff --git a/keyboards/hadron/rules.mk b/keyboards/hadron/rules.mk
index 66a900825a..1f835e0660 100644
--- a/keyboards/hadron/rules.mk
+++ b/keyboards/hadron/rules.mk
@@ -44,30 +44,30 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Atmel DFU loader 4096
# LUFA bootloader 4096
# USBaspLoader 2048
-OPT_DEFS += -DBOOTLOADER_SIZE=512
+BOOTLOADER = halfkay
# Build Options
-# change to "no" to disable the options, or define them in the Makefile in
+# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
-BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= no # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
-CONSOLE_ENABLE ?= no # Console for debug(+400)
-COMMAND_ENABLE ?= no # Commands for debug and configuration
-NKRO_ENABLE ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality
-MIDI_ENABLE ?= no # MIDI controls
-AUDIO_ENABLE ?= no # Audio output on port C6
-UNICODE_ENABLE ?= no # Unicode
-BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight.
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
+CONSOLE_ENABLE = no # Console for debug(+400)
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+MIDI_ENABLE = no # MIDI controls
+AUDIO_ENABLE = no # Audio output on port C6
+UNICODE_ENABLE = no # Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
API_SYSEX_ENABLE = yes
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
SRC = i2c.c \
ssd1306.c
-DEFAULT_FOLDER = hadron/ver2 \ No newline at end of file
+DEFAULT_FOLDER = hadron/ver2
diff --git a/keyboards/hadron/ver0/config.h b/keyboards/hadron/ver0/config.h
index 039d4f1c71..2157a52cee 100644
--- a/keyboards/hadron/ver0/config.h
+++ b/keyboards/hadron/ver0/config.h
@@ -14,10 +14,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef VER0_CONFIG_H
-#define VER0_CONFIG_H
-
-#include "../config.h"
+#pragma once
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0001
@@ -32,4 +29,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define UNUSED_PINS
-#endif
+
diff --git a/keyboards/hadron/ver2/config.h b/keyboards/hadron/ver2/config.h
index 71a0ab5b3f..5ee3f931ff 100644
--- a/keyboards/hadron/ver2/config.h
+++ b/keyboards/hadron/ver2/config.h
@@ -14,10 +14,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef VER2_CONFIG_H
-#define VER2_CONFIG_H
-
-#include "../config.h"
+#pragma once
/* USB Device descriptor parameter */
#define DEVICE_VER 0x0002
@@ -32,4 +29,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define UNUSED_PINS
-#endif
+
diff --git a/keyboards/hadron/ver2/rules.mk b/keyboards/hadron/ver2/rules.mk
index a3952a5d33..521493b3d3 100644
--- a/keyboards/hadron/ver2/rules.mk
+++ b/keyboards/hadron/ver2/rules.mk
@@ -1 +1 @@
-#AUDIO_ENABLE ?= yes # Audio output on port C6 \ No newline at end of file
+#AUDIO_ENABLE = yes # Audio output on port C6