summaryrefslogtreecommitdiffstats
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/bcat/bcat.h2
-rw-r--r--users/curry/oled.c10
-rw-r--r--users/curry/rgb_lighting_user.c6
-rw-r--r--users/doogle999/doogle999.c2
-rw-r--r--users/drashna/drashna.c2
-rwxr-xr-xusers/ericgebhart/oled/oled_stuff.c13
-rw-r--r--users/ishtob/ishtob.h2
-rw-r--r--users/konstantin/unicode.h2
-rw-r--r--users/kuchosauronad0/unicode.h1
-rw-r--r--users/kuchosauronad0/wrappers.h12
-rw-r--r--users/ridingqwerty/unicode.h116
-rw-r--r--users/rmeli/keyrecords/unicode.h20
-rw-r--r--users/rupa/wrappers.h24
-rw-r--r--users/snowe/readme_ocean_dream.md1
-rw-r--r--users/spidey3/layer_rgb.c12
-rw-r--r--users/spidey3/spidey3_unicode.h4
-rw-r--r--users/tominabox1/rules.mk1
-rw-r--r--users/turbomech/backupturbomech.c5
-rw-r--r--users/turbomech/turbomech.c3
-rw-r--r--users/wanleg/rules.mk2
-rw-r--r--users/xulkal/custom_oled.c14
-rw-r--r--users/yet-another-developer/unicode.h1
-rw-r--r--users/yet-another-developer/wrappers.h12
-rw-r--r--users/zer09/zer09.c9
24 files changed, 135 insertions, 141 deletions
diff --git a/users/bcat/bcat.h b/users/bcat/bcat.h
index 6fc84937c4..fb500b3b3b 100644
--- a/users/bcat/bcat.h
+++ b/users/bcat/bcat.h
@@ -18,7 +18,7 @@
#include <stdbool.h>
-#include "keycodes.h"
+#include "quantum_keycodes.h"
/* Layer numbers shared across keymaps. */
enum user_layer {
diff --git a/users/curry/oled.c b/users/curry/oled.c
index 89112af121..2defcbd80e 100644
--- a/users/curry/oled.c
+++ b/users/curry/oled.c
@@ -86,12 +86,12 @@ void render_layer_state(void) {
oled_write_P(PSTR(" Mods"), layer_state_is(_MODS));
}
-void render_keylock_status(uint8_t led_usb_state) {
+void render_keylock_status(led_t led_state) {
oled_write_P(PSTR("Lock:"), false);
oled_write_P(PSTR(" "), false);
- oled_write_P(PSTR("N"), led_usb_state & (1 << USB_LED_NUM_LOCK));
- oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
- oled_write_ln_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
+ oled_write_P(PSTR("N"), led_state.num_lock);
+ oled_write_P(PSTR("C"), led_state.caps_lock);
+ oled_write_ln_P(PSTR("S"), led_state.scroll_lock);
}
void render_mod_status(uint8_t modifiers) {
@@ -129,7 +129,7 @@ void render_user_status(void) {
void render_status_main(void) {
/* Show Keyboard Layout */
render_default_layer_state();
- render_keylock_status(host_keyboard_leds());
+ render_keylock_status(host_keyboard_led_state());
render_bootmagic_status();
render_user_status();
diff --git a/users/curry/rgb_lighting_user.c b/users/curry/rgb_lighting_user.c
index b8d519feca..34156744fe 100644
--- a/users/curry/rgb_lighting_user.c
+++ b/users/curry/rgb_lighting_user.c
@@ -11,9 +11,9 @@ void rgblight_sethsv_default_helper(uint8_t index) { rgblight_sethsv_at(rgblight
* This is especially useful for One Shot Mods, since it's not always obvious if they're still lit up.
*/
#if defined(INDICATOR_LIGHTS)
-void set_rgb_indicators(uint8_t this_mod, uint8_t this_led, uint8_t this_osm) {
+void set_rgb_indicators(uint8_t this_mod, led_t this_led, uint8_t this_osm) {
if (userspace_config.rgb_layer_change && get_highest_layer(layer_state) == 0) {
- if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) {
+ if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led.caps_lock) {
# ifdef SHFT_LED1
rgblight_sethsv_at(120, 255, 255, SHFT_LED1);
# endif // SHFT_LED1
@@ -79,7 +79,7 @@ void set_rgb_indicators(uint8_t this_mod, uint8_t this_led, uint8_t this_osm) {
/* Function for the indicators */
void matrix_scan_indicator(void) {
if (has_initialized) {
- set_rgb_indicators(get_mods(), host_keyboard_leds(), get_oneshot_mods());
+ set_rgb_indicators(get_mods(), host_keyboard_led_state(), get_oneshot_mods());
}
}
#endif // INDICATOR_LIGHTS
diff --git a/users/doogle999/doogle999.c b/users/doogle999/doogle999.c
index 5d71599687..a5bd637ece 100644
--- a/users/doogle999/doogle999.c
+++ b/users/doogle999/doogle999.c
@@ -389,7 +389,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record)
/* KC_KP_1, KC_KP_2, ..., KC_KP_0, KC_KP_DOT */
(keycode >= KC_KP_1 && keycode <= KC_KP_DOT);
- if(numpadKeyPressed && !(host_keyboard_leds() & (1 << USB_LED_NUM_LOCK)))
+ if(numpadKeyPressed && !host_keyboard_led_state().num_lock)
{
add_key(KC_NUM_LOCK);
send_keyboard_report();
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index cad6db8f3d..b8ccbb028c 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -141,7 +141,7 @@ float autocorrect_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
# endif
# endif
-bool apply_autocorrect(uint8_t backspaces, const char *str) {
+bool apply_autocorrect(uint8_t backspaces, const char* str, char *typo, char *correct) {
if (layer_state_is(_GAMEPAD)) {
return false;
}
diff --git a/users/ericgebhart/oled/oled_stuff.c b/users/ericgebhart/oled/oled_stuff.c
index f2c4f0f394..211fe4ab3e 100755
--- a/users/ericgebhart/oled/oled_stuff.c
+++ b/users/ericgebhart/oled/oled_stuff.c
@@ -32,11 +32,11 @@ void oled_render_locale(void) {
}
}
-void oled_render_keylock_status(uint8_t led_usb_state) {
+void oled_render_keylock_status(led_t led_state) {
oled_write_P(PSTR(" Lock:"), false);
- oled_write_P(PSTR("N"), led_usb_state & (1 << USB_LED_NUM_LOCK));
- oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
- oled_write_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
+ oled_write_P(PSTR("N"), led_state.num_lock);
+ oled_write_P(PSTR("C"), led_state.caps_lock);
+ oled_write_P(PSTR("S"), led_state.scroll_lock);
}
void oled_render_mod_status(uint8_t modifiers) {
@@ -49,7 +49,7 @@ void oled_render_mod_status(uint8_t modifiers) {
void oled_render_mod_lock_status(void){
oled_render_mod_status(get_mods() | get_oneshot_mods());
- oled_render_keylock_status(host_keyboard_leds());
+ oled_render_keylock_status(host_keyboard_led_state());
}
@@ -187,6 +187,3 @@ bool oled_task_user(void) {
}
#endif
-
-/* oled_render_keylock_status(host_keyboard_leds()); */
-/* oled_render_mod_status(get_mods() | get_oneshot_mods()); */
diff --git a/users/ishtob/ishtob.h b/users/ishtob/ishtob.h
index fd9e19c809..fcc2e2b847 100644
--- a/users/ishtob/ishtob.h
+++ b/users/ishtob/ishtob.h
@@ -36,7 +36,7 @@ enum userspace_keycodes {
#define _FNLAYER 6
#define _NUMLAY 7
#define _MOUSECURSOR 8
-#define _ADJUST 16
+#define _ADJUST 9
diff --git a/users/konstantin/unicode.h b/users/konstantin/unicode.h
index 82caea7c9a..472f48a942 100644
--- a/users/konstantin/unicode.h
+++ b/users/konstantin/unicode.h
@@ -31,7 +31,7 @@
#define UCM_NAME(name, code) UCM_ ## name,
#define UCM_ENTRY(name, code) [UCM_ ## name] = code,
-#define UCM_KEYCODE(name, code) name = X(UCM_ ## name),
+#define UCM_KEYCODE(name, code) name = UM(UCM_ ## name),
#if defined(UNICODE_ENABLE)
enum unicode_keycodes {
diff --git a/users/kuchosauronad0/unicode.h b/users/kuchosauronad0/unicode.h
index 9ff523baad..340b4cf94b 100644
--- a/users/kuchosauronad0/unicode.h
+++ b/users/kuchosauronad0/unicode.h
@@ -2,7 +2,6 @@
#include "quantum.h"
-/* use X(n) to call the */
#ifdef UNICODEMAP_ENABLE
enum unicode_name {
OKOK, //
diff --git a/users/kuchosauronad0/wrappers.h b/users/kuchosauronad0/wrappers.h
index 543586e009..a17e4178ff 100644
--- a/users/kuchosauronad0/wrappers.h
+++ b/users/kuchosauronad0/wrappers.h
@@ -152,13 +152,13 @@ NOTE: These are all the same length. If you do a search/replace
#endif
#ifdef UNICODEMAP_ENABLE
-# define _______________UNICODE_L1__________________ X(SMRK), X(THINK), X(CLOWN), X(HUNDR), X(BANG)
-# define _______________UNICODE_L2__________________ X(GRIN), X(MONKEY), X(OKOK), X(EGGPL), X(LIT)
-# define _______________UNICODE_L3__________________ X(WEARY), X(UNAMU), X(EFFU), X(MONOCL), X(IRONY)
+# define _______________UNICODE_L1__________________ UM(SMRK), UM(THINK), UM(CLOWN), UM(HUNDR), UM(BANG)
+# define _______________UNICODE_L2__________________ UM(GRIN), UM(MONKEY), UM(OKOK), UM(EGGPL), UM(LIT)
+# define _______________UNICODE_L3__________________ UM(WEARY), UM(UNAMU), UM(EFFU), UM(MONOCL), UM(IRONY)
-# define _______________UNICODE_R1__________________ X(DRUG0), X(THUP), X(INUP), X(DIZZY), X(COOL)
-# define _______________UNICODE_R2__________________ X(FIST0), X(FIST2), X(FIST3), X(FIST1), X(OKOK)
-# define _______________UNICODE_R3__________________ X(MNDBLWN), X(THDN), X(SPOCK), X(HOLE), X(DASH)
+# define _______________UNICODE_R1__________________ UM(DRUG0), UM(THUP), UM(INUP), UM(DIZZY), UM(COOL)
+# define _______________UNICODE_R2__________________ UM(FIST0), UM(FIST2), UM(FIST3), UM(FIST1), UM(OKOK)
+# define _______________UNICODE_R3__________________ UM(MNDBLWN), UM(THDN), UM(SPOCK), UM(HOLE), UM(DASH)
#endif
#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5
diff --git a/users/ridingqwerty/unicode.h b/users/ridingqwerty/unicode.h
index de8d1593b4..08b6f4fb8d 100644
--- a/users/ridingqwerty/unicode.h
+++ b/users/ridingqwerty/unicode.h
@@ -216,7 +216,7 @@
#define UCM_NAME(name, code) UCM_ ## name, // UCM_LALP,
#define UCM_ENTRY(name, code) [UCM_ ## name] = code, // [UCM_LALP] = 0x03B1,
-#define UCM_KEYCODE(name, code) name = X(UCM_ ## name), // LALP = X(UCM_LALP)
+#define UCM_KEYCODE(name, code) name = UM(UCM_ ## name), // LALP = UM(UCM_LALP)
#if defined(UNICODE_ENABLE)
enum unicode_keycodes {
@@ -235,61 +235,61 @@ enum unicode_keycodes {
#endif
-#define ALPHA XP(LALP, UALP)
-#define BETA XP(LBET, UBET)
-#define GAMMA XP(LGAM, UGAM)
-#define DELTA XP(LDEL, UDEL)
-#define EPSLN XP(LEPS, UEPS)
-#define ZETA XP(LZET, UZET)
-#define ETA XP(LETA, UETA)
-#define THETA XP(LTHE, UTHE)
-#define IOTA XP(LIOT, UIOT)
-#define KAPPA XP(LKAP, UKAP)
-#define LAMBD XP(LLAM, ULAM)
-#define GMU XP(LMU, UMU)
-#define NU XP(LNU, UNU)
-#define XI XP(LXI, UXI)
-#define OMCRN XP(LOMI, UOMI)
-#define PI XP(LPI, UPI)
-#define RHO XP(LRHO, URHO)
-#define SIGMA XP(LSIG, USIG)
-#define TAU XP(LTAU, UTAU)
-#define UPSLN XP(LUPS, UUPS)
-#define PHI XP(LPHI, UPHI)
-#define CHI XP(LCHI, UCHI)
-#define PSI XP(LPSI, UPSI)
-#define OMEGA XP(LOME, UOME)
+#define ALPHA UP(LALP, UALP)
+#define BETA UP(LBET, UBET)
+#define GAMMA UP(LGAM, UGAM)
+#define DELTA UP(LDEL, UDEL)
+#define EPSLN UP(LEPS, UEPS)
+#define ZETA UP(LZET, UZET)
+#define ETA UP(LETA, UETA)
+#define THETA UP(LTHE, UTHE)
+#define IOTA UP(LIOT, UIOT)
+#define KAPPA UP(LKAP, UKAP)
+#define LAMBD UP(LLAM, ULAM)
+#define GMU UP(LMU, UMU)
+#define NU UP(LNU, UNU)
+#define XI UP(LXI, UXI)
+#define OMCRN UP(LOMI, UOMI)
+#define PI UP(LPI, UPI)
+#define RHO UP(LRHO, URHO)
+#define SIGMA UP(LSIG, USIG)
+#define TAU UP(LTAU, UTAU)
+#define UPSLN UP(LUPS, UUPS)
+#define PHI UP(LPHI, UPHI)
+#define CHI UP(LCHI, UCHI)
+#define PSI UP(LPSI, UPSI)
+#define OMEGA UP(LOME, UOME)
-#define AH XP(LAH, UAH)
-#define BE XP(LBE, UBE)
-#define VE XP(LVE, UVE)
-#define GHE XP(LGHE, UGHE)
-#define DE XP(LDE, UDE)
-#define IE XP(LIE, UIE)
-#define IO XP(LIO, UIO)
-#define ZHE XP(LZHE, UZHE)
-#define ZE XP(LZE, UZE)
-#define IH XP(LIH, UIH)
-#define SIH XP(LSIH, USIH)
-#define KA XP(LKA, UKA)
-#define EL XP(LEL, UEL)
-#define EM XP(LEM, UEM)
-#define EN XP(LEN, UEN)
-#define OH XP(LOH, UOH)
-#define PE XP(LPE, UPE)
-#define ER XP(LER, UER)
-#define ES XP(LES, UES)
-#define TE XP(LTE, UTE)
-#define UU XP(LUU, UUU)
-#define EF XP(LEF, UEF)
-#define HA XP(LHA, UHA)
-#define TSE XP(LTSE, UTSE)
-#define CHE XP(LCHE, UCHE)
-#define SHA XP(LSHA, USHA)
-#define SCHA XP(LSCHA, USCHA)
-#define HARD XP(LHARD, UHARD)
-#define YERU XP(LYERU, UYERU)
-#define SOFT XP(LSOFT, USOFT)
-#define EH XP(LEH, UEH)
-#define YU XP(LYU, UYU)
-#define YA XP(LYA, UYA)
+#define AH UP(LAH, UAH)
+#define BE UP(LBE, UBE)
+#define VE UP(LVE, UVE)
+#define GHE UP(LGHE, UGHE)
+#define DE UP(LDE, UDE)
+#define IE UP(LIE, UIE)
+#define IO UP(LIO, UIO)
+#define ZHE UP(LZHE, UZHE)
+#define ZE UP(LZE, UZE)
+#define IH UP(LIH, UIH)
+#define SIH UP(LSIH, USIH)
+#define KA UP(LKA, UKA)
+#define EL UP(LEL, UEL)
+#define EM UP(LEM, UEM)
+#define EN UP(LEN, UEN)
+#define OH UP(LOH, UOH)
+#define PE UP(LPE, UPE)
+#define ER UP(LER, UER)
+#define ES UP(LES, UES)
+#define TE UP(LTE, UTE)
+#define UU UP(LUU, UUU)
+#define EF UP(LEF, UEF)
+#define HA UP(LHA, UHA)
+#define TSE UP(LTSE, UTSE)
+#define CHE UP(LCHE, UCHE)
+#define SHA UP(LSHA, USHA)
+#define SCHA UP(LSCHA, USCHA)
+#define HARD UP(LHARD, UHARD)
+#define YERU UP(LYERU, UYERU)
+#define SOFT UP(LSOFT, USOFT)
+#define EH UP(LEH, UEH)
+#define YU UP(LYU, UYU)
+#define YA UP(LYA, UYA)
diff --git a/users/rmeli/keyrecords/unicode.h b/users/rmeli/keyrecords/unicode.h
index c3ba96d5b6..63c355415e 100644
--- a/users/rmeli/keyrecords/unicode.h
+++ b/users/rmeli/keyrecords/unicode.h
@@ -74,13 +74,13 @@ const uint32_t unicode_map[] PROGMEM = {
};
// Accents
-#define A_GRV XP(aGRV, AGRV)
-#define A_UML XP(aUML, AUML)
-#define E_GRV XP(eGRV, EGRV)
-#define E_ACT XP(eACT, EACT)
-#define I_GRV XP(iGRV, IGRV)
-#define I_CIR XP(iCIR, ICIR)
-#define O_GRV XP(oGRV, OGRV)
-#define O_UML XP(oUML, OUML)
-#define U_GRV XP(uGRV, UGRV)
-#define U_UML XP(uUML, UUML)
+#define A_GRV UP(aGRV, AGRV)
+#define A_UML UP(aUML, AUML)
+#define E_GRV UP(eGRV, EGRV)
+#define E_ACT UP(eACT, EACT)
+#define I_GRV UP(iGRV, IGRV)
+#define I_CIR UP(iCIR, ICIR)
+#define O_GRV UP(oGRV, OGRV)
+#define O_UML UP(oUML, OUML)
+#define U_GRV UP(uGRV, UGRV)
+#define U_UML UP(uUML, UUML)
diff --git a/users/rupa/wrappers.h b/users/rupa/wrappers.h
index dfc00b5120..df32ef39ab 100644
--- a/users/rupa/wrappers.h
+++ b/users/rupa/wrappers.h
@@ -28,14 +28,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define G_LWR LT(_LOWER, KC_G)
#if defined(UNICODEMAP_ENABLE)
-# define CSHAPES XP(CCIR,CKEY)
-# define CUIDADO XP(CUI,HAS)
-# define NOPENAH XP(NOPE,STOP)
-# define MUSIC_A XP(M4,M8)
-# define MUSIC_B XP(M8B,M16)
-# define SMILE XP(SMB,SMW)
-# define STARS XP(STB,STW)
-# define YEPYEP XP(CHEK,HUN)
+# define CSHAPES UP(CCIR,CKEY)
+# define CUIDADO UP(CUI,HAS)
+# define NOPENAH UP(NOPE,STOP)
+# define MUSIC_A UP(M4,M8)
+# define MUSIC_B UP(M8B,M16)
+# define SMILE UP(SMB,SMW)
+# define STARS UP(STB,STW)
+# define YEPYEP UP(CHEK,HUN)
#endif
/* _QWERTY
@@ -70,10 +70,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* │RCtl│RAlt│RGui│ FLIP │ │ │ │M← │M↓ │M→ │
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
*/
-#define ____65_RAISE_______________ROW1 KC_GRV, X(IBNG), X(IRNY), _______, X(CENT), _______, _______, _______, STARS, _______, SMILE, X(NEG), CSHAPES, KC_DEL, KC_HOME
-#define ____65_RAISE_______________ROW2 _______, _______, WAT, X(LEXI), RUPA, TADA, YUNO, _______, X(LELM), X(OM), _______, MUSIC_A, MUSIC_B, _______, KC_INS
-#define ____65_RAISE_______________ROW3 _______, X(LALL), X(EFF), DICE, FART, _______, HUGS, JOY, KISS, LOD, _______, NOPENAH, YEPYEP, KC_END
-#define ____65_RAISE_______________ROW4 OS_RSFT, CUIDADO, X(ECKS), CATS, DOMO, BUGS, X(NUM), MUSIC, DANCE, X(LPRO), SHRUG, KC_BTN1, KC_MS_U, KC_BTN2
+#define ____65_RAISE_______________ROW1 KC_GRV, UM(IBNG), UM(IRNY), _______, UM(CENT), _______, _______, _______, STARS, _______, SMILE, UM(NEG), CSHAPES, KC_DEL, KC_HOME
+#define ____65_RAISE_______________ROW2 _______, _______, WAT, UM(LEXI), RUPA, TADA, YUNO, _______, UM(LELM), UM(OM), _______, MUSIC_A, MUSIC_B, _______, KC_INS
+#define ____65_RAISE_______________ROW3 _______, UM(LALL), UM(EFF), DICE, FART, _______, HUGS, JOY, KISS, LOD, _______, NOPENAH, YEPYEP, KC_END
+#define ____65_RAISE_______________ROW4 OS_RSFT, CUIDADO, UM(ECKS), CATS, DOMO, BUGS, UM(NUM), MUSIC, DANCE, UM(LPRO), SHRUG, KC_BTN1, KC_MS_U, KC_BTN2
#define ____65_RAISE_______________ROW5 OS_RCTL, OS_RALT, OS_RGUI, FLIP, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
/* _LOWER
diff --git a/users/snowe/readme_ocean_dream.md b/users/snowe/readme_ocean_dream.md
index 688afc8998..fd6de1bca7 100644
--- a/users/snowe/readme_ocean_dream.md
+++ b/users/snowe/readme_ocean_dream.md
@@ -60,7 +60,6 @@ endif
You're done! Now you can enable **Ocean Dream** by simply turning on the OLED feature
```makefile
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
```
And if you want to disable it without turning off the OLED Driver you can simply set
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c
index cff20898cd..be76788d21 100644
--- a/users/spidey3/layer_rgb.c
+++ b/users/spidey3/layer_rgb.c
@@ -73,9 +73,9 @@ const rgblight_segment_t *const PROGMEM _rgb_layers[] = {
[LAYER_OFFSET + _NUMPAD] = _layer1_layer,
[LAYER_OFFSET + _FN] = _layer2_layer,
- [LOCK_OFFSET + USB_LED_NUM_LOCK] = _numlock_layer,
- [LOCK_OFFSET + USB_LED_CAPS_LOCK] = _capslock_layer,
- [LOCK_OFFSET + USB_LED_SCROLL_LOCK] = _scrolllock_layer,
+ [LOCK_OFFSET + 0] = _numlock_layer,
+ [LOCK_OFFSET + 1] = _capslock_layer,
+ [LOCK_OFFSET + 2] = _scrolllock_layer,
[MISC_OFFSET + 0] = _gflock_layer,
[MISC_OFFSET + 1] = _glyphreplace_layer,
@@ -374,9 +374,9 @@ layer_state_t layer_state_set_user_rgb(layer_state_t state) {
}
bool led_update_user_rgb(led_t led_state) {
- rgblight_set_layer_state(LOCK_OFFSET + USB_LED_NUM_LOCK, led_state.num_lock);
- rgblight_set_layer_state(LOCK_OFFSET + USB_LED_CAPS_LOCK, led_state.caps_lock);
- rgblight_set_layer_state(LOCK_OFFSET + USB_LED_SCROLL_LOCK, led_state.scroll_lock);
+ rgblight_set_layer_state(LOCK_OFFSET + 0, led_state.num_lock);
+ rgblight_set_layer_state(LOCK_OFFSET + 1, led_state.caps_lock);
+ rgblight_set_layer_state(LOCK_OFFSET + 2, led_state.scroll_lock);
return true;
}
diff --git a/users/spidey3/spidey3_unicode.h b/users/spidey3/spidey3_unicode.h
index ee8e00056c..4a3657fdfd 100644
--- a/users/spidey3/spidey3_unicode.h
+++ b/users/spidey3/spidey3_unicode.h
@@ -25,7 +25,7 @@ enum unicode_names {
SURPRISE,
};
-# define X_BUL (XP(BUL1, BUL2))
-# define X_DASH (XP(EMDASH, ENDASH))
+# define X_BUL (UP(BUL1, BUL2))
+# define X_DASH (UP(EMDASH, ENDASH))
#endif
diff --git a/users/tominabox1/rules.mk b/users/tominabox1/rules.mk
index 1df5634640..f1ee5c0485 100644
--- a/users/tominabox1/rules.mk
+++ b/users/tominabox1/rules.mk
@@ -12,7 +12,6 @@ RGB_MATRIX_ENABLE = yes
EXTRAFLAGS += -flto
BOOTLOADER = qmk-dfu
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
endif
ifeq ($(strip $(KEYBOARD)), lazydesigners/dimple)
diff --git a/users/turbomech/backupturbomech.c b/users/turbomech/backupturbomech.c
index 3671d27ab4..70d3d065c4 100644
--- a/users/turbomech/backupturbomech.c
+++ b/users/turbomech/backupturbomech.c
@@ -135,14 +135,15 @@ void matrix_init_user(void) {
}
static bool is_capslocked = false;
-void led_set_user(uint8_t usb_led) {
- if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+ if (led_state.caps_lock) {
is_capslocked = true;
// DDRB |= (1 << 2); PORTB &= ~(1 << 2);
} else {
is_capslocked = false;
// DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
}
+ return false;
}
//rgblight_set();
diff --git a/users/turbomech/turbomech.c b/users/turbomech/turbomech.c
index 892db1b927..75796fb8fb 100644
--- a/users/turbomech/turbomech.c
+++ b/users/turbomech/turbomech.c
@@ -101,8 +101,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
register_code(KC_LPRN);
unregister_code(KC_LPRN);
- register_code(X(0x00B0));
- unregister_code(X(0x00B0));
+ register_unicode(0x00B0);
UC(0x256F);
PROCESS_UNICODE(UC(0x00B0));
diff --git a/users/wanleg/rules.mk b/users/wanleg/rules.mk
index de4decf78a..cb447a1792 100644
--- a/users/wanleg/rules.mk
+++ b/users/wanleg/rules.mk
@@ -22,7 +22,7 @@ ifeq ($(strip $(BT)), yes)
OPT_DEFS += -DBLUEFRUIT
#Adafruit Bluefruit controller settings
BLUETOOTH_ENABLE = yes
- BLUETOOTH_DRIVER = BluefruitLE
+ BLUETOOTH_DRIVER = bluefruit_le
F_CPU = 8000000
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = no # Commands for debug and configuration
diff --git a/users/xulkal/custom_oled.c b/users/xulkal/custom_oled.c
index fd03033ad6..c6341fa3d7 100644
--- a/users/xulkal/custom_oled.c
+++ b/users/xulkal/custom_oled.c
@@ -71,15 +71,15 @@ static void render_layer(void)
static void render_keyboard_leds(void)
{
// Host Keyboard LED Status
- uint8_t led_state = host_keyboard_leds();
+ led_t led_state = host_keyboard_led_state();
#ifdef OLED_90ROTATION
- oled_write_P(IS_LED_ON(led_state, USB_LED_NUM_LOCK) ? PSTR("NUMLK") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLK") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLK") : PSTR(" "), false);
+ oled_write_P(led_state.num_lock ? PSTR("NUMLK") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPLK") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCRLK") : PSTR(" "), false);
#else
- oled_write_P(IS_LED_ON(led_state, USB_LED_NUM_LOCK) ? PSTR("NUM ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_CAPS_LOCK) ? PSTR("CAPS ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRL") : PSTR(" "), false);
+ oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCRL") : PSTR(" "), false);
#endif
}
diff --git a/users/yet-another-developer/unicode.h b/users/yet-another-developer/unicode.h
index 9ff523baad..340b4cf94b 100644
--- a/users/yet-another-developer/unicode.h
+++ b/users/yet-another-developer/unicode.h
@@ -2,7 +2,6 @@
#include "quantum.h"
-/* use X(n) to call the */
#ifdef UNICODEMAP_ENABLE
enum unicode_name {
OKOK, //
diff --git a/users/yet-another-developer/wrappers.h b/users/yet-another-developer/wrappers.h
index cd21032a4e..776da0c77e 100644
--- a/users/yet-another-developer/wrappers.h
+++ b/users/yet-another-developer/wrappers.h
@@ -118,13 +118,13 @@ NOTE: These are all the same length. If you do a search/replace
#endif
#ifdef UNICODEMAP_ENABLE
-#define _______________UNICODE_L1__________________ X(SMRK), X(THINK), X(CLOWN), X(HUNDR), X(BANG)
-#define _______________UNICODE_L2__________________ X(GRIN), X(MONKEY), X(OKOK), X(EGGPL), X(LIT)
-#define _______________UNICODE_L3__________________ X(WEARY), X(UNAMU), X(EFFU), X(MONOCL), X(IRONY)
+#define _______________UNICODE_L1__________________ UM(SMRK), UM(THINK), UM(CLOWN), UM(HUNDR), UM(BANG)
+#define _______________UNICODE_L2__________________ UM(GRIN), UM(MONKEY), UM(OKOK), UM(EGGPL), UM(LIT)
+#define _______________UNICODE_L3__________________ UM(WEARY), UM(UNAMU), UM(EFFU), UM(MONOCL), UM(IRONY)
-#define _______________UNICODE_R1__________________ X(DRUG0), X(THUP), X(INUP), X(DIZZY), X(COOL)
-#define _______________UNICODE_R2__________________ X(FIST0), X(FIST2),X(FIST3),X(FIST1), X(OKOK)
-#define _______________UNICODE_R3__________________ X(MNDBLWN), X(THDN), X(SPOCK),X(HOLE), X(DASH)
+#define _______________UNICODE_R1__________________ UM(DRUG0), UM(THUP), UM(INUP), UM(DIZZY), UM(COOL)
+#define _______________UNICODE_R2__________________ UM(FIST0), UM(FIST2),UM(FIST3),UM(FIST1), UM(OKOK)
+#define _______________UNICODE_R3__________________ UM(MNDBLWN), UM(THDN), UM(SPOCK),UM(HOLE), UM(DASH)
#endif
#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5
diff --git a/users/zer09/zer09.c b/users/zer09/zer09.c
index 78433b4c20..5e192f037a 100644
--- a/users/zer09/zer09.c
+++ b/users/zer09/zer09.c
@@ -69,8 +69,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return process_record_keymap(keycode, record);
}
-void led_set_user(uint8_t usb_led) {
- if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+ if (led_state.caps_lock) {
rbw_led_keys[RBW_LCAP].status = ENABLED;
rbw_led_keys[RBW_RCAP].status = ENABLED;
} else {
@@ -78,11 +78,12 @@ void led_set_user(uint8_t usb_led) {
rbw_led_keys[RBW_RCAP].status = DISABLED;
}
- if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+ if (led_state.scroll_lock) {
rbw_led_keys[RBW_SCRL].status = ENABLED;
} else {
rbw_led_keys[RBW_SCRL].status = DISABLED;
}
- led_set_keymap(usb_led);
+ led_set_keymap(led_state.raw);
+ return false;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 08:43:34 +0000