diff options
| author | QMK Bot <hello@qmk.fm> | 2021-09-29 16:30:58 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-09-29 16:30:58 +0000 |
| commit | f58095fab7c6c0b36c4ef325737bdb009f8c1433 (patch) | |
| tree | 6e42142422ab679fb2d66aa3814ea9986e48baf6 /keyboards/handwired/tractyl_manuform/5x6_right/f411 | |
| parent | f1aab47d13030bfe73794aa351b11cae07bd30f2 (diff) | |
| parent | 0338481090f4c2330a7fd237416cf66ba2bd4d22 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/handwired/tractyl_manuform/5x6_right/f411')
3 files changed, 13 insertions, 8 deletions
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 983b7b11b7..92bbe26e12 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -28,9 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define UNUSED_PINS \ { C15 } -// B2 used for BOOT1, has internal pull down? -// A9 has internal pull-down -// A11 and A12 are used for USB sense. DO NOT USE. #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index 240219f1d3..394c597b84 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -23,3 +23,9 @@ void matrix_scan_sub_kb(void) { reset_keyboard(); } } + +bool usb_vbus_state(void) { + setPinInputLow(USB_VBUS_PIN); + wait_us(5); + return readPin(USB_VBUS_PIN); +} diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h index fb835e8ee2..39644726c3 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/halconf.h @@ -15,10 +15,12 @@ */ #pragma once -#define HAL_USE_PWM TRUE -#define HAL_USE_SERIAL TRUE -#define HAL_USE_I2C TRUE -#define HAL_USE_SPI TRUE -#define HAL_USE_GPT TRUE +#define HAL_USE_PWM TRUE +#define HAL_USE_SERIAL TRUE +#define HAL_USE_I2C TRUE +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD +#define HAL_USE_GPT TRUE #include_next <halconf.h> |