From 69fef83b0ea6dde3d20e2b239f8a7b54c42ddb12 Mon Sep 17 00:00:00 2001 From: James Underwood Date: Tue, 7 Aug 2018 17:47:49 -0700 Subject: [PATCH] Keyboard: Adds Fleuron v1.0 keyboard (#3571) * Adds Fleuron keyboard directory and default layout * Adds Fleuron keyboard directory and default layout * adds double zero macro, and updates to the new macro methodology * adds raise and lower layers * removes makefile from default layout, turns off mousekey, console, and command in rules.mk * makes upper right key a bksp in default layout, adds .json layout file * updates to default layout * tweak default layout jusabit * fix raise and lower switch case, and scoot a few keycodes around * make changes for PR #3571 * fixing erros for PR #3571 * adds Dollartacos first custom keymap * fixes for PR #3571 --- keyboards/fleuron/config.h | 194 ++++++++++++++++++ keyboards/fleuron/fleuron.c | 43 ++++ keyboards/fleuron/fleuron.h | 44 ++++ keyboards/fleuron/info.json | 109 ++++++++++ keyboards/fleuron/keymaps/default/config.h | 18 ++ keyboards/fleuron/keymaps/default/keymap.c | 168 +++++++++++++++ keyboards/fleuron/keymaps/default/readme.md | 1 + .../fleuron/keymaps/dollartacos/config.h | 18 ++ .../fleuron/keymaps/dollartacos/keymap.c | 162 +++++++++++++++ .../fleuron/keymaps/dollartacos/readme.md | 1 + keyboards/fleuron/readme.md | 16 ++ keyboards/fleuron/rules.mk | 71 +++++++ 12 files changed, 845 insertions(+) create mode 100644 keyboards/fleuron/config.h create mode 100644 keyboards/fleuron/fleuron.c create mode 100644 keyboards/fleuron/fleuron.h create mode 100644 keyboards/fleuron/info.json create mode 100644 keyboards/fleuron/keymaps/default/config.h create mode 100644 keyboards/fleuron/keymaps/default/keymap.c create mode 100644 keyboards/fleuron/keymaps/default/readme.md create mode 100644 keyboards/fleuron/keymaps/dollartacos/config.h create mode 100644 keyboards/fleuron/keymaps/dollartacos/keymap.c create mode 100644 keyboards/fleuron/keymaps/dollartacos/readme.md create mode 100644 keyboards/fleuron/readme.md create mode 100644 keyboards/fleuron/rules.mk diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h new file mode 100644 index 000000000..a3ff43b06 --- /dev/null +++ b/keyboards/fleuron/config.h @@ -0,0 +1,194 @@ +/* +Copyright 2018 James Underwood + +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 You +#define PRODUCT Fleuron v1 +#define DESCRIPTION A 6x16 ortho + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 16 + +/* + * 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 { F0, F1, F4, F5, F6, F7 } +#define MATRIX_COL_PINS { C7, B6, B3, B5, B4, D7, D4, D5, D3, D2, D1, D0, B7, B0, B1, B2 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ +#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 + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is userful for the Windows task manager shortcut (ctrl+shift+esc). + */ +// #define GRAVE_ESC_CTRL_OVERRIDE + +/* + * 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 */ +#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 + +/* + * MIDI options + */ + +/* Prevent use of disabled MIDI features in the keymap */ +//#define MIDI_ENABLE_STRICT 1 + +/* enable basic MIDI features: + - MIDI notes can be sent when in Music mode is on +*/ +//#define MIDI_BASIC + +/* enable advanced MIDI features: + - MIDI notes can be added to the keymap + - Octave shift and transpose + - Virtual sustain, portamento, and modulation wheel + - etc. +*/ +//#define MIDI_ADVANCED + +/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */ +//#define MIDI_TONE_KEYCODE_OCTAVES 1 + +#define RGB_DI_PIN E6 // The pin the LED strip is connected to +#define RGBLED_NUM 18 // Number of LEDs in your strip +#define RGBLIGHT_ANIMATIONS + +#endif diff --git a/keyboards/fleuron/fleuron.c b/keyboards/fleuron/fleuron.c new file mode 100644 index 000000000..12f950f36 --- /dev/null +++ b/keyboards/fleuron/fleuron.c @@ -0,0 +1,43 @@ +/* Copyright 2018 James Underwood + * + * 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 . + */ +#include "fleuron.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/fleuron/fleuron.h b/keyboards/fleuron/fleuron.h new file mode 100644 index 000000000..abdccf237 --- /dev/null +++ b/keyboards/fleuron/fleuron.h @@ -0,0 +1,44 @@ +/* Copyright 2018 James Underwood + * + * 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 FLEURON_H +#define FLEURON_H + +#include "quantum.h" + +// This a shortcut to help you visually see your layout. +// The following is an example using the Planck MIT layout +// The first section contains all of the arguments +// The second converts the arguments into a two-dimensional array +#define LAYOUT_ortho_6x16( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, \ + k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5e, k5f \ +) \ +{ \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f }, \ + { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5e, k5f } \ +} + +#define LAYOUT_fleuron_grid LAYOUT_ortho_6x16 + +#endif diff --git a/keyboards/fleuron/info.json b/keyboards/fleuron/info.json new file mode 100644 index 000000000..2f357d3bf --- /dev/null +++ b/keyboards/fleuron/info.json @@ -0,0 +1,109 @@ +{ + "keyboard_name": "Fleuron v1.0", + "url": "", + "maintainer": "qmk", + "bootloader": "", + "width": 16, + "height": 6, + "layouts": { + "LAYOUT_ortho_6x16": { + "layout": [ + {"label":"Esc", "x":0, "y":0}, + {"label":"F1", "x":1, "y":0}, + {"label":"F2", "x":2, "y":0}, + {"label":"F3", "x":3, "y":0}, + {"label":"F4", "x":4, "y":0}, + {"label":"F5", "x":5, "y":0}, + {"label":"F6", "x":6, "y":0}, + {"label":"F7", "x":7, "y":0}, + {"label":"F8", "x":8, "y":0}, + {"label":"F9", "x":9, "y":0}, + {"label":"F10", "x":10, "y":0}, + {"label":"F11", "x":11, "y":0}, + {"label":"F12", "x":12, "y":0}, + {"label":"Home", "x":13, "y":0}, + {"label":"PgUp", "x":14, "y":0}, + {"label":"Bksp", "x":15, "y":0}, + {"label":"`", "x":0, "y":1}, + {"label":"1", "x":1, "y":1}, + {"label":"2", "x":2, "y":1}, + {"label":"3", "x":3, "y":1}, + {"label":"4", "x":4, "y":1}, + {"label":"5", "x":5, "y":1}, + {"label":"6", "x":6, "y":1}, + {"label":"7", "x":7, "y":1}, + {"label":"8", "x":8, "y":1}, + {"label":"9", "x":9, "y":1}, + {"label":"0", "x":10, "y":1}, + {"label":"Bksp", "x":11, "y":1}, + {"label":"Delete", "x":12, "y":1}, + {"label":"End", "x":13, "y":1}, + {"label":"PgDn", "x":14, "y":1}, + {"label":"", "x":15, "y":1}, + {"label":"Tab", "x":0, "y":2}, + {"label":"q", "x":1, "y":2}, + {"label":"w", "x":2, "y":2}, + {"label":"e", "x":3, "y":2}, + {"label":"r", "x":4, "y":2}, + {"label":"t", "x":5, "y":2}, + {"label":"y", "x":6, "y":2}, + {"label":"u", "x":7, "y":2}, + {"label":"i", "x":8, "y":2}, + {"label":"o", "x":9, "y":2}, + {"label":"p", "x":10, "y":2}, + {"label":"\\", "x":11, "y":2}, + {"label":"7", "x":12, "y":2}, + {"label":"8", "x":13, "y":2}, + {"label":"9", "x":14, "y":2}, + {"label":"*", "x":15, "y":2}, + {"label":"Caps Lock", "x":0, "y":3}, + {"label":"a", "x":1, "y":3}, + {"label":"s", "x":2, "y":3}, + {"label":"d", "x":3, "y":3}, + {"label":"f", "x":4, "y":3}, + {"label":"g", "x":5, "y":3}, + {"label":"h", "x":6, "y":3}, + {"label":"j", "x":7, "y":3}, + {"label":"k", "x":8, "y":3}, + {"label":"l", "x":9, "y":3}, + {"label":";", "x":10, "y":3}, + {"label":"'", "x":11, "y":3}, + {"label":"4", "x":12, "y":3}, + {"label":"5", "x":13, "y":3}, + {"label":"6", "x":14, "y":3}, + {"label":"-", "x":15, "y":3}, + {"label":"Shift", "x":0, "y":4}, + {"label":"z", "x":1, "y":4}, + {"label":"x", "x":2, "y":4}, + {"label":"c", "x":3, "y":4}, + {"label":"v", "x":4, "y":4}, + {"label":"b", "x":5, "y":4}, + {"label":"n", "x":6, "y":4}, + {"label":"m", "x":7, "y":4}, + {"label":",", "x":8, "y":4}, + {"label":".", "x":9, "y":4}, + {"label":"/", "x":10, "y":4}, + {"label":"Enter", "x":11, "y":4}, + {"label":"1", "x":12, "y":4}, + {"label":"2", "x":13, "y":4}, + {"label":"3", "x":14, "y":4}, + {"label":"+", "x":15, "y":4}, + {"label":"RGB", "x":0, "y":5}, + {"label":"Ctrl", "x":1, "y":5}, + {"label":"Win", "x":2, "y":5}, + {"label":"Alt", "x":3, "y":5}, + {"label":"Lower", "x":4, "y":5}, + {"label":"Space", "x":5, "y":5}, + {"label":"Space", "x":6, "y":5}, + {"label":"Raise", "x":7, "y":5}, + {"label":"\u2190", "x":8, "y":5}, + {"label":"\u2193", "x":9, "y":5}, + {"label":"\u2191", "x":10, "y":5}, + {"label":"\u2192", "x":11, "y":5}, + {"label":"0", "x":12, "y":5}, + {"label":"00", "x":13, "y":5}, + {"label":".", "x":14, "y":5}, + {"label":"Enter", "x":15, "y":5}] + } + } +} \ No newline at end of file diff --git a/keyboards/fleuron/keymaps/default/config.h b/keyboards/fleuron/keymaps/default/config.h new file mode 100644 index 000000000..1ce0a168f --- /dev/null +++ b/keyboards/fleuron/keymaps/default/config.h @@ -0,0 +1,18 @@ +/* Copyright 2018 James Underwood + * + * 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 . + */ + +#pragma once +// Place overrides here \ No newline at end of file diff --git a/keyboards/fleuron/keymaps/default/keymap.c b/keyboards/fleuron/keymaps/default/keymap.c new file mode 100644 index 000000000..331401366 --- /dev/null +++ b/keyboards/fleuron/keymaps/default/keymap.c @@ -0,0 +1,168 @@ +/* Copyright 2018 James Underwood + * + * 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 . + */ +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE +}; + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + DZ, + LOWER, + RAISE +}; + +/* +#define _QWERTY 0 +#define _LOWER 1 +#define _RAISE 2 +*/ + +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_QWERTY] = LAYOUT_ortho_6x16( + /* Qwerty + * ,---------------------------------------------------------------------------------------------------------------. + * | Esc | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Home | PgUp | Bksp | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | Del | End | PgDn | / | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | Y | U | I | O | P | \ | 7 | 8 | 9 | * | + * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------+------| + * | Caps | A | S | D | F | G | H | J | K | L | ; | " | 4 | 5 | 6 | - | + * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | 1 | 2 | 3 | + | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | RGB | Ctrl | Alt | GUI |Lower |Shift |Space |Raise | Left | Down | Up |Right | 0 | 00 | . |Enter | + * `---------------------------------------------------------------------------------------------------------------' + */ + KC_ESC, 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_HOME, KC_PGUP, KC_BSPC, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_END, KC_PGDN, KC_PSLS, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PAST, \ + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_P4, KC_P5, KC_P6, KC_PMNS, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PPLS, \ + RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_P0, DZ, KC_PDOT, KC_PENT \ +), + +[_LOWER] = LAYOUT_ortho_6x16( + /* Lower + * ,---------------------------------------------------------------------------------------------------------------. + * |RESET | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | _ | + | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | { | } | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * |RGBtog| | | | | | | | Home | PgUp | PgDn | End | | | | | + * `---------------------------------------------------------------------------------------------------------------' + */ + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______, _______, \ + RGB_TOG, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, _______, _______ \ +), + +[_RAISE] = LAYOUT_ortho_6x16( + /* Raise + * ,---------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | - | = | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | [ | ] | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | Prev | Vol- | Vol+ | Next | | | | | + * `---------------------------------------------------------------------------------------------------------------' + */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD, _______, _______, _______, _______ \ +) +}; + +/* +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + switch(keycode) { + case DZ: + SEND_STRING("00"); // Double 0 macro for numpad + return false; + break; + case LOWER: + + } + } + return true; +}; +*/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + } else { + layer_off(_LOWER); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + } else { + layer_off(_RAISE); + } + return false; + break; + case DZ: + if (record->event.pressed) { + SEND_STRING("00"); // Double 0 macro for numpad + return false; + break; + } + } + return true; +} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/fleuron/keymaps/default/readme.md b/keyboards/fleuron/keymaps/default/readme.md new file mode 100644 index 000000000..ad065932b --- /dev/null +++ b/keyboards/fleuron/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for fleuron \ No newline at end of file diff --git a/keyboards/fleuron/keymaps/dollartacos/config.h b/keyboards/fleuron/keymaps/dollartacos/config.h new file mode 100644 index 000000000..1ce0a168f --- /dev/null +++ b/keyboards/fleuron/keymaps/dollartacos/config.h @@ -0,0 +1,18 @@ +/* Copyright 2018 James Underwood + * + * 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 . + */ + +#pragma once +// Place overrides here \ No newline at end of file diff --git a/keyboards/fleuron/keymaps/dollartacos/keymap.c b/keyboards/fleuron/keymaps/dollartacos/keymap.c new file mode 100644 index 000000000..e38dd8bd5 --- /dev/null +++ b/keyboards/fleuron/keymaps/dollartacos/keymap.c @@ -0,0 +1,162 @@ +/* Copyright 2018 James Underwood + * + * 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 . + */ +#include QMK_KEYBOARD_H + +enum custom_layers { + _QWERTY, + _LOWER, + _RAISE +}; + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + DZ, + LOWER, + RAISE +}; + +/* +#define _QWERTY 0 +#define _LOWER 1 +#define _RAISE 2 +*/ + +#define _______ KC_TRNS +#define XXXXXXX KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[_QWERTY] = LAYOUT_fleuron_grid( + /* Qwerty + * ,---------------------------------------------------------------------------------------------------------------. + * | Esc | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Mute | Play | Next | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | Del | / | * | / | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | Y | U | I | O | P | \ | 7 | 8 | 9 | * | + * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------+------| + * | Caps | A | S | D | F | G | H | J | K | L | ; | " | 4 | 5 | 6 | - | + * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter | 1 | 2 | 3 | + | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | RGB | Ctrl | Alt |Lower | Cmd |Enter | Bksp |Space | Raise| Left | Down | Up |Right | 0 | . |Enter | + * `---------------------------------------------------------------------------------------------------------------' + */ + KC_ESC, 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__MUTE, KC_MPLY, KC_MFFD, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_DEL, KC_PSLS, KC_PAST, KC_PSLS, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PAST, \ + 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_P4, KC_P5, KC_P6, KC_PMNS, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_P1, KC_P2, KC_P3, KC_PPLS, \ + RGB_MOD, KC_LCTL, KC_LALT, LOWER, KC_LGUI, KC_ENT, KC_BSPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_P0, KC_PDOT, KC_PENT \ +), + +[_LOWER] = LAYOUT_fleuron_grid( + /* Lower + * ,---------------------------------------------------------------------------------------------------------------. + * |RESET | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | _ | + | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | { | } | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * |RGBtog| | | | | | | | | Home | PgUp | PgDn | End | | | | + * `---------------------------------------------------------------------------------------------------------------' + */ + RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______, _______, \ + RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______, _______, _______ \ +), + +[_RAISE] = LAYOUT_fleuron_grid( + /* Raise + * ,---------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | | + * |------+------+------+------+------+-------------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | - | = | | | | | | | | + * |------+------+------+------+------+------|------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | [ | ] | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | Prev | Vol- | Vol+ | Next | | | | + * `---------------------------------------------------------------------------------------------------------------' + */ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MRWD, KC_VOLD, KC_VOLU, KC_MFFD, _______, _______, _______ \ +) +}; + +/* +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + switch(keycode) { + case DZ: + SEND_STRING("00"); // Double 0 macro for numpad + return false; + break; + case LOWER: + + } + } + return true; +}; +*/ + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + } else { + layer_off(_LOWER); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + } else { + layer_off(_RAISE); + } + return false; + break; + } + return true; +} + +void matrix_init_user(void) { + +} + +void matrix_scan_user(void) { + +} + +void led_set_user(uint8_t usb_led) { + +} diff --git a/keyboards/fleuron/keymaps/dollartacos/readme.md b/keyboards/fleuron/keymaps/dollartacos/readme.md new file mode 100644 index 000000000..d370b574c --- /dev/null +++ b/keyboards/fleuron/keymaps/dollartacos/readme.md @@ -0,0 +1 @@ +# Dollartaco's keymap for fleuron \ No newline at end of file diff --git a/keyboards/fleuron/readme.md b/keyboards/fleuron/readme.md new file mode 100644 index 000000000..077753a28 --- /dev/null +++ b/keyboards/fleuron/readme.md @@ -0,0 +1,16 @@ +# Fleuron + +![Fleuron](https://i.imgur.com/ejXBFRP.jpg "the fleuron keyboard") + +The Fleuron keyboard is a 6x16 ortho keyboard supporting right, left, or center numpad placement and rgb backlighting. + +Keyboard Maintainer: [James Underwood](https://github.com/ju0) +Hardware Supported: The Fleuron pcb, ATmega32u4 based controller +Hardware Availability: limited production run, contact maintainer for details + +Make example for this keyboard (after setting up your build environment): + + make fleuron:default to build firmware + make fleuron:default:dfu to make and flash with dfu + +See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. \ No newline at end of file diff --git a/keyboards/fleuron/rules.mk b/keyboards/fleuron/rules.mk new file mode 100644 index 000000000..c295dc55d --- /dev/null +++ b/keyboards/fleuron/rules.mk @@ -0,0 +1,71 @@ +# MCU name +#MCU = at90usb1286 +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* +# Teensy halfKay 512 +# Teensy++ halfKay 1024 +# Atmel DFU loader 4096 +# LUFA bootloader 4096 +# USBaspLoader 2048 +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# change yes to no to disable +# +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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config) +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches + +RGBLIGHT_ENABLE = yes +LAYOUTS = ortho_6x16 \ No newline at end of file