diff options
author | QMK Bot <hello@qmk.fm> | 2022-10-15 21:23:33 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-10-15 21:23:33 +0000 |
commit | 3fe9fbf950c8a27462957ed1309ec2eeb15cb7e9 (patch) | |
tree | 261cb337f9d0877fb4ad390b39b1192811ec1cdb /keyboards | |
parent | 2b24f16779b642d0a20f19a2767645a6ec0b1952 (diff) | |
parent | ccdd28930a8f399f3dfd5e39a14e3972e5bc1872 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/handwired/riblee_f411/config.h | 2 | ||||
-rw-r--r-- | keyboards/handwired/riblee_f411/halconf.h | 27 | ||||
-rw-r--r-- | keyboards/handwired/riblee_f411/mcuconf.h | 22 | ||||
-rw-r--r-- | keyboards/handwired/riblee_f411/rules.mk | 4 |
4 files changed, 0 insertions, 55 deletions
diff --git a/keyboards/handwired/riblee_f411/config.h b/keyboards/handwired/riblee_f411/config.h index 6cf4b6370a..e855133713 100644 --- a/keyboards/handwired/riblee_f411/config.h +++ b/keyboards/handwired/riblee_f411/config.h @@ -29,5 +29,3 @@ #define MOUSEKEY_INTERVAL 32 #define TAPPING_TERM 175 - -#define OLED_DISPLAY_128X64 diff --git a/keyboards/handwired/riblee_f411/halconf.h b/keyboards/handwired/riblee_f411/halconf.h deleted file mode 100644 index 6084293ff1..0000000000 --- a/keyboards/handwired/riblee_f411/halconf.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/handwired/riblee_f411/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ - -#pragma once - -#define HAL_USE_I2C TRUE - -#include_next <halconf.h> - diff --git a/keyboards/handwired/riblee_f411/mcuconf.h b/keyboards/handwired/riblee_f411/mcuconf.h deleted file mode 100644 index 79a654f1a4..0000000000 --- a/keyboards/handwired/riblee_f411/mcuconf.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Nick Brassel (tzarc) - * Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee - * - * 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ -#pragma once - -#include_next "mcuconf.h" - -#undef STM32_I2C_USE_I2C1 -#define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk index ae4bc544a7..d3ca449aaf 100644 --- a/keyboards/handwired/riblee_f411/rules.mk +++ b/keyboards/handwired/riblee_f411/rules.mk @@ -20,7 +20,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LAYOUTS = ortho_5x12 - -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 -RAW_ENABLE = yes |