Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

format code according to conventions [skip ci]

Browse source
This commit is contained in:
QMK Bot 2020-04-11 00:48:16 +00:00
parent 6c2c3c13e9
commit cc38627816
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
quantum/debounce/eager_pk.c
View file

@ -45,12 +45,12 @@ static bool matrix_need_update;
#define MAX_DEBOUNCE (DEBOUNCE_ELAPSED - 1) #define MAX_DEBOUNCE (DEBOUNCE_ELAPSED - 1)
static uint8_t wrapping_timer_read(void) { static uint8_t wrapping_timer_read(void) {
static uint16_t time = 0; static uint16_t time = 0;
static uint8_t last_result = 0; static uint8_t last_result = 0;
uint16_t new_time = timer_read(); uint16_t new_time = timer_read();
uint16_t diff = new_time - time; uint16_t diff = new_time - time;
time = new_time; time = new_time;
last_result = (last_result + diff) % (MAX_DEBOUNCE + 1); last_result = (last_result + diff) % (MAX_DEBOUNCE + 1);
return last_result; return last_result;
} }

10
quantum/debounce/eager_pr.c
View file

@ -37,12 +37,12 @@ static bool counters_need_update;
#define MAX_DEBOUNCE (DEBOUNCE_ELAPSED - 1) #define MAX_DEBOUNCE (DEBOUNCE_ELAPSED - 1)
static uint8_t wrapping_timer_read(void) { static uint8_t wrapping_timer_read(void) {
static uint16_t time = 0; static uint16_t time = 0;
static uint8_t last_result = 0; static uint8_t last_result = 0;
uint16_t new_time = timer_read(); uint16_t new_time = timer_read();
uint16_t diff = new_time - time; uint16_t diff = new_time - time;
time = new_time; time = new_time;
last_result = (last_result + diff) % (MAX_DEBOUNCE + 1); last_result = (last_result + diff) % (MAX_DEBOUNCE + 1);
return last_result; return last_result;
} }

5
tmk_core/common/timer.h
View file

@ -25,10 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "avr/timer_avr.h" # include "avr/timer_avr.h"
#endif #endif
#define TIMER_DIFF(a, b, max) ((max == UINT8_MAX) ? ((uint8_t)((a)-(b))) : ( \ #define TIMER_DIFF(a, b, max) ((max == UINT8_MAX) ? ((uint8_t)((a) - (b))) : ((max == UINT16_MAX) ? ((uint16_t)((a) - (b))) : ((max == UINT32_MAX) ? ((uint32_t)((a) - (b))) : ((a) >= (b) ? (a) - (b) : (max) + 1 - (b) + (a)))))
(max == UINT16_MAX) ? ((uint16_t)((a)-(b))) : ( \
(max == UINT32_MAX) ? ((uint32_t)((a)-(b))) : ( \
(a) >= (b) ? (a) - (b) : (max) + 1 - (b) + (a) ))))
#define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX) #define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX)
#define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX) #define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX)
#define TIMER_DIFF_32(a, b) TIMER_DIFF(a, b, UINT32_MAX) #define TIMER_DIFF_32(a, b) TIMER_DIFF(a, b, UINT32_MAX)