diff options
| -rw-r--r-- | keyboards/s60-x/Makefile | 2 | ||||
| -rw-r--r-- | keyboards/s60-x/config.h | 120 | ||||
| -rw-r--r-- | keyboards/s60-x/default/Makefile | 3 | ||||
| -rw-r--r-- | keyboards/s60-x/default/config.h | 25 | ||||
| -rw-r--r-- | keyboards/s60-x/default/default.c | 28 | ||||
| -rw-r--r-- | keyboards/s60-x/default/default.h | 69 | ||||
| -rw-r--r-- | keyboards/s60-x/default/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/s60-x/keymaps/dbroqua/keymap.c | 194 | ||||
| -rw-r--r-- | keyboards/s60-x/rgb/Makefile | 3 | ||||
| -rw-r--r-- | keyboards/s60-x/rgb/config.h | 31 | ||||
| -rw-r--r-- | keyboards/s60-x/rgb/rgb.c | 1 | ||||
| -rw-r--r-- | keyboards/s60-x/rgb/rgb.h | 37 | ||||
| -rw-r--r-- | keyboards/s60-x/rgb/rules.mk | 56 | ||||
| -rw-r--r-- | keyboards/s60-x/s60-x.c | 29 | ||||
| -rw-r--r-- | keyboards/s60-x/s60-x.h | 68 | 
15 files changed, 458 insertions, 209 deletions
| diff --git a/keyboards/s60-x/Makefile b/keyboards/s60-x/Makefile index 4e2a6f00fd..879e493a21 100644 --- a/keyboards/s60-x/Makefile +++ b/keyboards/s60-x/Makefile @@ -1,3 +1,5 @@ +SUBPROJECT_DEFAULT = default +  ifndef MAKEFILE_INCLUDED  	include ../../Makefile  endif
\ No newline at end of file diff --git a/keyboards/s60-x/config.h b/keyboards/s60-x/config.h index ac7951c247..8e7bc78be2 100644 --- a/keyboards/s60-x/config.h +++ b/keyboards/s60-x/config.h @@ -27,138 +27,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define PRODUCT_ID      0x6060  #define DEVICE_VER      0x0001  #define MANUFACTURER    Massdrop -#define PRODUCT         S60-X -#define DESCRIPTION     q.m.k. keyboard firmware for S60-X  /* key matrix size */  #define MATRIX_ROWS 5  #define MATRIX_COLS 15 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 } -#define UNUSED_PINS { F0 } -  /* COL2ROW or ROW2COL */  #define DIODE_DIRECTION COL2ROW -  -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -// #define BACKLIGHT_LEVELS 3 -  /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */  #define DEBOUNCING_DELAY 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Magic Key Options - * - * Magic keys are hotkey commands that allow control over firmware functions of - * the keyboard. They are best used in combination with the HID Listen program, - * found here: https://www.pjrc.com/teensy/hid_listen.html - * - * The options below allow the magic key functionality to be changed. This is - * useful if your keyboard/keypad is missing keys and you want magic key support. - * - */ - -/* key combination for magic key command */ +/* key combination for command */  #define IS_COMMAND() ( \      keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \  ) -/* control how magic key switches layers */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false - -/* override magic key keymap */ -//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS -//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM -//#define MAGIC_KEY_HELP1          H -//#define MAGIC_KEY_HELP2          SLASH -//#define MAGIC_KEY_DEBUG          D -//#define MAGIC_KEY_DEBUG_MATRIX   X -//#define MAGIC_KEY_DEBUG_KBD      K -//#define MAGIC_KEY_DEBUG_MOUSE    M -//#define MAGIC_KEY_VERSION        V -//#define MAGIC_KEY_STATUS         S -//#define MAGIC_KEY_CONSOLE        C -//#define MAGIC_KEY_LAYER0_ALT1    ESC -//#define MAGIC_KEY_LAYER0_ALT2    GRAVE -//#define MAGIC_KEY_LAYER0         0 -//#define MAGIC_KEY_LAYER1         1 -//#define MAGIC_KEY_LAYER2         2 -//#define MAGIC_KEY_LAYER3         3 -//#define MAGIC_KEY_LAYER4         4 -//#define MAGIC_KEY_LAYER5         5 -//#define MAGIC_KEY_LAYER6         6 -//#define MAGIC_KEY_LAYER7         7 -//#define MAGIC_KEY_LAYER8         8 -//#define MAGIC_KEY_LAYER9         9 -//#define MAGIC_KEY_BOOTLOADER     PAUSE -//#define MAGIC_KEY_LOCK           CAPS -//#define MAGIC_KEY_EEPROM         E -//#define MAGIC_KEY_NKRO           N -//#define MAGIC_KEY_SLEEP_LED      Z - -/* - * Feature disable options - *  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_FUNCTION -  #endif diff --git a/keyboards/s60-x/default/Makefile b/keyboards/s60-x/default/Makefile new file mode 100644 index 0000000000..191c6bb664 --- /dev/null +++ b/keyboards/s60-x/default/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED +	include ../../../Makefile +endif
\ No newline at end of file diff --git a/keyboards/s60-x/default/config.h b/keyboards/s60-x/default/config.h new file mode 100644 index 0000000000..436c6fa8b6 --- /dev/null +++ b/keyboards/s60-x/default/config.h @@ -0,0 +1,25 @@ +#ifndef DEFAULT_CONFIG_H +#define DEFAULT_CONFIG_H + +#include "../config.h" + +#define PRODUCT         S60-X +#define DESCRIPTION     q.m.k. keyboard firmware for S60-X + +#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } +#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 } +#define UNUSED_PINS { F0 } + +#define LOCKING_SUPPORT_ENABLE +#define LOCKING_RESYNC_ENABLE + +/* key combination for magic key command */ +#define IS_COMMAND() ( \ +    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +#define NO_ACTION_ONESHOT +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +#endif diff --git a/keyboards/s60-x/default/default.c b/keyboards/s60-x/default/default.c new file mode 100644 index 0000000000..253f5495c2 --- /dev/null +++ b/keyboards/s60-x/default/default.c @@ -0,0 +1,28 @@ +#include "default.h" + +void matrix_init_kb(void) { +	// put your keyboard start-up code here +	// runs once when the firmware starts up + +	matrix_init_user(); +} + +void matrix_scan_kb(void) { +	// put your looping keyboard code here +	// runs every cycle (a lot) + +	matrix_scan_user(); +} + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { +	// put your per-action keyboard code here +	// runs for every action, just before processing by the firmware + +	return process_record_user(keycode, record); +} + +void led_set_kb(uint8_t usb_led) { +	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here + +	led_set_user(usb_led); +} diff --git a/keyboards/s60-x/default/default.h b/keyboards/s60-x/default/default.h new file mode 100644 index 0000000000..86233ef7e0 --- /dev/null +++ b/keyboards/s60-x/default/default.h @@ -0,0 +1,69 @@ +/* +Copyright 2012,2013 Jun Wako <[email protected]> +Copyright 2015 Vin�cius Nery Cordeiro <[email protected]> +Copyright 2016 Felix Uhl <[email protected]> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +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 DEFAULT_H +#define DEFAULT_H + +#include "quantum.h" + +#ifdef __INTELLISENSE__ +#define PROGMEM +#include "../config.h" +#endif + +/* S60-X keymap definition macro +* K31 is the extra key next to short left ISO shift +* K2C is the moved key next to enter on ISO boards +* K3C is the extra key next to short right JIS shift +* K0D is extra key from split backspace +* K3E is extra key from HHKB-style split right shift +*/ + +#define KEYMAP( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ +    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \ +    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ +    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ +    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \ +) { \ +    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E }, \ +    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO    }, \ +    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO    }, \ +    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E }, \ +    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   KC_NO    }  \ +} + +/*This special definition is used for S60-X keymaps that were ported from TMK + * QMK has a lot of keycodes that don't start with KC_, so using the regular KEYMAP macro is recommended + */ +#define LEGACY_KEYMAP( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ +    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \ +    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ +    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ +    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \ +) { \ +  { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E }, \ +  { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_NO  }, \ +  { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_NO  }, \ +  { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E }, \ +  { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_NO,    KC_##K46, KC_NO,    KC_NO,    KC_NO,    KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_NO  }  \ +} + +#endif
\ No newline at end of file diff --git a/keyboards/s60-x/default/rules.mk b/keyboards/s60-x/default/rules.mk new file mode 100644 index 0000000000..b8ff762607 --- /dev/null +++ b/keyboards/s60-x/default/rules.mk @@ -0,0 +1 @@ +RGBLIGHT_ENABLE ?= no
\ No newline at end of file diff --git a/keyboards/s60-x/keymaps/dbroqua/keymap.c b/keyboards/s60-x/keymaps/dbroqua/keymap.c new file mode 100644 index 0000000000..940119e52f --- /dev/null +++ b/keyboards/s60-x/keymaps/dbroqua/keymap.c @@ -0,0 +1,194 @@ +#include "s60-x.h" + +#define _DEFAULT 0 +#define _FN 1 +#define _SFX 2 + +// Fillers to make layering more clear +#define ______ KC_TRNS + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +/* Qwerty gui/alt/space/alt/gui + * ,-----------------------------------------------------------------------------------------. + * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  | + * |-----------------------------------------------------------------------------------------+ + * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  | + * |-----------------------------------------------------------------------------------------+ + * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    | + * |-----------------------------------------------------------------------------------------+ + * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  | + * |-----------------------------------------------------------------------------------------+ + *         |LGUI | LAlt  |               Space                | RAlt   |RGUI | + *         `-----------------------------------------------------------------' + */ +  [_DEFAULT] = KEYMAP( /* Basic QWERTY */ +      KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, \ +      KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,  \ +      KC_LCTL, KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, ______,  KC_ENT,  \ +      KC_LSFT, ______,  KC_Z,    KC_X, KC_C, KC_V,   KC_B, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, ______,  KC_RSFT, MO(_FN), \ +      ______,  KC_LGUI, KC_LALT,                     KC_SPC,                       KC_RALT, KC_RGUI, ______,  ______ \ +      ), + +/* FN Layer + * ,-----------------------------------------------------------------------------------------. + * | SFX | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del | + * |-----------------------------------------------------------------------------------------+ + * |  CAPS  |     |     |     |     |     |     |     | Psc | Slck| Paus| Up  |     |        | + * |-----------------------------------------------------------------------------------------+ + * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             | + * |-----------------------------------------------------------------------------------------+ + * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     | + * |-----------------------------------------------------------------------------------------+ + *         |       |       |                                 | Stop  |       | + *         `-----------------------------------------------------------------' + */ +  [_FN] = KEYMAP( /* Layer 1 */ +      TG(_SFX),KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, KC_F12, KC_INS,  KC_DEL, \ +      KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,  ______, ______,  \ +      ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,______, ______,   \ +      ______,  ______,  KC_MPRV, KC_MPLY, KC_MNXT,______, ______, KC_PPLS,  KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,______, ______, ______,  \ +      ______,  ______,  ______,                           ______,                          KC_MSTP, ______, ______, ______ \ +      ), + + +/* SFX Layer + * ,-----------------------------------------------------------------------------------------. + * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     | + * |-----------------------------------------------------------------------------------------+ + * |        | BL- | BL+ | BL  |     |     |     |     |     |     |     |     |     |        | + * |-----------------------------------------------------------------------------------------+ + * |         | RGBT| RGBM|     |     |     |     |     |     |     |     |     |             | + * |-----------------------------------------------------------------------------------------+ + * |           | Hue+| Hue-| Sat+| Sat-| Val+| Val-|     |      |    |     |           |     | + * |-----------------------------------------------------------------------------------------+ + *         |       |       |                                 |       |       | + *         `-----------------------------------------------------------------' + */ +  [_SFX] = KEYMAP( +      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, \ +      ______,   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \ +      ______,   F(0),   F(1),   ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,  \ +      ______,   ______, F(2),   F(3),   F(4),   F(5),   F(6),   F(7),   ______, ______, ______, ______, ______, ______, ______,  \ +      ______,   ______, ______,                         ______,                         ______, ______, ______, ______ \ +      ) +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { +	keyevent_t event = record->event; + +	switch (id) { + +	} +	return MACRO_NONE; +} + +enum function_id { +    RGBLED_TOGGLE, +    RGBLED_STEP_MODE, +    RGBLED_INCREASE_HUE, +    RGBLED_DECREASE_HUE, +    RGBLED_INCREASE_SAT, +    RGBLED_DECREASE_SAT, +    RGBLED_INCREASE_VAL, +    RGBLED_DECREASE_VAL +}; + +const uint16_t PROGMEM fn_actions[] = { +  [0]  = ACTION_FUNCTION(RGBLED_TOGGLE), +  [1]  = ACTION_FUNCTION(RGBLED_STEP_MODE), +  [2]  = ACTION_FUNCTION(RGBLED_INCREASE_HUE), +  [3]  = ACTION_FUNCTION(RGBLED_DECREASE_HUE), +  [4]  = ACTION_FUNCTION(RGBLED_INCREASE_SAT), +  [5]  = ACTION_FUNCTION(RGBLED_DECREASE_SAT), +  [6]  = ACTION_FUNCTION(RGBLED_INCREASE_VAL), +  [7]  = ACTION_FUNCTION(RGBLED_DECREASE_VAL) +}; + +void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { +  switch (id) { +    case RGBLED_TOGGLE: +      if (record->event.pressed) { +        rgblight_toggle(); +      } +      break; +    case RGBLED_INCREASE_HUE: +      if (record->event.pressed) { +        rgblight_increase_hue(); +      } +      break; +    case RGBLED_DECREASE_HUE: +      if (record->event.pressed) { +        rgblight_decrease_hue(); +      } +      break; +    case RGBLED_INCREASE_SAT: +      if (record->event.pressed) { +        rgblight_increase_sat(); +      } +      break; +    case RGBLED_DECREASE_SAT: +      if (record->event.pressed) { +        rgblight_decrease_sat(); +      } +      break; +    case RGBLED_INCREASE_VAL: +      if (record->event.pressed) { +        rgblight_increase_val(); +      } +      break; +    case RGBLED_DECREASE_VAL: +      if (record->event.pressed) { +        rgblight_decrease_val(); +      } +      break; +    case RGBLED_STEP_MODE: +      if (record->event.pressed) { +        rgblight_step(); +      } +      break; +  } +} + +void matrix_init_user(void) { +} + +void matrix_scan_user(void) { +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +	return true; +} + +void led_set_user(uint8_t usb_led) { + +	if (usb_led & (1 << USB_LED_NUM_LOCK)) { +		 +	} else { +		 +	} + +	if (usb_led & (1 << USB_LED_CAPS_LOCK)) { +		 +	} else { +		 +	} + +	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { +		 +	} else { +		 +	} + +	if (usb_led & (1 << USB_LED_COMPOSE)) { +		 +	} else { +		 +	} + +	if (usb_led & (1 << USB_LED_KANA)) { +		 +	} else { +		 +	} + +}
\ No newline at end of file diff --git a/keyboards/s60-x/rgb/Makefile b/keyboards/s60-x/rgb/Makefile new file mode 100644 index 0000000000..bd09e5885d --- /dev/null +++ b/keyboards/s60-x/rgb/Makefile @@ -0,0 +1,3 @@ +ifndef MAKEFILE_INCLUDED +	include ../../../Makefile +endif diff --git a/keyboards/s60-x/rgb/config.h b/keyboards/s60-x/rgb/config.h new file mode 100644 index 0000000000..26b246e573 --- /dev/null +++ b/keyboards/s60-x/rgb/config.h @@ -0,0 +1,31 @@ +#ifndef RBG_CONFIG_H +#define RBG_CONFIG_H + +#include "../config.h" + +#define PRODUCT         S60-X-RGB +#define DESCRIPTION     q.m.k. keyboard firmware for S60-X RGB + +/* key matrix pins */ +#define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } +#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 } + +/* number of backlight levels */ +#define BACKLIGHT_PIN B7 +#ifdef BACKLIGHT_PIN +#define BACKLIGHT_LEVELS 3 +#endif + +/* prevent stuck modifiers */ +#define PREVENT_STUCK_MODIFIERS + +#define RGB_DI_PIN F6 +#ifdef RGB_DI_PIN +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 10 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#endif + +#endif
\ No newline at end of file diff --git a/keyboards/s60-x/rgb/rgb.c b/keyboards/s60-x/rgb/rgb.c new file mode 100644 index 0000000000..0117e14ae5 --- /dev/null +++ b/keyboards/s60-x/rgb/rgb.c @@ -0,0 +1 @@ +#include "rgb.h" diff --git a/keyboards/s60-x/rgb/rgb.h b/keyboards/s60-x/rgb/rgb.h new file mode 100644 index 0000000000..cb7a5f567f --- /dev/null +++ b/keyboards/s60-x/rgb/rgb.h @@ -0,0 +1,37 @@ +#ifndef S60XRGB_H +#define S60XRGB_H + +#include "quantum.h" + +#define KEYMAP( \ +	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ +	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \ +	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \ +	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ +	K400, K401, K402,                   K406,                   K410, K411, K412, K413  \ +) { \ +	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \ +	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO }, \ +	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \ +	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \ +	{ K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  KC_NO }  \ +} + +/*This special definition is used for S60-X keymaps that were ported from TMK + * QMK has a lot of keycodes that don't start with KC_, so using the regular KEYMAP macro is recommended + */ +#define LEGACY_KEYMAP( \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ +    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \ +    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ +    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ +    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \ +) { \ +  { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E }, \ +  { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_NO  }, \ +  { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_NO  }, \ +  { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E }, \ +  { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_NO,    KC_##K46, KC_NO,    KC_NO,    KC_NO,    KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_NO  }  \ +} + +#endif
\ No newline at end of file diff --git a/keyboards/s60-x/rgb/rules.mk b/keyboards/s60-x/rgb/rules.mk new file mode 100644 index 0000000000..c303af4bcc --- /dev/null +++ b/keyboards/s60-x/rgb/rules.mk @@ -0,0 +1,56 @@ +# MCU name +MCU = atmega32u4 + +# Processor frequency. +#     This will define a symbol, F_CPU, in all source code files equal to the +#     processor frequency in Hz. You can then use this symbol in your source code to +#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done +#     automatically to create a 32-bit value in your source code. +# +#     This will be an integer division of F_USB below, as it is sourced by +#     F_USB after it has run through any CPU prescalers. Note that this value +#     does not *change* the processor frequency - it should merely be updated to +#     reflect the processor speed set externally so that the code can use accurate +#     software delays. +F_CPU = 16000000 + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +#     This will define a symbol, F_USB, in all source code files equal to the +#     input clock frequency (before any prescaling is performed) in Hz. This value may +#     differ from F_CPU if prescaling is used on the latter, and is required as the +#     raw input clock is fed directly to the PLL sections of the AVR for high speed +#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +#     at the end, this will be done automatically to create a 32-bit value in your +#     source code. +# +#     If no clock division is performed on the input clock inside the AVR (via the +#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +#   comment out to disable the options. +# +BOOTMAGIC_ENABLE ?= yes	# Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes	# 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 +SLEEP_LED_ENABLE ?= no  # Breathing sleep LED during USB suspend +NKRO_ENABLE ?= yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE ?= yes  # Enable keyboard backlight functionality +AUDIO_ENABLE ?= no +RGBLIGHT_ENABLE ?= yes
\ No newline at end of file diff --git a/keyboards/s60-x/s60-x.c b/keyboards/s60-x/s60-x.c index 417358140c..f031dd770d 100644 --- a/keyboards/s60-x/s60-x.c +++ b/keyboards/s60-x/s60-x.c @@ -1,28 +1 @@ -#include "s60-x.h" - -void matrix_init_kb(void) { -	// put your keyboard start-up code here -	// runs once when the firmware starts up - -	matrix_init_user(); -} - -void matrix_scan_kb(void) { -	// put your looping keyboard code here -	// runs every cycle (a lot) - -	matrix_scan_user(); -} - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { -	// put your per-action keyboard code here -	// runs for every action, just before processing by the firmware - -	return process_record_user(keycode, record); -} - -void led_set_kb(uint8_t usb_led) { -	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here - -	led_set_user(usb_led); -} +#include "s60-x.h"
\ No newline at end of file diff --git a/keyboards/s60-x/s60-x.h b/keyboards/s60-x/s60-x.h index 29a2a27b22..5bf8cfcefa 100644 --- a/keyboards/s60-x/s60-x.h +++ b/keyboards/s60-x/s60-x.h @@ -1,69 +1,13 @@ -/* -Copyright 2012,2013 Jun Wako <[email protected]> -Copyright 2015 Vin�cius Nery Cordeiro <[email protected]> -Copyright 2016 Felix Uhl <[email protected]> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -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 S60X_H  #define S60X_H -#include "quantum.h" - -#ifdef __INTELLISENSE__ -#define PROGMEM -#include "config.h" +#ifdef SUBPROJECT_default +    #include "default.h" +#endif +#ifdef SUBPROJECT_rgb +    #include "rgb.h"  #endif -/* S60-X keymap definition macro -* K31 is the extra key next to short left ISO shift -* K2C is the moved key next to enter on ISO boards -* K3C is the extra key next to short right JIS shift -* K0D is extra key from split backspace -* K3E is extra key from HHKB-style split right shift -*/ - -#define KEYMAP( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \ -) { \ -    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E }, \ -    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO    }, \ -    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO    }, \ -    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E }, \ -    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   KC_NO    }  \ -} - -/*This special definition is used for S60-X keymaps that were ported from TMK - * QMK has a lot of keycodes that don't start with KC_, so using the regular KEYMAP macro is recommended - */ -#define LEGACY_KEYMAP( \ -    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \ -    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \ -    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ -    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \ -) { \ -  { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E }, \ -  { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_NO  }, \ -  { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_NO  }, \ -  { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E }, \ -  { KC_##K40, KC_##K41, KC_##K42, KC_NO,    KC_NO,    KC_NO,    KC_##K46, KC_NO,    KC_NO,    KC_NO,    KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_NO  }  \ -} +#include "quantum.h"  #endif | 
