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

Some minor refactoring of boards in 1upkeyboards directory (#5236)

Browse Source 
* use #pragma once

* get rid of code for unused indicators

* pragma once and other small fixes for consistency

* use #pragma once

* pragma once and other small fixes for consistency

* add a short blurb to the readme

* turn on compiler optimization flags

* remove the compiler optimization

* remove compiler optimization for super16
pull/5251/head
MechMerlin 6 years ago committed by Drashna Jaelre
parent da5e904306
commit d7e3d718d0
15 changed files with 26 additions and 60 deletions
Show Stats Download Patch File Download Diff File

4
keyboards/1upkeyboards/1up60hse/1up60hse.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 KB_H #pragma once
#define KB_H
#include "quantum.h" #include "quantum.h"
@ -36,4 +35,3 @@
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D }, \ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D }, \
{ K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D } \ { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D } \
} }
#endif

1
keyboards/1upkeyboards/1up60hse/rules.mk
Unescape View File

@ -68,5 +68,6 @@ 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
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
EXTRAFLAGS += -flto
LAYOUTS = 60_ansi LAYOUTS = 60_ansi

28
keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
Unescape View File

@ -46,35 +46,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
void led_set_user(uint8_t usb_led) { void led_set_user(uint8_t usb_led) {
if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
if (usb_led & (1 << USB_LED_NUM_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
writePinLow(B6); writePinLow(B6);
} else { } else {
writePinHigh(B6); writePinHigh(B6);
} }
if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
} else {
}
if (usb_led & (1 << USB_LED_COMPOSE)) {
} else {
}
if (usb_led & (1 << USB_LED_KANA)) {
} else {
}
} }

1
keyboards/1upkeyboards/1up60hte/rules.mk
Unescape View File

@ -54,5 +54,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https:/
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no AUDIO_ENABLE = no
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
EXTRAFLAGS += -flto
LAYOUTS = 60_hhkb LAYOUTS = 60_hhkb

5
keyboards/1upkeyboards/1up60rgb/1up60rgb.h
Unescape View File

@ -1,5 +1,4 @@
#ifndef KB_H #pragma once
#define KB_H
#include "quantum.h" #include "quantum.h"
@ -77,5 +76,3 @@
K300, KC_NO,K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ K300, KC_NO,K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
KC_NO,K401, K403, K406, KC_NO,K411, K413, KC_NO \ KC_NO,K401, K403, K406, KC_NO,K411, K413, KC_NO \
) )
#endif

5
keyboards/1upkeyboards/1up60rgb/config.h
Unescape View File

@ -1,5 +1,4 @@
#ifndef CONFIG_H #pragma once
#define CONFIG_H
#include "config_common.h" #include "config_common.h"
@ -46,5 +45,3 @@
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8
#endif #endif
#endif

2
keyboards/1upkeyboards/1up60rgb/readme.md
Unescape View File

@ -1,4 +1,4 @@
# 1upkeyboards 60% RGB # 1up60rgb 60% RGB
Firmware for custom keyboard PCB with 60% key layout. Firmware for custom keyboard PCB with 60% key layout.

20
keyboards/1upkeyboards/1up60rgb/rules.mk
Unescape View File

@ -44,15 +44,15 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) MOUSEKEY_ENABLE = yes # 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 ?= no # Commands for debug and configuration COMMAND_ENABLE = no # Commands for debug and configuration
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE ?= no AUDIO_ENABLE = no
RGBLIGHT_ENABLE ?= yes RGBLIGHT_ENABLE = yes
LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift 60_hhkb LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift 60_hhkb

2
keyboards/1upkeyboards/readme.md
Unescape View File

@ -1,5 +1,7 @@
# 1UP Keyboards # 1UP Keyboards
1UP Keyboards is an online mechanical keyboard retailer located in New York, USA.
Website: [1UP Keyboards](https://www.1upkeyboards.com/) Website: [1UP Keyboards](https://www.1upkeyboards.com/)
Discord: [Server Invite](https://discordapp.com/invite/c6SYn8) Discord: [Server Invite](https://discordapp.com/invite/c6SYn8)
YouTube: [skiwithpete](https://www.youtube.com/user/skiwithpete) YouTube: [skiwithpete](https://www.youtube.com/user/skiwithpete)

2
keyboards/1upkeyboards/super16/keymaps/default/config.h
Unescape View File

@ -1,4 +1,4 @@
/* Copyright 2019 'mechmerlin' /* Copyright 2019 MechMerlin
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
keyboards/1upkeyboards/super16/rules.mk
Unescape View File

@ -80,4 +80,4 @@ 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
HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
LAYOUTS = ortho_4x4 LAYOUTS = ortho_4x4

4
keyboards/1upkeyboards/sweet16/config.h
Unescape View File

@ -1,5 +1,4 @@
#ifndef CONFIG_H #pragma once
#define CONFIG_H
#include "config_common.h" #include "config_common.h"
@ -47,4 +46,3 @@
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8
#endif #endif
#endif

3
keyboards/1upkeyboards/sweet16/readme.md
Unescape View File

@ -1,5 +1,4 @@
Sweet16 # Sweet 16 Macropad
===
A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Bishop Keyboards A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Bishop Keyboards

3
keyboards/1upkeyboards/sweet16/rules.mk
Unescape View File

@ -53,4 +53,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no AUDIO_ENABLE = no
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
EXTRAFLAGS += -flto

4
keyboards/1upkeyboards/sweet16/sweet16.h
Unescape View File

@ -1,5 +1,4 @@
#ifndef KB_H #pragma once
#define KB_H
#include "quantum.h" #include "quantum.h"
@ -29,4 +28,3 @@
{ KC_NO, K31, K32, KC_NO } \ { KC_NO, K31, K32, KC_NO } \
} }
#endif

Write Preview
Loading…
Cancel
Save