From abb19dd419809c635dad981656bf245d6b217803 Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 11 Aug 2022 10:47:47 +0200 Subject: [PATCH 1/8] feat: added support for ft/mars65 --- keyboards/ft/mars65/config.h | 55 +++ keyboards/ft/mars65/info.json | 378 +++++++++++++++++++ keyboards/ft/mars65/keymaps/default/keymap.c | 25 ++ keyboards/ft/mars65/mars65.c | 8 + keyboards/ft/mars65/mars65.h | 55 +++ keyboards/ft/mars65/readme.md | 19 + keyboards/ft/mars65/rules.mk | 24 ++ 7 files changed, 564 insertions(+) create mode 100644 keyboards/ft/mars65/config.h create mode 100644 keyboards/ft/mars65/info.json create mode 100644 keyboards/ft/mars65/keymaps/default/keymap.c create mode 100644 keyboards/ft/mars65/mars65.c create mode 100644 keyboards/ft/mars65/mars65.h create mode 100644 keyboards/ft/mars65/readme.md create mode 100644 keyboards/ft/mars65/rules.mk diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h new file mode 100644 index 000000000000..300a85d2e12f --- /dev/null +++ b/keyboards/ft/mars65/config.h @@ -0,0 +1,55 @@ +// Copyright 2022 wonderbeel (https://github.com/wonderbeel) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 16 + +/* + * 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 { B0, B1, B2, B3, B4 } +#define MATRIX_COL_PINS { C6, C7, D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6, F7 } + +#define DIODE_DIRECTION COL2ROW + +#define BACKLIGHT_PIN B7 +// #define BACKLIGHT_BREATHING +#define BACKLIGHT_LEVELS 3 + +#define RGB_DI_PIN E6 +#ifdef RGB_DI_PIN + #define RGBLED_NUM 24 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 8 + #define RGBLIGHT_VAL_STEP 8 + #define RGBLIGHT_LIMIT_VAL 130 /* The maximum brightness level */ + #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +/*== all animations enable ==*/ + #define RGBLIGHT_ANIMATIONS +// /*== or choose animations ==*/ +// #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 +#endif + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ + diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json new file mode 100644 index 000000000000..bdb0ceedc366 --- /dev/null +++ b/keyboards/ft/mars65/info.json @@ -0,0 +1,378 @@ +{ + "keyboard_name": "Mars 6.5", + "manufacturer": "FT", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x20A0", + "pid": "0x422F", + "device_version": "0.0.1" + }, + "layouts": { + "LAYOUT": { + "layout": [ + { + "label": "K00 (B0,C6)", + "x": 0, + "y": 0 + }, + { + "label": "K01 (B0,C7)", + "x": 1, + "y": 0 + }, + { + "label": "K02 (B0,D0)", + "x": 2, + "y": 0 + }, + { + "label": "K03 (B0,D1)", + "x": 3, + "y": 0 + }, + { + "label": "K04 (B0,D2)", + "x": 4, + "y": 0 + }, + { + "label": "K05 (B0,D3)", + "x": 5, + "y": 0 + }, + { + "label": "K06 (B0,D4)", + "x": 6, + "y": 0 + }, + { + "label": "K07 (B0,D5)", + "x": 7, + "y": 0 + }, + { + "label": "K08 (B0,D6)", + "x": 8, + "y": 0 + }, + { + "label": "K09 (B0,D7)", + "x": 9, + "y": 0 + }, + { + "label": "K0A (B0,F0)", + "x": 10, + "y": 0 + }, + { + "label": "K0B (B0,F1)", + "x": 11, + "y": 0 + }, + { + "label": "K0C (B0,F4)", + "x": 12, + "y": 0 + }, + { + "label": "K0D (B0,F5)", + "x": 13, + "y": 0 + }, + { + "label": "K0E (B0,F6)", + "x": 14, + "y": 0 + }, + { + "label": "K0F (B0,F7)", + "x": 15, + "y": 0 + }, + { + "label": "K10 (B1,C6)", + "x": 0, + "y": 1, + "w": 1.5 + }, + { + "label": "K12 (B1,D0)", + "x": 1.5, + "y": 1 + }, + { + "label": "K13 (B1,D1)", + "x": 2.5, + "y": 1 + }, + { + "label": "K14 (B1,D2)", + "x": 3.5, + "y": 1 + }, + { + "label": "K15 (B1,D3)", + "x": 4.5, + "y": 1 + }, + { + "label": "K16 (B1,D4)", + "x": 5.5, + "y": 1 + }, + { + "label": "K17 (B1,D5)", + "x": 6.5, + "y": 1 + }, + { + "label": "K18 (B1,D6)", + "x": 7.5, + "y": 1 + }, + { + "label": "K19 (B1,D7)", + "x": 8.5, + "y": 1 + }, + { + "label": "K1A (B1,F0)", + "x": 9.5, + "y": 1 + }, + { + "label": "K1B (B1,F1)", + "x": 10.5, + "y": 1 + }, + { + "label": "K1C (B1,F4)", + "x": 11.5, + "y": 1 + }, + { + "label": "K1D (B1,F5)", + "x": 12.5, + "y": 1 + }, + { + "label": "K1E (B1,F6)", + "x": 13.5, + "y": 1, + "w": 1.5 + }, + { + "label": "K1F (B1,F7)", + "x": 15, + "y": 1 + }, + { + "label": "K20 (B2,C6)", + "x": 0, + "y": 2, + "w": 1.75 + }, + { + "label": "K22 (B2,D0)", + "x": 1.75, + "y": 2 + }, + { + "label": "K23 (B2,D1)", + "x": 2.75, + "y": 2 + }, + { + "label": "K24 (B2,D2)", + "x": 3.75, + "y": 2 + }, + { + "label": "K25 (B2,D3)", + "x": 4.75, + "y": 2 + }, + { + "label": "K26 (B2,D4)", + "x": 5.75, + "y": 2 + }, + { + "label": "K27 (B2,D5)", + "x": 6.75, + "y": 2 + }, + { + "label": "K28 (B2,D6)", + "x": 7.75, + "y": 2 + }, + { + "label": "K29 (B2,D7)", + "x": 8.75, + "y": 2 + }, + { + "label": "K2A (B2,F0)", + "x": 9.75, + "y": 2 + }, + { + "label": "K2B (B2,F1)", + "x": 10.75, + "y": 2 + }, + { + "label": "K2C (B2,F4)", + "x": 11.75, + "y": 2 + }, + { + "label": "K2E (B2,F6)", + "x": 12.75, + "y": 2, + "w": 2.25 + }, + { + "label": "K2F (B2,F7)", + "x": 15, + "y": 2 + }, + { + "label": "K30 (B3,C6)", + "x": 0, + "y": 3, + "w": 1.25 + }, + { + "label": "K31 (B3,C7)", + "x": 1.25, + "y": 3 + }, + { + "label": "K32 (B3,D0)", + "x": 2.25, + "y": 3 + }, + { + "label": "K33 (B3,D1)", + "x": 3.25, + "y": 3 + }, + { + "label": "K34 (B3,D2)", + "x": 4.25, + "y": 3 + }, + { + "label": "K35 (B3,D3)", + "x": 5.25, + "y": 3 + }, + { + "label": "K36 (B3,D4)", + "x": 6.25, + "y": 3 + }, + { + "label": "K37 (B3,D5)", + "x": 7.25, + "y": 3 + }, + { + "label": "K38 (B3,D6)", + "x": 8.25, + "y": 3 + }, + { + "label": "K39 (B3,D7)", + "x": 9.25, + "y": 3 + }, + { + "label": "K3A (B3,F0)", + "x": 10.25, + "y": 3 + }, + { + "label": "K3B (B3,F1)", + "x": 11.25, + "y": 3 + }, + { + "label": "K3D (B3,F5)", + "x": 12.25, + "y": 3, + "w": 1.75 + }, + { + "label": "K3E (B3,F6)", + "x": 14, + "y": 3 + }, + { + "label": "K3F (B3,F7)", + "x": 15, + "y": 3 + }, + { + "label": "K40 (B4,C6)", + "x": 0, + "y": 4, + "w": 1.25 + }, + { + "label": "K41 (B4,C7)", + "x": 1.25, + "y": 4, + "w": 1.25 + }, + { + "label": "K43 (B4,D1)", + "x": 2.5, + "y": 4, + "w": 1.25 + }, + { + "label": "K46 (B4,D4)", + "x": 3.75, + "y": 4, + "w": 6.25 + }, + { + "label": "K4A (B4,F0)", + "x": 10, + "y": 4 + }, + { + "label": "K4B (B4,F1)", + "x": 11, + "y": 4 + }, + { + "label": "K4C (B4,F4)", + "x": 12, + "y": 4 + }, + { + "label": "K4D (B4,F5)", + "x": 13, + "y": 4 + }, + { + "label": "K4E (B4,F6)", + "x": 14, + "y": 4 + }, + { + "label": "K4F (B4,F7)", + "x": 15, + "y": 4 + } + ] + } + }, + "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" +} diff --git a/keyboards/ft/mars65/keymaps/default/keymap.c b/keyboards/ft/mars65/keymaps/default/keymap.c new file mode 100644 index 000000000000..c18d2a6803cf --- /dev/null +++ b/keyboards/ft/mars65/keymaps/default/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2022 wonderbeel (https://github.com/wonderbeel) +// SPDX-License-Identifier: GPL-2.0-or-later + +#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_MINS, KC_EQL, KC_BSPC, KC_GRV, KC_INS, + 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_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_NLCK, 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_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT( + 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, _______, RESET, + BL_TOGG, BL_DEC, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, _______, RGB_SAI, RGB_VAD, RGB_SAD + ), + +}; + diff --git a/keyboards/ft/mars65/mars65.c b/keyboards/ft/mars65/mars65.c new file mode 100644 index 000000000000..d4fbf86d5a29 --- /dev/null +++ b/keyboards/ft/mars65/mars65.c @@ -0,0 +1,8 @@ +// Copyright 2022 wonderbeel (https://github.com/wonderbeel) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "mars65.h" + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ + diff --git a/keyboards/ft/mars65/mars65.h b/keyboards/ft/mars65/mars65.h new file mode 100644 index 000000000000..2cdac475f1cb --- /dev/null +++ b/keyboards/ft/mars65/mars65.h @@ -0,0 +1,55 @@ +// Copyright 2022 wonderbeel (https://github.com/wonderbeel) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +/* ANSI + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ │0D │ 2u Backspace + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └───────┘ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │2F │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │3F │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │40 │41 │43 │46 │4A │4B │ │4D │4E │4F │ + * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ + */ + + +/* ISO + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ + * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ │0D │ 2u Backspace + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └───────┘ + * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ 1E │1F │ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤ + * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │ │2F │ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ + * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │3F │ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * │40 │41 │43 │46 │4A │4B │ │4D │4E │4F │ + * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ + */ + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ + K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ + K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ + K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E, K4F \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ + { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ + { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \ + { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F }, \ +} + +// generated by KBFirmware JSON to QMK Parser +// https://noroadsleft.github.io/kbf_qmk_converter/ + diff --git a/keyboards/ft/mars65/readme.md b/keyboards/ft/mars65/readme.md new file mode 100644 index 000000000000..9799fb8dea0a --- /dev/null +++ b/keyboards/ft/mars65/readme.md @@ -0,0 +1,19 @@ +# Mars 6.5 + +65% Keyboard with in switch backlight and RGB Underglow. + +* Keyboard Maintainer: [wonderbeel](https://github.com/wonderbeel) +* Hardware Supported: Mars 6.5 PCB +* Hardware Availability: [Group Buy now completed](https://geekhack.org/index.php?topic=98601.0) + +Make example for this keyboard (after setting up your build environment): + + make ft/mars65:default + +Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid)) + + make ft/mars65:default:flash + +**Reset Key:** Hold down the key located at `K00`, commonly programmed as `Pause/Break` while plugging in the keyboard. + +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). diff --git a/keyboards/ft/mars65/rules.mk b/keyboards/ft/mars65/rules.mk new file mode 100644 index 000000000000..c338b4c7dd05 --- /dev/null +++ b/keyboards/ft/mars65/rules.mk @@ -0,0 +1,24 @@ +# 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 = yes # Mouse keys +EXTRAKEY_ENABLE = yes # 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 = yes # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +LTO_ENABLE = yes # Reduce firmware size + +# generated by KBFirmware JSON to QMK Parser +# https://noroadsleft.github.io/kbf_qmk_converter/ + From 6f9a1436b151226fe72de8f3afd280ba6bd233de Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 11 Aug 2022 11:10:37 +0200 Subject: [PATCH 2/8] chore: removed debug flags --- keyboards/ft/mars65/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/ft/mars65/rules.mk b/keyboards/ft/mars65/rules.mk index c338b4c7dd05..f3e472d0cda4 100644 --- a/keyboards/ft/mars65/rules.mk +++ b/keyboards/ft/mars65/rules.mk @@ -10,8 +10,8 @@ BOOTLOADER = atmel-dfu BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow From 3e04a4aa591bf98b1ebeb2a664863927a4dbd2c7 Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 11 Aug 2022 12:15:09 +0200 Subject: [PATCH 3/8] chore: prepare for release --- keyboards/ft/mars65/info.json | 2 +- keyboards/ft/mars65/keymaps/default/keymap.c | 4 ++-- keyboards/ft/mars65/mars65.h | 2 +- keyboards/ft/mars65/readme.md | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json index bdb0ceedc366..e9040ce9ded7 100644 --- a/keyboards/ft/mars65/info.json +++ b/keyboards/ft/mars65/info.json @@ -9,7 +9,7 @@ "device_version": "0.0.1" }, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ { "label": "K00 (B0,C6)", diff --git a/keyboards/ft/mars65/keymaps/default/keymap.c b/keyboards/ft/mars65/keymaps/default/keymap.c index c18d2a6803cf..fd8ad0134e57 100644 --- a/keyboards/ft/mars65/keymaps/default/keymap.c +++ b/keyboards/ft/mars65/keymaps/default/keymap.c @@ -5,7 +5,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( 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_GRV, KC_INS, 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_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, @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT( + [1] = LAYOUT_all( 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, _______, RESET, BL_TOGG, BL_DEC, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, diff --git a/keyboards/ft/mars65/mars65.h b/keyboards/ft/mars65/mars65.h index 2cdac475f1cb..c0fb8602fe55 100644 --- a/keyboards/ft/mars65/mars65.h +++ b/keyboards/ft/mars65/mars65.h @@ -36,7 +36,7 @@ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ */ -#define LAYOUT( \ +#define LAYOUT_all( \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \ diff --git a/keyboards/ft/mars65/readme.md b/keyboards/ft/mars65/readme.md index 9799fb8dea0a..9f4a8a3c80fa 100644 --- a/keyboards/ft/mars65/readme.md +++ b/keyboards/ft/mars65/readme.md @@ -2,6 +2,8 @@ 65% Keyboard with in switch backlight and RGB Underglow. +![Mars 6.5 image](https://i.imgur.com/cg5qADr.jpg) + * Keyboard Maintainer: [wonderbeel](https://github.com/wonderbeel) * Hardware Supported: Mars 6.5 PCB * Hardware Availability: [Group Buy now completed](https://geekhack.org/index.php?topic=98601.0) From e426d6f939873354b2f641c5699424ff290c7336 Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 11 Aug 2022 12:16:18 +0200 Subject: [PATCH 4/8] feat: added via keymap --- keyboards/ft/mars65/keymaps/via/keymap.c | 25 ++++++++++++++++++++++++ keyboards/ft/mars65/keymaps/via/rules.mk | 1 + 2 files changed, 26 insertions(+) create mode 100644 keyboards/ft/mars65/keymaps/via/keymap.c create mode 100644 keyboards/ft/mars65/keymaps/via/rules.mk diff --git a/keyboards/ft/mars65/keymaps/via/keymap.c b/keyboards/ft/mars65/keymaps/via/keymap.c new file mode 100644 index 000000000000..fd8ad0134e57 --- /dev/null +++ b/keyboards/ft/mars65/keymaps/via/keymap.c @@ -0,0 +1,25 @@ +// Copyright 2022 wonderbeel (https://github.com/wonderbeel) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_GRV, KC_INS, + 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_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_NLCK, 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_DEL, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_all( + 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, _______, RESET, + BL_TOGG, BL_DEC, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, + _______, _______, _______, _______, _______, _______, _______, RGB_SAI, RGB_VAD, RGB_SAD + ), + +}; + diff --git a/keyboards/ft/mars65/keymaps/via/rules.mk b/keyboards/ft/mars65/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/ft/mars65/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From eb1e07a060670463db67b93eb70478e71f21dd4c Mon Sep 17 00:00:00 2001 From: Alberto Date: Thu, 11 Aug 2022 12:52:17 +0200 Subject: [PATCH 5/8] fix: fixed ISO layout doc --- keyboards/ft/mars65/mars65.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/ft/mars65/mars65.h b/keyboards/ft/mars65/mars65.h index c0fb8602fe55..73850e51c6f3 100644 --- a/keyboards/ft/mars65/mars65.h +++ b/keyboards/ft/mars65/mars65.h @@ -29,9 +29,9 @@ * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ 1E │1F │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ├───┤ * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │ │2F │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ - * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │3F │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ + * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │3F │ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ * │40 │41 │43 │46 │4A │4B │ │4D │4E │4F │ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ */ From 7cc9b020c6fbaac449ab8955d69a21d0224e04c1 Mon Sep 17 00:00:00 2001 From: Alberto Date: Fri, 12 Aug 2022 09:36:22 +0200 Subject: [PATCH 6/8] doc: updated readme --- keyboards/ft/mars65/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ft/mars65/readme.md b/keyboards/ft/mars65/readme.md index 9f4a8a3c80fa..358b1a69ba48 100644 --- a/keyboards/ft/mars65/readme.md +++ b/keyboards/ft/mars65/readme.md @@ -2,7 +2,7 @@ 65% Keyboard with in switch backlight and RGB Underglow. -![Mars 6.5 image](https://i.imgur.com/cg5qADr.jpg) +![Mars 6.5 image](https://i.imgur.com/cg5qADrl.jpg) * Keyboard Maintainer: [wonderbeel](https://github.com/wonderbeel) * Hardware Supported: Mars 6.5 PCB From 7de41debd6fb412a2a54149a92fac9fe8af09f0d Mon Sep 17 00:00:00 2001 From: Alberto Date: Fri, 12 Aug 2022 09:36:38 +0200 Subject: [PATCH 7/8] refactor: explicitly enable all RGB effects --- keyboards/ft/mars65/config.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h index 300a85d2e12f..69efcea1fc94 100644 --- a/keyboards/ft/mars65/config.h +++ b/keyboards/ft/mars65/config.h @@ -36,18 +36,16 @@ #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 130 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -/*== all animations enable ==*/ - #define RGBLIGHT_ANIMATIONS -// /*== or choose animations ==*/ -// #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_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 From c5ee46ba8d614c9768ac5105a6ae79db69da229a Mon Sep 17 00:00:00 2001 From: Alberto Date: Sun, 14 Aug 2022 20:51:34 +0200 Subject: [PATCH 8/8] doc: update thumbnail url --- keyboards/ft/mars65/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ft/mars65/readme.md b/keyboards/ft/mars65/readme.md index 358b1a69ba48..6853994ee43b 100644 --- a/keyboards/ft/mars65/readme.md +++ b/keyboards/ft/mars65/readme.md @@ -2,7 +2,7 @@ 65% Keyboard with in switch backlight and RGB Underglow. -![Mars 6.5 image](https://i.imgur.com/cg5qADrl.jpg) +![Mars 6.5 image](https://i.imgur.com/cg5qADrh.jpg) * Keyboard Maintainer: [wonderbeel](https://github.com/wonderbeel) * Hardware Supported: Mars 6.5 PCB