jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remerge 0.16.x' into firmware21

Browse Source
This commit is contained in:
Drashna Jael're
2022-03-25 16:19:22 -07:00
parent e8171efc71 efc9c525b1
commit 53ff570bf0
548 changed files with 14528 additions and 7820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keyboards/moonlander/config.h
View File

@@ -75,8 +75,6 @@
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_ADDR_2 0b1110111
@@ -142,10 +140,6 @@
// #define RGB_MATRIX_LED_PROCESS_LIMIT 5
// #define RGB_MATRIX_LED_FLUSH_LIMIT 26
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TOGGLE 1
#define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_DELAY 0
#define MOUSEKEY_TIME_TO_MAX 60

4
keyboards/moonlander/matrix.c
View File

@@ -102,9 +102,9 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
print("trying to reset mcp23018\n");
mcp23018_init();
if (!mcp23018_initd) {
print("left side not responding\n");
print("right side not responding\n");
} else {
print("left side attached\n");
print("right side attached\n");
#ifdef RGB_MATRIX_ENABLE
rgb_matrix_init();
#endif

59
keyboards/moonlander/moonlander.c
View File

@@ -19,9 +19,6 @@
#include "moonlander.h"
#ifdef WEBUSB_ENABLE
# include "webusb.h"
#endif
keyboard_config_t keyboard_config;
@@ -83,50 +80,9 @@ void moonlander_led_task(void) {
wait_ms(155);
}
#endif
#ifdef WEBUSB_ENABLE
else if (webusb_state.pairing == true) {
static uint8_t led_mask;
ML_LED_1(false);
ML_LED_2(false);
ML_LED_3(false);
ML_LED_4(false);
ML_LED_5(false);
ML_LED_6(false);
if (!led_mask) {
led_mask = 1;
} else {
led_mask++;
if (led_mask > 12) led_mask = 1;
}
switch (led_mask) {
case 1:
case 12:
ML_LED_1(true);
break;
case 2:
case 11:
ML_LED_2(true);
break;
case 3:
case 10:
ML_LED_3(true);
break;
case 4:
case 9:
ML_LED_4(true);
break;
case 5:
case 8:
ML_LED_5(true);
break;
case 6:
case 7:
ML_LED_6(true);
break;
}
wait_ms(150);
#if !defined(MOONLANDER_USER_LEDS)
else {
layer_state_set_kb(layer_state);
}
#endif
#if !defined(MOONLANDER_USER_LEDS)
@@ -174,8 +130,10 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
bool LED_3 = false;
bool LED_4 = false;
bool LED_5 = false;
#if !defined(CAPS_LOCK_STATUS)
bool LED_6 = false;
#endif
uint8_t layer = get_highest_layer(state);
switch (layer) {
case 1:
@@ -430,11 +388,6 @@ bool led_update_kb(led_t led_state) {
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (!process_record_user(keycode, record)) { return false; }
switch (keycode) {
#ifdef WEBUSB_ENABLE
case WEBUSB_PAIR:
if (!record->event.pressed && !webusb_state.pairing) layer_state_set_kb(layer_state);
break;
#endif
#if !defined(MOONLANDER_USER_LEDS)
case LED_LEVEL:
if (record->event.pressed) {

2
keyboards/moonlander/readme.md
View File

@@ -31,7 +31,7 @@ By default, the Indicator LEDs are used to indicate the layer state for the keyb
### Oryx Configuration
To enable the features from Oryx (ZSA's Configurator), either compile the the `default` keymap, or add `#define ORYX_CONFIGURATOR` to your `config.h` file.
To enable the features from Oryx (ZSA's Configurator), either compile the `default` keymap, or add `#define ORYX_CONFIGURATOR` to your `config.h` file.
This enables the front Indicator LEDs, and the `TOGGLE_LAYER_COLOR` keycode. The `TOGGLE_LAYER_COLOR` keycode toggles the customized LED map configured on Oryx.

2
keyboards/moonlander/rules.mk
View File

@@ -27,3 +27,5 @@ MOUSE_SHARED_EP = no
#project specific files
SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c
MOUSE_SHARED_EP = no