From d1d2b87f972c6d17b7ffcfe015f23eee26b60bdb Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sun, 30 Apr 2017 10:48:17 -0400 Subject: fixes s60_x keyboard --- keyboards/s60_x/Makefile | 5 + keyboards/s60_x/config.h | 59 ++ keyboards/s60_x/default/Makefile | 3 + keyboards/s60_x/default/config.h | 25 + keyboards/s60_x/default/default.c | 28 + keyboards/s60_x/default/default.h | 69 ++ keyboards/s60_x/default/rules.mk | 9 + keyboards/s60_x/keymaps/ansi_qwertz/Makefile | 21 + keyboards/s60_x/keymaps/ansi_qwertz/config.h | 14 + .../docs/KB_US-International-Alternative.png | Bin 0 -> 54748 bytes .../docs/KB_US-International-Alternative.svg | 1046 +++++++++++++++++++ ...ional-Alternative.svg.2016_08_18_09_06_36.0.svg | 1049 ++++++++++++++++++++ .../ansi_qwertz/docs/KB_US-International.png | Bin 0 -> 54041 bytes .../ansi_qwertz/docs/KB_US-International.svg | 935 +++++++++++++++++ .../s60_x/keymaps/ansi_qwertz/docs/base_layer.PNG | Bin 0 -> 29411 bytes .../keymaps/ansi_qwertz/docs/function_layer.PNG | Bin 0 -> 25567 bytes .../keymaps/ansi_qwertz/docs/gaming_layer.PNG | Bin 0 -> 17895 bytes keyboards/s60_x/keymaps/ansi_qwertz/keymap.c | 237 +++++ keyboards/s60_x/keymaps/ansi_qwertz/readme.md | 94 ++ keyboards/s60_x/keymaps/custom/keymap.c | 28 + keyboards/s60_x/keymaps/custom/readme.md | 15 + keyboards/s60_x/keymaps/dbroqua/keymap.c | 205 ++++ keyboards/s60_x/keymaps/default/keymap.c | 48 + keyboards/s60_x/keymaps/default/readme.md | 27 + keyboards/s60_x/keymaps/hasu/keymap.c | 182 ++++ keyboards/s60_x/keymaps/hasu/readme.md | 4 + keyboards/s60_x/keymaps/hhkb/keymap.c | 52 + keyboards/s60_x/keymaps/hhkb/readme.md | 26 + keyboards/s60_x/keymaps/iso/keymap.c | 48 + keyboards/s60_x/keymaps/iso/readme.md | 28 + keyboards/s60_x/keymaps/jpec/keymap.c | 92 ++ keyboards/s60_x/keymaps/jpec/readme.md | 1 + keyboards/s60_x/keymaps/plain/keymap.c | 25 + keyboards/s60_x/keymaps/plain/readme.md | 16 + keyboards/s60_x/keymaps/poker/keymap.c | 180 ++++ keyboards/s60_x/keymaps/poker/readme.md | 31 + keyboards/s60_x/keymaps/poker_bit/keymap.c | 110 ++ keyboards/s60_x/keymaps/poker_bit/readme.md | 31 + keyboards/s60_x/keymaps/poker_set/keymap.c | 178 ++++ keyboards/s60_x/keymaps/poker_set/readme.md | 31 + keyboards/s60_x/keymaps/spacefn/keymap.c | 55 + keyboards/s60_x/keymaps/spacefn/readme.md | 27 + keyboards/s60_x/readme.md | 255 +++++ keyboards/s60_x/rgb/Makefile | 3 + keyboards/s60_x/rgb/config.h | 32 + keyboards/s60_x/rgb/rgb.c | 1 + keyboards/s60_x/rgb/rgb.h | 37 + keyboards/s60_x/rgb/rules.mk | 9 + keyboards/s60_x/rules.mk | 65 ++ keyboards/s60_x/s60_x.c | 1 + keyboards/s60_x/s60_x.h | 13 + 51 files changed, 5450 insertions(+) create mode 100644 keyboards/s60_x/Makefile create mode 100644 keyboards/s60_x/config.h create mode 100644 keyboards/s60_x/default/Makefile create mode 100644 keyboards/s60_x/default/config.h create mode 100644 keyboards/s60_x/default/default.c create mode 100644 keyboards/s60_x/default/default.h create mode 100644 keyboards/s60_x/default/rules.mk create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/Makefile create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/config.h create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg.2016_08_18_09_06_36.0.svg create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.png create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International.svg create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/docs/base_layer.PNG create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/docs/function_layer.PNG create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/docs/gaming_layer.PNG create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/keymap.c create mode 100644 keyboards/s60_x/keymaps/ansi_qwertz/readme.md create mode 100644 keyboards/s60_x/keymaps/custom/keymap.c create mode 100644 keyboards/s60_x/keymaps/custom/readme.md create mode 100644 keyboards/s60_x/keymaps/dbroqua/keymap.c create mode 100644 keyboards/s60_x/keymaps/default/keymap.c create mode 100644 keyboards/s60_x/keymaps/default/readme.md create mode 100644 keyboards/s60_x/keymaps/hasu/keymap.c create mode 100644 keyboards/s60_x/keymaps/hasu/readme.md create mode 100644 keyboards/s60_x/keymaps/hhkb/keymap.c create mode 100644 keyboards/s60_x/keymaps/hhkb/readme.md create mode 100644 keyboards/s60_x/keymaps/iso/keymap.c create mode 100644 keyboards/s60_x/keymaps/iso/readme.md create mode 100644 keyboards/s60_x/keymaps/jpec/keymap.c create mode 100644 keyboards/s60_x/keymaps/jpec/readme.md create mode 100644 keyboards/s60_x/keymaps/plain/keymap.c create mode 100644 keyboards/s60_x/keymaps/plain/readme.md create mode 100644 keyboards/s60_x/keymaps/poker/keymap.c create mode 100644 keyboards/s60_x/keymaps/poker/readme.md create mode 100644 keyboards/s60_x/keymaps/poker_bit/keymap.c create mode 100644 keyboards/s60_x/keymaps/poker_bit/readme.md create mode 100644 keyboards/s60_x/keymaps/poker_set/keymap.c create mode 100644 keyboards/s60_x/keymaps/poker_set/readme.md create mode 100644 keyboards/s60_x/keymaps/spacefn/keymap.c create mode 100644 keyboards/s60_x/keymaps/spacefn/readme.md create mode 100644 keyboards/s60_x/readme.md create mode 100644 keyboards/s60_x/rgb/Makefile create mode 100644 keyboards/s60_x/rgb/config.h create mode 100644 keyboards/s60_x/rgb/rgb.c create mode 100644 keyboards/s60_x/rgb/rgb.h create mode 100644 keyboards/s60_x/rgb/rules.mk create mode 100644 keyboards/s60_x/rules.mk create mode 100644 keyboards/s60_x/s60_x.c create mode 100644 keyboards/s60_x/s60_x.h (limited to 'keyboards/s60_x') diff --git a/keyboards/s60_x/Makefile b/keyboards/s60_x/Makefile new file mode 100644 index 0000000000..879e493a21 --- /dev/null +++ b/keyboards/s60_x/Makefile @@ -0,0 +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 new file mode 100644 index 0000000000..8b97b3c814 --- /dev/null +++ b/keyboards/s60_x/config.h @@ -0,0 +1,59 @@ +/* +Copyright 2012 Jun Wako +Copyright 2016 Julien Pecqueur +Copyright 2016 Felix Uhl + +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 . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER Massdrop + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* number of backlight levels */ +#define BACKLIGHT_PIN B7 +#ifdef BACKLIGHT_PIN +#define BACKLIGHT_LEVELS 3 +#endif + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCING_DELAY 5 + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +#ifdef SUBPROJECT_default + #include "default/config.h" +#endif +#ifdef SUBPROJECT_rgb + #include "rgb/config.h" +#endif + +#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 +Copyright 2015 Vin�cius Nery Cordeiro +Copyright 2016 Felix Uhl + +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 . +*/ + +#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..aaa3764df6 --- /dev/null +++ b/keyboards/s60_x/default/rules.mk @@ -0,0 +1,9 @@ +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no # Commands for debug and configuration +NKRO_ENABLE ?= no # 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 +RGBLIGHT_ENABLE ?= no + +ifndef QUANTUM_DIR + include ../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/Makefile b/keyboards/s60_x/keymaps/ansi_qwertz/Makefile new file mode 100644 index 0000000000..6a078bcc3f --- /dev/null +++ b/keyboards/s60_x/keymaps/ansi_qwertz/Makefile @@ -0,0 +1,21 @@ +# Build Options +# 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 = yes # 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 = 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. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif \ No newline at end of file diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/config.h b/keyboards/s60_x/keymaps/ansi_qwertz/config.h new file mode 100644 index 0000000000..6c01d579f8 --- /dev/null +++ b/keyboards/s60_x/keymaps/ansi_qwertz/config.h @@ -0,0 +1,14 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + +// keymap needs oneshot functionality +#undef NO_ACTION_ONESHOT + +#undef IS_COMMAND +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +#endif \ No newline at end of file diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png new file mode 100644 index 0000000000..168780c824 Binary files /dev/null and b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.png differ diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg new file mode 100644 index 0000000000..f03858993e --- /dev/null +++ b/keyboards/s60_x/keymaps/ansi_qwertz/docs/KB_US-International-Alternative.svg @@ -0,0 +1,1046 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +