Keyboard: Clean up Iris files (#3640)

This commit is contained in:
Danny 2018-08-13 15:38:49 -04:00 committed by Drashna Jaelre
parent 6cdc6e8397
commit e12151f15e
11 changed files with 13 additions and 39 deletions

View file

@ -1,9 +1,9 @@
{ {
"keyboard_name": "Iris", "keyboard_name": "Iris",
"url": "Keeb.io", "url": "https://keeb.io",
"maintainer": "qmk", "maintainer": "Keebio",
"width": 14.5, "width": 14.5,
"height": 5, "height": 5,
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View file

@ -1,5 +1,4 @@
#ifndef IRIS_H #pragma once
#define IRIS_H
#ifdef KEYBOARD_iris_rev1 #ifdef KEYBOARD_iris_rev1
#include "rev1.h" #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_##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 \ KC_##LT1, KC_##LT2, KC_##LT3, KC_##RT3, KC_##RT2, KC_##RT1 \
) )
#endif

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 REV1_CONFIG_H #pragma once
#define REV1_CONFIG_H
#include QMK_KEYBOARD_CONFIG_H #include QMK_KEYBOARD_CONFIG_H
@ -86,5 +85,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO //#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION //#define NO_ACTION_FUNCTION
#endif

View file

@ -1,6 +1,5 @@
#include "rev1.h" #include "rev1.h"
#ifdef SSD1306OLED #ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) { void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here

View file

@ -1,5 +1,4 @@
#ifndef REV1_H #pragma once
#define REV1_H
#include "iris.h" #include "iris.h"
@ -36,5 +35,3 @@
{ R35, R34, R33, R32, R31, R30 }, \ { R35, R34, R33, R32, R31, R30 }, \
{ KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \
} }
#endif

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 REV1_CONFIG_H #pragma once
#define REV1_CONFIG_H
#include QMK_KEYBOARD_CONFIG_H #include QMK_KEYBOARD_CONFIG_H
@ -86,5 +85,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO //#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION //#define NO_ACTION_FUNCTION
#endif

View file

@ -1,6 +1,5 @@
#include "rev1_led.h" #include "rev1_led.h"
#ifdef SSD1306OLED #ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) { void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here

View file

@ -1,5 +1,4 @@
#ifndef REV1_LED_H #pragma once
#define REV1_LED_H
#include "iris.h" #include "iris.h"
@ -36,5 +35,3 @@
{ R35, R34, R33, R32, R31, R30 }, \ { R35, R34, R33, R32, R31, R30 }, \
{ KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \
} }
#endif

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 REV1_CONFIG_H #pragma once
#define REV1_CONFIG_H
#include QMK_KEYBOARD_CONFIG_H #include QMK_KEYBOARD_CONFIG_H
@ -86,5 +85,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO //#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION //#define NO_ACTION_FUNCTION
#endif

View file

@ -1,5 +1,4 @@
#ifndef REV2_H #pragma once
#define REV2_H
#include "iris.h" #include "iris.h"
@ -36,5 +35,3 @@
{ R35, R34, R33, R32, R31, R30 }, \ { R35, R34, R33, R32, R31, R30 }, \
{ KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \
} }
#endif

View file

@ -1,5 +1,4 @@
# MCU name # MCU name
#MCU = at90usb1287
MCU = atmega32u4 MCU = atmega32u4
# Processor frequency. # Processor frequency.
@ -36,7 +35,7 @@ F_USB = $(F_CPU)
# Bootloader # Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of # 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. # automatically (+60). See bootloader.mk for all options.
BOOTLOADER = caterina BOOTLOADER = caterina
@ -59,8 +58,6 @@ AUDIO_ENABLE = no # Audio output on port C6
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
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. 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 # 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