Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
QMK Bot 2021-02-13 02:35:08 +00:00
commit 6680aa6bdf
4 changed files with 88 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
keyboards/melgeek/mojo75/config.h
View file

@ -17,3 +17,36 @@
#pragma once
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xEDED
#define PRODUCT_ID 0x7075
#define DEVICE_VER 0x0001
#define MANUFACTURER MelGeek
#define PRODUCT MOJO75
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 3
/* disable these deprecated features by default */
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_LED_PROCESS_LIMIT 4
#define RGB_MATRIX_LED_FLUSH_LIMIT 26
#define DISABLE_RGB_MATRIX_SPLASH
#define DISABLE_RGB_MATRIX_MULTISPLASH
#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
#define DRIVER_ADDR_1 0b0110000
#define DRIVER_ADDR_2 0b0110000 // this is here for compliancy reasons.
#define DRIVER_COUNT 1

32
keyboards/melgeek/mojo75/rev1/config.h
View file

@ -16,17 +16,6 @@
#pragma once
/* USB Device descriptor parameter */
#define VENDOR_ID 0xEDED
#define PRODUCT_ID 0x7075
#define DEVICE_VER 0x0001
#define MANUFACTURER MelGeek
#define PRODUCT MOJO75
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 16
/*
* Keyboard Matrix Assignments
*
@ -45,27 +34,6 @@
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 3
/* disable these deprecated features by default */
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_LED_PROCESS_LIMIT 4
#define RGB_MATRIX_LED_FLUSH_LIMIT 26
#define DISABLE_RGB_MATRIX_SPLASH
#define DISABLE_RGB_MATRIX_MULTISPLASH
#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
#define DRIVER_ADDR_1 0b0110000
#define DRIVER_ADDR_2 0b0110000 // this is here for compliancy reasons.
#define DRIVER_COUNT 1
#define DRIVER_1_LED_TOTAL 92
#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
#define DRIVER_INDICATOR_LED_TOTAL 0

93
keyboards/melgeek/mojo75/rev1/rev1.c
View file

@ -17,6 +17,7 @@
#include "mojo75.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1 */
{0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB2 */
@ -27,6 +28,13 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB7 */
{0, CS6_SW8, CS5_SW8, CS4_SW8}, /* RGB8 */
{0, CS6_SW9, CS5_SW9, CS4_SW9}, /* RGB9 */
{0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */
{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */
{0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */
{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */
{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */
{0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */
{0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */
{0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB10 */
{0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB11 */
{0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB12 */
@ -36,6 +44,14 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB16 */
{0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB17 */
{0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB18 */
{0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */
{0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */
{0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */
{0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */
{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */
{0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */
{0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */
{0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */
{0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB19 */
{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB20 */
{0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB21 */
@ -45,6 +61,12 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB25 */
{0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB26 */
{0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB27 */
{0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */
{0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */
{0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */
{0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */
{0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */
{0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */
{0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB28 */
{0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB29 */
{0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB30 */
@ -54,6 +76,13 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB34 */
{0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB35 */
{0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB36 */
{0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */
{0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */
{0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */
{0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */
{0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */
{0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */
{0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */
{0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB37 */
{0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB38 */
{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB39 */
@ -63,6 +92,13 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB43 */
{0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB44 */
{0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB45 */
{0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */
{0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */
{0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */
{0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
{0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */
{0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */
{0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */
{0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB46 */
{0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB47 */
{0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB48 */
@ -72,66 +108,31 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB52 */
{0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB53 */
{0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB54 */
{0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */
{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */
{0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */
{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */
{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */
{0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */
{0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */
{0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */
{0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */
{0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */
{0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */
{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */
{0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */
{0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */
{0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */
{0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */
{0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */
{0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */
{0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */
{0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */
{0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */
{0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */
{0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */
{0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */
{0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */
{0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */
{0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */
{0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */
{0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */
{0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */
{0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
{0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */
{0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */
{0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */
{0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB88 */
{0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB90 */
{0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */
{0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB92 */
{0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB90 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 54, 55, 56, 57, 58, 59, 60 }, /* R0 */
{ 9, 10, 11, 12, 13, 14, 15, 16, 17, 61, 62, 63, 64, 66, 67, 68 }, /* R1 */
{ 18, 19, 20, 21, 22, 23, 24, 25, 26, 69, 70, 71, 85, 72, 65,/*?*/ 73 }, /* R2 */
{ 27, 28, 29, 30, 31, 32, 33, 34, 35, 74, 75, 76, 77, 78, 79, 90 }, /* R3 */
{ 36, 37, 38, 39, 40, 41, 42, 43, 44, 83, 82, 81, 84, 80, 86, 88 }, /* R4 */
{ 45, 46, 47, 48, 49, NO_LED, NO_LED, 50, NO_LED, NO_LED, 51, 52, 53, 87, 91, 89 }, /* R5 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, /* R0 */
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, NO_LED, 32 }, /* R1 */
{ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, NO_LED, 47 }, /* R2 */
{ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, NO_LED, 61, NO_LED, 63 }, /* R3 */
{ 65, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, NO_LED, 77, NO_LED, 78, 79 }, /* R4 */
{ 80, 81, 82, NO_LED, NO_LED, 84, NO_LED, NO_LED, NO_LED, 86, 87, NO_LED, 88, 89, 90, 91 }, /* R5 */
}, {
{0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, {224, 0}, {240, 0},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, {224, 16}, {240, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32}, {224, 32}, {240, 32},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, {224, 16}, {240, 16}, {255, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32}, {224, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48}, {224, 48}, {240, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 64}, {176, 64}, {192, 64}, {208, 64}, {224, 64}, {240, 64},
{0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, {128, 80}, {144, 80}, {160, 80}, {176, 80},
}, {
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,

2
keyboards/melgeek/mojo75/rev1/rules.mk
View file

@ -20,3 +20,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth
RGB_MATRIX_ENABLE = yes # Use RGB matrix
RGB_MATRIX_DRIVER = IS31FL3741
NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
LAYOUTS = 75_ansi