Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to data driven - superseeds part of https://github.com/qmk/qmk… #20220

Merged
merged 35 commits into from
Oct 12, 2023
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c02e5b1
update to data driven - superseeds part of https://github.com/qmk/qmk…
Mar 22, 2023
36bb701
update
alinelena Mar 23, 2023
d4ec3b5
remove lock leds as layer indicator and replace them with real leds
alinelena Mar 23, 2023
3652ab1
Update keyboards/mlego/m65/rev1/info.json
Jul 4, 2023
83ffcee
update json
Jul 4, 2023
454051f
move led to kb
Jul 4, 2023
125e5d9
consistent leds, cleanup info.json
Jul 4, 2023
5ec8732
add missing config
Jul 4, 2023
8486f5e
fix borked merge
Jul 4, 2023
34ee0a3
fix borked merge
Jul 4, 2023
c16c9b4
address review requests
Jul 4, 2023
69a9bfa
Update keyboards/mlego/m65/keymaps/default/keymap.c
Jul 5, 2023
87f5bce
Update keyboards/mlego/m65/keymaps/uk/keymap.c
Jul 5, 2023
32fa23d
Update keyboards/mlego/m65/m65.c
Jul 6, 2023
dea2b2a
apply format-json
Aug 29, 2023
4c8277a
one more _kb fixed
Aug 29, 2023
68a9002
Update keyboards/mlego/m65/rev2/info.json
Aug 30, 2023
b29b31f
Update keyboards/mlego/m65/rev3/info.json
Aug 30, 2023
9813d23
Update keyboards/mlego/m65/rev4/info.json
Aug 30, 2023
1bef852
Update keyboards/mlego/m65/rev4/rules.mk
Aug 30, 2023
6b27f15
one more user
Aug 30, 2023
e8547d1
one more
Aug 30, 2023
43617cb
more cleanup
Aug 30, 2023
598265f
more cleanup
Aug 30, 2023
c6b3f85
better codes for encoder
Aug 30, 2023
364ed36
update
Sep 25, 2023
843f31b
remove lock leds as layer indicator and replace them with real leds
alinelena Mar 23, 2023
764e30a
rebase and fix
alinelena Sep 25, 2023
26816ab
rebase and fix still does not compile
alinelena Sep 25, 2023
3292a67
rebase and fix and compiles
alinelena Sep 25, 2023
73e741e
rebase and fix and compiles
alinelena Sep 25, 2023
f847881
update
Sep 25, 2023
d0250ec
update
Sep 25, 2023
cb1a675
update
Sep 25, 2023
5a82d77
update fix uk keymap
Sep 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove lock leds as layer indicator and replace them with real leds
  • Loading branch information
alinelena authored and Alin Marin Elena committed Oct 6, 2023
commit 843f31bec16a77c81a1f8b2a230ad4d538f50a19
5 changes: 2 additions & 3 deletions keyboards/mlego/m65/m65.c
Original file line number Diff line number Diff line change
@@ -3,9 +3,6 @@

#include "m65.h"

// let us assume we start with both layers off
static bool toggle_lwr = false;
static bool toggle_rse = false;

#if defined(RGBLIGHT_ENABLE)

@@ -234,6 +231,8 @@ void keyboard_post_init_kb(void) {
init_timer();
#endif

#endif

#if defined(CONSOLE_ENABLE)
debug_enable = true;
debug_matrix = true;
19 changes: 18 additions & 1 deletion keyboards/mlego/m65/m65.h
Original file line number Diff line number Diff line change
@@ -11,6 +11,10 @@ enum unicode_names { la = 0, lA, lb, lB, lc, lC, ld, lD, le, lE, lf, lF, lg, lG,

enum layer_names { _QW = 0, _LWR, _RSE, _ADJ };

// let us assume we start with both layers off
static bool toggle_lwr = false;
static bool toggle_rse = false;

#ifdef OLED_ENABLE
void user_oled_magic(void);
void render_logo(void);
@@ -27,7 +31,7 @@ void set_default_rgb_layers(layer_state_t);
void toggle_leds(void);
void set_led_toggle(const uint8_t, const bool);

static inline void init_lwr_rse_led(const bool toggle_lwr, const bool toggle_rse) {
static inline void init_lwr_rse_led(void) {
#ifdef LED_LWR_PIN
setPinOutput(LED_LWR_PIN);
writePin(LED_LWR_PIN, toggle_lwr);
@@ -52,3 +56,16 @@ static inline void led_rse(const bool on) {
writePin(LED_RSE_PIN, on);
#endif
}
static inline void led_caps(const bool on) {
#ifdef LED_CAPS_LOCK_PIN
/*
if (((PRODUCT_ID == 0x6061) || (PRODUCT_ID == 0x6063) || (PRODUCT_ID == 0x6062)) && (DEVICE_VER == 0x0002)) {
writePin(LED_CAPS_LOCK_PIN, on);
} else {
*/
writePin(LED_CAPS_LOCK_PIN, !on);
/*
}
*/
#endif
}
4 changes: 2 additions & 2 deletions keyboards/mlego/m65/rev4/config.h
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@

#pragma once

#define LED_RSE_PIN B13
#define LED_LWR_PIN B12
#define LED_RSE_PIN B12
#define LED_LWR_PIN B13

#ifdef OLED_ENABLE
# define I2C1_SCL_PIN B9