forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Keyboard] Small Refactor of Duck boards (#5521)

Browse Source 
* 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
pull/5551/head
MechMerlin 6 years ago committed by Drashna Jaelre
parent caefb1c61e
commit cb2f2fd258
33 changed files with 192 additions and 202 deletions
Show Stats Download Patch File Download Diff File

7
keyboards/duck/duck_led/duck_led.c
Unescape View File

@ -0,0 +1,7 @@
#include <avr/io.h>
#include "duck_led.h"
#include "quantum.h"
void show(void) {
wait_us((RES / 1000UL) + 1);
}

16
keyboards/duck/duck_led/duck_led.h
Unescape View File

@ -0,0 +1,16 @@
#pragma once
#define RES 6000
#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)
enum Device {
Device_PCBRGB,
Device_STATUSLED
};
void show(void);

1
keyboards/duck/eagle_viper/readme.md
Unescape View File

@ -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 example for this keyboard (after setting up your build environment):
make duck/eagle_viper/v2:default make duck/eagle_viper/v2:default

8
keyboards/duck/eagle_viper/v2/config.h
Unescape View File

@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_H #pragma once
#define CONFIG_H
#include "config_common.h" #include "config_common.h"
@ -44,6 +43,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN D6 #define RGB_DI_PIN D6
#define RGBLED_NUM 17 #define RGBLED_NUM 17
/* Set to top left most key */
#define BOOTMAGIC_LITE_ROW 4
#define BOOTMAGIC_LITE_COLUMN 10
#define TAPPING_TERM 200 #define TAPPING_TERM 200
#endif

23
keyboards/duck/eagle_viper/v2/indicator_leds.c
Unescape View File

@ -19,19 +19,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h> #include <stdbool.h>
#include <util/delay.h> #include <util/delay.h>
#include "indicator_leds.h" #include "indicator_leds.h"
#include "duck_led/duck_led.h"
#define RES 6000
#define LED_T1H 600 #define LED_T1H 600
#define LED_T1L 650 #define LED_T1L 650
#define LED_T0H 250 #define LED_T0H 250
#define LED_T0L 1000 #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) { void send_bit_d4(bool bitVal) {
if(bitVal) { if(bitVal) {
asm volatile ( asm volatile (
@ -66,14 +60,12 @@ void send_bit_d4(bool bitVal) {
} }
} }
void show(void) { void send_value(uint8_t byte, enum Device device) {
_delay_us((RES / 1000UL) + 1);
}
void send_value(uint8_t byte) {
for(uint8_t b = 0; b < 8; b++) { for(uint8_t b = 0; b < 8; b++) {
send_bit_d4(byte & 0b10000000); if(device == Device_STATUSLED) {
byte <<= 1; send_bit_d4(byte & 0b10000000);
byte <<= 1;
}
} }
} }
@ -83,7 +75,8 @@ void indicator_leds_set(bool leds[8]) {
cli(); cli();
for(led_cnt = 0; led_cnt < 8; led_cnt++) 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(); sei();
show(); show();
} }

1
keyboards/duck/eagle_viper/v2/indicator_leds.h
Unescape View File

@ -1,2 +1 @@
void indicator_leds_set(bool leds[8]); void indicator_leds_set(bool leds[8]);
void show(void);

3
keyboards/duck/eagle_viper/v2/matrix.c
Unescape View File

@ -89,6 +89,9 @@ uint8_t matrix_scan(void) {
bool curr_bit = rows & (1<<row); bool curr_bit = rows & (1<<row);
if (prev_bit != curr_bit) { if (prev_bit != curr_bit) {
matrix_debouncing[row] ^= ((matrix_row_t)1<<col); matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
if (debouncing) {
dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
}
debouncing = DEBOUNCING_DELAY; debouncing = DEBOUNCING_DELAY;
} }
} }

2
keyboards/duck/eagle_viper/v2/readme.md
Unescape View File

@ -11,6 +11,8 @@ Make example for this keyboard (after setting up your build environment):
make eagle_viper/v2:default make eagle_viper/v2:default
**Reset Key:** To put the Eagle/Viper V2 into reset, hold caps lock key (`K2A`) while plugging in.
See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
## Hardware Notes ## Hardware Notes

28
keyboards/duck/eagle_viper/v2/rules.mk
Unescape View File

@ -50,23 +50,23 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= no # Mouse keys(+4700) MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE ?= no # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE ?= yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE ?= yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality on B7 by default BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config) MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
UNICODE_ENABLE ?= no # Unicode UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE ?= no # Audio output on port C6 AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
CUSTOM_MATRIX = yes CUSTOM_MATRIX = yes
SRC += indicator_leds.c \ SRC += indicator_leds.c \
matrix.c matrix.c duck_led/duck_led.c

4
keyboards/duck/eagle_viper/v2/v2.h
Unescape View File

@ -13,8 +13,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef V2_H #pragma once
#define V2_H
#include "quantum.h" #include "quantum.h"
@ -78,4 +77,3 @@
#define LAYOUT_eagle LAYOUT_60_ansi #define LAYOUT_eagle LAYOUT_60_ansi
#endif

4
keyboards/duck/jetfire/config.h
Unescape View File

@ -48,6 +48,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCING_DELAY 5 #define DEBOUNCING_DELAY 5
/* Set to top left most key */
#define BOOTMAGIC_LITE_ROW 5
#define BOOTMAGIC_LITE_COLUMN 10
/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
* This is userful for the Windows task manager shortcut (ctrl+shift+esc). * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
*/ */

43
keyboards/duck/jetfire/backlight_led.c → keyboards/duck/jetfire/indicator_leds.c
Unescape View File

@ -17,21 +17,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h> #include <stdbool.h>
#include <util/delay.h> #include <util/delay.h>
#include <stdint.h> #include <stdint.h>
#include "backlight_led.h" #include "indicator_leds.h"
#include "quantum.h" #include "quantum.h"
// #include "led.h"
#define LED_T1H 900
#define T1H 900 #define LED_T1L 600
#define T1L 600 #define LED_T0H 400
#define T0H 400 #define LED_T0L 900
#define T0L 900
#define RES 6000
#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) void send_bit_d4(bool bitVal)
{ {
@ -48,8 +40,8 @@ void send_bit_d4(bool bitVal)
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (4), [bit] "I" (4),
[onCycles] "I" (NS_TO_CYCLES(T1H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T1H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T1L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T1L) - 2));
} else { } else {
asm volatile ( asm volatile (
"sbi %[port], %[bit] \n\t" "sbi %[port], %[bit] \n\t"
@ -63,8 +55,8 @@ void send_bit_d4(bool bitVal)
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (4), [bit] "I" (4),
[onCycles] "I" (NS_TO_CYCLES(T0H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T0H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T0L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T0L) - 2));
} }
} }
@ -83,8 +75,8 @@ void send_bit_d6(bool bitVal)
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (6), [bit] "I" (6),
[onCycles] "I" (NS_TO_CYCLES(T1H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T1H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T1L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T1L) - 2));
} else { } else {
asm volatile ( asm volatile (
"sbi %[port], %[bit] \n\t" "sbi %[port], %[bit] \n\t"
@ -98,20 +90,15 @@ void send_bit_d6(bool bitVal)
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (6), [bit] "I" (6),
[onCycles] "I" (NS_TO_CYCLES(T0H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T0H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T0L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T0L) - 2));
} }
} }
void show(void)
{
_delay_us((RES / 1000UL) + 1);
}
void send_value(uint8_t byte, enum Device device) void send_value(uint8_t byte, enum Device device)
{ {
for(uint8_t b = 0; b < 8; b++) { for(uint8_t b = 0; b < 8; b++) {
if(device == Device_STATELED) { if(device == Device_STATUSLED) {
send_bit_d4(byte & 0b10000000); send_bit_d4(byte & 0b10000000);
} }
if(device == Device_PCBRGB) { if(device == Device_PCBRGB) {
@ -123,7 +110,7 @@ void send_value(uint8_t byte, enum Device device)
void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device) void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device)
{ {
send_value(g, device);
send_value(r, device); send_value(r, device);
send_value(g, device);
send_value(b, device); send_value(b, device);
} }

11
keyboards/duck/jetfire/backlight_led.h → keyboards/duck/jetfire/indicator_leds.h
Unescape View File

@ -1,10 +1,6 @@
#ifndef BACKLIGHT_LED_H #pragma once
#define BACKLIGHT_LED_H
enum Device { #include "duck_led/duck_led.h"
Device_PCBRGB,
Device_STATELED
};
void backlight_init_ports(void); void backlight_init_ports(void);
void backlight_set_state(bool cfg[7]); void backlight_set_state(bool cfg[7]);
@ -13,6 +9,3 @@ void backlight_toggle_rgb(bool enabled);
void backlight_set_rgb(uint8_t cfg[17][3]); void backlight_set_rgb(uint8_t cfg[17][3]);
void backlight_set(uint8_t level); void backlight_set(uint8_t level);
void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device); void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device);
void show(void);
#endif

10
keyboards/duck/jetfire/jetfire.c
Unescape View File

@ -14,9 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "jetfire.h" #include "jetfire.h"
#include "backlight_led.h" #include "indicator_leds.h"
enum backlight_level { enum BACKLIGHT_AREAS {
BACKLIGHT_ALPHA = 0b0000001, BACKLIGHT_ALPHA = 0b0000001,
BACKLIGHT_MOD = 0b0000010, BACKLIGHT_MOD = 0b0000010,
BACKLIGHT_FROW = 0b0000100, BACKLIGHT_FROW = 0b0000100,
@ -137,15 +137,15 @@ void backlight_update_state()
send_color(backlight_state_led & (1<<STATE_LED_SCROLL_LOCK) ? 255 : 0, send_color(backlight_state_led & (1<<STATE_LED_SCROLL_LOCK) ? 255 : 0,
backlight_state_led & (1<<STATE_LED_CAPS_LOCK) ? 255 : 0, backlight_state_led & (1<<STATE_LED_CAPS_LOCK) ? 255 : 0,
backlight_state_led & (1<<STATE_LED_NUM_LOCK) ? 255 : 0, backlight_state_led & (1<<STATE_LED_NUM_LOCK) ? 255 : 0,
Device_STATELED); Device_STATUSLED);
send_color(backlight_state_led & (1<<STATE_LED_LAYER_1) ? 255 : 0, send_color(backlight_state_led & (1<<STATE_LED_LAYER_1) ? 255 : 0,
backlight_state_led & (1<<STATE_LED_LAYER_2) ? 255 : 0, backlight_state_led & (1<<STATE_LED_LAYER_2) ? 255 : 0,
backlight_state_led & (1<<STATE_LED_LAYER_0) ? 255 : 0, backlight_state_led & (1<<STATE_LED_LAYER_0) ? 255 : 0,
Device_STATELED); Device_STATUSLED);
send_color(backlight_state_led & (1<<STATE_LED_LAYER_4) ? 255 : 0, send_color(backlight_state_led & (1<<STATE_LED_LAYER_4) ? 255 : 0,
backlight_state_led & (1<<STATE_LED_LAYER_3) ? 255 : 0, backlight_state_led & (1<<STATE_LED_LAYER_3) ? 255 : 0,
0, 0,
Device_STATELED); Device_STATUSLED);
sei(); sei();
show(); show();
} }

4
keyboards/duck/jetfire/jetfire.h
Unescape View File

@ -13,8 +13,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef JETFIRE_H #pragma once
#define JETFIRE_H
#include "quantum.h" #include "quantum.h"
@ -57,4 +56,3 @@
{ K0A, K0B, K0C, KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, K0I, KC_NO,KC_NO,KC_NO, K0M, K0N, K0O, K0P, K0Q, K0R, K0S, KC_NO } \ { K0A, K0B, K0C, KC_NO,KC_NO,KC_NO,KC_NO,KC_NO, K0I, KC_NO,KC_NO,KC_NO, K0M, K0N, K0O, K0P, K0Q, K0R, K0S, KC_NO } \
} }
#endif

2
keyboards/duck/jetfire/readme.md
Unescape View File

@ -9,7 +9,7 @@ Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
Hardware Supported: Duck Jetfire PCB Hardware Supported: Duck Jetfire PCB
Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=92708.0) Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=92708.0)
To get into bootloader mode, hold the top top most key above the 2 navigation keys while connecting the USB cable. **Reset Key:** To put the Jetfire into reset, hold top most key above the 2 navigation keys (`K5P`) while plugging in.
Make example for this keyboard (after setting up your build environment): Make example for this keyboard (after setting up your build environment):

6
keyboards/duck/jetfire/rules.mk
Unescape View File

@ -51,7 +51,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = no # Mouse keys(+4700) MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = no # Audio control and System control(+450) EXTRAKEY_ENABLE = no # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400) CONSOLE_ENABLE = yes # Console for debug(+400)
@ -70,5 +70,5 @@ FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
CUSTOM_MATRIX = yes CUSTOM_MATRIX = yes
SRC += backlight_led.c \ SRC += indicator_leds.c \
matrix.c matrix.c duck_led/duck_led.c

8
keyboards/duck/lightsaver/config.h
Unescape View File

@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_H #pragma once
#define CONFIG_H
#include "config_common.h" #include "config_common.h"
@ -44,6 +43,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN D6 #define RGB_DI_PIN D6
#define RGBLED_NUM 17 #define RGBLED_NUM 17
/* Set to top left most key */
#define BOOTMAGIC_LITE_ROW 5
#define BOOTMAGIC_LITE_COLUMN 10
#define TAPPING_TERM 200 #define TAPPING_TERM 200
#endif

49
keyboards/duck/lightsaver/indicator_leds.c
Unescape View File

@ -18,17 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <avr/io.h> #include <avr/io.h>
#include <stdbool.h> #include <stdbool.h>
#include <util/delay.h> #include <util/delay.h>
#include "duck_led/duck_led.h"
#define T1H 900 #define LED_T1H 900
#define T1L 600 #define LED_T1L 600
#define T0H 400 #define LED_T0H 400
#define T0L 900 #define LED_T0L 900
#define RES 6000
#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) { void send_bit_d4(bool bitVal) {
if(bitVal) { if(bitVal) {
@ -44,8 +39,8 @@ void send_bit_d4(bool bitVal) {
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (4), [bit] "I" (4),
[onCycles] "I" (NS_TO_CYCLES(T1H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T1H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T1L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T1L) - 2));
} else { } else {
asm volatile ( asm volatile (
"sbi %[port], %[bit] \n\t" "sbi %[port], %[bit] \n\t"
@ -59,33 +54,31 @@ void send_bit_d4(bool bitVal) {
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (4), [bit] "I" (4),
[onCycles] "I" (NS_TO_CYCLES(T0H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T0H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T0L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T0L) - 2));
} }
} }
void show(void) { void send_value(uint8_t byte, enum Device device) {
_delay_us((RES / 1000UL) + 1);
}
void send_value(uint8_t byte) {
for(uint8_t b = 0; b < 8; b++) { for(uint8_t b = 0; b < 8; b++) {
send_bit_d4(byte & 0b10000000); if(device == Device_STATUSLED) {
byte <<= 1; send_bit_d4(byte & 0b10000000);
byte <<= 1;
}
} }
} }
void send_color(uint8_t r, uint8_t g, uint8_t b) { void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device) {
send_value(g); send_value(r, device);
send_value(r); send_value(g, device);
send_value(b); send_value(b, device);
} }
void indicator_leds_set(bool leds[8]) { void indicator_leds_set(bool leds[8]) {
cli(); cli();
send_color(leds[1] ? 255 : 0, leds[2] ? 255 : 0, leds[0] ? 255 : 0); send_color(leds[1] ? 255 : 0, leds[2] ? 255 : 0, leds[0] ? 255 : 0, Device_STATUSLED);
send_color(leds[4] ? 255 : 0, leds[5] ? 255 : 0, leds[3] ? 255 : 0); send_color(leds[4] ? 255 : 0, leds[5] ? 255 : 0, leds[3] ? 255 : 0, Device_STATUSLED);
send_color(leds[6] ? 255 : 0, leds[7] ? 255 : 0, 0); send_color(leds[6] ? 255 : 0, leds[7] ? 255 : 0, 0, Device_STATUSLED);
sei(); sei();
show(); show();
} }

4
keyboards/duck/lightsaver/lightsaver.h
Unescape View File

@ -13,8 +13,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIGHTSAVER_H #pragma once
#define LIGHTSAVER_H
#include "quantum.h" #include "quantum.h"
@ -37,4 +36,3 @@
/* 5 */ { K0A, K0B, K0C, NO, NO, NO, NO, NO, K0I, NO, K0K, NO, K0M, K0N, K0O, K0P, K0Q, K0R } \ /* 5 */ { K0A, K0B, K0C, NO, NO, NO, NO, NO, K0I, NO, K0K, NO, K0M, K0N, K0O, K0P, K0Q, K0R } \
} }
#endif

3
keyboards/duck/lightsaver/matrix.c
Unescape View File

@ -87,6 +87,9 @@ uint8_t matrix_scan(void) {
bool curr_bit = rows & (1<<row); bool curr_bit = rows & (1<<row);
if (prev_bit != curr_bit) { if (prev_bit != curr_bit) {
matrix_debouncing[row] ^= ((matrix_row_t)1<<col); matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
if (debouncing) {
dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
}
debouncing = DEBOUNCING_DELAY; debouncing = DEBOUNCING_DELAY;
} }
} }

28
keyboards/duck/lightsaver/rules.mk
Unescape View File

@ -50,23 +50,23 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= no # Mouse keys(+4700) MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= no # Audio control and System control(+450) EXTRAKEY_ENABLE = no # Audio control and System control(+450)
CONSOLE_ENABLE ?= no # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE ?= yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE ?= yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality on B7 by default BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config) MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
UNICODE_ENABLE ?= no # Unicode UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE ?= no # Audio output on port C6 AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
CUSTOM_MATRIX = yes CUSTOM_MATRIX = yes
SRC += indicator_leds.c \ SRC += indicator_leds.c \
matrix.c matrix.c duck_led/duck_led.c

9
keyboards/duck/octagon/v1/config.h
Unescape View File

@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_H #pragma once
#define CONFIG_H
#include "config_common.h" #include "config_common.h"
@ -44,6 +43,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN D6 #define RGB_DI_PIN D6
#define RGBLED_NUM 17 #define RGBLED_NUM 17
#define TAPPING_TERM 200 /* Set to top left most key */
#define BOOTMAGIC_LITE_ROW 5
#define BOOTMAGIC_LITE_COLUMN 10
#endif #define TAPPING_TERM 200

3
keyboards/duck/octagon/v1/matrix.c
Unescape View File

@ -84,6 +84,9 @@ uint8_t matrix_scan(void) {
bool curr_bit = rows & (1<<row); bool curr_bit = rows & (1<<row);
if (prev_bit != curr_bit) { if (prev_bit != curr_bit) {
matrix_debouncing[row] ^= ((matrix_row_t)1<<col); matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
if (debouncing) {
dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
}
debouncing = DEBOUNCING_DELAY; debouncing = DEBOUNCING_DELAY;
} }
} }

26
keyboards/duck/octagon/v1/rules.mk
Unescape View File

@ -50,21 +50,21 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= no # Mouse keys(+4700) MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= no # Audio control and System control(+450) EXTRAKEY_ENABLE = no # Audio control and System control(+450)
CONSOLE_ENABLE ?= no # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE ?= yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE ?= yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality on B7 by default BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config) MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
UNICODE_ENABLE ?= no # Unicode UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE ?= no # Audio output on port C6 AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
CUSTOM_MATRIX = yes CUSTOM_MATRIX = yes

4
keyboards/duck/octagon/v1/v1.h
Unescape View File

@ -13,8 +13,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef V1_H #pragma once
#define V1_H
#include "quantum.h" #include "quantum.h"
@ -49,4 +48,3 @@
{ K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, KC_NO, K1M, K1N, KC_NO, K1P }, \ { K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, KC_NO, K1M, K1N, KC_NO, K1P }, \
{ K0A, K0B, K0C, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, K0K, K0L, KC_NO, K0M, K0N, KC_NO, K0P } \ { K0A, K0B, K0C, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, K0K, K0L, KC_NO, K0M, K0N, KC_NO, K0P } \
} }
#endif

8
keyboards/duck/octagon/v2/config.h
Unescape View File

@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef CONFIG_H #pragma once
#define CONFIG_H
#include "config_common.h" #include "config_common.h"
@ -44,6 +43,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN D6 #define RGB_DI_PIN D6
#define RGBLED_NUM 17 #define RGBLED_NUM 17
/* Set to top left most key */
#define BOOTMAGIC_LITE_ROW 5
#define BOOTMAGIC_LITE_COLUMN 10
#define TAPPING_TERM 200 #define TAPPING_TERM 200
#endif

36
keyboards/duck/octagon/v2/indicator_leds.c
Unescape View File

@ -20,16 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <util/delay.h> #include <util/delay.h>
#include "indicator_leds.h" #include "indicator_leds.h"
#define T1H 900 #define LED_T1H 900
#define T1L 600 #define LED_T1L 600
#define T0H 400 #define LED_T0H 400
#define T0L 900 #define LED_T0L 900
#define RES 6000
#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) { void send_bit_d4(bool bitVal) {
if(bitVal) { if(bitVal) {
@ -45,8 +39,8 @@ void send_bit_d4(bool bitVal) {
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (4), [bit] "I" (4),
[onCycles] "I" (NS_TO_CYCLES(T1H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T1H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T1L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T1L) - 2));
} else { } else {
asm volatile ( asm volatile (
"sbi %[port], %[bit] \n\t" "sbi %[port], %[bit] \n\t"
@ -60,8 +54,8 @@ void send_bit_d4(bool bitVal) {
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (4), [bit] "I" (4),
[onCycles] "I" (NS_TO_CYCLES(T0H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T0H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T0L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T0L) - 2));
} }
} }
@ -80,8 +74,8 @@ void send_bit_d6(bool bitVal)
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (6), [bit] "I" (6),
[onCycles] "I" (NS_TO_CYCLES(T1H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T1H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T1L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T1L) - 2));
} else { } else {
asm volatile ( asm volatile (
"sbi %[port], %[bit] \n\t" "sbi %[port], %[bit] \n\t"
@ -95,15 +89,11 @@ void send_bit_d6(bool bitVal)
:: ::
[port] "I" (_SFR_IO_ADDR(PORTD)), [port] "I" (_SFR_IO_ADDR(PORTD)),
[bit] "I" (6), [bit] "I" (6),
[onCycles] "I" (NS_TO_CYCLES(T0H) - 2), [onCycles] "I" (NS_TO_CYCLES(LED_T0H) - 2),
[offCycles] "I" (NS_TO_CYCLES(T0L) - 2)); [offCycles] "I" (NS_TO_CYCLES(LED_T0L) - 2));
} }
} }
void show(void) {
_delay_us((RES / 1000UL) + 1);
}
void send_value(uint8_t byte, enum Device device) { void send_value(uint8_t byte, enum Device device) {
for(uint8_t b = 0; b < 8; b++) { for(uint8_t b = 0; b < 8; b++) {
if(device == Device_STATUSLED) { if(device == Device_STATUSLED) {
@ -117,8 +107,8 @@ void send_value(uint8_t byte, enum Device device) {
} }
void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device) { void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device) {
send_value(g, device);
send_value(r, device); send_value(r, device);
send_value(g, device);
send_value(b, device); send_value(b, device);
} }

6
keyboards/duck/octagon/v2/indicator_leds.h
Unescape View File

@ -1,11 +1,7 @@
enum Device { #include "duck_led/duck_led.h"
Device_PCBRGB,
Device_STATUSLED
};
void indicator_leds_set(bool leds[8]); void indicator_leds_set(bool leds[8]);
void backlight_toggle_rgb(bool enabled); void backlight_toggle_rgb(bool enabled);
void backlight_set_rgb(uint8_t cfg[17][3]); void backlight_set_rgb(uint8_t cfg[17][3]);
void backlight_init_ports(void); void backlight_init_ports(void);
void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device); void send_color(uint8_t r, uint8_t g, uint8_t b, enum Device device);
void show(void);

3
keyboards/duck/octagon/v2/matrix.c
Unescape View File

@ -89,6 +89,9 @@ uint8_t matrix_scan(void) {
bool curr_bit = rows & (1<<row); bool curr_bit = rows & (1<<row);
if (prev_bit != curr_bit) { if (prev_bit != curr_bit) {
matrix_debouncing[row] ^= ((matrix_row_t)1<<col); matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
if (debouncing) {
dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
}
debouncing = DEBOUNCING_DELAY; debouncing = DEBOUNCING_DELAY;
} }
} }

2
keyboards/duck/octagon/v2/readme.md
Unescape View File

@ -11,6 +11,8 @@ Make example for this keyboard (after setting up your build environment):
make octagon/v2:default make octagon/v2:default
**Reset Key:** To put the Octagon V2 into reset, hold the top right most key (`K5Q`) while plugging in.
See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
## Hardware Notes ## Hardware Notes

28
keyboards/duck/octagon/v2/rules.mk
Unescape View File

@ -50,25 +50,25 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options
# change yes to no to disable # change yes to no to disable
# #
BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= no # Mouse keys(+4700) MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE ?= no # Audio control and System control(+450) EXTRAKEY_ENABLE = no # Audio control and System control(+450)
CONSOLE_ENABLE ?= no # Console for debug(+400) CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE ?= yes # Commands for debug and configuration COMMAND_ENABLE = yes # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE ?= yes # USB Nkey Rollover NKRO_ENABLE = yes # USB Nkey Rollover
BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality on B7 by default BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
MIDI_ENABLE ?= no # MIDI support (+2400 to 4200, depending on config) MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
UNICODE_ENABLE ?= no # Unicode UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
AUDIO_ENABLE ?= no # Audio output on port C6 AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
CUSTOM_MATRIX = yes CUSTOM_MATRIX = yes
SRC += indicator_leds.c \ SRC += indicator_leds.c \
matrix.c matrix.c duck_led/duck_led.c
LAYOUTS = 75_ansi LAYOUTS = 75_ansi

4
keyboards/duck/octagon/v2/v2.h
Unescape View File

@ -13,8 +13,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef V2_H #pragma once
#define V2_H
#include "quantum.h" #include "quantum.h"
@ -49,4 +48,3 @@
{ K1A, KC_NO, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, KC_NO, K1M, K1N, K1O, K1P, KC_NO }, \ { K1A, KC_NO, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, KC_NO, K1M, K1N, K1O, K1P, KC_NO }, \
{ K0A, K0B, K0C, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0J, KC_NO, K0K, K0L, K0M, K0N, K0O, K0P, KC_NO } \ { K0A, K0B, K0C, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0J, KC_NO, K0K, K0L, K0M, K0N, K0O, K0P, KC_NO } \
} }
#endif

Write Preview
Loading…
Cancel
Save