Mark
/
QMK
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Formatting

master
Mark 2022-02-06 13:27:09 -08:00
parent d40756b91e
commit c7649ca758
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
2 changed files with 487 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
betalupi_ergodox.c
View File

@ -79,8 +79,7 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
} }
void ergodox_blink_all_leds(void) void ergodox_blink_all_leds(void) {
{
ergodox_led_all_off(); ergodox_led_all_off();
ergodox_led_all_set(LED_BRIGHTNESS_DEFAULT); ergodox_led_all_set(LED_BRIGHTNESS_DEFAULT);
ergodox_right_led_1_on(); ergodox_right_led_1_on();
@ -211,7 +210,7 @@ uint8_t ergodox_left_leds_update(void) {
ERGODOX_EZ_I2C_TIMEOUT); ERGODOX_EZ_I2C_TIMEOUT);
if (mcp23018_status) goto out; if (mcp23018_status) goto out;
out: out:
i2c_stop(); i2c_stop();
return mcp23018_status; return mcp23018_status;
} }
@ -372,11 +371,13 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
case TOGGLE_LAYER_COLOR: case TOGGLE_LAYER_COLOR:
if (record->event.pressed) { if (record->event.pressed) {
keyboard_config.disable_layer_led ^= 1; keyboard_config.disable_layer_led ^= 1;
if (keyboard_config.disable_layer_led) if (keyboard_config.disable_layer_led) {
rgb_matrix_set_color_all(0, 0, 0); rgb_matrix_set_color_all(0, 0, 0);
}
eeconfig_update_kb(keyboard_config.raw); eeconfig_update_kb(keyboard_config.raw);
} }
break; break;
case RGB_TOG: case RGB_TOG:
if (record->event.pressed) { if (record->event.pressed) {
switch (rgb_matrix_get_flags()) { switch (rgb_matrix_get_flags()) {

21
betalupi_ergodox.h
View File

@ -80,8 +80,7 @@ inline void ergodox_left_led_2_off(void) { ergodox_left_led_2 = 0; }
inline void ergodox_left_led_3_off(void) { ergodox_left_led_3 = 0; } inline void ergodox_left_led_3_off(void) { ergodox_left_led_3 = 0; }
#endif // LEFT_LEDS #endif // LEFT_LEDS
inline void ergodox_led_all_on(void) inline void ergodox_led_all_on(void) {
{
ergodox_board_led_on(); ergodox_board_led_on();
ergodox_right_led_1_on(); ergodox_right_led_1_on();
ergodox_right_led_2_on(); ergodox_right_led_2_on();
@ -93,8 +92,7 @@ inline void ergodox_led_all_on(void)
#endif // LEFT_LEDS #endif // LEFT_LEDS
} }
inline void ergodox_led_all_off(void) inline void ergodox_led_all_off(void) {
{
ergodox_board_led_off(); ergodox_board_led_off();
ergodox_right_led_1_off(); ergodox_right_led_1_off();
ergodox_right_led_2_off(); ergodox_right_led_2_off();
@ -115,8 +113,7 @@ inline void ergodox_right_led_set(uint8_t led, uint8_t n) {
(OCR1C = n); (OCR1C = n);
} }
inline void ergodox_led_all_set(uint8_t n) inline void ergodox_led_all_set(uint8_t n) {
{
ergodox_right_led_1_set(n); ergodox_right_led_1_set(n);
ergodox_right_led_2_set(n); ergodox_right_led_2_set(n);
ergodox_right_led_3_set(n); ergodox_right_led_3_set(n);
@ -140,9 +137,9 @@ typedef union {
extern keyboard_config_t keyboard_config; extern keyboard_config_t keyboard_config;
/* /*
* LEFT HAND: LINES 115-122 LEFT HAND: LINES 115-122
* RIGHT HAND: LINES 124-131 RIGHT HAND: LINES 124-131
*/ */
#define LAYOUT_ergodox( \ #define LAYOUT_ergodox( \
\ \
k00,k01,k02,k03,k04,k05,k06, \ k00,k01,k02,k03,k04,k05,k06, \
@ -183,9 +180,9 @@ extern keyboard_config_t keyboard_config;
} }
/* /*
* LEFT HAND: LINES 158-165 LEFT HAND: LINES 158-165
* RIGHT HAND: LINES 167-174 RIGHT HAND: LINES 167-174
*/ */
#define LAYOUT_ergodox_80( \ #define LAYOUT_ergodox_80( \
\ \
k00,k01,k02,k03,k04,k05,k06, \ k00,k01,k02,k03,k04,k05,k06, \