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

1 files changed, 106 insertions, 0 deletions

diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/keymap.c b/keyboards/nullbitsco/nibble/keymaps/oled_status/keymap.c
new file mode 100644
index 0000000000..c39f42b361
--- /dev/null
+++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/keymap.c
@@ -0,0 +1,106 @@
+/* Copyright 2021 Jose Luis Adelantado Torres
+ *
+ * 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
+
+#ifdef OLED_DRIVER_ENABLE
+#    include "oled_display.h"
+#endif
+
+enum layer_names {
+  _MA,
+  _FN
+};
+
+enum custom_keycodes {
+    KC_CUST = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MA] = LAYOUT_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_F13, 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_DEL,
+        KC_F14, 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_PGUP,
+        KC_F15, 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_PGDN,
+        KC_F16, KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    MO(_FN), KC_RALT, KC_RCTL, KC_LEFT,          KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_ansi(
+                 RESET,   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_END,
+        RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______,          _______, _______
+    ),
+};
+
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    oled_timer = timer_read32();
+    set_oled_mode(OLED_MODE_IDLE);
+    return OLED_ROTATION_180;
+}
+
+void oled_task_user(void) {
+     if (timer_elapsed(oled_timer) >= 3000) {
+        set_oled_mode(OLED_MODE_IDLE);
+    }
+    render_frame();
+}
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    // Send keystrokes to host keyboard, if connected (see readme)
+    process_record_remote_kb(keycode, record);
+
+    switch(keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+#ifdef OLED_DRIVER_ENABLE
+                process_record_keymap_oled(keycode);
+#endif
+            }
+        break;
+        case KC_CUST: //custom macro
+            if (record->event.pressed) {
+            }
+        break;
+    }
+    return true;
+}
+
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+#ifdef OLED_DRIVER_ENABLE
+        process_record_encoder_oled(KC_VOLU);
+#endif
+    } else {
+        tap_code(KC_VOLD);
+#ifdef OLED_DRIVER_ENABLE
+        process_record_encoder_oled(KC_VOLD);
+#endif
+    }
+}
+
+void matrix_init_user(void) {
+    // Initialize remote keyboard, if connected (see readme)
+    matrix_init_remote_kb();
+}
+
+void matrix_scan_user(void) {
+    // Scan and parse keystrokes from remote keyboard, if connected (see readme)
+    matrix_scan_remote_kb();
+}