summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-27 17:37:04 +0000
committerQMK Bot <hello@qmk.fm>2020-12-27 17:37:04 +0000
commit99d6349978b2117ed7ca3e0e3d2d84616df323d6 (patch)
treec75879012cba1026d3cee3ae7a793d0c525d6cc8 /tmk_core/common
parent0c5be869ffb7de6ca1107a5804d6d4d536d80e91 (diff)
parent1b7b72c0e96856d2b9f73f705787af3426662bcf (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/avr/xprintf.S4
-rw-r--r--tmk_core/common/chibios/sleep_led.c2
-rw-r--r--tmk_core/common/test/timer.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/tmk_core/common/avr/xprintf.S b/tmk_core/common/avr/xprintf.S
index 06434b98d9..c5a414c35c 100644
--- a/tmk_core/common/avr/xprintf.S
+++ b/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
-
-
diff --git a/tmk_core/common/chibios/sleep_led.c b/tmk_core/common/chibios/sleep_led.c
index 18c6d6e170..5595eec0e5 100644
--- a/tmk_core/common/chibios/sleep_led.c
+++ b/tmk_core/common/chibios/sleep_led.c
@@ -211,4 +211,4 @@ void sleep_led_toggle(void) {
// not implemented
}
-#endif /* platform selection */ \ No newline at end of file
+#endif /* platform selection */
diff --git a/tmk_core/common/test/timer.c b/tmk_core/common/test/timer.c
index 3c786ae293..61c3a00201 100644
--- a/tmk_core/common/test/timer.c
+++ b/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); } \ No newline at end of file
+void wait_ms(uint32_t ms) { advance_time(ms); }