summaryrefslogtreecommitdiff
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)
[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 417678f7e6..25108aa13d 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] = {
[_QWERTY] = LAYOUT_base_wrapper(QWERTY_base),
#ifdef DIPS_ENABLE
-[_DIPS] = LAYOUT_DIPS(\
+[_DIPS] = LAYOUT_dips(\
LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH, \
LAYOUT0, LAYOUT1, LAYOUT2, LAYOUT3, DIP_ISO, FLIP_TH \
),
diff --git a/keyboards/jian/nsrev2/nsrev2.c b/keyboards/jian/nsrev2/nsrev2.c
index a7508ad9b2..c3acff55ee 100644
--- a/keyboards/jian/nsrev2/nsrev2.c
+++ b/keyboards/jian/nsrev2/nsrev2.c
@@ -1,7 +1,7 @@
#include "nsrev2.h"
-// TODO:
#ifdef SWAP_HANDS_ENABLE
+__attribute__ ((weak))
const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
{{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}},
{{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] = {
};
#endif
+#ifdef BACKLIGHT_ENABLE
static bool backlight_was_toggled = false;
void suspend_power_down_kb(void) {
@@ -29,6 +30,7 @@ void suspend_wakeup_init_kb(void) {
backlight_was_toggled = false;
}
}
+#endif
#ifdef PHYSICAL_LEDS_ENABLE
void led_init_kb(void)
diff --git a/keyboards/jian/rev1/rev1.c b/keyboards/jian/rev1/rev1.c
index f1cfe99180..1c7e936270 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] = {
};
#endif
+#ifdef BACKLIGHT_ENABLE
static bool backlight_was_toggled = false;
void suspend_power_down_kb(void) {
@@ -29,6 +30,7 @@ void suspend_wakeup_init_kb(void) {
backlight_was_toggled = false;
}
}
+#endif
#ifdef PHYSICAL_LEDS_ENABLE
void led_init_kb(void)
diff --git a/keyboards/jian/rev2/rev2.c b/keyboards/jian/rev2/rev2.c
index 6f4808de73..09824c6652 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] = {
};
#endif
+#ifdef BACKLIGHT_ENABLE
static bool backlight_was_toggled = false;
void suspend_power_down_kb(void) {
@@ -29,6 +30,7 @@ void suspend_wakeup_init_kb(void) {
backlight_was_toggled = false;
}
}
+#endif
#ifdef PHYSICAL_LEDS_ENABLE
void led_init_kb(void)