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

tmk_core/common/avr/xprintf.S

@@ -450,7 +450,7 @@ xatoi:
 	brcs	70f		;/
 	cpi	r22, 10		;if(r22 >= 10) {
 	brcs	53f		; r22 -= 7;
-	subi	r22, 7		; if(r22 < 10) 
+	subi	r22, 7		; if(r22 < 10)
 	cpi	r22, 10		;
 	brcs	70f		;}
 53:	cp	r22, r25	;if(r22 >= r25) error;
@@ -496,5 +496,3 @@ xatoi:
 	ret
 .endfunc
 #endif
-
-

tmk_core/common/chibios/sleep_led.c

@@ -211,4 +211,4 @@ void sleep_led_toggle(void) {
     // not implemented
 }
 
-#endif /* platform selection */
+#endif /* platform selection */

tmk_core/common/test/timer.c

@@ -30,4 +30,4 @@ uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), l
 void set_time(uint32_t t) { current_time = t; }
 void advance_time(uint32_t ms) { current_time += ms; }
 
-void wait_ms(uint32_t ms) { advance_time(ms); }
+void wait_ms(uint32_t ms) { advance_time(ms); }

tmk_core/protocol/chibios.mk

@@ -18,4 +18,3 @@ OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1
 ifeq ($(strip $(MIDI_ENABLE)), yes)
   include $(TMK_PATH)/protocol/midi.mk
 endif
-