Make both RGB and sound work on Clueboard 66% hotswap

master
skullY 2018-08-11 12:14:02 -07:00 committed by skullydazed
parent c909c4ea50
commit 8e50a472ab
7 changed files with 36 additions and 58 deletions

View File

@ -1,10 +1,5 @@
#ifndef CLUEBOARD_H #pragma once
#define CLUEBOARD_H
#include "quantum.h"
#ifdef KEYBOARD_clueboard_66_hotswap_gen1 #ifdef KEYBOARD_clueboard_66_hotswap_gen1
#include "gen1.h" #include "gen1.h"
#endif #endif
#endif

View File

@ -15,9 +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/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CLUEBOARD_66_CONFIG_H #pragma once
#define CLUEBOARD_66_CONFIG_H
#include "config_common.h" #include "config_common.h"
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
@ -47,17 +45,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* These options are also useful to firmware size reduction. * These options are also useful to firmware size reduction.
*/ */
/* disable debug print */
//#define NO_DEBUG //#define NO_DEBUG
/* disable print */
//#define NO_PRINT //#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER //#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING //#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT #define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO #define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION //#define NO_ACTION_FUNCTION
#endif

View File

@ -1,6 +1,4 @@
#ifndef CLUEBOARD_66_REV3_CONFIG_H #pragma once
#define CLUEBOARD_66_REV3_CONFIG_H
#include "config_common.h" #include "config_common.h"
#define PRODUCT_ID 0x2390 #define PRODUCT_ID 0x2390
@ -26,7 +24,9 @@
/* Speaker configuration /* 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 /* Backlight configuration
*/ */
@ -49,5 +49,3 @@
#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 16 // The led to start at #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_KNIGHT_LED_NUM 8 // How many LEDs to travel
#define RGBLIGHT_EFFECT_SNAKE_LENGTH 4 // How many LEDs wide to light up #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4 // How many LEDs wide to light up
#endif

View File

@ -1,7 +1,5 @@
#ifndef gen1_H #pragma once
#define gen1_H #include "quantum.h"
#include "66_hotswap.h"
/* Clueboard matrix layout /* Clueboard matrix layout
* ,-----------------------------------------------------------. ,---. * ,-----------------------------------------------------------. ,---.
@ -67,5 +65,3 @@
{ k80, k81, k82, k83, KC_NO, k85, k86, KC_NO }, \ { k80, k81, k82, k83, KC_NO, k85, k86, KC_NO }, \
{ KC_NO, KC_NO, k92, k93, k94, k95, k96, k97 } \ { KC_NO, KC_NO, k92, k93, k94, k95, k96, k97 } \
} }
#endif

View File

@ -1 +1,24 @@
BACKLIGHT_ENABLE = yes 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

View File

@ -4,10 +4,10 @@
A fully customizable 66% keyboard with Hot Swap sockets. 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 * Hardware Supported: Clueboard 66% HotSwap PCB
* 2.9 * 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): Make example for this keyboard (after setting up your build environment):

View File

@ -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