drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2020-12-27 17:37:04 +00:00
commit 99d6349978
40 changed files with 40 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tmk_core/common/avr/xprintf.S
View file

@ -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

2
tmk_core/common/chibios/sleep_led.c
View file

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

2
tmk_core/common/test/timer.c
View file

@ -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); }