di0ib
/
controller
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Adding USB port swapping (when supported) to the bootloader 

- Every 1000 ms, if no USB connection detected, swap to the other USB port
ICPad
Jacob Alexander 8 years ago
parent
808e617f9f
commit
571c7ad35a
2 changed files with 44 additions and 2 deletions
Unified View Show Diff Stats
  1. 42
    0
      Bootloader/main.c
  2. 2
    2
      Lib/mk20dx.c

+ 42
- 0
Bootloader/main.c View File



// ----- Includes ----- // ----- Includes -----


// Project Includes
#include <delay.h>

// Local Includes // Local Includes
#include "mchck.h" #include "mchck.h"
#include "dfu.desc.h" #include "dfu.desc.h"


#include "debug.h" #include "debug.h"


#include "usb-internal.h"





// ----- Variables ----- // ----- Variables -----
void init_usb_bootloader( int config ) void init_usb_bootloader( int config )
{ {
dfu_init( setup_read, setup_write, finish_write, &dfu_ctx ); dfu_init( setup_read, setup_write, finish_write, &dfu_ctx );

// Make sure SysTick counter is disabled
SYST_CSR = 0;
} }


void main() void main()


flash_prepare_flashing(); flash_prepare_flashing();
usb_init( &dfu_device ); usb_init( &dfu_device );

#if defined(_mk20dx256vlh7_) // Kiibohd-dfu
// PTA13 - USB Swap
// Start, disabled
GPIOA_PDDR |= (1<<13);
PORTA_PCR13 = PORT_PCR_SRE | PORT_PCR_DSE | PORT_PCR_MUX(1);
GPIOA_PCOR |= (1<<13);

#define USBPortSwapDelay_ms 1000
// 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
uint32_t last_ms = systick_millis_count;
for (;;)
{
usb_poll();

// Only check for swapping after delay
uint32_t wait_ms = systick_millis_count - last_ms;
if ( wait_ms < USBPortSwapDelay_ms )
{
continue;
}

last_ms = systick_millis_count;

// USB not initialized, attempt to swap
if ( usb.state != USBD_STATE_ADDRESS )
{
print("USB not initializing, port swapping (if supported)");
GPIOA_PTOR |= (1<<13);
}
}
#else
for (;;) for (;;)
{ {
usb_poll(); usb_poll();
} }
#endif
} }



+ 2
- 2
Lib/mk20dx.c View File

// Also checking for ARM lock-up signal (invalid firmware image) // Also checking for ARM lock-up signal (invalid firmware image)
// RCM_SRS1 & 0x02 // RCM_SRS1 & 0x02
if ( // PIN (External Reset Pin/Switch) if ( // PIN (External Reset Pin/Switch)
RCM_SRS0 & 0x40
RCM_SRS0 & 0x40
// WDOG (Watchdog timeout) // WDOG (Watchdog timeout)
|| RCM_SRS0 & 0x20 || RCM_SRS0 & 0x20
// LOCKUP (ARM Core LOCKUP event) // LOCKUP (ARM Core LOCKUP event)


#endif #endif


#if !defined(_bootloader_)
// Initialize the SysTick counter // Initialize the SysTick counter
SYST_RVR = (F_CPU / 1000) - 1; SYST_RVR = (F_CPU / 1000) - 1;
SYST_CSR = SYST_CSR_CLKSOURCE | SYST_CSR_TICKINT | SYST_CSR_ENABLE; SYST_CSR = SYST_CSR_CLKSOURCE | SYST_CSR_TICKINT | SYST_CSR_ENABLE;


#if !defined(_bootloader_)
__enable_irq(); __enable_irq();
#else #else
// Disable Watchdog for bootloader // Disable Watchdog for bootloader