From 3546932a8b25ea199f33b8a39c49ccaa5f7ca3c9 Mon Sep 17 00:00:00 2001
From: worthlessowl <53881082+worthlessowl@users.noreply.github.com>
Date: Sat, 2 Nov 2019 07:19:04 +0700
Subject: [PATCH] [Keyboard] Owlet60 keymap removal, matrix.c and owlet60.h fix
(#7235)
---
.../handwired/owlet60/keymaps/irham/config.h | 19 -----
.../handwired/owlet60/keymaps/irham/keymap.c | 74 -------------------
.../handwired/owlet60/keymaps/irham/readme.md | 1 -
keyboards/handwired/owlet60/matrix.c | 8 +-
keyboards/handwired/owlet60/owlet60.h | 54 +++++++-------
5 files changed, 31 insertions(+), 125 deletions(-)
delete mode 100644 keyboards/handwired/owlet60/keymaps/irham/config.h
delete mode 100644 keyboards/handwired/owlet60/keymaps/irham/keymap.c
delete mode 100644 keyboards/handwired/owlet60/keymaps/irham/readme.md
diff --git a/keyboards/handwired/owlet60/keymaps/irham/config.h b/keyboards/handwired/owlet60/keymaps/irham/config.h
deleted file mode 100644
index f662fe7c9..000000000
--- a/keyboards/handwired/owlet60/keymaps/irham/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2019 worthlessowl
- *
- * 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
-
-// place overrides here
diff --git a/keyboards/handwired/owlet60/keymaps/irham/keymap.c b/keyboards/handwired/owlet60/keymaps/irham/keymap.c
deleted file mode 100644
index dc1d34ff2..000000000
--- a/keyboards/handwired/owlet60/keymaps/irham/keymap.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2019 worthlessowl
- *
- * 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
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
- QMKBEST = SAFE_RANGE,
- QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_owlet60_full_bsp(
- KC__VOLUP, 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__VOLDOWN, 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__MUTE, 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_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1), \
- KC_LCTRL, KC_LALT, KC_SPC, KC_LGUI,KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT \
- ),
-
- [1] = LAYOUT_owlet60_full_bsp(
- KC_TRNS, 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, RGB_TOG, \
- 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, RGB_MOD, \
- 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_END, \
- 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, RGB_VAI, KC_TRNS, \
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS \
- )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case QMKBEST:
- if (record->event.pressed) {
- // when keycode QMKBEST is pressed
- SEND_STRING("QMK is the best thing ever!");
- } else {
- // when keycode QMKBEST is released
- }
- break;
- case QMKURL:
- if (record->event.pressed) {
- // when keycode QMKURL is pressed
- SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
- } else {
- // when keycode QMKURL is released
- }
- break;
- }
- return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/handwired/owlet60/keymaps/irham/readme.md b/keyboards/handwired/owlet60/keymaps/irham/readme.md
deleted file mode 100644
index 1d177ae10..000000000
--- a/keyboards/handwired/owlet60/keymaps/irham/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for owlet60
\ No newline at end of file
diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c
index 8ecce4eb1..994f527ec 100644
--- a/keyboards/handwired/owlet60/matrix.c
+++ b/keyboards/handwired/owlet60/matrix.c
@@ -225,10 +225,10 @@ void matrix_init(void) {
uint8_t matrix_scan(void)
{
bool changed = false;
-
+
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
changed |= read_cols_on_row(raw_matrix, current_row);
- }
+ }
debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
@@ -290,7 +290,7 @@ static void select_col_analog(uint8_t col) {
static void mux_pin_control(const uint8_t binary[]) {
// set pin0
setPinOutput(col_select_pins[0]);
- if(binary[0] == 0) {
+ if(binary[2] == 0) {
writePinLow(col_select_pins[0]);
}
else {
@@ -306,7 +306,7 @@ static void mux_pin_control(const uint8_t binary[]) {
}
// set pin2
setPinOutput(col_select_pins[2]);
- if(binary[2] == 0) {
+ if(binary[0] == 0) {
writePinLow(col_select_pins[2]);
}
else {
diff --git a/keyboards/handwired/owlet60/owlet60.h b/keyboards/handwired/owlet60/owlet60.h
index 9db2a789d..f17f40fda 100644
--- a/keyboards/handwired/owlet60/owlet60.h
+++ b/keyboards/handwired/owlet60/owlet60.h
@@ -32,15 +32,15 @@
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
k40, k41, k42, k43, k44, k45, k46, k47, k48 \
) { \
- { k07, k11, k13, k15, k50, k19, k1b, k1d}, \
- { k17, k21, k23, k25, k51, k29, k2b, k3d}, \
- { k27, k31, k33, k35, k52, k39, k3b, k47}, \
- { k37, k41, k42, k43, k40, k45, k46, k48}, \
- { k38, k32, k34, k44, k30, k3a, k3c, k3e}, \
- { k28, k22, k24, k36, k20, k2a, k2c, k2d}, \
- { k18, k12, k14, k26, k10, k1a, k1c, k1e}, \
- { k08, k02, k04, k16, k00, k0a, k0c, k0f}, \
- { k09, k03, k05, k06, k01, k0b, k0d, k0e} \
+ { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
+ { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
+ { k52, k31, k33, k35, k27, k39, k3b, k47}, \
+ { k40, k41, k42, k43, k37, k45, k46, k48}, \
+ { k30, k32, k34, k44, k38, k3a, k3c, k3e}, \
+ { k20, k22, k24, k36, k28, k2a, k2c, k2d}, \
+ { k10, k12, k14, k26, k18, k1a, k1c, k1e}, \
+ { k00, k02, k04, k16, k08, k0a, k0c, k0f}, \
+ { k01, k03, k05, k06, k09, k0b, k0d, k0e} \
}
#define LAYOUT_owlet60_full_bsp( \
@@ -68,15 +68,15 @@
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
k40, k41, k42, k43, k44, k45, k47 \
) { \
- { k07, k11, k13, k15, k50, k19, k1b, k1d}, \
- { k17, k21, k23, k25, k51, k29, k2b, k3d}, \
- { k27, k31, k33, k35, k52, k39, k3b, k47}, \
- { k37, k41, k42, k43, k40, k45, KC_NO, KC_NO}, \
- { k38, k32, k34, k44, k30, k3a, k3c, KC_NO}, \
- { k28, k22, k24, k36, k20, k2a, k2c, KC_NO}, \
- { k18, k12, k14, k26, k10, k1a, k1c, KC_NO}, \
- { k08, k02, k04, k16, k00, k0a, k0c, KC_NO}, \
- { k09, k03, k05, k06, k01, k0b, k0d, k0e} \
+ { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
+ { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
+ { k52, k31, k33, k35, k27, k39, k3b, k47}, \
+ { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \
+ { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \
+ { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \
+ { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \
+ { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \
+ { k01, k03, k05, k06, k09, k0b, k0d, k0e} \
}
#define LAYOUT_owlet60_60_percent_full_bsp( \
@@ -86,13 +86,13 @@
k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
k40, k41, k42, k43, k44, k45, k47 \
) { \
- { k07, k11, k13, k15, k50, k19, k1b, k1d}, \
- { k17, k21, k23, k25, k51, k29, k2b, k3d}, \
- { k27, k31, k33, k35, k52, k39, k3b, k47}, \
- { k37, k41, k42, k43, k40, k45, KC_NO, KC_NO}, \
- { k38, k32, k34, k44, k30, k3a, k3c, KC_NO}, \
- { k28, k22, k24, k36, k20, k2a, k2c, KC_NO}, \
- { k18, k12, k14, k26, k10, k1a, k1c, KC_NO}, \
- { k08, k02, k04, k16, k00, k0a, k0c, KC_NO}, \
- { k09, k03, k05, k06, k01, k0b, k0d, KC_NO} \
+ { k50, k11, k13, k15, k07, k19, k1b, k1d}, \
+ { k51, k21, k23, k25, k17, k29, k2b, k3d}, \
+ { k52, k31, k33, k35, k27, k39, k3b, k47}, \
+ { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \
+ { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \
+ { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \
+ { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \
+ { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \
+ { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \
}