From 8e50a472ab2a6740f7659807cf6dd70c15fdf641 Mon Sep 17 00:00:00 2001 From: skullY Date: Sat, 11 Aug 2018 12:14:02 -0700 Subject: [PATCH] Make both RGB and sound work on Clueboard 66% hotswap --- keyboards/clueboard/66_hotswap/66_hotswap.h | 7 +----- keyboards/clueboard/66_hotswap/config.h | 15 +++--------- keyboards/clueboard/66_hotswap/gen1/config.h | 10 ++++---- keyboards/clueboard/66_hotswap/gen1/gen1.h | 8 ++----- keyboards/clueboard/66_hotswap/gen1/rules.mk | 25 +++++++++++++++++++- keyboards/clueboard/66_hotswap/readme.md | 4 ++-- keyboards/clueboard/66_hotswap/rules.mk | 25 -------------------- 7 files changed, 36 insertions(+), 58 deletions(-) delete mode 100644 keyboards/clueboard/66_hotswap/rules.mk diff --git a/keyboards/clueboard/66_hotswap/66_hotswap.h b/keyboards/clueboard/66_hotswap/66_hotswap.h index 61c6fe359..9367c2633 100644 --- a/keyboards/clueboard/66_hotswap/66_hotswap.h +++ b/keyboards/clueboard/66_hotswap/66_hotswap.h @@ -1,10 +1,5 @@ -#ifndef CLUEBOARD_H -#define CLUEBOARD_H - -#include "quantum.h" +#pragma once #ifdef KEYBOARD_clueboard_66_hotswap_gen1 #include "gen1.h" #endif - -#endif diff --git a/keyboards/clueboard/66_hotswap/config.h b/keyboards/clueboard/66_hotswap/config.h index 59a0abc7f..97da92cfd 100644 --- a/keyboards/clueboard/66_hotswap/config.h +++ b/keyboards/clueboard/66_hotswap/config.h @@ -15,9 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CLUEBOARD_66_CONFIG_H -#define CLUEBOARD_66_CONFIG_H - +#pragma once #include "config_common.h" /* USB Device descriptor parameter */ @@ -47,17 +45,10 @@ along with this program. If not, see . * These options are also useful to firmware size reduction. */ -/* disable debug print */ //#define NO_DEBUG - -/* disable print */ //#define NO_PRINT - -/* disable action features */ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO +#define NO_ACTION_ONESHOT +#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h index d8163f538..14188634b 100644 --- a/keyboards/clueboard/66_hotswap/gen1/config.h +++ b/keyboards/clueboard/66_hotswap/gen1/config.h @@ -1,6 +1,4 @@ -#ifndef CLUEBOARD_66_REV3_CONFIG_H -#define CLUEBOARD_66_REV3_CONFIG_H - +#pragma once #include "config_common.h" #define PRODUCT_ID 0x2390 @@ -26,7 +24,9 @@ /* Speaker configuration */ -//#define SPEAKER_PIN B7 // FIXME: find the correct name for this define +#define B7_AUDIO +#define NO_MUSIC_MODE +#define AUDIO_CLICKY /* Backlight configuration */ @@ -49,5 +49,3 @@ #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 16 // The led to start at #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 8 // How many LEDs to travel #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4 // How many LEDs wide to light up - -#endif diff --git a/keyboards/clueboard/66_hotswap/gen1/gen1.h b/keyboards/clueboard/66_hotswap/gen1/gen1.h index 293620ac0..2d0a9d397 100644 --- a/keyboards/clueboard/66_hotswap/gen1/gen1.h +++ b/keyboards/clueboard/66_hotswap/gen1/gen1.h @@ -1,7 +1,5 @@ -#ifndef gen1_H -#define gen1_H - -#include "66_hotswap.h" +#pragma once +#include "quantum.h" /* Clueboard matrix layout * ,-----------------------------------------------------------. ,---. @@ -67,5 +65,3 @@ { k80, k81, k82, k83, KC_NO, k85, k86, KC_NO }, \ { KC_NO, KC_NO, k92, k93, k94, k95, k96, k97 } \ } - -#endif diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk index 54a2685bf..887592b37 100644 --- a/keyboards/clueboard/66_hotswap/gen1/rules.mk +++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk @@ -1 +1,24 @@ -BACKLIGHT_ENABLE = yes \ No newline at end of file +EXTRAFLAGS += -flto +LAYOUTS = 66_ansi +MCU = atmega32u4 +F_CPU = 16000000 +ARCH = AVR8 +F_USB = $(F_CPU) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + +# Build Options +# comment out to disable the options. +# +BACKLIGHT_ENABLE = yes +BOOTMAGIC_ENABLE = no +MOUSEKEY_ENABLE = no +EXTRAKEY_ENABLE = yes +CONSOLE_ENABLE = yes +COMMAND_ENABLE = no +NKRO_ENABLE = yes +AUDIO_ENABLE = yes +RGBLIGHT_ENABLE = yes +MIDI_ENABLE = no +UNICODE_ENABLE = no +BLUETOOTH_ENABLE = no diff --git a/keyboards/clueboard/66_hotswap/readme.md b/keyboards/clueboard/66_hotswap/readme.md index 2ae46b84c..014c761b0 100644 --- a/keyboards/clueboard/66_hotswap/readme.md +++ b/keyboards/clueboard/66_hotswap/readme.md @@ -4,10 +4,10 @@ A fully customizable 66% keyboard with Hot Swap sockets. -* Keyboard Maintainer: [Zach White](https://github.com/skullydazed) +* Keyboard Maintainer: [Zach White](https://github.com/skullydazed) * Hardware Supported: Clueboard 66% HotSwap PCB * 2.9 -* Hardware Availability: [clueboard.co](https://clueboard.co/) +* Hardware Availability: [clueboard.co](https://clueboard.co/) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/clueboard/66_hotswap/rules.mk b/keyboards/clueboard/66_hotswap/rules.mk deleted file mode 100644 index 1fc5f89fa..000000000 --- a/keyboards/clueboard/66_hotswap/rules.mk +++ /dev/null @@ -1,25 +0,0 @@ -DEFAULT_FOLDER = clueboard/66_hotswap/gen1 -LAYOUTS = 66_ansi -MCU = atmega32u4 -F_CPU = 16000000 -ARCH = AVR8 -F_USB = $(F_CPU) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - -# Build Options -# comment out to disable the options. -# -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 = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality -MIDI_ENABLE = no # MIDI controls -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID - -LAYOUTS = 66_ansi