diff options
| -rw-r--r-- | keyboards/m0lly/config.h | 6 | ||||
| -rw-r--r-- | keyboards/m0lly/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/m0lly/keymaps/via/config.h | 1 | ||||
| -rw-r--r-- | keyboards/m0lly/keymaps/via/keymap.c | 94 | ||||
| -rw-r--r-- | keyboards/m0lly/keymaps/via/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/m0lly/m0lly.c | 7 | 
6 files changed, 107 insertions, 4 deletions
| diff --git a/keyboards/m0lly/config.h b/keyboards/m0lly/config.h index 327b0f08c..29bd8411e 100644 --- a/keyboards/m0lly/config.h +++ b/keyboards/m0lly/config.h @@ -20,9 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #include "config_common.h"  /* USB Device descriptor parameter */ -#define VENDOR_ID       0xFEED -#define PRODUCT_ID      0x6060 -#define DEVICE_VER      0x0003 +#define VENDOR_ID       0x544B // "TK" +#define PRODUCT_ID      0x0004 +#define DEVICE_VER      0x0001  #define MANUFACTURER    The Key Company  #define PRODUCT         M0lly  #define DESCRIPTION     QMK keyboard firmware for M0lly diff --git a/keyboards/m0lly/keymaps/default/keymap.c b/keyboards/m0lly/keymaps/default/keymap.c index 5f6211f0f..27e83cd21 100644 --- a/keyboards/m0lly/keymaps/default/keymap.c +++ b/keyboards/m0lly/keymaps/default/keymap.c @@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  #ifdef OLED_DRIVER_ENABLE  void oled_task_user(void) { -    oled_write_P(PSTR("TKC1800\n"),false); +    oled_write_P(PSTR("M0lly\n"),false);  	// Host Keyboard Layer Status      oled_write_P(PSTR("Layer: "), false); diff --git a/keyboards/m0lly/keymaps/via/config.h b/keyboards/m0lly/keymaps/via/config.h new file mode 100644 index 000000000..579212d4a --- /dev/null +++ b/keyboards/m0lly/keymaps/via/config.h @@ -0,0 +1 @@ +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/m0lly/keymaps/via/keymap.c b/keyboards/m0lly/keymaps/via/keymap.c new file mode 100644 index 000000000..2e5900f16 --- /dev/null +++ b/keyboards/m0lly/keymaps/via/keymap.c @@ -0,0 +1,94 @@ +/* Copyright 2017 Mathias Andersson <wraul@dbox.se> + * + * 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 + +//Layers + +enum { +  BASE = 0, +  FUNCTION, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +  /* Keymap BASE: (Base Layer) Default Layer +   *  +   * ,-----------------------------------------------------------. .-------------------. +   * | ~ | 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | |NumL| /  | *  | -  | +   * |-----------------------------------------------------------| |-------------------| +   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | | 7  | 8  | 9  |    | +   * |-----------------------------------------------------------| |--------------| +  | +   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return | | 4  | 5  | 6  |    | +   * |-----------------------------------------------------------| |-------------------| +   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     | | 1  | 2  | 3  | Ent| +   * |-----------------------------------------------------------| |--------------|    | +   * |Ctrl|Gui |Alt |      Space           | Alt | Win |FN  |Ctr | |   0     | .  |    | +   * `-----------------------------------------------------------' '-------------------' +   */ +  [BASE] = LAYOUT_all( +    KC_GRV,  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, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, +    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_P7,   KC_P8,   KC_P9,   XXXXXXX, +    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS, +    KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXXXX,          KC_P1,   KC_P2,   KC_P3,   XXXXXXX, +    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                        KC_RALT, KC_RWIN, MO(FUNCTION), KC_RCTL,                   KC_P0,   XXXXXXX, KC_PDOT, KC_PENT +  ), +  /* Keymap FUNCTION: (Function Layer) +   *  +   * ,-----------------------------------------------------------. .-------------------. +   * |   |   |   |   |   |   |   |   |   |   |   |   |   | RESET | |    |    |    |    | +   * |-----------------------------------------------------------| |-------------------| +   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     | |    |    |    |    | +   * |-----------------------------------------------------------| |-------------------| +   * |       |   |   |   |   |   |   |   |   |   |   |   |       | |    |    |    |    | +   * |-----------------------------------------------------------| |-------------------| +   * |        |Tog|Mod|Hu+|Hu-|Sa+|Sa-|Va+|Va-|Stp|   |          | |    |    |    |    | +   * |-----------------------------------------------------------| |--------------|    | +   * |    |    |    |                      |     |     |    |    | |         |    |    | +   * `-----------------------------------------------------------' '-------------------' +   */ +  [FUNCTION] = LAYOUT_all( +    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   XXXXXXX, _______, _______, _______, _______, +    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, XXXXXXX, +    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______,          _______, _______, _______, _______, +    _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_STEP, _______, _______, XXXXXXX,          _______, _______, _______, XXXXXXX, +    _______, _______, _______,                   _______,                        _______, _______, MO(FUNCTION), _______,                  _______, XXXXXXX, _______, _______ +  ), +}; + +#ifdef OLED_DRIVER_ENABLE +void oled_task_user(void) { +    oled_write_P(PSTR("M0lly\n"),false); +	// Host Keyboard Layer Status +    oled_write_P(PSTR("Layer: "), false); + +    switch (get_highest_layer(layer_state)) { +        case BASE: +            oled_write_P(PSTR("Base\n"), false); +            break; +        case FUNCTION: +            oled_write_P(PSTR("Function\n"), false); +            break; +        default: +            // Or use the write_ln shortcut over adding '\n' to the end of your string +            oled_write_ln_P(PSTR("Undefined"), false); +    } +	// Host Keyboard LED Status +    led_t led_state = host_keyboard_led_state(); +    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false); +    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false); +    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false); +} +#endif diff --git a/keyboards/m0lly/keymaps/via/rules.mk b/keyboards/m0lly/keymaps/via/rules.mk new file mode 100644 index 000000000..1e5b99807 --- /dev/null +++ b/keyboards/m0lly/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/m0lly/m0lly.c b/keyboards/m0lly/m0lly.c index 5e1b5371a..e47f9531e 100644 --- a/keyboards/m0lly/m0lly.c +++ b/keyboards/m0lly/m0lly.c @@ -16,6 +16,13 @@  #include "m0lly.h"  #include "led.h" +void keyboard_pre_init_kb(void) { +  setPinInputHigh(D0); +  setPinInputHigh(D1); + +  keyboard_pre_init_user(); +} +  void matrix_init_kb(void) {      // put your keyboard start-up code here      // runs once when the firmware starts up | 
