From e12151f15e49191b48d88eb428e010dc020fbc14 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Aug 2018 15:38:49 -0400 Subject: [PATCH] Keyboard: Clean up Iris files (#3640) --- keyboards/iris/info.json | 10 +++++----- keyboards/iris/iris.h | 5 +---- keyboards/iris/rev1/config.h | 5 +---- keyboards/iris/rev1/rev1.c | 1 - keyboards/iris/rev1/rev1.h | 5 +---- keyboards/iris/rev1_led/config.h | 5 +---- keyboards/iris/rev1_led/rev1_led.c | 1 - keyboards/iris/rev1_led/rev1_led.h | 5 +---- keyboards/iris/rev2/config.h | 5 +---- keyboards/iris/rev2/rev2.h | 5 +---- keyboards/iris/rules.mk | 5 +---- 11 files changed, 13 insertions(+), 39 deletions(-) diff --git a/keyboards/iris/info.json b/keyboards/iris/info.json index a26ffae87a..f7b017b97a 100644 --- a/keyboards/iris/info.json +++ b/keyboards/iris/info.json @@ -1,9 +1,9 @@ { - "keyboard_name": "Iris", - "url": "Keeb.io", - "maintainer": "qmk", - "width": 14.5, - "height": 5, + "keyboard_name": "Iris", + "url": "https://keeb.io", + "maintainer": "Keebio", + "width": 14.5, + "height": 5, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/iris/iris.h b/keyboards/iris/iris.h index 56ba15473b..8d33b6b217 100644 --- a/keyboards/iris/iris.h +++ b/keyboards/iris/iris.h @@ -1,5 +1,4 @@ -#ifndef IRIS_H -#define IRIS_H +#pragma once #ifdef KEYBOARD_iris_rev1 #include "rev1.h" @@ -26,5 +25,3 @@ KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##LT4, KC_##RT4, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \ KC_##LT1, KC_##LT2, KC_##LT3, KC_##RT3, KC_##RT2, KC_##RT1 \ ) - -#endif diff --git a/keyboards/iris/rev1/config.h b/keyboards/iris/rev1/config.h index c22d49b262..fd9b2ced39 100644 --- a/keyboards/iris/rev1/config.h +++ b/keyboards/iris/rev1/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 REV1_CONFIG_H -#define REV1_CONFIG_H +#pragma once #include QMK_KEYBOARD_CONFIG_H @@ -86,5 +85,3 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/iris/rev1/rev1.c b/keyboards/iris/rev1/rev1.c index 3fdfaa94bc..fe91fa3ead 100644 --- a/keyboards/iris/rev1/rev1.c +++ b/keyboards/iris/rev1/rev1.c @@ -1,6 +1,5 @@ #include "rev1.h" - #ifdef SSD1306OLED void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here diff --git a/keyboards/iris/rev1/rev1.h b/keyboards/iris/rev1/rev1.h index 4db6bd1973..da5c9cdc03 100644 --- a/keyboards/iris/rev1/rev1.h +++ b/keyboards/iris/rev1/rev1.h @@ -1,5 +1,4 @@ -#ifndef REV1_H -#define REV1_H +#pragma once #include "iris.h" @@ -36,5 +35,3 @@ { R35, R34, R33, R32, R31, R30 }, \ { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ } - -#endif diff --git a/keyboards/iris/rev1_led/config.h b/keyboards/iris/rev1_led/config.h index 957776022e..18d783ae79 100644 --- a/keyboards/iris/rev1_led/config.h +++ b/keyboards/iris/rev1_led/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 REV1_CONFIG_H -#define REV1_CONFIG_H +#pragma once #include QMK_KEYBOARD_CONFIG_H @@ -86,5 +85,3 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/iris/rev1_led/rev1_led.c b/keyboards/iris/rev1_led/rev1_led.c index 681625f4b0..d08eaea662 100644 --- a/keyboards/iris/rev1_led/rev1_led.c +++ b/keyboards/iris/rev1_led/rev1_led.c @@ -1,6 +1,5 @@ #include "rev1_led.h" - #ifdef SSD1306OLED void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here diff --git a/keyboards/iris/rev1_led/rev1_led.h b/keyboards/iris/rev1_led/rev1_led.h index bac5e7bec3..da5c9cdc03 100644 --- a/keyboards/iris/rev1_led/rev1_led.h +++ b/keyboards/iris/rev1_led/rev1_led.h @@ -1,5 +1,4 @@ -#ifndef REV1_LED_H -#define REV1_LED_H +#pragma once #include "iris.h" @@ -36,5 +35,3 @@ { R35, R34, R33, R32, R31, R30 }, \ { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ } - -#endif diff --git a/keyboards/iris/rev2/config.h b/keyboards/iris/rev2/config.h index 4aa8cda176..2ea31a1541 100644 --- a/keyboards/iris/rev2/config.h +++ b/keyboards/iris/rev2/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 REV1_CONFIG_H -#define REV1_CONFIG_H +#pragma once #include QMK_KEYBOARD_CONFIG_H @@ -86,5 +85,3 @@ along with this program. If not, see . //#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION - -#endif diff --git a/keyboards/iris/rev2/rev2.h b/keyboards/iris/rev2/rev2.h index d581b346d1..da5c9cdc03 100644 --- a/keyboards/iris/rev2/rev2.h +++ b/keyboards/iris/rev2/rev2.h @@ -1,5 +1,4 @@ -#ifndef REV2_H -#define REV2_H +#pragma once #include "iris.h" @@ -36,5 +35,3 @@ { R35, R34, R33, R32, R31, R30 }, \ { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ } - -#endif diff --git a/keyboards/iris/rules.mk b/keyboards/iris/rules.mk index 07d78059ea..fa261adc6f 100644 --- a/keyboards/iris/rules.mk +++ b/keyboards/iris/rules.mk @@ -1,5 +1,4 @@ # MCU name -#MCU = at90usb1287 MCU = atmega32u4 # Processor frequency. @@ -36,7 +35,7 @@ F_USB = $(F_CPU) # Bootloader # This definition is optional, and if your keyboard supports multiple bootloaders of -# different sizes, comment this out, and the correct address will be loaded +# different sizes, comment this out, and the correct address will be loaded # automatically (+60). See bootloader.mk for all options. BOOTLOADER = caterina @@ -59,8 +58,6 @@ AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -SUBPROJECT_rev1 = yes -USE_I2C = yes # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend