From cb2f2fd258011e6637ed182f484a4317ac510db8 Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Wed, 3 Apr 2019 10:17:25 -0700
Subject: [Keyboard] Small Refactor of Duck boards (#5521)
* first [ass at pulling out common duck library functions
* use new library in jetfire
* use new library in duck lightsaver
* use new library in octagon v2
* put Device into the library
* refactor send_value
* refactor send_value and send_color
* use pragma once
* use pragma once
* use pragma once
* use pragma once
* rename backlight_led to indicator_leds to match with other duck boards
* rename enum
* make #define names consistent
* rename ducklib to duck_led
* update rules.mk ?= to =
* put rgb in the correct order
* add debounce debugging printouts
* turn on bootmagic lite and set it to the top left most key commonly programmed as Escape
* add reset key documentation
* fix that typo
* Update keyboards/duck/duck_led/duck_led.c
Co-Authored-By: mechmerlin <30334081+mechmerlin@users.noreply.github.com>
* include the correct library
---
keyboards/duck/eagle_viper/readme.md | 1 -
keyboards/duck/eagle_viper/v2/config.h | 8 +++++---
keyboards/duck/eagle_viper/v2/indicator_leds.c | 23 ++++++++-------------
keyboards/duck/eagle_viper/v2/indicator_leds.h | 1 -
keyboards/duck/eagle_viper/v2/matrix.c | 3 +++
keyboards/duck/eagle_viper/v2/readme.md | 2 ++
keyboards/duck/eagle_viper/v2/rules.mk | 28 +++++++++++++-------------
keyboards/duck/eagle_viper/v2/v2.h | 4 +---
8 files changed, 33 insertions(+), 37 deletions(-)
(limited to 'keyboards/duck/eagle_viper')
diff --git a/keyboards/duck/eagle_viper/readme.md b/keyboards/duck/eagle_viper/readme.md
index 14fb166698..3fec11bc0a 100644
--- a/keyboards/duck/eagle_viper/readme.md
+++ b/keyboards/duck/eagle_viper/readme.md
@@ -9,4 +9,3 @@ Newest version is the [Eagle/Viper V2](http://duck0113.tistory.com/127)
Make example for this keyboard (after setting up your build environment):
make duck/eagle_viper/v2:default
-
diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index f454b2e0e1..a0ce866cc3 100644
--- a/keyboards/duck/eagle_viper/v2/config.h
+++ b/keyboards/duck/eagle_viper/v2/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
#include "config_common.h"
@@ -44,6 +43,9 @@ along with this program. If not, see .
#define RGB_DI_PIN D6
#define RGBLED_NUM 17
+/* Set to top left most key */
+#define BOOTMAGIC_LITE_ROW 4
+#define BOOTMAGIC_LITE_COLUMN 10
+
#define TAPPING_TERM 200
-#endif
diff --git a/keyboards/duck/eagle_viper/v2/indicator_leds.c b/keyboards/duck/eagle_viper/v2/indicator_leds.c
index 03a93197da..fc90ed3fbd 100644
--- a/keyboards/duck/eagle_viper/v2/indicator_leds.c
+++ b/keyboards/duck/eagle_viper/v2/indicator_leds.c
@@ -19,19 +19,13 @@ along with this program. If not, see .
#include
#include
#include "indicator_leds.h"
-
-#define RES 6000
+#include "duck_led/duck_led.h"
#define LED_T1H 600
#define LED_T1L 650
#define LED_T0H 250
#define LED_T0L 1000
-#define NS_PER_SEC (1000000000L)
-#define CYCLES_PER_SEC (F_CPU)
-#define NS_PER_CYCLE (NS_PER_SEC / CYCLES_PER_SEC)
-#define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE)
-
void send_bit_d4(bool bitVal) {
if(bitVal) {
asm volatile (
@@ -66,14 +60,12 @@ void send_bit_d4(bool bitVal) {
}
}
-void show(void) {
- _delay_us((RES / 1000UL) + 1);
-}
-
-void send_value(uint8_t byte) {
+void send_value(uint8_t byte, enum Device device) {
for(uint8_t b = 0; b < 8; b++) {
- send_bit_d4(byte & 0b10000000);
- byte <<= 1;
+ if(device == Device_STATUSLED) {
+ send_bit_d4(byte & 0b10000000);
+ byte <<= 1;
+ }
}
}
@@ -83,7 +75,8 @@ void indicator_leds_set(bool leds[8]) {
cli();
for(led_cnt = 0; led_cnt < 8; led_cnt++)
- send_value(leds[led_cnt] ? 255 : 0);
+ send_value(leds[led_cnt] ? 255 : 0, Device_STATUSLED);
sei();
show();
}
+
diff --git a/keyboards/duck/eagle_viper/v2/indicator_leds.h b/keyboards/duck/eagle_viper/v2/indicator_leds.h
index c174fa404d..fe66eef6b2 100644
--- a/keyboards/duck/eagle_viper/v2/indicator_leds.h
+++ b/keyboards/duck/eagle_viper/v2/indicator_leds.h
@@ -1,2 +1 @@
void indicator_leds_set(bool leds[8]);
-void show(void);
diff --git a/keyboards/duck/eagle_viper/v2/matrix.c b/keyboards/duck/eagle_viper/v2/matrix.c
index 7003a7ae00..a6bc563422 100644
--- a/keyboards/duck/eagle_viper/v2/matrix.c
+++ b/keyboards/duck/eagle_viper/v2/matrix.c
@@ -89,6 +89,9 @@ uint8_t matrix_scan(void) {
bool curr_bit = rows & (1<.
*/
-#ifndef V2_H
-#define V2_H
+#pragma once
#include "quantum.h"
@@ -78,4 +77,3 @@
#define LAYOUT_eagle LAYOUT_60_ansi
-#endif
--
cgit v1.2.1