diff --git a/keyboards/ciaanh/old/kanagawa/kanagawa.c b/keyboards/ciaanh/ergodash/ergodash.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/kanagawa.c rename to keyboards/ciaanh/ergodash/ergodash.c index 2b7f0847711..51e6dbf08fc 100644 --- a/keyboards/ciaanh/old/kanagawa/kanagawa.c +++ b/keyboards/ciaanh/ergodash/ergodash.c @@ -1 +1 @@ -#include "kanagawa.h" +#include "ergodash.h" diff --git a/keyboards/ciaanh/ergodash/ergodash.h b/keyboards/ciaanh/ergodash/ergodash.h new file mode 100644 index 00000000000..6b7a9ea6d55 --- /dev/null +++ b/keyboards/ciaanh/ergodash/ergodash.h @@ -0,0 +1,7 @@ +#pragma once + +#include "quantum.h" + +#ifdef KEYBOARD_ciaanh_ergodash_rev1 + #include "rev1.h" +#endif diff --git a/keyboards/ciaanh/ergodash/info.json b/keyboards/ciaanh/ergodash/info.json new file mode 100644 index 00000000000..4369a041038 --- /dev/null +++ b/keyboards/ciaanh/ergodash/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "caterina" +} diff --git a/keyboards/ciaanh/ergodash/readme.md b/keyboards/ciaanh/ergodash/readme.md new file mode 100644 index 00000000000..4260397a990 --- /dev/null +++ b/keyboards/ciaanh/ergodash/readme.md @@ -0,0 +1,32 @@ +# ErgoDash + +![ErgoDash](https://github.com/omkbd/picture/blob/master/Ergodash.jpg) + +Keyboard Maintainer: [omkbd](https://github.com/omkbd) [@omkbd](https://twitter.com/omkbd) +Hardware Supported: ErgoDash PCB, Pro Micro ATmega32u4 +Hardware Availability: Order your own [yourself](https://github.com/omkbd/ErgoDash) + + +Make example for this keyboard (after setting up your build environment): + + make omkbd/ergodash/rev1:default + +See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. + +Install Example: (for pro micro) + `make omkbd/ergodash/rev1:default:avrdude` + +Note: + "rev1" is for PCB ver 1.0,1.1,1.2 + **The original Rev 1 was owned only by the designer. Therefore, Rev1 has been removed. Since the current PCB is Rev1, we changed Rev2 to Rev1 to match the firmware version.** + + +# Layout +![layout](https://github.com/omkbd/picture/blob/master/ergodash-layout.png) + +Layout Note: +- In thumb cluster, it is not possible to use all 5 positions as small keys. (as pictured) +- The top 2 1u keys in the thumb cluster share the same connection. +- 2u key (center) position shares with the lower 1u key position + +![PCB](https://github.com/omkbd/picture/blob/master/Ergodash_PCB.jpg) diff --git a/keyboards/ciaanh/ergodash/rev1/config.h b/keyboards/ciaanh/ergodash/rev1/config.h new file mode 100644 index 00000000000..21bd3d4f7bd --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/config.h @@ -0,0 +1,67 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 + + +// wiring of each half +#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } +// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order + +#define DIODE_DIRECTION COL2ROW + +/* define tapping term */ +#define TAPPING_TERM 120 + +#define AUDIO_PIN C6 + +/* 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 + +/* ws2812 RGB LED */ +#define RGB_DI_PIN D3 +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#define RGBLIGHT_EFFECT_TWINKLE +#define RGBLED_NUM 24 +#define RGBLIGHT_SPLIT +#define RGBLED_SPLIT { 12, 12 } // Number of LEDs + +// The LEDs on the slave half go in reverse order +#define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, \ + 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12} + +#define SELECT_SOFT_SERIAL_SPEED 1 +/*Sets the protocol speed when using serial communication*/ +//Speeds: +//0: about 189kbps (Experimental only) +//1: about 137kbps (default) +//2: about 75kbps +//3: about 39kbps +//4: about 26kbps +//5: about 20kbps diff --git a/keyboards/ciaanh/ergodash/rev1/info.json b/keyboards/ciaanh/ergodash/rev1/info.json new file mode 100644 index 00000000000..d11b84b733e --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/info.json @@ -0,0 +1,377 @@ +{ + "keyboard_name": "ErgoDash rev1.2", + "manufacturer": "Omkbd", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "1.0.0" + }, + "backlight": { + "pin": "B6", + "levels": 7 + }, + "split": { + "soft_serial_pin": "D0" + }, + "layouts": { + "LAYOUT_4key": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 4, "x": 6.5, "label": "L36"}, + {"y": 4, "x": 12, "label": "R30"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"y": 5, "x": 6.5, "label": "L45"}, + {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, + {"h": 2, "y": 4, "x": 11, "label": "R40"}, + {"y": 5, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + }, + "LAYOUT_4key_2u_inner": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 4, "x": 7.5, "label": "L36"}, + {"y": 4, "x": 11, "label": "R30"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, + {"y": 5, "x": 7.5, "label": "L46"}, + {"y": 5, "x": 11, "label": "R40"}, + {"h": 2, "y": 4, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + }, + "LAYOUT_3key_2us": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, + {"h": 2, "y": 4, "x": 7.5, "label": "L46"}, + {"h": 2, "y": 4, "x": 11, "label": "R40"}, + {"h": 2, "y": 4, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + }, + "LAYOUT_3key_1us": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 4, "x": 6.5, "label": "L36"}, + {"y": 4, "x": 12, "label": "R30"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"y": 5, "x": 6.5, "label": "L45"}, + {"y": 5, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + }, + "LAYOUT_2key": { + "layout": [ + {"y": 0.375, "x": 0.5, "label": "L00"}, + {"y": 0.375, "x": 1.5, "label": "L01"}, + {"y": 0.125, "x": 2.5, "label": "L02"}, + {"y": 0, "x": 3.5, "label": "L03"}, + {"y": 0.125, "x": 4.5, "label": "L04"}, + {"y": 0.25, "x": 5.5, "label": "L05"}, + {"y": 0.75, "x": 6.5, "label": "L06"}, + {"y": 0.75, "x": 12, "label": "R00"}, + {"y": 0.25, "x": 13, "label": "R01"}, + {"y": 0.125, "x": 14, "label": "R02"}, + {"y": 0, "x": 15, "label": "R03"}, + {"y": 0.125, "x": 16, "label": "R04"}, + {"y": 0.375, "x": 17, "label": "R05"}, + {"y": 0.375, "x": 18, "label": "R06"}, + {"y": 1.375, "x": 0.5, "label": "L10"}, + {"y": 1.375, "x": 1.5, "label": "L11"}, + {"y": 1.125, "x": 2.5, "label": "L12"}, + {"y": 1, "x": 3.5, "label": "L13"}, + {"y": 1.125, "x": 4.5, "label": "L14"}, + {"y": 1.25, "x": 5.5, "label": "L15"}, + {"y": 1.75, "x": 6.5, "label": "L16"}, + {"y": 1.75, "x": 12, "label": "R10"}, + {"y": 1.25, "x": 13, "label": "R11"}, + {"y": 1.125, "x": 14, "label": "R12"}, + {"y": 1, "x": 15, "label": "R13"}, + {"y": 1.125, "x": 16, "label": "R14"}, + {"y": 1.375, "x": 17, "label": "R15"}, + {"y": 1.375, "x": 18, "label": "R16"}, + {"y": 2.375, "x": 0.5, "label": "L20"}, + {"y": 2.375, "x": 1.5, "label": "L21"}, + {"y": 2.125, "x": 2.5, "label": "L22"}, + {"y": 2, "x": 3.5, "label": "L23"}, + {"y": 2.125, "x": 4.5, "label": "L24"}, + {"y": 2.25, "x": 5.5, "label": "L25"}, + {"y": 2.75, "x": 6.5, "label": "L26"}, + {"y": 2.75, "x": 12, "label": "R20"}, + {"y": 2.25, "x": 13, "label": "R21"}, + {"y": 2.125, "x": 14, "label": "R22"}, + {"y": 2, "x": 15, "label": "R23"}, + {"y": 2.125, "x": 16, "label": "R24"}, + {"y": 2.375, "x": 17, "label": "R25"}, + {"y": 2.375, "x": 18, "label": "R26"}, + {"y": 3.375, "x": 0.5, "label": "L30"}, + {"y": 3.375, "x": 1.5, "label": "L31"}, + {"y": 3.125, "x": 2.5, "label": "L32"}, + {"y": 3, "x": 3.5, "label": "L33"}, + {"y": 3.125, "x": 4.5, "label": "L34"}, + {"y": 3.25, "x": 5.5, "label": "L35"}, + {"y": 3.25, "x": 13, "label": "R31"}, + {"y": 3.125, "x": 14, "label": "R32"}, + {"y": 3, "x": 15, "label": "R33"}, + {"y": 3.125, "x": 16, "label": "R34"}, + {"y": 3.375, "x": 17, "label": "R35"}, + {"y": 3.375, "x": 18, "label": "R36"}, + {"y": 4.375, "x": 0.5, "label": "L40"}, + {"y": 4.375, "x": 1.5, "label": "L41"}, + {"y": 4.125, "x": 2.5, "label": "L42"}, + {"y": 4, "x": 3.5, "label": "L43"}, + {"y": 5, "x": 5.5, "label": "L44"}, + {"h": 2, "y": 4, "x": 6.5, "label": "L45"}, + {"h": 2, "y": 4, "x": 12, "label": "R41"}, + {"y": 5, "x": 13, "label": "R42"}, + {"y": 4, "x": 15, "label": "R43"}, + {"y": 4.125, "x": 16, "label": "R44"}, + {"y": 4.375, "x": 17, "label": "R45"}, + {"y": 4.375, "x": 18, "label": "R46"}] + } + } +} diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h b/keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h new file mode 100644 index 00000000000..a597d848e2e --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/keymaps/default/config.h @@ -0,0 +1,27 @@ +/* +This is the c configuration file for the keymap + +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 + +/* Select hand configuration */ + +#define MASTER_LEFT +// #define MASTER_RIGHT +// #define EE_HANDS diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c b/keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c new file mode 100644 index 00000000000..16e88db3455 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/keymaps/default/keymap.c @@ -0,0 +1,154 @@ +#include QMK_KEYBOARD_H + + +enum layer_names { + _QWERTY, + _LOWER, + _RAISE, + _ADJUST +}; + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, + RAISE, + ADJUST, +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Qwerty + * ,----------------------------------------------------------------------------------------------------------------------. + * | ESC | 1 | 2 | 3 | 4 | 5 | [ | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | ` | Q | W | E | R | T | - | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | Tab | A | S | D | F | G | Del | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | Shift| Z | X | C | V | B | Space| | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | Ctrl | GUI | ALt | EISU |||||||| Lower| Space| Del |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_QWERTY] = LAYOUT( + KC_ESC, C(KC_F1), C(KC_F2), C(KC_F3), C(KC_F4), C(KC_F5), C(KC_F10), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, C(KC_F11), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SCLN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, C(KC_F6), C(KC_F7), C(KC_F8), C(KC_F9), KC_B, KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LCTL, KC_LALT, XXXXXXX, XXXXXXX, LOWER, KC_DOWN, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + + /* Lower + * ,----------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_LOWER] = LAYOUT( + XXXXXXX, XXXXXXX, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + + /* Raise + * ,----------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| Lower| | |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_RAISE] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + + /* Adjust + * ,----------------------------------------------------------------------------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | Reset|RGB ON| MODE| HUE-| HUE+| | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | BL ON| BRTG| INC| DEC| | | | | | | | | | + * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | | | | | + * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------| + * | | | | |||||||| | | |||||||| | | |||||||| | | | | + * ,----------------------------------------------------------------------------------------------------------------------. + */ + [_ADJUST] = LAYOUT( + _______, _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,_______, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, BL_TOGG, BL_BRTG, BL_UP , BL_DOWN,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______,_______,_______, _______,_______, _______, _______, _______, _______, _______ + ) +}; + +#ifdef AUDIO_ENABLE +float tone_qwerty[][2] = SONG(QWERTY_SOUND); +#endif + +void persistent_default_layer_set(uint16_t default_layer) { + eeconfig_update_default_layer(default_layer); + default_layer_set(default_layer); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case QWERTY: + if (record->event.pressed) { + print("mode just switched to qwerty and this is a huge string\n"); + set_single_persistent_default_layer(_QWERTY); + } + return false; + break; + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case ADJUST: + if (record->event.pressed) { + layer_on(_ADJUST); + } else { + layer_off(_ADJUST); + } + return false; + break; + } + return true; +} diff --git a/keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk b/keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk new file mode 100644 index 00000000000..11b62b9bffe --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/keymaps/default/rules.mk @@ -0,0 +1,3 @@ +BACKLIGHT_ENABLE = yes +RGBLIGHT_ENABLE = yes +AUDIO_ENABLE = no diff --git a/keyboards/ciaanh/ergodash/rev1/rev1.c b/keyboards/ciaanh/ergodash/rev1/rev1.c new file mode 100644 index 00000000000..00f81cae117 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/rev1.c @@ -0,0 +1,32 @@ +#include "ergodash.h" + +#ifdef AUDIO_ENABLE + float tone_startup[][2] = SONG(STARTUP_SOUND); + float tone_goodbye[][2] = SONG(GOODBYE_SOUND); +#endif + +void matrix_init_kb(void) { + + #ifdef AUDIO_ENABLE + _delay_ms(20); // gets rid of tick + PLAY_SONG(tone_startup); + #endif + + // // green led on + // DDRD |= (1<<5); + // PORTD &= ~(1<<5); + + // // orange led on + // DDRB |= (1<<0); + // PORTB &= ~(1<<0); + + matrix_init_user(); +}; + +void shutdown_user(void) { + #ifdef AUDIO_ENABLE + PLAY_SONG(tone_goodbye); + _delay_ms(150); + stop_all_notes(); + #endif +} diff --git a/keyboards/ciaanh/ergodash/rev1/rev1.h b/keyboards/ciaanh/ergodash/rev1/rev1.h new file mode 100644 index 00000000000..7f094534cc3 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/rev1.h @@ -0,0 +1,139 @@ +#pragma once + +#include "ergodash.h" + +#include "quantum.h" + +#ifdef USE_I2C +#include +#ifdef __AVR__ + #include + #include +#endif +#endif + +#define XXX KC_NO + +#ifndef FLIP_HALF +// Standard Keymap +// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) +# define LAYOUT_4key( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, R30 }, \ + { R46, R45, R44, R43, R42, R41, R40 } \ +} + +// Just defined for configurator support, the matrix is identical to LAYOUT_4key +# define LAYOUT_4key_2u_inner( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, R30 }, \ + { R46, R45, R44, R43, R42, R41, R40 } \ +} + +# define LAYOUT_3key_2us( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, XXX }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, XXX }, \ + { R46, R45, R44, R43, R42, R41, R40 } \ +} + +# define LAYOUT_3key_1us( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, XXX }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, R30 }, \ + { R46, R45, R44, R43, R42, R41, XXX } \ +} + +# define LAYOUT_2key( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, XXX }, \ + { L40, L41, L42, L43, L44, L45, XXX }, \ + { R06, R05, R04, R03, R02, R01, R00 }, \ + { R16, R15, R14, R13, R12, R11, R10 }, \ + { R26, R25, R24, R23, R22, R21, R20 }, \ + { R36, R35, R34, R33, R32, R31, XXX }, \ + { R46, R45, R44, R43, R42, R41, XXX } \ +} + +#define LAYOUT LAYOUT_4key + +#else +// Keymap with right side flipped +// (TRRS jack on both halves are to the right) +# define LAYOUT( \ + L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ + L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ + L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ + L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ + L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ +) { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ + { R00, R01, R02, R03, R04, R05, R06 }, \ + { R10, R11, R12, R13, R14, R15, R16 }, \ + { R20, R21, R22, R23, R24, R25, R26 }, \ + { R30, R31, R32, R33, R34, R35, R36 }, \ + { R40, R41, R42, R43, R44, R45, R46 } \ +} +#endif diff --git a/keyboards/ciaanh/ergodash/rev1/rules.mk b/keyboards/ciaanh/ergodash/rev1/rules.mk new file mode 100644 index 00000000000..bb9e33b0829 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rev1/rules.mk @@ -0,0 +1,3 @@ +BACKLIGHT_ENABLE = no +RGBLIGHT_ENABLE = no +AUDIO_ENABLE = no diff --git a/keyboards/ciaanh/ergodash/rules.mk b/keyboards/ciaanh/ergodash/rules.mk new file mode 100644 index 00000000000..29aa64f49f1 --- /dev/null +++ b/keyboards/ciaanh/ergodash/rules.mk @@ -0,0 +1,16 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +AUDIO_ENABLE = no # Audio output +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. + +SPLIT_KEYBOARD = yes # Enables split keyboard support + +DEFAULT_FOLDER = ciaanh/ergodash/rev1 diff --git a/keyboards/ciaanh/kanagawa/ansi/ansi.c b/keyboards/ciaanh/kanagawa/ansi/ansi.c index 0d27baa54d3..9eef1c8015c 100644 --- a/keyboards/ciaanh/kanagawa/ansi/ansi.c +++ b/keyboards/ciaanh/kanagawa/ansi/ansi.c @@ -9,23 +9,45 @@ { 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, NA }, { 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13 }, { 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27 }, - { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 65 }, - { 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 68, 66 }, - { 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 67 } + { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 66 }, + { 65, NA, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 67 }, + { 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, 69, 68 } }, { // LED Index to Physical Position - {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, - {14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, - {28,157}, {28,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, - {42,156}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, - {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,7}, - {14,186}, - {28,186}, - {42,186}, - {60,166}, {56,147}, - {74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + + /*00*/{ 0,157}, /*01*/{ 0,145}, /*02*/{ 0,134}, /*03*/{ 0,122}, /*04*/{ 0,105}, + /*05*/{ 0, 93}, /*06*/{ 0, 81}, /*07*/{ 0, 70}, /*08*/{ 0, 52}, /*09*/{ 0, 41}, + /*10*/{ 0, 29}, /*11*/{ 0, 17}, /*12*/{ 0, 0}, + + /*13*/{ 14,157}, /*14*/{ 14,140}, /*15*/{ 14,128}, /*16*/{ 14,116}, /*17*/{ 14,105}, + /*18*/{ 14, 93}, /*19*/{ 14, 81}, /*20*/{ 14, 70}, /*21*/{ 14, 58}, /*22*/{ 14, 47}, + /*23*/{ 14, 35}, /*24*/{ 14, 23}, /*25*/{ 14, 12}, /*26*/{ 14, 0}, + + + /*27*/{ 28,157}, /*28*/{ 28,148}, /*29*/{ 28,134}, /*30*/{ 28,122}, /*31*/{ 28,111}, + /*32*/{ 28, 99}, /*33*/{ 28, 87}, /*34*/{ 28, 76}, /*35*/{ 28, 64}, /*36*/{ 28, 52}, + /*37*/{ 28, 41}, /*38*/{ 28, 29}, /*39*/{ 28, 17}, /*40*/{ 28, 3}, + + + /*41*/{ 42,156}, /*42*/{ 42,137}, /*43*/{ 42,125}, /*44*/{ 42,113}, /*45*/{ 42,102}, + /*46*/{ 42, 90}, /*47*/{ 42, 79}, /*48*/{ 42, 67}, /*49*/{ 42, 55}, /*50*/{ 42, 44}, + /*51*/{ 42, 32}, /*52*/{ 42, 20}, /*53*/{ 42, 4}, + + + /*54*/{ 56,147}, /*55*/{ 56,131}, /*56*/{ 56,119}, /*57*/{ 56,108}, /*58*/{ 56, 96}, + /*59*/{ 56, 84}, /*60*/{ 56, 73}, /*61*/{ 56, 61}, /*62*/{ 56, 49}, /*63*/{ 56, 38}, + /*64*/{ 56, 26}, /*65*/{ 56, 7}, + + /*66*/{ 14,186}, + /*67*/{ 28,186}, + /*68*/{ 42,186}, + + /*69*/{ 74,177}, + /*70*/{ 60,166}, /*71*/{ 74,166}, /*72*/{ 74,154}, /*73*/{ 70,140}, /*74*/{ 70,128}, + /*75*/{ 70,116}, /*76*/{ 77, 95}, /*77*/{ 77, 68}, /*78*/{ 70, 58}, /*79*/{ 70, 26}, + /*80*/{ 70, 13}, /*81*/{ 70, 0} }, { diff --git a/keyboards/ciaanh/kanagawa/iso/iso.c b/keyboards/ciaanh/kanagawa/iso/iso.c index 5ff386809ba..02210c2f752 100644 --- a/keyboards/ciaanh/kanagawa/iso/iso.c +++ b/keyboards/ciaanh/kanagawa/iso/iso.c @@ -15,18 +15,50 @@ { // LED Index to Physical Position - {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, -{14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, -{28,157}, {35,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, - {42,148}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, - {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,15}, {56,1}, + {0,157}, {0,145}, {0,134}, {0,122}, {0,105}, {0,93}, {0,81}, {0,70}, {0,52}, {0,41}, {0,29}, {0,17}, {0,0}, + {14,157}, {14,140}, {14,128}, {14,116}, {14,105}, {14,93}, {14,81}, {14,70}, {14,58}, {14,47}, {14,35}, {14,23}, {14,12}, {14,0}, + {28,157}, {35,148}, {28,134}, {28,122}, {28,111}, {28,99}, {28,87}, {28,76}, {28,64}, {28,52}, {28,41}, {28,29}, {28,17}, {28,3}, + {42,148}, {42,137}, {42,125}, {42,113}, {42,102}, {42,90}, {42,79}, {42,67}, {42,55}, {42,44}, {42,32}, {42,20}, {42,4}, + {56,131}, {56,119}, {56,108}, {56,96}, {56,84}, {56,73}, {56,61}, {56,49}, {56,38}, {56,26}, {56,15}, {56,1}, {14,186}, {28,186}, {42,186}, - {60,166}, {56,147}, - {74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + {60,166}, {56,147}, +{74,177}, {74,166}, {74,154}, {70,140}, {70,128}, {70,116}, {77,95}, {77,68}, {70,58}, {70,26}, {70,13}, {70,0} + + // LED Index to Physical Position + + /*00*/{ 0,157}, /*01*/{ 0,145}, /*02*/{ 0,134}, /*03*/{ 0,122}, /*04*/{ 0,105}, + /*05*/{ 0, 93}, /*06*/{ 0, 81}, /*07*/{ 0, 70}, /*08*/{ 0, 52}, /*09*/{ 0, 41}, + /*10*/{ 0, 29}, /*11*/{ 0, 17}, /*12*/{ 0, 0}, + + /*13*/{ 14,157}, /*14*/{ 14,140}, /*15*/{ 14,128}, /*16*/{ 14,116}, /*17*/{ 14,105}, + /*18*/{ 14, 93}, /*19*/{ 14, 81}, /*20*/{ 14, 70}, /*21*/{ 14, 58}, /*22*/{ 14, 47}, + /*23*/{ 14, 35}, /*24*/{ 14, 23}, /*25*/{ 14, 12}, /*26*/{ 14, 0}, + + + /*27*/{ 28,157}, /*28*/{ 28,148}, /*29*/{ 28,134}, /*30*/{ 28,122}, /*31*/{ 28,111}, + /*32*/{ 28, 99}, /*33*/{ 28, 87}, /*34*/{ 28, 76}, /*35*/{ 28, 64}, /*36*/{ 28, 52}, + /*37*/{ 28, 41}, /*38*/{ 28, 29}, /*39*/{ 28, 17}, /*40*/{ 28, 3}, + + + /*41*/{ 42,156}, /*42*/{ 42,137}, /*43*/{ 42,125}, /*44*/{ 42,113}, /*45*/{ 42,102}, + /*46*/{ 42, 90}, /*47*/{ 42, 79}, /*48*/{ 42, 67}, /*49*/{ 42, 55}, /*50*/{ 42, 44}, + /*51*/{ 42, 32}, /*52*/{ 42, 20}, /*53*/{ 42, 4}, + /*54*/{ 56,147}, /*55*/{ 56,131}, /*56*/{ 56,119}, /*57*/{ 56,108}, /*58*/{ 56, 96}, + /*59*/{ 56, 84}, /*60*/{ 56, 73}, /*61*/{ 56, 61}, /*62*/{ 56, 49}, /*63*/{ 56, 38}, + /*64*/{ 56, 26}, /*65*/{ 56, 15}, /*66*/{ 56, 1}, + + /*67*/{ 14,186}, + /*68*/{ 28,186}, + /*69*/{ 42,186}, + + /*70*/{ 74,177}, + /*71*/{ 60,166}, /*72*/{ 74,166}, /*73*/{ 74,154}, /*74*/{ 70,140}, /*75*/{ 70,128}, + /*76*/{ 70,116}, /*77*/{ 77, 95}, /*78*/{ 77, 68}, /*79*/{ 70, 58}, /*80*/{ 70, 26}, + /*81*/{ 70, 13}, /*82*/{ 70, 0} }, { diff --git a/keyboards/ciaanh/kanagawa/readme.md b/keyboards/ciaanh/kanagawa/readme.md index f4c50935169..af466f9cf1f 100644 --- a/keyboards/ciaanh/kanagawa/readme.md +++ b/keyboards/ciaanh/kanagawa/readme.md @@ -1,31 +1,23 @@ https://learn.adafruit.com/using-qmk-on-rp2040-microcontrollers/adafruit-macropad-with-qmk -qmk compile -kb ciaanh/kanagawa2040 -km default - -# Ciaanh Kanagawa2040 - - -```sh -qmk compile -kb ciaanh/kanagawa2040 -km default -``` - # Kanagawa A 75% keyboard with oled and rotary encoder for Elite-C Keyboard Maintainer : Ciaanh - Hardware Supported : Kanagawa PCB + Hardware Supported : Kanagawa PCB rev 2.1 Hardware Availability : https://github.com/Ciaanh/keyboards/tree/main/Kanagawa Make example for this keyboard (after setting up your build environment): - qmk compile -kb ciaanh/kanagawa -km default - -Driver issues https://docs.qmk.fm/#/faq_build?id=unknown-device-for-dfu-bootloader +```sh +qmk compile -kb ciaanh/kanagawa/iso -km default +qmk compile -kb ciaanh/kanagawa/ansi -km default +``` ## Bootloader diff --git a/keyboards/ciaanh/old/kanagawa/config.h b/keyboards/ciaanh/kanagawalegacy/config.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/config.h rename to keyboards/ciaanh/kanagawalegacy/config.h diff --git a/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c new file mode 100644 index 00000000000..335e9a9ca03 --- /dev/null +++ b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.c @@ -0,0 +1 @@ +#include "kanagawalegacy.h" diff --git a/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h new file mode 100644 index 00000000000..ba5fde6eaff --- /dev/null +++ b/keyboards/ciaanh/kanagawalegacy/kanagawalegacy.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef KEYBOARD_ciaanh_kanagawalegacy_rev1 + #include "rev1.h" +#endif \ No newline at end of file diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/default/config.h b/keyboards/ciaanh/kanagawalegacy/keymaps/default/config.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/default/config.h rename to keyboards/ciaanh/kanagawalegacy/keymaps/default/config.h diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/default/keycodes.h b/keyboards/ciaanh/kanagawalegacy/keymaps/default/keycodes.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/default/keycodes.h rename to keyboards/ciaanh/kanagawalegacy/keymaps/default/keycodes.h diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawalegacy/keymaps/default/keymap.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/default/keymap.c rename to keyboards/ciaanh/kanagawalegacy/keymaps/default/keymap.c diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/default/rules.mk b/keyboards/ciaanh/kanagawalegacy/keymaps/default/rules.mk similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/default/rules.mk rename to keyboards/ciaanh/kanagawalegacy/keymaps/default/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/via/keycodes.h b/keyboards/ciaanh/kanagawalegacy/keymaps/via/keycodes.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/via/keycodes.h rename to keyboards/ciaanh/kanagawalegacy/keymaps/via/keycodes.h diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawalegacy/keymaps/via/keymap.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/via/keymap.c rename to keyboards/ciaanh/kanagawalegacy/keymaps/via/keymap.c diff --git a/keyboards/ciaanh/old/kanagawa/keymaps/via/rules.mk b/keyboards/ciaanh/kanagawalegacy/keymaps/via/rules.mk similarity index 100% rename from keyboards/ciaanh/old/kanagawa/keymaps/via/rules.mk rename to keyboards/ciaanh/kanagawalegacy/keymaps/via/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/lib/oledfont.c b/keyboards/ciaanh/kanagawalegacy/lib/oledfont.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/lib/oledfont.c rename to keyboards/ciaanh/kanagawalegacy/lib/oledfont.c diff --git a/keyboards/ciaanh/old/kanagawa/readme.md b/keyboards/ciaanh/kanagawalegacy/readme.md similarity index 100% rename from keyboards/ciaanh/old/kanagawa/readme.md rename to keyboards/ciaanh/kanagawalegacy/readme.md diff --git a/keyboards/ciaanh/old/kanagawa/rev1/config.h b/keyboards/ciaanh/kanagawalegacy/rev1/config.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/config.h rename to keyboards/ciaanh/kanagawalegacy/rev1/config.h diff --git a/keyboards/ciaanh/old/kanagawa/rev1/kanagawa.json b/keyboards/ciaanh/kanagawalegacy/rev1/kanagawa.json similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/kanagawa.json rename to keyboards/ciaanh/kanagawalegacy/rev1/kanagawa.json diff --git a/keyboards/ciaanh/old/kanagawa/rev1/rev1.c b/keyboards/ciaanh/kanagawalegacy/rev1/rev1.c similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/rev1.c rename to keyboards/ciaanh/kanagawalegacy/rev1/rev1.c diff --git a/keyboards/ciaanh/old/kanagawa/rev1/rev1.h b/keyboards/ciaanh/kanagawalegacy/rev1/rev1.h similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/rev1.h rename to keyboards/ciaanh/kanagawalegacy/rev1/rev1.h diff --git a/keyboards/ciaanh/old/kanagawa/rev1/rules.mk b/keyboards/ciaanh/kanagawalegacy/rev1/rules.mk similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rev1/rules.mk rename to keyboards/ciaanh/kanagawalegacy/rev1/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/rules.mk b/keyboards/ciaanh/kanagawalegacy/rules.mk similarity index 100% rename from keyboards/ciaanh/old/kanagawa/rules.mk rename to keyboards/ciaanh/kanagawalegacy/rules.mk diff --git a/keyboards/ciaanh/old/kanagawa/kanagawa.h b/keyboards/ciaanh/old/kanagawa/kanagawa.h deleted file mode 100644 index ab445c721e4..00000000000 --- a/keyboards/ciaanh/old/kanagawa/kanagawa.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_ciaanh_kanagawa_rev1 - #include "rev1.h" -#endif \ No newline at end of file