ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-10-03 21:17:56 +00:00
commit d785282df7
2 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

69
keyboards/mechlovin/olly/bb/matrix.c
View file

@ -17,6 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "matrix.h" #include "matrix.h"
#include "gpio.h"
static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
@ -27,40 +28,40 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
* 0: 0 ── 0 ── 0 1 ── 0 0 0 0 * 0: 0 ── 0 ── 0 1 ── 0 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
* 1: 0 ── 0 ── 1 1 ── 0 0 0 0 * 1: 0 ── 0 ── 1 1 ── 0 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
* 2: 0 ── 1 ── 0 1 ── 0 0 0 0 * 2: 0 ── 1 ── 0 1 ── 0 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
* 3: 0 ── 1 ── 1 1 ── 0 0 0 0 * 3: 0 ── 1 ── 1 1 ── 0 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
* 4: 1 ── 0 ── 0 1 ── 0 0 0 0 * 4: 1 ── 0 ── 0 1 ── 0 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
* 5: 1 ── 0 ── 1 1 ── 0 0 0 0 * 5: 1 ── 0 ── 1 1 ── 0 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
* 6: 1 ── 1 ── 0 1 ── 0 0 0 0 * 6: 1 ── 1 ── 0 1 ── 0 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
* 7: 1 ── 1 ── 1 1 ── 0 0 0 0 * 7: 1 ── 1 ── 1 1 ── 0 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
* 8: 1 ── 1 ── 1 0 ── 1 0 0 0 * 8: 1 ── 1 ── 1 0 ── 1 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
* 9: 0 ── 0 ── 0 0 ── 1 0 0 0 * 9: 0 ── 0 ── 0 0 ── 1 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
*10: 0 ── 0 ── 1 0 ── 1 0 0 0 *10: 0 ── 0 ── 1 0 ── 1 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
*11: 0 ── 1 ── 0 0 ── 1 0 0 0 *11: 0 ── 1 ── 0 0 ── 1 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
*12: 0 ── 1 ── 1 0 ── 1 0 0 0 *12: 0 ── 1 ── 1 0 ── 1 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
*13: 1 ── 0 ── 0 0 ── 1 0 0 0 *13: 1 ── 0 ── 0 0 ── 1 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
*14: 1 ── 0 ── 1 0 ── 1 0 0 0 *14: 1 ── 0 ── 1 0 ── 1 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
*15: 1 ── 1 ── 0 0 ── 1 0 0 0 *15: 1 ── 1 ── 0 0 ── 1 0 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
*16: 0 ── 0 ── 0 0 ── 0 1 0 0 *16: 0 ── 0 ── 0 0 ── 0 1 0 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
*17: 0 ── 0 ── 0 0 ── 0 0 1 0 *17: 0 ── 0 ── 0 0 ── 0 0 1 0
* ──────────────────────────────────────────── * ────────────────────────────────────────────
*18: 0 ── 0 ── 0 0 ── 0 0 0 1 *18: 0 ── 0 ── 0 0 ── 0 0 0 1
* *
*/ */
static void select_col(uint8_t col) { static void select_col(uint8_t col) {

2
keyboards/mokey/mokey64/rules.mk
View file

@ -17,5 +17,5 @@ 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 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = no # USB Nkey Rollover NKRO_ENABLE = no # USB Nkey Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output