Merge branch 'master' of https://github.com/smasher816/controller into smasher816-master

Lib/_buildvars.h

@@ -55,8 +55,8 @@
 // Windows, even though the driver is supplied by Microsoft, an
 // INF file is needed to load the driver.  These numbers need to
 // match the INF file.
-#define VENDOR_ID		@VENDOR_ID@
-#define PRODUCT_ID		@PRODUCT_ID@
+#define VENDOR_ID               @VENDOR_ID@
+#define PRODUCT_ID              @PRODUCT_ID@
 
 #endif
 

Lib/delay.h

@@ -69,9 +69,9 @@ static inline void delayMicroseconds(uint32_t usec)
 	uint32_t n = usec << 3;
 #endif
 	asm volatile(
-		"L_%=_delayMicroseconds:"		"\n\t"
-		"subs   %0, #1"				"\n\t"
-		"bne    L_%=_delayMicroseconds"		"\n"
+		"L_%=_delayMicroseconds:"               "\n\t"
+		"subs   %0, #1"                         "\n\t"
+		"bne    L_%=_delayMicroseconds"         "\n"
 		: "+r" (n) :
 	);
 }

Lib/mk20dx.c

@@ -410,12 +410,12 @@ const uint8_t flashconfigbytes[16] = {
 __attribute__((noreturn))
 static inline void jump_to_app( uintptr_t addr )
 {
-        // addr is in r0
-        __asm__("ldr sp, [%[addr], #0]\n"
-                "ldr pc, [%[addr], #4]"
-                :: [addr] "r" (addr));
-        // NOTREACHED
-        __builtin_unreachable();
+	// addr is in r0
+	__asm__("ldr sp, [%[addr], #0]\n"
+		"ldr pc, [%[addr], #4]"
+		:: [addr] "r" (addr));
+	// NOTREACHED
+	__builtin_unreachable();
 }
 #endif
 
@@ -526,7 +526,7 @@ void ResetHandler()
 		NVIC_SET_PRIORITY( i, 128 );
 	}
 
-        // FLL at 48MHz
+	// FLL at 48MHz
 	MCG_C4 = MCG_C4_DMX32 | MCG_C4_DRST_DRS( 1 );
 
 	// USB Clock and FLL select
@@ -534,7 +534,7 @@ void ResetHandler()
 
 // Teensy 3.0 and 3.1 and Kiibohd-dfu (mk20dx256vlh7)
 #else
-	SCB_VTOR = 0;	// use vector table in flash
+	SCB_VTOR = 0;   // use vector table in flash
 
 	// default all interrupts to medium priority level
 	for ( unsigned int i = 0; i < NVIC_NUM_INTERRUPTS; i++ )