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

* 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

diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.h b/keyboards/1upkeyboards/1up60hse/1up60hse.h
index d24bbaabf6048485cdde9f17d723f403a92fd7f0..f1b4f5e43e96bc2de217edec641699c3c2b8d2f7 100644 (file)
--- a/keyboards/1upkeyboards/1up60hse/1up60hse.h
+++ b/keyboards/1upkeyboards/1up60hse/1up60hse.h
@@ -13,8 +13,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/>.
  */
-#ifndef KB_H
-#define KB_H
+#pragma once
 
 #include "quantum.h"
 
@@ -36,4 +35,3 @@
        { 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 }  \
 }
-#endif

diff --git a/keyboards/1upkeyboards/1up60hse/rules.mk b/keyboards/1upkeyboards/1up60hse/rules.mk
index f33e33fd9e4775b0fb442f47305b06e9b1795b43..72e6849e04f16687a026bfa2abb78a44ecf27e9d 100644 (file)
--- a/keyboards/1upkeyboards/1up60hse/rules.mk
+++ b/keyboards/1upkeyboards/1up60hse/rules.mk
@@ -68,5 +68,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no            # Enable support for HD44780 based LCDs (+400)
+EXTRAFLAGS += -flto
 
 LAYOUTS = 60_ansi

diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
index 396b660803a29431cafa72b8023e29bb4929e964..8c3916629f1f9f367d6da0ceaee0d2fd8162bd08 100644 (file)
--- a/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
@@ -46,35 +46,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void led_set_user(uint8_t usb_led) {
-
-       if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-
-       } else {
-
-       }
-
-       if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+       if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
                writePinLow(B6);
        } else {
                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 {
-
-       }
-
 }

diff --git a/keyboards/1upkeyboards/1up60hte/rules.mk b/keyboards/1upkeyboards/1up60hte/rules.mk
index b8b5582991bac26b02654e5921f7254b546011ac..860a754a643de1872770169ec415b202a087df5f 100644 (file)
--- a/keyboards/1upkeyboards/1up60hte/rules.mk
+++ b/keyboards/1upkeyboards/1up60hte/rules.mk
@@ -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
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = yes
+EXTRAFLAGS += -flto
 
 LAYOUTS = 60_hhkb

diff --git a/keyboards/1upkeyboards/1up60rgb/1up60rgb.h b/keyboards/1upkeyboards/1up60rgb/1up60rgb.h
index 6905fd22050879e4a1740689fa9ca25a8c28b870..0f6818a6d861c375366973375e9a0b935f4dd47a 100644 (file)
--- a/keyboards/1upkeyboards/1up60rgb/1up60rgb.h
+++ b/keyboards/1upkeyboards/1up60rgb/1up60rgb.h
@@ -1,5 +1,4 @@
-#ifndef KB_H
-#define KB_H
+#pragma once
 
 #include "quantum.h"
 
@@ -77,5 +76,3 @@
        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 \
 )
-
-#endif

diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 86696dab845759e50de32ed1f0f37936bef7586b..fbafe0c44bc112cc1a4257e883e43e99db813006 100644 (file)
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -1,5 +1,4 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -46,5 +45,3 @@
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #endif
-
-#endif

diff --git a/keyboards/1upkeyboards/1up60rgb/readme.md b/keyboards/1upkeyboards/1up60rgb/readme.md
index de3ad98b7388dce6846bd72678e8092197d3a1ea..ad733f6b5e55b665212c742506ff826cd228f71c 100644 (file)
--- a/keyboards/1upkeyboards/1up60rgb/readme.md
+++ b/keyboards/1upkeyboards/1up60rgb/readme.md
@@ -1,4 +1,4 @@
-# 1upkeyboards 60% RGB
+# 1up60rgb 60% RGB
 
 Firmware for custom keyboard PCB with 60% key layout.
 

diff --git a/keyboards/1upkeyboards/1up60rgb/rules.mk b/keyboards/1upkeyboards/1up60rgb/rules.mk
index 540e4ea96c271bb04425c76203b9bb22cc5bff7a..8b1cf6667fa179e86cbe5d89c67263f8931ffd6c 100644 (file)
--- a/keyboards/1upkeyboards/1up60rgb/rules.mk
+++ b/keyboards/1upkeyboards/1up60rgb/rules.mk
@@ -44,15 +44,15 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= yes        # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
-CONSOLE_ENABLE ?= no   # Console for debug(+400)
-COMMAND_ENABLE ?= no    # Commands for debug and configuration
-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
-BACKLIGHT_ENABLE ?= yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE ?= no
-RGBLIGHT_ENABLE ?= yes
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes  # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes  # Audio control and System control(+450)
+CONSOLE_ENABLE = no    # Console for debug(+400)
+COMMAND_ENABLE = no    # Commands for debug and configuration
+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
+BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+AUDIO_ENABLE = no
+RGBLIGHT_ENABLE = yes
 
 LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift 60_hhkb

diff --git a/keyboards/1upkeyboards/readme.md b/keyboards/1upkeyboards/readme.md
index 4f075d827922d6a83dc9d442b14a839c93181af1..de8ae36acb6ccaba69eef9c45c7dc5635fd60729 100644 (file)
--- a/keyboards/1upkeyboards/readme.md
+++ b/keyboards/1upkeyboards/readme.md
@@ -1,5 +1,7 @@
 # 1UP Keyboards
 
+1UP Keyboards is an online mechanical keyboard retailer located in New York, USA.
+
 Website: [1UP Keyboards](https://www.1upkeyboards.com/)  
 Discord: [Server Invite](https://discordapp.com/invite/c6SYn8)  
 YouTube: [skiwithpete](https://www.youtube.com/user/skiwithpete)  
\ No newline at end of file

diff --git a/keyboards/1upkeyboards/super16/keymaps/default/config.h b/keyboards/1upkeyboards/super16/keymaps/default/config.h
index 16fc8b9746808c9fbe91152ecf386d571a7fa738..26c6d6ade1011ccf79e800fb13f59c20d53b544c 100644 (file)
--- a/keyboards/1upkeyboards/super16/keymaps/default/config.h
+++ b/keyboards/1upkeyboards/super16/keymaps/default/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 'mechmerlin'
+/* Copyright 2019 MechMerlin
  *
  * 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

diff --git a/keyboards/1upkeyboards/super16/rules.mk b/keyboards/1upkeyboards/super16/rules.mk
index efcde883428f315e5cda5e6bbaeb34ae296f0b95..8fb44b9b5cf0969ffc95c113c3f3074e44a48871 100644 (file)
--- a/keyboards/1upkeyboards/super16/rules.mk
+++ b/keyboards/1upkeyboards/super16/rules.mk
@@ -80,4 +80,4 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no            # Enable support for HD44780 based LCDs (+400)
 
-LAYOUTS = ortho_4x4
\ No newline at end of file
+LAYOUTS = ortho_4x4

diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h
index eedd3708f219c01321bfc6a6dba4098a1444fb87..b05b5774006e2955c17defa2d4cf8d0718ad6650 100644 (file)
--- a/keyboards/1upkeyboards/sweet16/config.h
+++ b/keyboards/1upkeyboards/sweet16/config.h
@@ -1,5 +1,4 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -47,4 +46,3 @@
 #define RGBLIGHT_VAL_STEP 8
 #endif
 
-#endif

diff --git a/keyboards/1upkeyboards/sweet16/readme.md b/keyboards/1upkeyboards/sweet16/readme.md
index 3b7b1d6f0b094d5e639af64f8db641c56c982bc2..f096a5fc992a47f244730904e2b9644d940c0feb 100644 (file)
--- a/keyboards/1upkeyboards/sweet16/readme.md
+++ b/keyboards/1upkeyboards/sweet16/readme.md
@@ -1,5 +1,4 @@
-Sweet16
-===
+# Sweet 16 Macropad
 
 A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Bishop Keyboards
 

diff --git a/keyboards/1upkeyboards/sweet16/rules.mk b/keyboards/1upkeyboards/sweet16/rules.mk
index 212e74059e4b5a38857fabc7024ce598d3b825c3..e3436dc3387f578f9896f067655350953d28e824 100644 (file)
--- a/keyboards/1upkeyboards/sweet16/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/rules.mk
@@ -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
 BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
 AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
+RGBLIGHT_ENABLE = yes
+EXTRAFLAGS += -flto

diff --git a/keyboards/1upkeyboards/sweet16/sweet16.h b/keyboards/1upkeyboards/sweet16/sweet16.h
index 879f51fae66afffbd870de5a3c0e7fbecb9ff7f4..7320ccd9e07423f4a2e24bc63ea3913fcd79716d 100644 (file)
--- a/keyboards/1upkeyboards/sweet16/sweet16.h
+++ b/keyboards/1upkeyboards/sweet16/sweet16.h
@@ -1,5 +1,4 @@
-#ifndef KB_H
-#define KB_H
+#pragma once
 
 #include "quantum.h"
 
@@ -29,4 +28,3 @@
     { KC_NO, K31,   K32,   KC_NO }  \
 }
 
-#endif