Merge remote-tracking branch 'origin/master' into develop

6 files changed, 23 insertions, 28 deletions

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index cd42364b4f..ce35197f71 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -41,8 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DYNAMIC_KEYMAP_LAYER_COUNT  16
 #define LAYER_STATE_16BIT
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
 
 /* disable action features */
 //#define NO_ACTION_LAYER
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 172ccf7bc2..4dbe03acbf 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -44,11 +44,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_DMA_STREAM   STM32_DMA1_STREAM7  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #define WS2812_DMA_CHANNEL  3                   // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 
-#define RGBLED_NUM          20
+#define RGBLED_NUM          52
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT \
-    { 10, 10 }
-#define RGBLIGHT_LMIT_VAL 80
+    { 26, 26 }
+#define RGBLIGHT_LIMIT_VAL 150
 
 #define DEBUG_LED_PIN      C13
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/readme.md b/keyboards/handwired/tractyl_manuform/5x6_right/f411/readme.md
index 5fb2c0fc72..b387435122 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/readme.md
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/readme.md
@@ -1,16 +1,21 @@
 # Drashna's Blackpill Tractyl Manuform (5x6) with a right side trackball
 
-* VBUS mod, using PB10
+* System Timer on TIM5
+* ~~VBUS mod, using PB10~~ (*doesn't seem to work for me*)
 * Split Hand Pin, using PC14
-* Full Duplex Serial/USART using PA3 and PA4 on USART2
+* Full Duplex Serial/USART using PA2 and PA3 on USART2
 * PWM Audio using PB1 and TIM3 and GPT on TIM4
-* PWM RGB using PA1 TIM2
-* pmw3360 sensor sharing PA5-PA7 on SPI1, with B0 as CS pin
+* PWM WS2812 RGB using PA1 TIM2
 * 8KB SPI EEPROM chip sharing PA5-PA7 on SPI1 with PA4 as CS pin
+* pmw3360 sensor sharing PA5-PA7 on SPI1, with B0 as CS pin
 * Encoder using PA13 and PA14
 * SSD1306 OLED display (128x64) using PB8-PB9 on I2C1
 * Pull-up resistor (22k) on PA10 to fix reset issue.
 * Pull-up resistor (5.1k) on PA1 for WS2812 LED support, and wire it's VCC to the 5V pin.
+* Pins PA9, PA11, A12 are not useable because they're used for USB connection, and can't be shared. 
+* Pin PB2 is used by BOOT1, and is unusable
+
+## Keyboard Info
 
 * Keyboard Maintainer: [Drashna Jael're](https://github.com/drashna)
 * Hardware Supported: [Design files](https://gitlab.com/keyboards1/dm_r_track/-/tree/master/boolean), [WeAct BlackPill (F411)](https://github.com/WeActTC/MiniSTM32F4x1), [PMW3360 Optical Sensor](https://www.tindie.com/products/jkicklighter/pmw3360-motion-sensor/)
@@ -24,3 +29,9 @@ Flashing example for this keyboard:
     make handwired/tractyl_manuform/5x6_right/f411:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader 
+
+* **Bootmagic reset**: Hold down the top right key on the right side, or the top left key on the left side while plugging in.
+* **Physical reset button**: Briefly press the "USER" button on the BlackPill
+* **Keycode in layout**: Press the key mapped to `RESET`.
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
index ede1a6baff..d6f972b468 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
@@ -6,8 +6,11 @@ BOOTLOADER = stm32-dfu
 
 KEYBOARD_SHARED_EP = yes
 CONSOLE_ENABLE     = yes
+MOUSE_SHARED_EP    = no
 
 EEPROM_DRIVER = spi
 WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 AUDIO_DRIVER  = pwm_hardware
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
index df3e877f98..a984ba4885 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -16,16 +16,7 @@
 
 #pragma once
 
-// #define USE_I2C
-// #define SELECT_SOFT_SERIAL_SPEED 1
-// #define SERIAL_USE_MULTI_TRANSACTION
-#define SPLIT_MODS_ENABLE
-#define EE_HANDS
-
 #define TRACKBALL_DPI_OPTIONS { 1200, 1800, 2600, 3400 }
 
 #undef DEBOUNCE
-#define DEBOUNCE 10
-
-#define SOLENOID_PIN F1
-#define SOLENOID_DEFAULT_DWELL 8
+#define DEBOUNCE 15
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index abfec41a62..5bfc21fd14 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -348,16 +348,8 @@ void render_kitty(void) {
                                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
 
     // assumes 1 frame prep stage
-#ifdef SWAP_HANDS_ENABLE
-    extern bool swap_hands;
-#endif
     void        animation_phase(void) {
-#    ifdef SWAP_HANDS_ENABLE
-        if (swap_hands)
-#else
-        if (tap_toggling)
-#endif
-        {
+        if (tap_toggling) {
             anim_frame_duration = 300;
             current_rtogi_frame = (current_rtogi_frame + 1) % RTOGI_FRAMES;
             oled_write_raw_P(rtogi[abs((RTOGI_FRAMES - 1) - current_rtogi_frame)], ANIM_SIZE);