~ruther/qmk_firmware

793de76bb451d2072a4460407dec2b2811dc48ac — mechlovin 4 years ago f176daa
[Keyboard] Add hannah60rgb rev.2 PCB (#10287)

* add hannah60rgb_rev2

* add

* Update rev2.c

* fixed rgb matrix

* Update rev2.c

* update rules.mk

* update readme

* update

* Update config.h

* Update rules.mk
M keyboards/mechlovin/hannah60rgb/config.h => keyboards/mechlovin/hannah60rgb/config.h +1 -16
@@ 21,11 21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

/* USB Device descriptor parameter */
#define VENDOR_ID    0x4D4C // ML-Mechlovin
#define PRODUCT_ID   0x6001
#define DEVICE_VER   0x0001
#define MANUFACTURER Team.Mechlovin
#define PRODUCT      Hannah60 RGB
#define DESCRIPTION  Team.Mechlovin Hannah60 RGB

/* key matrix size */
#define MATRIX_ROWS 5


@@ 44,15 40,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14 }

#define DIODE_DIRECTION COL2ROW

#define RGB_DI_PIN A15
#define DRIVER_LED_TOTAL 72
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
\ No newline at end of file
#define DIODE_DIRECTION COL2ROW
\ No newline at end of file

M keyboards/mechlovin/hannah60rgb/hannah60rgb.h => keyboards/mechlovin/hannah60rgb/hannah60rgb.h +20 -59
@@ 1,63 1,24 @@
/*
Copyright 2020 Mechlovin'

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
*/
/* Copyright 2019 Mechlovin
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
#pragma once

#include "quantum.h"

#define LAYOUT_all( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      \
K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D       \
) { \
    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D   }, \
}
#define LAYOUT_60_ansi( \
                 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
                 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
                 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
                 K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
                 K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
) { \
    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C, KC_NO   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
    { K30, KC_NO,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C, KC_NO   }, \
    { K40,   K41,   K42, KC_NO, KC_NO,   KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D   }, \
}
#define LAYOUT_60_iso( \
                 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
                 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
                 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
                 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
                 K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
) { \
    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C, KC_NO   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C, KC_NO   }, \
    { K40,   K41,   K42, KC_NO, KC_NO,   KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D   }, \
}


// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/
#if defined(KEYBOARD_mechlovin_hannah60rgb_rev1)
    #include "rev1.h"
#elif defined(KEYBOARD_mechlovin_hannah60rgb_rev2)
    #include "rev2.h"
#endif

M keyboards/mechlovin/hannah60rgb/info.json => keyboards/mechlovin/hannah60rgb/info.json +1 -2
@@ 1,12 1,11 @@
{
    "keyboard_name": "hannah60rgb",
    "url": "",
    "maintainer": "qmk",
    "maintainer": "Team Mechlovin'",
    "width": 15,
    "height": 5,
    "layouts": {
        "LAYOUT_all": {
            "key_count": 66,
            "layout": [
                {"label":"K00 (B0,B5)", "x":2.75, "y":0},
                {"label":"K01 (B0,B6)", "x":3.75, "y":0},

D keyboards/mechlovin/hannah60rgb/keymaps/default/readme.md => keyboards/mechlovin/hannah60rgb/keymaps/default/readme.md +0 -1
@@ 1,1 0,0 @@
# The default keymap for hannah60rgb

D keyboards/mechlovin/hannah60rgb/keymaps/via/readme.md => keyboards/mechlovin/hannah60rgb/keymaps/via/readme.md +0 -1
@@ 1,1 0,0 @@
# The VIA keymap for hannah60rgb

M keyboards/mechlovin/hannah60rgb/readme.md => keyboards/mechlovin/hannah60rgb/readme.md +1 -1
@@ 10,6 10,6 @@ A 60% PCB with per-key RGB, compatible with Poker and Unikorn cases.

Make example for this keyboard (after setting up your build environment):

    make mechlovin/hannah60rgb:default
    make mechlovin/hannah60rgb/rev1:default

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).

A keyboards/mechlovin/hannah60rgb/rev1/config.h => keyboards/mechlovin/hannah60rgb/rev1/config.h +18 -0
@@ 0,0 1,18 @@
#pragma once

#define PRODUCT_ID   0x6001
#define DEVICE_VER   0x0001
#define PRODUCT      Hannah60 RGB

#define RGB_DI_PIN A15
#ifdef RGB_MATRIX_ENABLE
#    define DRIVER_LED_TOTAL 72
#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#    define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
#    define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
#    define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
#endif
\ No newline at end of file

A keyboards/mechlovin/hannah60rgb/rev1/keymaps/default/keymap.c => keyboards/mechlovin/hannah60rgb/rev1/keymaps/default/keymap.c +26 -0
@@ 0,0 1,26 @@
/* Copyright 2020 Mechlovin'
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [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_DEL,  
        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,      
        LT(2,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_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, MO(1),    
        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL     ),

};

R keyboards/mechlovin/hannah60rgb/keymaps/via/keymap.c => keyboards/mechlovin/hannah60rgb/rev1/keymaps/via/keymap.c +1 -1
@@ 19,7 19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [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_DEL,  
        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,      
        LT(2,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,              
        LT(2,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_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, MO(1),    
        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL     ),
    [1] = LAYOUT_all(

R keyboards/mechlovin/hannah60rgb/keymaps/via/rules.mk => keyboards/mechlovin/hannah60rgb/rev1/keymaps/via/rules.mk +0 -0
R keyboards/mechlovin/hannah60rgb/hannah60rgb.c => keyboards/mechlovin/hannah60rgb/rev1/rev1.c +0 -0
A keyboards/mechlovin/hannah60rgb/rev1/rev1.h => keyboards/mechlovin/hannah60rgb/rev1/rev1.h +63 -0
@@ 0,0 1,63 @@
/*
Copyright 2020 Mechlovin'

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once

#include "quantum.h"

#define LAYOUT_all( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      \
K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D       \
) { \
    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
    { K40,   K41,   K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D   }, \
}
#define LAYOUT_60_ansi( \
                 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
                 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
                 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
                 K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
                 K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
) { \
    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C, KC_NO   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
    { K30, KC_NO,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C, KC_NO   }, \
    { K40,   K41,   K42, KC_NO, KC_NO,   KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D   }, \
}
#define LAYOUT_60_iso( \
                 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
                 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
                 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
                 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
                 K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
) { \
    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C, KC_NO   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C, KC_NO   }, \
    { K40,   K41,   K42, KC_NO, KC_NO,   KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D   }, \
}


// generated by KBFirmware JSON to QMK Parser
// https://noroadsleft.github.io/kbf_qmk_converter/

A keyboards/mechlovin/hannah60rgb/rev1/rules.mk => keyboards/mechlovin/hannah60rgb/rev1/rules.mk +1 -0
@@ 0,0 1,1 @@
RGB_MATRIX_ENABLE = WS2812

A keyboards/mechlovin/hannah60rgb/rev2/config.h => keyboards/mechlovin/hannah60rgb/rev2/config.h +40 -0
@@ 0,0 1,40 @@
#pragma once

#define PRODUCT_ID   0x6002
#define DEVICE_VER   0x0001
#define PRODUCT      Hannah60 RGB Rev.2

#ifdef RGBLIGHT_ENABLE
#    define RGB_DI_PIN A15
#    define RGBLED_NUM      18
#    define RGBLIGHT_ANIMATIONS
#    define RGBLIGHT_HUE_STEP 8
#    define RGBLIGHT_SAT_STEP 8
#    define RGBLIGHT_VAL_STEP 8
#endif

//rgb matrix setting// This is a 7-bit address, that gets left-shifted and bit 0
// set to 0 for write, 1 for read (as per I2C protocol)
// The address will vary depending on your wiring:
// 0b1110100 AD <-> GND
// 0b1110111 AD <-> VCC
// 0b1110101 AD <-> SCL
// 0b1110110 AD <-> SDA
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_ADDR_2 0b1110110
#define DRIVER_COUNT 2
#define DRIVER_1_LED_TOTAL 44
#define DRIVER_2_LED_TOTAL 34
#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended
#define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set

#if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
#    define RGB_MATRIX_DISABLE_KEYCODES
#endif
\ No newline at end of file

R keyboards/mechlovin/hannah60rgb/keymaps/default/keymap.c => keyboards/mechlovin/hannah60rgb/rev2/keymaps/default/keymap.c +1 -1
@@ 21,6 21,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        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_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_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, MO(1),    
        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL     ),
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL     ),

};

A keyboards/mechlovin/hannah60rgb/rev2/keymaps/via/keymap.c => keyboards/mechlovin/hannah60rgb/rev2/keymaps/via/keymap.c +44 -0
@@ 0,0 1,44 @@
/* Copyright 2020 Mechlovin'
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [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_DEL,  
        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,      
        LT(2,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_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, MO(1),    
        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL     ),
    [1] = LAYOUT_all(
        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, 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     ),
    [2] = LAYOUT_all(
        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, 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     ),
    [3] = LAYOUT_all(
        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, 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     ),

};

A keyboards/mechlovin/hannah60rgb/rev2/keymaps/via/rules.mk => keyboards/mechlovin/hannah60rgb/rev2/keymaps/via/rules.mk +1 -0
@@ 0,0 1,1 @@
VIA_ENABLE = yes
\ No newline at end of file

A keyboards/mechlovin/hannah60rgb/rev2/rev2.c => keyboards/mechlovin/hannah60rgb/rev2/rev2.c +247 -0
@@ 0,0 1,247 @@
/* Copyright 2020 Mechlovin'
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

#include "rev2.h"

#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
 *   driver
 *   |  R location
 *   |  |       G location
 *   |  |       |       B location
 *   |  |       |       | */
// left CA
    {0, C1_1,   C3_2,   C4_2}, //D9-0-0
    {0, C5_2,   C6_2,   C7_2}, //D59-1-1
    {0, C2_1,   C3_1,   C4_1}, //D68-2-2
    {0, C5_1,   C6_1,   C7_1}, //D76-3-3
    {0, C1_2,   C2_2,   C4_3}, //D10-15-4
    {0, C5_3,   C6_3,   C7_3}, //D60-16-5
    {0, C1_3,   C2_3,   C3_3}, //D72-17-6
    {0, C5_4,   C6_4,   C7_4}, //D77-18-7
    {0, C1_4,   C2_4,   C3_4}, //D46-30-8
    {0, C4_4,   C6_5,   C7_5}, //D61-31-9
    {0, C1_5,   C2_5,   C3_5}, //D73-32-10
    {0, C4_5,   C5_5,   C7_6}, //D78-33-11
    {0, C1_6,   C2_6,   C3_6}, //D126-44-12
    {0, C4_6,   C5_6,   C6_6}, //D51-45-13
    {0, C1_7,   C2_7,   C3_7}, //D63-46-14
    {0, C4_7,   C5_7,   C6_7}, //D74-47-15
    {0, C1_8,   C2_8,   C3_8}, //D56-60-16
    {0, C4_8,   C5_8,   C6_8}, //D67-61-17

// left CB
    {0, C2_9,   C3_9,   C4_9},  //D80-4-18
    {0, C5_9,   C6_9,   C7_9},  //D84-5-19
    {0, C1_9,   C3_10,  C4_10}, //D89-6-20
    {0, C5_10,  C6_10,  C7_10}, //D94-7-21
    {0, C1_10,  C2_10,  C4_11}, //D81-19-22
    {0, C5_11,  C6_11,  C7_11}, //D85-20-23
    {0, C1_11,  C2_11,  C3_11}, //D90-21-24
    {0, C5_12,  C6_12,  C7_12}, //D95-22-25
    {0, C1_12,  C2_12,  C3_12}, //D82-34-26
    {0, C4_12,  C6_13,  C7_13}, //D86-35-27
    {0, C1_13,  C2_13,  C3_13}, //D91-36-28
    {0, C4_13,  C5_13,  C7_14}, //D96-37-29
    {0, C1_14,  C2_14,  C3_14}, //D79-48-30
    {0, C4_14,  C5_14,  C6_14}, //D83-49-31
    {0, C1_15,  C2_15,  C3_15}, //D87-50-32
    {0, C4_15,  C5_15,  C6_15}, //D92-51-33
    {0, C1_16,  C2_16,  C3_16}, //D75-62-34
    {0, C4_16,  C5_16,  C6_16}, //D93-63-35

// right CA
    {1, C2_1,   C3_1,   C4_1},  //D98-8-36
    {1, C5_1,   C6_1,   C7_1},  //D102-9-37
    {1, C1_1,   C3_2,   C4_2},  //D106-10-38
    {1, C5_2,   C6_2,   C7_2},  //D111-11-39
    {1, C2_9,   C3_9,   C4_9},  //D116-12-40
    {1, C5_9,   C6_9,   C7_9},  //D130-13-41
    {1, C1_13,  C2_13,  C3_13}, //D121-14-42
    {1, C1_2,   C2_2,   C4_3},  //D99-23-43
    {1, C5_3,   C6_3,   C7_3},  //D103-24-44
    {1, C1_3,   C2_3,   C3_3},  //D107-25-45
    {1, C5_4,   C6_4,   C7_4},  //D112-26-46
    {1, C1_9,   C3_10,  C4_10}, //D117-27-47
    {1, C5_10,  C6_10,  C7_10}, //D129-28-48
    {1, C4_13,  C5_13,  C7_14}, //D122-29-49
    {1, C1_4,   C2_4,   C3_4},  //D100-38-50
    {1, C4_4,   C6_5,   C7_5},  //D104-39-51
    {1, C1_5,   C2_5,   C3_5},  //D108-40-52
    {1, C4_5,   C5_5,   C7_6},  //D113-41-53
// right CB
    {1, C1_10,  C2_10,  C4_11}, //D118-42-54
    {1, C5_11,  C6_11,  C7_11}, //D123-43-55
    {1, C1_6,   C2_6,   C3_6},  //D97-52-56
    {1, C4_6,   C5_6,   C6_6},  //D101-53-57
    {1, C1_7,   C2_7,   C3_7},  //D105-54-58
    {1, C4_7,   C5_7,   C6_7},  //D109-55-59
    {1, C1_11,  C2_11,  C3_11}, //D114-56-60
    {1, C5_12,  C6_12,  C7_12}, //D128-57-61
    {1, C1_14,  C2_14,  C3_14}, //D119-58-62
    {1, C4_14,  C5_14,  C6_14}, //D124-59-63
    {1, C1_8,   C2_8,   C3_8}, //D127-64-64
    {1, C4_8,   C5_8,   C6_8}, //D110-65-65
    {1, C1_12,  C2_12,  C3_12}, //D115-66-66
    {1, C4_12,  C6_13,  C7_13}, //D120-67-67
    {1, C1_15,  C2_15,  C3_15}, //D125-68-68
    {1, C4_15,  C5_15,  C6_15}, //D140-69-69
    {0, C8_7,   C7_7,   C7_8}, //INDICATOR LED-70
    {0, C8_8,   C8_1,   C8_2}, //INDICATOR LED-71
    {0, C9_7,   C8_6,   C9_6}, //INDICATOR LED-72
    {0, C9_8,   C8_4,   C8_5},//INDICATOR LED-73
    {0, C8_15,  C9_1,   C9_2},//INDICATOR LED-74
    {0, C8_16,  C8_3,   C9_3},//INDICATOR LED-75
    {0, C9_15,  C9_9,   C9_10},//INDICATOR LED-76
    {0, C9_16,  C9_11,  C7_12},//INDICATOR LED-77
};

led_config_t g_led_config = { {
  // Key Matrix to LED Index
  {0,          1,          2,          3,          18,          19,        20,         21,         36,         37,          38,        39,          40,           41},
  {4,           5,         6,           7,         22,          23,        24,         25,         43,         44,          45,        46,          47,           69},
  {8,           9,         10,         11,         26,          27,        28,         29,         50,         51,          52,        53,          54,           55},
  {13,         14,         15,         30,         31,          32,        33,         56,         57,         58,          59,        60,          62,           63},
  {16,         17,         34,         NO_LED,     NO_LED,      NO_LED,    35,         NO_LED,     NO_LED,     NO_LED,      65,        66,          67,           68},
    },
    {
  //LED Index to Physical Positon
  {  0,  0},  { 16,  0},  { 32, 0 },  { 48,  0}, //9-59-68-76
  {  0, 16},  { 16, 16},  { 32, 16},  { 48, 16}, //10-60-72-77
  {  0, 32},  { 16, 32},  { 32, 32},  { 48, 32}, //46-61-73-78
  {  0, 48},  {  0, 48},  { 12, 48},  { 16, 48}, //126-51-63-74  
  {  0, 64},  { 16, 64}, //56-67  
  { 64,  0},  { 80,  0},   { 96, 0},  { 112, 0}, //80-84-89-94
  { 64, 16},  { 80, 16},   { 96,16},  { 112,16}, //81-85-90-95
  { 64, 32},  { 80, 32},   { 96,32},  { 112,32}, //82-86-91-96
  { 32, 48},  { 48, 48},   { 64,48},  {  80,48}, //79-83-87-92
  { 32, 64},  { 80, 64}, //75-93
  { 128, 0},  { 144, 0},  { 160, 0},  { 176, 0},    {192,  0},   {220,  0},   {210, 0}, //98-102-106-111-116-121-130
  { 128,16},   {144,16},   {160,16},  {176, 16},    {192, 16},   {220, 16},   {220,16}, //99-103-107-112-117-129-122
  { 128,32},  { 144,32},  { 160,32},  { 176,32},    {192, 32},   {220, 32}, //100-104-108-113-118-123
  {  96,48},   {112,48},  {128, 48},  {144, 48},    {160, 48},   {200, 48},   {220,48},   {220,48}, //97-101-105-109-114-119-128-124 
  {  96,64},   {144,64},   {160,64},   {176,64},    {220, 64}, //127-110-115-120-125
  { 220, 0},   //140                  
}, {
  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,  
  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,  
  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,  
  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1, 
} };

__attribute__((weak)) void rgb_matrix_indicators_user(void) {
        if (host_keyboard_led_state().caps_lock) {
            rgb_matrix_set_color(8, 255, 255, 255);
            rgb_matrix_set_color(70, 255, 0, 0);
        } else {
            rgb_matrix_set_color(70, 0, 0, 0);
        }
        if (host_keyboard_led_state().num_lock) {
            rgb_matrix_set_color(71, 255, 0, 0);
        } else {
            rgb_matrix_set_color(71, 0, 0, 0);
        }
        if (host_keyboard_led_state().scroll_lock) {
            rgb_matrix_set_color(72, 255, 0, 0);
        } else {
            rgb_matrix_set_color(72, 0, 0, 0);
        }
}

__attribute__((weak))
layer_state_t layer_state_set_user(layer_state_t state) {
  // if on layer 1, turn on L1 LED, otherwise off.
    if (get_highest_layer(state) == 0) {
        rgb_matrix_set_color(73, 255, 0, 0);
    } else {
        rgb_matrix_set_color(73, 0, 0, 0);
    }
  // if on layer 2, turn on L2 LED, otherwise off.
    if (get_highest_layer(state) == 1) {
        rgb_matrix_set_color(74, 255, 0, 0);
    } else {
        rgb_matrix_set_color(74, 0, 0, 0);
    }

  // if on layer 3, turn on L3 LED, otherwise off.
    if (get_highest_layer(state) == 2) {
        rgb_matrix_set_color(75, 255, 0, 0);
    } else {
        rgb_matrix_set_color(75, 0, 0, 0);
    }

  // if on layer 4, turn on L4 LED, otherwise off.
    if (get_highest_layer(state) == 3) {
        rgb_matrix_set_color(76, 255, 0, 0);
    } else {
        rgb_matrix_set_color(76, 0, 0, 0);
    }

  // if on layer 5, turn on L5 LED, otherwise off.
    if (get_highest_layer(state) == 4) {
        rgb_matrix_set_color(77, 255, 0, 0);
    } else {
        rgb_matrix_set_color(77, 0, 0, 0);
    }

    return state;
}

#endif

bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
  if (record->event.pressed) {
    switch(keycode) {
    #ifdef RGB_MATRIX_DISABLE_KEYCODES
        case KC_F13: // toggle rgb matrix
            rgb_matrix_toggle();
            return false;
        case KC_F14:
            rgb_matrix_step();
            return false;
        case KC_F15:
            rgb_matrix_increase_speed();
            return false;
        case KC_F16:
            rgb_matrix_decrease_speed();
            return false;
        case KC_F17:
            rgb_matrix_increase_hue();
            return false;
        case KC_F18:
            rgb_matrix_decrease_hue();
            return false;
        case KC_F19:
            rgb_matrix_increase_sat();
            return false;
        case KC_F20:
            rgb_matrix_decrease_sat();
            return false;
        case KC_F21:
            rgb_matrix_increase_val();
            return false;
        case KC_F22:
            rgb_matrix_decrease_val();
            return false;
    #endif
        default:
        break;
    }
  }
  return true;
}

A keyboards/mechlovin/hannah60rgb/rev2/rev2.h => keyboards/mechlovin/hannah60rgb/rev2/rev2.h +33 -0
@@ 0,0 1,33 @@
/*
Copyright 2020 Mechlovin'

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once

#include "quantum.h"

#define LAYOUT_all( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      \
K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \
) { \
    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D   }, \
}

A keyboards/mechlovin/hannah60rgb/rev2/rules.mk => keyboards/mechlovin/hannah60rgb/rev2/rules.mk +2 -0
@@ 0,0 1,2 @@
RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = IS31FL3731
\ No newline at end of file

M keyboards/mechlovin/hannah60rgb/rules.mk => keyboards/mechlovin/hannah60rgb/rules.mk +2 -7
@@ 14,14 14,9 @@ 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
RGBLIGHT_ENABLE = no         # Enable keyboard RGB underglow
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
HD44780_ENABLE = no          # Enable support for HD44780 based LCDs
RGB_MATRIX_ENABLE = WS2812

# generated by KBFirmware JSON to QMK Parser
# https://noroadsleft.github.io/kbf_qmk_converter/

DEFAULT_FOLDER = mechlovin/hannah60rgb/rev1