summaryrefslogtreecommitdiffstats
path: root/keyboards/duck
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/duck')
-rw-r--r--keyboards/duck/eagle_viper/v2/config.h3
-rw-r--r--keyboards/duck/eagle_viper/v2/info.json3
-rw-r--r--keyboards/duck/jetfire/config.h1
-rw-r--r--keyboards/duck/jetfire/info.json3
-rw-r--r--keyboards/duck/lightsaver/config.h3
-rw-r--r--keyboards/duck/lightsaver/info.json3
-rw-r--r--keyboards/duck/octagon/v1/config.h3
-rw-r--r--keyboards/duck/octagon/v1/info.json3
-rw-r--r--keyboards/duck/octagon/v1/v1.c4
-rw-r--r--keyboards/duck/octagon/v2/config.h3
-rw-r--r--keyboards/duck/octagon/v2/info.json3
-rw-r--r--keyboards/duck/octagon/v2/v2.c10
-rw-r--r--keyboards/duck/orion/v3/config.h3
-rw-r--r--keyboards/duck/orion/v3/info.json3
-rw-r--r--keyboards/duck/tcv3/config.h1
-rw-r--r--keyboards/duck/tcv3/info.json3
-rw-r--r--keyboards/duck/tcv3/tcv3.c83
17 files changed, 28 insertions, 107 deletions
diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index e39099ef56..68f0ffa60f 100644
--- a/keyboards/duck/eagle_viper/v2/config.h
+++ b/keyboards/duck/eagle_viper/v2/config.h
@@ -34,6 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json
index 4d6019ddba..0352ab4760 100644
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ b/keyboards/duck/eagle_viper/v2/info.json
@@ -12,6 +12,9 @@
"bootmagic": {
"matrix": [4, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h
index 95459e67b1..426f673b05 100644
--- a/keyboards/duck/jetfire/config.h
+++ b/keyboards/duck/jetfire/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 23
/*
* Feature disable options
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json
index 287ab0ac4a..8c0a02dd7b 100644
--- a/keyboards/duck/jetfire/info.json
+++ b/keyboards/duck/jetfire/info.json
@@ -15,6 +15,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 23
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h
index cb5a419f56..07a54c3ca8 100644
--- a/keyboards/duck/lightsaver/config.h
+++ b/keyboards/duck/lightsaver/config.h
@@ -34,6 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json
index 296820d7ca..6c77c26bf0 100644
--- a/keyboards/duck/lightsaver/info.json
+++ b/keyboards/duck/lightsaver/info.json
@@ -15,6 +15,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h
index 9b557edaba..f0e8b748f0 100644
--- a/keyboards/duck/octagon/v1/config.h
+++ b/keyboards/duck/octagon/v1/config.h
@@ -34,6 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json
index 8186ce878e..2f07bbcb6d 100644
--- a/keyboards/duck/octagon/v1/info.json
+++ b/keyboards/duck/octagon/v1/info.json
@@ -15,6 +15,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/octagon/v1/v1.c b/keyboards/duck/octagon/v1/v1.c
index dc3b7fc728..35aea54456 100644
--- a/keyboards/duck/octagon/v1/v1.c
+++ b/keyboards/duck/octagon/v1/v1.c
@@ -43,8 +43,8 @@ void backlight_set(uint8_t level) {
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- backlight_os_state & (1<<USB_LED_CAPS_LOCK) ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
- backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
+ backlight_os_state & 2 ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
+ backlight_os_state & 4 ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
}
return res;
}
diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index 2530cedc0f..56b5aea64d 100644
--- a/keyboards/duck/octagon/v2/config.h
+++ b/keyboards/duck/octagon/v2/config.h
@@ -34,6 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json
index f3bd30fbe5..53c8c629a6 100644
--- a/keyboards/duck/octagon/v2/info.json
+++ b/keyboards/duck/octagon/v2/info.json
@@ -15,6 +15,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/octagon/v2/v2.c b/keyboards/duck/octagon/v2/v2.c
index 612df9aa3e..7a3ad76027 100644
--- a/keyboards/duck/octagon/v2/v2.c
+++ b/keyboards/duck/octagon/v2/v2.c
@@ -101,17 +101,17 @@ bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
bool status[7] = {
- backlight_os_state & (1<<USB_LED_CAPS_LOCK),
- backlight_os_state & (1<<USB_LED_SCROLL_LOCK),
- backlight_os_state & (1<<USB_LED_NUM_LOCK),
+ backlight_os_state & 2,
+ backlight_os_state & 4,
+ backlight_os_state & 1,
backlight_layer_state & (1<<1),
backlight_layer_state & (1<<2),
backlight_layer_state & (1<<3),
backlight_layer_state & (1<<4)
};
indicator_leds_set(status);
- backlight_os_state & (1<<USB_LED_CAPS_LOCK) ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
- backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
+ backlight_os_state & 2 ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
+ backlight_os_state & 4 ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
}
return res;
}
diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h
index e8d87e0719..57327932f6 100644
--- a/keyboards/duck/orion/v3/config.h
+++ b/keyboards/duck/orion/v3/config.h
@@ -34,6 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 18
-
-#define TAPPING_TERM 200
diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json
index eff1e5f88c..d7de16e7c9 100644
--- a/keyboards/duck/orion/v3/info.json
+++ b/keyboards/duck/orion/v3/info.json
@@ -16,6 +16,9 @@
"bootmagic": {
"matrix": [4, 10]
},
+ "rgblight": {
+ "led_count": 18
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/tcv3/config.h b/keyboards/duck/tcv3/config.h
index 13f2d76139..ed75effe40 100644
--- a/keyboards/duck/tcv3/config.h
+++ b/keyboards/duck/tcv3/config.h
@@ -34,4 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 17
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json
index 69f1033d22..6b4a650596 100644
--- a/keyboards/duck/tcv3/info.json
+++ b/keyboards/duck/tcv3/info.json
@@ -11,6 +11,9 @@
"bootmagic": {
"matrix": [5, 10]
},
+ "rgblight": {
+ "led_count": 17
+ },
"ws2812": {
"pin": "D6"
},
diff --git a/keyboards/duck/tcv3/tcv3.c b/keyboards/duck/tcv3/tcv3.c
index ab89e180c0..87b22443e4 100644
--- a/keyboards/duck/tcv3/tcv3.c
+++ b/keyboards/duck/tcv3/tcv3.c
@@ -24,69 +24,6 @@ enum BACKLIGHT_AREAS {
BACKLIGHT_SWITCH = 0b0001111
};
-// uint8_t backlight_rgb_r = 255;
-// uint8_t backlight_rgb_g = 0;
-// uint8_t backlight_rgb_b = 0;
-// uint8_t backlight_os_state = 0;
-// uint32_t backlight_layer_state = 0;
-
-// void backlight_toggle_rgb(bool enabled)
-// {
-// if(enabled) {
-// uint8_t rgb[17][3] = {
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b},
-// {backlight_rgb_r, backlight_rgb_g, backlight_rgb_b}
-// };
-// backlight_set_rgb(rgb);
-// } else {
-// uint8_t rgb[17][3] = {
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0},
-// {0, 0, 0}
-// };
-// backlight_set_rgb(rgb);
-// }
-// }
-
-// void backlight_set_rgb(uint8_t cfg[17][3])
-// {
-// cli();
-// for(uint8_t i = 0; i < 17; ++i) {
-// send_color(cfg[i][0], cfg[i][1], cfg[i][2], Device_PCBRGB);
-// }
-// sei();
-// show();
-// }
-
// Q5, Q6, Q7 is connected to B1 - alphas
// Q8, Q9 is connected to B2 - frow
// Q1, Q2, Q3 is connected to B3 - mods
@@ -99,26 +36,6 @@ void backlight_set(uint8_t level) {
level & BACKLIGHT_MACRO ? (PORTE |= 0b01000000) : (PORTE &= ~0b01000000);
}
-// // Port from backlight_update_state
-// bool led_update_kb(led_t led_state) {
-// bool res = led_update_user(led_state);
-// if(res) {
-// bool status[7] = {
-// backlight_os_state & (1<<USB_LED_CAPS_LOCK),
-// backlight_os_state & (1<<USB_LED_SCROLL_LOCK),
-// backlight_os_state & (1<<USB_LED_NUM_LOCK),
-// backlight_layer_state & (1<<1),
-// backlight_layer_state & (1<<2),
-// backlight_layer_state & (1<<3),
-// backlight_layer_state & (1<<4)
-// };
-// indicator_leds_set(status);
-// backlight_os_state & (1<<USB_LED_CAPS_LOCK) ? (PORTB &= ~0b00000001) : (PORTB |= 0b00000001);
-// backlight_os_state & (1<<USB_LED_SCROLL_LOCK) ? (PORTB &= ~0b00010000) : (PORTB |= 0b00010000);
-// }
-// return res;
-// }
-
// U5 Pin 1, 2, 3 connected to top left LEDs
// U6 Pin 1, 2, 3 connected to bottom right leds col of 3