From d2292ca0ee23e75b438482a3cf0a689b62d80965 Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Mon, 23 Sep 2019 22:49:29 -0700 Subject: [PATCH] Revert "Disabling software port switching on Gemini Dusk/Dawn" This reverts commit de3a77c36b1234220595c63cf128729e730caf12. --- Bootloader/Devices/Gemini_Dusk_Dawn.c | 4 ---- Scan/Gemini_Dusk_Dawn/scan_loop.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Bootloader/Devices/Gemini_Dusk_Dawn.c b/Bootloader/Devices/Gemini_Dusk_Dawn.c index 7a83d5c8e..e6bba78aa 100644 --- a/Bootloader/Devices/Gemini_Dusk_Dawn.c +++ b/Bootloader/Devices/Gemini_Dusk_Dawn.c @@ -92,10 +92,8 @@ void Device_setup() // PA12 - USB Swap // Start, disabled - /* XXX (HaaTa) This function is disabled in hardware on the shipping hardware GPIO_Ctrl( usb_swap_pin, GPIO_Type_DriveSetup, GPIO_Config_None ); GPIO_Ctrl( usb_swap_pin, GPIO_Type_DriveLow, GPIO_Config_None ); - */ // Setup parameters for USB port swap last_ms = 0; @@ -127,7 +125,6 @@ void Device_process() // For keyboards with dual usb ports, doesn't do anything on keyboards without them // If a USB connection is not detected in 2 seconds, switch to the other port to see if it's plugged in there // USB not initialized, attempt to swap - /* XXX (HaaTa) This function is disabled in hardware on the shipping hardware uint32_t wait_ms = systick_millis_count - last_ms; if ( wait_ms > USBPortSwapDelay_ms + attempt / 2 * USBPortSwapDelay_ms ) { @@ -149,6 +146,5 @@ void Device_process() attempt++; } } - */ } diff --git a/Scan/Gemini_Dusk_Dawn/scan_loop.c b/Scan/Gemini_Dusk_Dawn/scan_loop.c index 61992866a..343bed95a 100644 --- a/Scan/Gemini_Dusk_Dawn/scan_loop.c +++ b/Scan/Gemini_Dusk_Dawn/scan_loop.c @@ -50,9 +50,7 @@ inline void Scan_setup() { // Setup Port Swap module - /* XXX (HaaTa) Disabled in the shipping hardware Port_setup(); - */ // Setup GPIO pins for matrix scanning Matrix_setup(); @@ -74,9 +72,7 @@ inline void Scan_setup() void Scan_poll() { // Port Swap detection - /* XXX (HaaTa) Disabled in the shipping hardware Port_scan(); - */ // Prepare any LED events Pixel_process();