~ruther/qmk_firmware

5360cb1fd72151318f0c70680a40573d8cdcbfd9 — QMK Bot 3 years ago 8a23742 + 3057e5f
Merge remote-tracking branch 'origin/master' into develop
A keyboards/ada/ada1800mini/ada1800mini.c => keyboards/ada/ada1800mini/ada1800mini.c +4 -0
@@ 0,0 1,4 @@
// Copyright 2022 peepeetee (@peepeetee)
// SPDX-License-Identifier: GPL-2.0-or-later

#include "ada1800mini.h"

A keyboards/ada/ada1800mini/ada1800mini.h => keyboards/ada/ada1800mini/ada1800mini.h +38 -0
@@ 0,0 1,38 @@
/* Copyright 2022 peepeetee
 *
 * 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 XXX KC_NO

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

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

A keyboards/ada/ada1800mini/config.h => keyboards/ada/ada1800mini/config.h +70 -0
@@ 0,0 1,70 @@
/* Copyright 2022 peepeetee
 *
 * 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 "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID       0xADA0
#define PRODUCT_ID      0x1800
#define DEVICE_VER      0x0001
#define MANUFACTURER    Ada
#define PRODUCT         ada1800mini

/* 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 { D0, D1, D2, D3, D5 }
#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, B3, B2, B1 }

#define DIODE_DIRECTION COL2ROW


//TODO: implement RGB matrix when I get the hardware
#define RGB_DI_PIN F0
#ifdef RGB_DI_PIN
    #define RGBLED_NUM 100
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
    #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#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
#endif

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

A keyboards/ada/ada1800mini/info.json => keyboards/ada/ada1800mini/info.json +82 -0
@@ 0,0 1,82 @@
{
    "keyboard_name": "ada1800mini",
    "url": "",
    "maintainer": "qmk",
    "layouts": {
        "LAYOUT": {
            "layout": [
                { "label": "K00 (D0,F1)", "x": 0, "y": 0 },
                { "label": "K01 (D0,F4)", "x": 1.25, "y": 0 },
                { "label": "K02 (D0,F5)", "x": 2.25, "y": 0 },
                { "label": "K03 (D0,F6)", "x": 3.25, "y": 0 },
                { "label": "K04 (D0,F7)", "x": 4.5, "y": 0 },
                { "label": "K05 (D0,C7)", "x": 5.5, "y": 0 },
                { "label": "K06 (D0,C6)", "x": 6.5, "y": 0 },
                { "label": "K07 (D0,B6)", "x": 7.5, "y": 0 },
                { "label": "K08 (D0,B5)", "x": 8.75, "y": 0 },
                { "label": "K09 (D0,B4)", "x": 9.75, "y": 0 },
                { "label": "K0A (D0,D7)", "x": 10.75, "y": 0 },
                { "label": "K0B (D0,D6)", "x": 12, "y": 0 },
                { "label": "K0C (D0,B3)", "x": 13.5, "y": 0 },
                { "label": "K0D (D0,B2)", "x": 14.5, "y": 0 },
                { "label": "K0E (D0,B1)", "x": 15.5, "y": 0 },
                { "label": "K10 (D1,F1)", "x": 0, "y": 1.25, "w": 1.5 },
                { "label": "K11 (D1,F4)", "x": 1.5, "y": 1.25 },
                { "label": "K12 (D1,F5)", "x": 2.5, "y": 1.25 },
                { "label": "K13 (D1,F6)", "x": 3.5, "y": 1.25 },
                { "label": "K14 (D1,F7)", "x": 4.5, "y": 1.25 },
                { "label": "K15 (D1,C7)", "x": 5.5, "y": 1.25 },
                { "label": "K16 (D1,C6)", "x": 6.5, "y": 1.25 },
                { "label": "K17 (D1,B6)", "x": 7.5, "y": 1.25 },
                { "label": "K18 (D1,B5)", "x": 8.5, "y": 1.25 },
                { "label": "K19 (D1,B4)", "x": 9.5, "y": 1.25 },
                { "label": "K1A (D1,D7)", "x": 10.5, "y": 1.25 },
                { "label": "K1B (D1,D6)", "x": 11.5, "y": 1.25, "w": 1.5 },
                { "label": "K1C (D1,B3)", "x": 13.5, "y": 1.25 },
                { "label": "K1D (D1,B2)", "x": 14.5, "y": 1.25 },
                { "label": "K1E (D1,B1)", "x": 15.5, "y": 1.25 },
                { "label": "K20 (D2,F1)", "x": 0, "y": 2.25, "w": 1.75 },
                { "label": "K21 (D2,F4)", "x": 1.75, "y": 2.25 },
                { "label": "K22 (D2,F5)", "x": 2.75, "y": 2.25 },
                { "label": "K23 (D2,F6)", "x": 3.75, "y": 2.25 },
                { "label": "K24 (D2,F7)", "x": 4.75, "y": 2.25 },
                { "label": "K25 (D2,C7)", "x": 5.75, "y": 2.25 },
                { "label": "K26 (D2,C6)", "x": 6.75, "y": 2.25 },
                { "label": "K27 (D2,B6)", "x": 7.75, "y": 2.25 },
                { "label": "K28 (D2,B5)", "x": 8.75, "y": 2.25 },
                { "label": "K29 (D2,B4)", "x": 9.75, "y": 2.25 },
                { "label": "K2A (D2,D7)", "x": 10.75, "y": 2.25, "w": 2.25 },
                { "label": "K2C (D2,B3)", "x": 13.5, "y": 2.25 },
                { "label": "K2D (D2,B2)", "x": 14.5, "y": 2.25 },
                { "label": "K2E (D2,B1)", "x": 15.5, "y": 2.25 },
                { "label": "K30 (D3,F1)", "x": 0, "y": 3.25, "w": 2.25 },
                { "label": "K31 (D3,F4)", "x": 2.25, "y": 3.25 },
                { "label": "K32 (D3,F5)", "x": 3.25, "y": 3.25 },
                { "label": "K33 (D3,F6)", "x": 4.25, "y": 3.25 },
                { "label": "K34 (D3,F7)", "x": 5.25, "y": 3.25 },
                { "label": "K35 (D3,C7)", "x": 6.25, "y": 3.25 },
                { "label": "K36 (D3,C6)", "x": 7.25, "y": 3.25 },
                { "label": "K37 (D3,B6)", "x": 8.25, "y": 3.25 },
                { "label": "K38 (D3,B5)", "x": 9.25, "y": 3.25 },
                { "label": "K39 (D3,B4)", "x": 10.25, "y": 3.25, "w": 1.75 },
                { "label": "K3C (D3,B3)", "x": 13.5, "y": 3.25 },
                { "label": "K3D (D3,B2)", "x": 14.5, "y": 3.25 },
                { "label": "K3E (D3,B1)", "x": 15.5, "y": 3.25 },
                { "label": "K3B (D3,D6)", "x": 12.25, "y": 3.5 },
                { "label": "K40 (D5,F1)", "x": 0, "y": 4.25, "w": 1.25 },
                { "label": "K41 (D5,F4)", "x": 1.25, "y": 4.25, "w": 1.25 },
                { "label": "K42 (D5,F5)", "x": 2.5, "y": 4.25, "w": 1.25 },
                { "label": "K43 (D5,F6)", "x": 3.75, "y": 4.25, "w": 2.75 },
                { "label": "K46 (D5,C6)", "x": 6.5, "y": 4.25, "w": 2.25 },
                { "label": "K47 (D5,B6)", "x": 8.75, "y": 4.25 },
                { "label": "K48 (D5,B5)", "x": 9.75, "y": 4.25, "w": 1.25 },
                { "label": "K4D (D5,B2)", "x": 14.5, "y": 4.25 },
                { "label": "K4E (D5,B1)", "x": 15.5, "y": 4.25 },
                { "label": "K4A (D5,D7)", "x": 11.25, "y": 4.5 },
                { "label": "K4B (D5,D6)", "x": 12.25, "y": 4.5 },
                { "label": "K4C (D5,B3)", "x": 13.25, "y": 4.5 }
            ]
        }
    }
    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}

A keyboards/ada/ada1800mini/keymaps/default/keymap.c => keyboards/ada/ada1800mini/keymaps/default/keymap.c +37 -0
@@ 0,0 1,37 @@
/* Copyright 2022 peepeetee
 *
 * 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(
        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_MINS, KC_EQL,  KC_NLCK,
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, KC_P7,   KC_P8,   KC_P9,
        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,  KC_P4,   KC_P5,   KC_P6,
        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_LSFT, KC_P1,   KC_P2,   KC_P3,   KC_UP,
        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_LALT, KC_LCTL, KC_P0,   KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT
    ),

    [1] = LAYOUT(
        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_DEL,  _______, _______, _______,
        _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_SCLN, KC_QUOT, _______, _______, _______, _______,
        _______, RGB_TOG, RGB_MOD, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, _______, _______, _______, _______, KC_VOLU,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______
    ),

};

A keyboards/ada/ada1800mini/keymaps/default/readme.md => keyboards/ada/ada1800mini/keymaps/default/readme.md +1 -0
@@ 0,0 1,1 @@
# The default keymap for ada1800mini

A keyboards/ada/ada1800mini/readme.md => keyboards/ada/ada1800mini/readme.md +27 -0
@@ 0,0 1,27 @@
# ada1800mini

![ada1800mini](https://i.imgur.com/87Rn2MJh.jpeg)

A per key RGB mini 1800 keyboard

* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
* Hardware Supported: ada1800mini
* Hardware Availability: no longer avaliable - future groupbuy possible

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

    make ada/ada1800mini:default

Flashing example for this keyboard:

    make ada/ada1800mini: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).

## Bootloader

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB
* **Keycode in layout**: Press the key mapped to `RESET` if it is available

A keyboards/ada/ada1800mini/rules.mk => keyboards/ada/ada1800mini/rules.mk +22 -0
@@ 0,0 1,22 @@
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
#   change yes to no to disable
#
BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no        # Mouse keys
EXTRAKEY_ENABLE = no        # Audio control and System control
CONSOLE_ENABLE = yes        # Console for debug
COMMAND_ENABLE = yes        # Commands for debug and configuration
NKRO_ENABLE = no            # Enable N-Key Rollover
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output


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