Update VSIX package generator; allow all newer test builds to be installed over the...

[pub/USBasp.git] / Bootloaders / MassStorage / BootloaderMassStorage.c

diff --git a/Bootloaders/MassStorage/BootloaderMassStorage.c b/Bootloaders/MassStorage/BootloaderMassStorage.c
index c891f85..28f42b6 100644 (file)
--- a/Bootloaders/MassStorage/BootloaderMassStorage.c
+++ b/Bootloaders/MassStorage/BootloaderMassStorage.c
@@ -69,8 +69,25 @@ void Application_Jump_Check(void)
                /* Enable pull-up on the IO13 pin so we can use it to select the mode */
                PORTC |=  (1 << 7);
                Delay_MS(10);
                /* Enable pull-up on the IO13 pin so we can use it to select the mode */
                PORTC |=  (1 << 7);
                Delay_MS(10);

+
+               /* If IO13 is not jumpered to ground, start the user application instead */

                JumpToApplication |= ((PINC & (1 << 7)) != 0);
                JumpToApplication |= ((PINC & (1 << 7)) != 0);

+
+               /* Disable pull-up after the check has completed */

                PORTC &= ~(1 << 7);
                PORTC &= ~(1 << 7);

+       #elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+               /* Disable JTAG debugging */
+               JTAG_DISABLE();
+
+               /* Enable pull-up on the JTAG TCK pin so we can use it to select the mode */
+               PORTF |= (1 << 4);
+               Delay_MS(10);
+
+               /* If the TCK pin is not jumpered to ground, start the user application instead */
+               JumpToApplication |= ((PINF & (1 << 4)) != 0);
+
+               /* Re-enable JTAG debugging */
+               JTAG_ENABLE();

        #endif
 
        if (JumpToApplication)
        #endif
 
        if (JumpToApplication)