aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKgOfHedgehogs <kgofhedgehogs@gmail.com>2020-10-23 05:16:33 +0200
committerGitHub <noreply@github.com>2020-10-22 20:16:33 -0700
commit8cbaea9e8d00b959ccb1b474fa8a81417b651de2 (patch)
tree7ac67cc5170ae05d2371ded82601c92d656f8824
parente7d8ccdbb2c14af9cf37be680af1d8633729b65a (diff)
downloadqmk_firmware-8cbaea9e8d00b959ccb1b474fa8a81417b651de2.tar.gz
qmk_firmware-8cbaea9e8d00b959ccb1b474fa8a81417b651de2.zip
[Keyboard] Fix jian backlight related ifdefs (#10679)
* Add jian backlight enabled ifdefs * Fix adavnced layout LAYOUT_dips usage
-rw-r--r--keyboards/jian/keymaps/advanced/keymap.c2
-rw-r--r--keyboards/jian/nsrev2/nsrev2.c4
-rw-r--r--keyboards/jian/rev1/rev1.c2
-rw-r--r--keyboards/jian/rev2/rev2.c2
4 files changed, 8 insertions, 2 deletions
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index 417678f7e..25108aa13 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -191,7 +191,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
191[_QWERTY] = LAYOUT_base_wrapper(QWERTY_base), 191[_QWERTY] = LAYOUT_base_wrapper(QWERTY_base),
192 192
193#ifdef DIPS_ENABLE 193#ifdef DIPS_ENABLE
194[_DIPS] = LAYOUT_DIPS(\ 194[_DIPS] = LAYOUT_dips(\
195 LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH, \ 195 LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH, \
196 LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH \ 196 LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH \
197), 197),
diff --git a/keyboards/jian/nsrev2/nsrev2.c b/keyboards/jian/nsrev2/nsrev2.c
index a7508ad9b..c3acff55e 100644
--- a/keyboards/jian/nsrev2/nsrev2.c
+++ b/keyboards/jian/nsrev2/nsrev2.c
@@ -1,7 +1,7 @@
1#include "nsrev2.h" 1#include "nsrev2.h"
2 2
3// TODO:
4#ifdef SWAP_HANDS_ENABLE 3#ifdef SWAP_HANDS_ENABLE
4__attribute__ ((weak))
5const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { 5const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
6 {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}}, 6 {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}},
7 {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}}, 7 {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}},
@@ -14,6 +14,7 @@ const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
14}; 14};
15#endif 15#endif
16 16
17#ifdef BACKLIGHT_ENABLE
17static bool backlight_was_toggled = false; 18static bool backlight_was_toggled = false;
18 19
19void suspend_power_down_kb(void) { 20void suspend_power_down_kb(void) {
@@ -29,6 +30,7 @@ void suspend_wakeup_init_kb(void) {
29 backlight_was_toggled = false; 30 backlight_was_toggled = false;
30 } 31 }
31} 32}
33#endif
32 34
33#ifdef PHYSICAL_LEDS_ENABLE 35#ifdef PHYSICAL_LEDS_ENABLE
34void led_init_kb(void) 36void led_init_kb(void)
diff --git a/keyboards/jian/rev1/rev1.c b/keyboards/jian/rev1/rev1.c
index f1cfe9918..1c7e93627 100644
--- a/keyboards/jian/rev1/rev1.c
+++ b/keyboards/jian/rev1/rev1.c
@@ -14,6 +14,7 @@ const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
14}; 14};
15#endif 15#endif
16 16
17#ifdef BACKLIGHT_ENABLE
17static bool backlight_was_toggled = false; 18static bool backlight_was_toggled = false;
18 19
19void suspend_power_down_kb(void) { 20void suspend_power_down_kb(void) {
@@ -29,6 +30,7 @@ void suspend_wakeup_init_kb(void) {
29 backlight_was_toggled = false; 30 backlight_was_toggled = false;
30 } 31 }
31} 32}
33#endif
32 34
33#ifdef PHYSICAL_LEDS_ENABLE 35#ifdef PHYSICAL_LEDS_ENABLE
34void led_init_kb(void) 36void led_init_kb(void)
diff --git a/keyboards/jian/rev2/rev2.c b/keyboards/jian/rev2/rev2.c
index 6f4808de7..09824c665 100644
--- a/keyboards/jian/rev2/rev2.c
+++ b/keyboards/jian/rev2/rev2.c
@@ -14,6 +14,7 @@ const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
14}; 14};
15#endif 15#endif
16 16
17#ifdef BACKLIGHT_ENABLE
17static bool backlight_was_toggled = false; 18static bool backlight_was_toggled = false;
18 19
19void suspend_power_down_kb(void) { 20void suspend_power_down_kb(void) {
@@ -29,6 +30,7 @@ void suspend_wakeup_init_kb(void) {
29 backlight_was_toggled = false; 30 backlight_was_toggled = false;
30 } 31 }
31} 32}
33#endif
32 34
33#ifdef PHYSICAL_LEDS_ENABLE 35#ifdef PHYSICAL_LEDS_ENABLE
34void led_init_kb(void) 36void led_init_kb(void)