From de6cfa7f1c0b9de083b41df3a246f5408cd5d4e8 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Mon, 27 Mar 2017 11:05:43 +0200 Subject: [PATCH] Rename readAndPlay to readKeyCodeAndPlay The new name reflects it better what the function does. Signed-off-by: Gergely Nagy --- src/Kaleidoscope-Macros.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Kaleidoscope-Macros.cpp b/src/Kaleidoscope-Macros.cpp index bcc9b7b2..018fa540 100644 --- a/src/Kaleidoscope-Macros.cpp +++ b/src/Kaleidoscope-Macros.cpp @@ -7,7 +7,7 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) { byte Macros_::row, Macros_::col; -static void readAndPlay (const macro_t *macro_p, uint8_t flags, uint8_t keyStates) { +static void readKeyCodeAndPlay (const macro_t *macro_p, uint8_t flags, uint8_t keyStates) { Key key; key.flags = flags; key.keyCode = pgm_read_byte(macro_p++); @@ -42,25 +42,25 @@ void Macros_::play(const macro_t *macro_p) { } case MACRO_ACTION_STEP_KEYDOWN: flags = pgm_read_byte(macro_p++); - readAndPlay (macro_p++, flags, IS_PRESSED); + readKeyCodeAndPlay (macro_p++, flags, IS_PRESSED); break; case MACRO_ACTION_STEP_KEYUP: flags = pgm_read_byte(macro_p++); - readAndPlay (macro_p++, flags, WAS_PRESSED); + readKeyCodeAndPlay (macro_p++, flags, WAS_PRESSED); break; case MACRO_ACTION_STEP_TAP: flags = pgm_read_byte(macro_p++); - readAndPlay (macro_p++, flags, IS_PRESSED | WAS_PRESSED); + readKeyCodeAndPlay (macro_p++, flags, IS_PRESSED | WAS_PRESSED); break; case MACRO_ACTION_STEP_KEYCODEDOWN: - readAndPlay (macro_p++, 0, IS_PRESSED); + readKeyCodeAndPlay (macro_p++, 0, IS_PRESSED); break; case MACRO_ACTION_STEP_KEYCODEUP: - readAndPlay (macro_p++, 0, WAS_PRESSED); + readKeyCodeAndPlay (macro_p++, 0, WAS_PRESSED); break; case MACRO_ACTION_STEP_TAPCODE: - readAndPlay (macro_p++, 0, IS_PRESSED | WAS_PRESSED); + readKeyCodeAndPlay (macro_p++, 0, IS_PRESSED | WAS_PRESSED); break; case END: