From 9fc542fc5d43c1d1e8b2fb2a9eb87b366117c819 Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Wed, 14 Oct 2020 19:01:50 -0400 Subject: [PATCH 01/22] Add files via upload --- genone/eclipse_65/config.h | 48 ++++++++++++++++++++++ genone/eclipse_65/eclipse_65.c | 15 +++++++ genone/eclipse_65/eclipse_65.h | 37 +++++++++++++++++ genone/eclipse_65/info.json | 12 ++++++ genone/eclipse_65/keymaps/default/keymap.c | 21 ++++++++++ genone/eclipse_65/readme.md | 11 +++++ genone/eclipse_65/rules.mk | 31 ++++++++++++++ genone/genone_main.c | 19 +++++++++ 8 files changed, 194 insertions(+) create mode 100644 genone/eclipse_65/config.h create mode 100644 genone/eclipse_65/eclipse_65.c create mode 100644 genone/eclipse_65/eclipse_65.h create mode 100644 genone/eclipse_65/info.json create mode 100644 genone/eclipse_65/keymaps/default/keymap.c create mode 100644 genone/eclipse_65/readme.md create mode 100644 genone/eclipse_65/rules.mk create mode 100644 genone/genone_main.c diff --git a/genone/eclipse_65/config.h b/genone/eclipse_65/config.h new file mode 100644 index 000000000000..011bc56eebef --- /dev/null +++ b/genone/eclipse_65/config.h @@ -0,0 +1,48 @@ +/* Copyright 2020 GEN ONE LLC + * + * 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 + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x0001 // GEN ONE LLC +#define PRODUCT_ID 0x0001 // Eclipse65 +#define DEVICE_VER 0x0001 +#define MANUFACTURER GEN ONE LLC +#define PRODUCT GEN ONE Eclipse65 +#define DESCRIPTION GEN ONE Eclipse65 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { B3, B7, B0, B1, B2 } +#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW \ No newline at end of file diff --git a/genone/eclipse_65/eclipse_65.c b/genone/eclipse_65/eclipse_65.c new file mode 100644 index 000000000000..426b2efa065b --- /dev/null +++ b/genone/eclipse_65/eclipse_65.c @@ -0,0 +1,15 @@ +/* Copyright 2020 GEN ONE LLC + * + * 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 . + */ diff --git a/genone/eclipse_65/eclipse_65.h b/genone/eclipse_65/eclipse_65.h new file mode 100644 index 000000000000..28a38787250e --- /dev/null +++ b/genone/eclipse_65/eclipse_65.h @@ -0,0 +1,37 @@ +/* Copyright 2020 GEN ONE LLC + * + * 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 + +#include "quantum.h" + +#define ____ KC_NO + + +#define LAYOUT_all( \ + K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ + K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ + K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \ + K400, K401, K402, K406, K409, K410, K411, K412, K413, K414 \ +) { \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ + { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \ + { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \ + { K400, K401, K402, ____, ____, ____, K406, ____, ____, K409, K410, K411, K412, K413, K414 } \ +} + diff --git a/genone/eclipse_65/info.json b/genone/eclipse_65/info.json new file mode 100644 index 000000000000..cbbd9f226ffc --- /dev/null +++ b/genone/eclipse_65/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "eclipse_65", + "url": "https://genonemerch.com", + "maintainer": "rojasa1990", + "width": 16, + "height": 5, + "layouts": { + "LAYOUT_65_ansi": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] + } + } +} diff --git a/genone/eclipse_65/keymaps/default/keymap.c b/genone/eclipse_65/keymaps/default/keymap.c new file mode 100644 index 000000000000..123e88b7e69f --- /dev/null +++ b/genone/eclipse_65/keymaps/default/keymap.c @@ -0,0 +1,21 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + // Default layer + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + 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_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + // Fn1 Layer + [1] = LAYOUT_all( + KC_GRV, 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_DEL, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; + diff --git a/genone/eclipse_65/readme.md b/genone/eclipse_65/readme.md new file mode 100644 index 000000000000..81438f921583 --- /dev/null +++ b/genone/eclipse_65/readme.md @@ -0,0 +1,11 @@ +# GEN ONE Eclipse_65 + +Eclipse_65 is a keyboard PCB supporting 65% layout. [More info at GEN ONE MERCH](https://genonemerch.com) + +Keyboard Maintainer: [rojasa1990](https://github.com/rojasa1990) +Hardware Supported: GEN ONE Eclipse_65 +Hardware Availability: GEN ONE MERCH + +Make example for this keyboard (after setting up your build environment): + + make genone/eclipse_65:default diff --git a/genone/eclipse_65/rules.mk b/genone/eclipse_65/rules.mk new file mode 100644 index 000000000000..a17df8c54022 --- /dev/null +++ b/genone/eclipse_65/rules.mk @@ -0,0 +1,31 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +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 +# 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 = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE = no # MIDI support +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 \ No newline at end of file diff --git a/genone/genone_main.c b/genone/genone_main.c new file mode 100644 index 000000000000..ba6e39d4e915 --- /dev/null +++ b/genone/genone_main.c @@ -0,0 +1,19 @@ +/* Copyright 2020 GEN ONE LLC + * + * 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 "quantum.h" + + From e35c8039dd1f4baf11929d845e2be0adc4130628 Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Wed, 14 Oct 2020 19:14:03 -0400 Subject: [PATCH 02/22] Add files via upload --- keyboards/genone/eclipse_65/config.h | 48 +++++++++++++++++++ keyboards/genone/eclipse_65/eclipse_65.c | 15 ++++++ keyboards/genone/eclipse_65/eclipse_65.h | 37 ++++++++++++++ keyboards/genone/eclipse_65/info.json | 12 +++++ .../eclipse_65/keymaps/default/keymap.c | 21 ++++++++ keyboards/genone/eclipse_65/readme.md | 11 +++++ keyboards/genone/eclipse_65/rules.mk | 31 ++++++++++++ keyboards/genone/genone_main.c | 19 ++++++++ 8 files changed, 194 insertions(+) create mode 100644 keyboards/genone/eclipse_65/config.h create mode 100644 keyboards/genone/eclipse_65/eclipse_65.c create mode 100644 keyboards/genone/eclipse_65/eclipse_65.h create mode 100644 keyboards/genone/eclipse_65/info.json create mode 100644 keyboards/genone/eclipse_65/keymaps/default/keymap.c create mode 100644 keyboards/genone/eclipse_65/readme.md create mode 100644 keyboards/genone/eclipse_65/rules.mk create mode 100644 keyboards/genone/genone_main.c diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h new file mode 100644 index 000000000000..011bc56eebef --- /dev/null +++ b/keyboards/genone/eclipse_65/config.h @@ -0,0 +1,48 @@ +/* Copyright 2020 GEN ONE LLC + * + * 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 + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x0001 // GEN ONE LLC +#define PRODUCT_ID 0x0001 // Eclipse65 +#define DEVICE_VER 0x0001 +#define MANUFACTURER GEN ONE LLC +#define PRODUCT GEN ONE Eclipse65 +#define DESCRIPTION GEN ONE Eclipse65 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { B3, B7, B0, B1, B2 } +#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW \ No newline at end of file diff --git a/keyboards/genone/eclipse_65/eclipse_65.c b/keyboards/genone/eclipse_65/eclipse_65.c new file mode 100644 index 000000000000..426b2efa065b --- /dev/null +++ b/keyboards/genone/eclipse_65/eclipse_65.c @@ -0,0 +1,15 @@ +/* Copyright 2020 GEN ONE LLC + * + * 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 . + */ diff --git a/keyboards/genone/eclipse_65/eclipse_65.h b/keyboards/genone/eclipse_65/eclipse_65.h new file mode 100644 index 000000000000..28a38787250e --- /dev/null +++ b/keyboards/genone/eclipse_65/eclipse_65.h @@ -0,0 +1,37 @@ +/* Copyright 2020 GEN ONE LLC + * + * 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 + +#include "quantum.h" + +#define ____ KC_NO + + +#define LAYOUT_all( \ + K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ + K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ + K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \ + K400, K401, K402, K406, K409, K410, K411, K412, K413, K414 \ +) { \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ + { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \ + { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \ + { K400, K401, K402, ____, ____, ____, K406, ____, ____, K409, K410, K411, K412, K413, K414 } \ +} + diff --git a/keyboards/genone/eclipse_65/info.json b/keyboards/genone/eclipse_65/info.json new file mode 100644 index 000000000000..cbbd9f226ffc --- /dev/null +++ b/keyboards/genone/eclipse_65/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "eclipse_65", + "url": "https://genonemerch.com", + "maintainer": "rojasa1990", + "width": 16, + "height": 5, + "layouts": { + "LAYOUT_65_ansi": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] + } + } +} diff --git a/keyboards/genone/eclipse_65/keymaps/default/keymap.c b/keyboards/genone/eclipse_65/keymaps/default/keymap.c new file mode 100644 index 000000000000..123e88b7e69f --- /dev/null +++ b/keyboards/genone/eclipse_65/keymaps/default/keymap.c @@ -0,0 +1,21 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + // Default layer + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + 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_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + // Fn1 Layer + [1] = LAYOUT_all( + KC_GRV, 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_DEL, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; + diff --git a/keyboards/genone/eclipse_65/readme.md b/keyboards/genone/eclipse_65/readme.md new file mode 100644 index 000000000000..81438f921583 --- /dev/null +++ b/keyboards/genone/eclipse_65/readme.md @@ -0,0 +1,11 @@ +# GEN ONE Eclipse_65 + +Eclipse_65 is a keyboard PCB supporting 65% layout. [More info at GEN ONE MERCH](https://genonemerch.com) + +Keyboard Maintainer: [rojasa1990](https://github.com/rojasa1990) +Hardware Supported: GEN ONE Eclipse_65 +Hardware Availability: GEN ONE MERCH + +Make example for this keyboard (after setting up your build environment): + + make genone/eclipse_65:default diff --git a/keyboards/genone/eclipse_65/rules.mk b/keyboards/genone/eclipse_65/rules.mk new file mode 100644 index 000000000000..a17df8c54022 --- /dev/null +++ b/keyboards/genone/eclipse_65/rules.mk @@ -0,0 +1,31 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +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 +# 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 = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default +MIDI_ENABLE = no # MIDI support +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 \ No newline at end of file diff --git a/keyboards/genone/genone_main.c b/keyboards/genone/genone_main.c new file mode 100644 index 000000000000..ba6e39d4e915 --- /dev/null +++ b/keyboards/genone/genone_main.c @@ -0,0 +1,19 @@ +/* Copyright 2020 GEN ONE LLC + * + * 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 "quantum.h" + + From b2c12d874b8ec82eb0d4713ced4a52688070519b Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Wed, 14 Oct 2020 20:36:37 -0400 Subject: [PATCH 03/22] Add files via upload --- keyboards/genone/eclipse_65/config.h | 2 +- keyboards/genone/eclipse_65/rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h index 011bc56eebef..eb7716fb241d 100644 --- a/keyboards/genone/eclipse_65/config.h +++ b/keyboards/genone/eclipse_65/config.h @@ -45,4 +45,4 @@ #define UNUSED_PINS /* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW \ No newline at end of file +#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/genone/eclipse_65/rules.mk b/keyboards/genone/eclipse_65/rules.mk index a17df8c54022..5ccb9456adbb 100644 --- a/keyboards/genone/eclipse_65/rules.mk +++ b/keyboards/genone/eclipse_65/rules.mk @@ -28,4 +28,4 @@ MIDI_ENABLE = no # MIDI support 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 \ No newline at end of file +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches From c9d22b13ce37c9b3c1d9fa482d318b2270a0cc68 Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Thu, 15 Oct 2020 17:15:02 -0400 Subject: [PATCH 04/22] Update config.h --- genone/eclipse_65/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/genone/eclipse_65/config.h b/genone/eclipse_65/config.h index 011bc56eebef..eb7716fb241d 100644 --- a/genone/eclipse_65/config.h +++ b/genone/eclipse_65/config.h @@ -45,4 +45,4 @@ #define UNUSED_PINS /* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW \ No newline at end of file +#define DIODE_DIRECTION COL2ROW From 29ec7f3805a41e8d1ee4e1cda2f3182af5c8a65d Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Thu, 15 Oct 2020 17:16:43 -0400 Subject: [PATCH 05/22] Update rules.mk --- genone/eclipse_65/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/genone/eclipse_65/rules.mk b/genone/eclipse_65/rules.mk index a17df8c54022..5ccb9456adbb 100644 --- a/genone/eclipse_65/rules.mk +++ b/genone/eclipse_65/rules.mk @@ -28,4 +28,4 @@ MIDI_ENABLE = no # MIDI support 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 \ No newline at end of file +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches From 48baebc54739403b4721d689b339fba80c1fb52c Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Thu, 15 Oct 2020 19:28:25 -0400 Subject: [PATCH 06/22] Update config.h --- genone/eclipse_65/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/genone/eclipse_65/config.h b/genone/eclipse_65/config.h index eb7716fb241d..57ef2e15a510 100644 --- a/genone/eclipse_65/config.h +++ b/genone/eclipse_65/config.h @@ -46,3 +46,4 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW +/**/ From 2d649d95cbf0c200dfcca448fe6fbaad75e41d54 Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Thu, 15 Oct 2020 19:28:45 -0400 Subject: [PATCH 07/22] Update config.h --- genone/eclipse_65/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/genone/eclipse_65/config.h b/genone/eclipse_65/config.h index 57ef2e15a510..eb7716fb241d 100644 --- a/genone/eclipse_65/config.h +++ b/genone/eclipse_65/config.h @@ -46,4 +46,3 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/**/ From 46bffda2f4fd9e1f27cacad7c87dbef9b1176d8a Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Thu, 15 Oct 2020 19:28:53 -0400 Subject: [PATCH 08/22] Update config.h From f66c4401c7eefd1336b85130df6d57fc63787862 Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Thu, 15 Oct 2020 19:29:32 -0400 Subject: [PATCH 09/22] Update config.h --- genone/eclipse_65/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/genone/eclipse_65/config.h b/genone/eclipse_65/config.h index eb7716fb241d..57ef2e15a510 100644 --- a/genone/eclipse_65/config.h +++ b/genone/eclipse_65/config.h @@ -46,3 +46,4 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW +/**/ From 8e65e912a80fa15170fbfd7541b6c0dafc17b59c Mon Sep 17 00:00:00 2001 From: rojasa1990 <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 16 Oct 2020 20:21:00 -0400 Subject: [PATCH 10/22] Add files via upload --- keyboards/genone/eclipse_65/config.h | 1 + keyboards/genone/eclipse_65/rules.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h index eb7716fb241d..fa76e6c2159d 100644 --- a/keyboards/genone/eclipse_65/config.h +++ b/keyboards/genone/eclipse_65/config.h @@ -46,3 +46,4 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW + diff --git a/keyboards/genone/eclipse_65/rules.mk b/keyboards/genone/eclipse_65/rules.mk index 5ccb9456adbb..cb9ad1acf19d 100644 --- a/keyboards/genone/eclipse_65/rules.mk +++ b/keyboards/genone/eclipse_65/rules.mk @@ -29,3 +29,4 @@ 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 + From 916a549913803b8107a192349c8e570090e7b254 Mon Sep 17 00:00:00 2001 From: Angel Rojas Date: Sat, 17 Oct 2020 18:32:21 -0400 Subject: [PATCH 11/22] Removing duplicate files --- genone/eclipse_65/config.h | 49 ---------------------- genone/eclipse_65/eclipse_65.c | 15 ------- genone/eclipse_65/eclipse_65.h | 37 ---------------- genone/eclipse_65/info.json | 12 ------ genone/eclipse_65/keymaps/default/keymap.c | 21 ---------- genone/eclipse_65/readme.md | 11 ----- genone/eclipse_65/rules.mk | 31 -------------- genone/genone_main.c | 19 --------- 8 files changed, 195 deletions(-) delete mode 100644 genone/eclipse_65/config.h delete mode 100644 genone/eclipse_65/eclipse_65.c delete mode 100644 genone/eclipse_65/eclipse_65.h delete mode 100644 genone/eclipse_65/info.json delete mode 100644 genone/eclipse_65/keymaps/default/keymap.c delete mode 100644 genone/eclipse_65/readme.md delete mode 100644 genone/eclipse_65/rules.mk delete mode 100644 genone/genone_main.c diff --git a/genone/eclipse_65/config.h b/genone/eclipse_65/config.h deleted file mode 100644 index 57ef2e15a510..000000000000 --- a/genone/eclipse_65/config.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2020 GEN ONE LLC - * - * 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 - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0001 // GEN ONE LLC -#define PRODUCT_ID 0x0001 // Eclipse65 -#define DEVICE_VER 0x0001 -#define MANUFACTURER GEN ONE LLC -#define PRODUCT GEN ONE Eclipse65 -#define DESCRIPTION GEN ONE Eclipse65 - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B3, B7, B0, B1, B2 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 } -#define UNUSED_PINS - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW -/**/ diff --git a/genone/eclipse_65/eclipse_65.c b/genone/eclipse_65/eclipse_65.c deleted file mode 100644 index 426b2efa065b..000000000000 --- a/genone/eclipse_65/eclipse_65.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2020 GEN ONE LLC - * - * 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 . - */ diff --git a/genone/eclipse_65/eclipse_65.h b/genone/eclipse_65/eclipse_65.h deleted file mode 100644 index 28a38787250e..000000000000 --- a/genone/eclipse_65/eclipse_65.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2020 GEN ONE LLC - * - * 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 - -#include "quantum.h" - -#define ____ KC_NO - - -#define LAYOUT_all( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \ - K400, K401, K402, K406, K409, K410, K411, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \ - { K400, K401, K402, ____, ____, ____, K406, ____, ____, K409, K410, K411, K412, K413, K414 } \ -} - diff --git a/genone/eclipse_65/info.json b/genone/eclipse_65/info.json deleted file mode 100644 index cbbd9f226ffc..000000000000 --- a/genone/eclipse_65/info.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "keyboard_name": "eclipse_65", - "url": "https://genonemerch.com", - "maintainer": "rojasa1990", - "width": 16, - "height": 5, - "layouts": { - "LAYOUT_65_ansi": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] - } - } -} diff --git a/genone/eclipse_65/keymaps/default/keymap.c b/genone/eclipse_65/keymaps/default/keymap.c deleted file mode 100644 index 123e88b7e69f..000000000000 --- a/genone/eclipse_65/keymaps/default/keymap.c +++ /dev/null @@ -1,21 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - // Default layer - [0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - 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_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - // Fn1 Layer - [1] = LAYOUT_all( - KC_GRV, 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_DEL, KC_TRNS, - KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -}; - diff --git a/genone/eclipse_65/readme.md b/genone/eclipse_65/readme.md deleted file mode 100644 index 81438f921583..000000000000 --- a/genone/eclipse_65/readme.md +++ /dev/null @@ -1,11 +0,0 @@ -# GEN ONE Eclipse_65 - -Eclipse_65 is a keyboard PCB supporting 65% layout. [More info at GEN ONE MERCH](https://genonemerch.com) - -Keyboard Maintainer: [rojasa1990](https://github.com/rojasa1990) -Hardware Supported: GEN ONE Eclipse_65 -Hardware Availability: GEN ONE MERCH - -Make example for this keyboard (after setting up your build environment): - - make genone/eclipse_65:default diff --git a/genone/eclipse_65/rules.mk b/genone/eclipse_65/rules.mk deleted file mode 100644 index 5ccb9456adbb..000000000000 --- a/genone/eclipse_65/rules.mk +++ /dev/null @@ -1,31 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -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 -# 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 = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE = no # MIDI support -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 diff --git a/genone/genone_main.c b/genone/genone_main.c deleted file mode 100644 index ba6e39d4e915..000000000000 --- a/genone/genone_main.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 GEN ONE LLC - * - * 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 "quantum.h" - - From 30687f76c5f3a0868c350da3f6f40acc5109ecd6 Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 08:04:03 -0400 Subject: [PATCH 12/22] Resolve VID and PID collisions as requested Taken the 0xFEED for vendor ID as suggested in vendor documentation and an available PID --- keyboards/genone/eclipse_65/config.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h index fa76e6c2159d..9709de74996e 100644 --- a/keyboards/genone/eclipse_65/config.h +++ b/keyboards/genone/eclipse_65/config.h @@ -19,8 +19,8 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x0001 // GEN ONE LLC -#define PRODUCT_ID 0x0001 // Eclipse65 +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x2222 #define DEVICE_VER 0x0001 #define MANUFACTURER GEN ONE LLC #define PRODUCT GEN ONE Eclipse65 @@ -46,4 +46,3 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - From cc13e400b7520a72e0e68ccd050851c3a24392f9 Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 08:07:37 -0400 Subject: [PATCH 13/22] add a GPL2+ compatible license header as requested Added the GPL2+ header to keymap.c file --- .../genone/eclipse_65/keymaps/default/keymap.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/keyboards/genone/eclipse_65/keymaps/default/keymap.c b/keyboards/genone/eclipse_65/keymaps/default/keymap.c index 123e88b7e69f..034bd0907ae6 100644 --- a/keyboards/genone/eclipse_65/keymaps/default/keymap.c +++ b/keyboards/genone/eclipse_65/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2020 GEN ONE LLC + * + * 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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -18,4 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - From 781912e4bf1cd673c3c22fc21fde4de553611438 Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:43:24 -0300 Subject: [PATCH 14/22] Update keyboards/genone/eclipse_65/config.h Co-authored-by: Ryan --- keyboards/genone/eclipse_65/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h index 9709de74996e..e9869e3694bf 100644 --- a/keyboards/genone/eclipse_65/config.h +++ b/keyboards/genone/eclipse_65/config.h @@ -23,8 +23,7 @@ #define PRODUCT_ID 0x2222 #define DEVICE_VER 0x0001 #define MANUFACTURER GEN ONE LLC -#define PRODUCT GEN ONE Eclipse65 -#define DESCRIPTION GEN ONE Eclipse65 +#define PRODUCT Eclipse65 /* key matrix size */ #define MATRIX_ROWS 5 From f1cb354cae1009c04d05a83f4d7d407ee6308e58 Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:44:11 -0300 Subject: [PATCH 15/22] Update keyboards/genone/eclipse_65/readme.md Co-authored-by: Ryan --- keyboards/genone/eclipse_65/readme.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/keyboards/genone/eclipse_65/readme.md b/keyboards/genone/eclipse_65/readme.md index 81438f921583..9c32d643ba4a 100644 --- a/keyboards/genone/eclipse_65/readme.md +++ b/keyboards/genone/eclipse_65/readme.md @@ -2,10 +2,16 @@ Eclipse_65 is a keyboard PCB supporting 65% layout. [More info at GEN ONE MERCH](https://genonemerch.com) -Keyboard Maintainer: [rojasa1990](https://github.com/rojasa1990) -Hardware Supported: GEN ONE Eclipse_65 -Hardware Availability: GEN ONE MERCH +* Keyboard Maintainer: [rojasa1990](https://github.com/rojasa1990) +* Hardware Supported: GEN ONE Eclipse_65 +* Hardware Availability: GEN ONE MERCH Make example for this keyboard (after setting up your build environment): make genone/eclipse_65:default + +Flashing example for this keyboard: + + make genone/eclipse_65:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 6608198413a16119ee4a81aef3694579d6ea0e46 Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:50:09 -0300 Subject: [PATCH 16/22] Update keyboards/genone/eclipse_65/eclipse_65.c Co-authored-by: Ryan --- keyboards/genone/eclipse_65/eclipse_65.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/genone/eclipse_65/eclipse_65.c b/keyboards/genone/eclipse_65/eclipse_65.c index 426b2efa065b..eab6d20d2e1f 100644 --- a/keyboards/genone/eclipse_65/eclipse_65.c +++ b/keyboards/genone/eclipse_65/eclipse_65.c @@ -13,3 +13,5 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + + #include "eclipse_65.h" From 7b8a5772fb0715ee95eaea031a314febc1ddb9b4 Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:50:35 -0300 Subject: [PATCH 17/22] Update keyboards/genone/eclipse_65/rules.mk Co-authored-by: Ryan --- keyboards/genone/eclipse_65/rules.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/keyboards/genone/eclipse_65/rules.mk b/keyboards/genone/eclipse_65/rules.mk index cb9ad1acf19d..61821c12573d 100644 --- a/keyboards/genone/eclipse_65/rules.mk +++ b/keyboards/genone/eclipse_65/rules.mk @@ -2,13 +2,6 @@ MCU = atmega32u4 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options @@ -29,4 +22,3 @@ 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 - From 2f8edfbb2a892cb66b420465682c6b691ff7a466 Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:51:13 -0300 Subject: [PATCH 18/22] Update keyboards/genone/eclipse_65/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/genone/eclipse_65/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/genone/eclipse_65/keymaps/default/keymap.c b/keyboards/genone/eclipse_65/keymaps/default/keymap.c index 034bd0907ae6..b1586d5c7ff1 100644 --- a/keyboards/genone/eclipse_65/keymaps/default/keymap.c +++ b/keyboards/genone/eclipse_65/keymaps/default/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Default layer - [0] = LAYOUT_all( + [0] = LAYOUT_65_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 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_ENT, KC_PGDN, From 9d938c7e80922962d088838f2394adcb3e3b08e1 Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:51:22 -0300 Subject: [PATCH 19/22] Update keyboards/genone/eclipse_65/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/genone/eclipse_65/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/genone/eclipse_65/keymaps/default/keymap.c b/keyboards/genone/eclipse_65/keymaps/default/keymap.c index b1586d5c7ff1..abc24808037c 100644 --- a/keyboards/genone/eclipse_65/keymaps/default/keymap.c +++ b/keyboards/genone/eclipse_65/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), // Fn1 Layer - [1] = LAYOUT_all( + [1] = LAYOUT_65_ansi( KC_GRV, 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_DEL, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From de14d466874c3e46fff403d59b124d0da2de8a1e Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:51:31 -0300 Subject: [PATCH 20/22] Update keyboards/genone/eclipse_65/eclipse_65.h Co-authored-by: Ryan --- keyboards/genone/eclipse_65/eclipse_65.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/genone/eclipse_65/eclipse_65.h b/keyboards/genone/eclipse_65/eclipse_65.h index 28a38787250e..84d5e5f2e95b 100644 --- a/keyboards/genone/eclipse_65/eclipse_65.h +++ b/keyboards/genone/eclipse_65/eclipse_65.h @@ -21,7 +21,7 @@ #define ____ KC_NO -#define LAYOUT_all( \ +#define LAYOUT_65_ansi( \ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ @@ -34,4 +34,3 @@ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \ { K400, K401, K402, ____, ____, ____, K406, ____, ____, K409, K410, K411, K412, K413, K414 } \ } - From 06d8e1ff31d1e7db6ad4e78d2d1e29e8a5c3513a Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:12:33 -0400 Subject: [PATCH 21/22] Corrected items on rules.mk as suggested Thanks for the comment I removed suggested items, corrected some spacing issues, and added suggested items. --- keyboards/genone/eclipse_65/rules.mk | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/keyboards/genone/eclipse_65/rules.mk b/keyboards/genone/eclipse_65/rules.mk index 61821c12573d..a8020aa5392f 100644 --- a/keyboards/genone/eclipse_65/rules.mk +++ b/keyboards/genone/eclipse_65/rules.mk @@ -7,18 +7,18 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +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 +CONSOLE_ENABLE = no # Console for debug +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 = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default -MIDI_ENABLE = no # MIDI support -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 +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keybaord RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output + +LAYOUTS = 65_ansi From 962ba3bcfb6157bbcfa2f862526b498d506e5c1c Mon Sep 17 00:00:00 2001 From: Angel Rojas <66912190+rojasa1990@users.noreply.github.com> Date: Fri, 23 Oct 2020 22:30:32 -0400 Subject: [PATCH 22/22] Deleted genone_main.c file Thanks for the comment. Deleted genone_main.c file as requested --- keyboards/genone/genone_main.c | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 keyboards/genone/genone_main.c diff --git a/keyboards/genone/genone_main.c b/keyboards/genone/genone_main.c deleted file mode 100644 index ba6e39d4e915..000000000000 --- a/keyboards/genone/genone_main.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 GEN ONE LLC - * - * 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 "quantum.h" - -