diff options
author | QMK Bot <hello@qmk.fm> | 2022-03-18 18:49:56 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-03-18 18:49:56 +0000 |
commit | c39eeaa1c82c9a1974d959b5673602dbd5930f47 (patch) | |
tree | f589161f2fd9f7fd806d82a847d2a853219bfdbe | |
parent | a900f9251a17a01880d34212a06f9e5f62d25bcb (diff) | |
parent | 61c644f6d00cc107e9079aa5e87716174ad77d44 (diff) | |
download | qmk_firmware-c39eeaa1c82c9a1974d959b5673602dbd5930f47.tar.gz qmk_firmware-c39eeaa1c82c9a1974d959b5673602dbd5930f47.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | keyboards/handwired/tractyl_manuform/5x6_right/f411/chconf.h | 38 | ||||
-rw-r--r-- | keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h | 8 |
2 files changed, 0 insertions, 46 deletions
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/chconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/chconf.h deleted file mode 100644 index 8b55eaeef0..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/chconf.h +++ /dev/null @@ -1,38 +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/onekey/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h` - */ - -#pragma once - -#define CH_CFG_ST_FREQUENCY 10000 - -#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE - -#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE - -#define CH_CFG_FACTORY_SEMAPHORES TRUE - -#define CH_CFG_FACTORY_MAILBOXES TRUE - -#define CH_CFG_FACTORY_OBJ_FIFOS TRUE - -#define CH_CFG_FACTORY_PIPES TRUE - -#include_next <chconf.h> diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 87c3239057..6f19332a62 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -100,14 +100,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* eeprom config */ #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4 #define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 64 -// #define EXTERNAL_EEPROM_BYTE_COUNT 8196 -// #define EXTERNAL_EEPROM_PAGE_SIZE 32 -// #define EXTERNAL_EEPROM_ADDRESS_SIZE 2 -// #define DEBUG_EEPROM_OUTPUT - -#ifdef EEPROM_SPI -# define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8195 -#endif /* pmw3360 config */ #define PMW3360_CS_PIN B0 |