From 889f645c1a4381ce24b0c3dc201f41e2bc3332d5 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 12 Mar 2021 11:07:31 +0100 Subject: [PATCH] pushEvent insteado of putEvent --- radio/src/gui/128x64/gui.h | 2 +- radio/src/gui/212x64/gui.h | 2 +- radio/src/gui/colorlcd/keyboard_curve.cpp | 12 ++++++------ radio/src/gui/colorlcd/model_select_old.cpp | 8 ++++---- radio/src/gui/navigation/common.cpp | 2 +- radio/src/keys.cpp | 10 +++++----- radio/src/keys.h | 2 +- radio/src/main.cpp | 2 +- radio/src/opentx.cpp | 2 +- .../src/targets/common/arm/stm32/bootloader/boot.cpp | 2 +- radio/src/telemetry/frsky_pxx2.cpp | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index caac6e958..032a5fbf0 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -248,7 +248,7 @@ void menuChannelsViewCommon(event_t event); #define IS_ROTARY_LONG(evt) (evt == EVT_ROTARY_LONG) #define IS_ROTARY_EVENT(evt) (EVT_KEY_MASK(evt) >= 0x0e) void repeatLastCursorMove(event_t event); - #define REPEAT_LAST_CURSOR_MOVE() { if (EVT_KEY_MASK(event) >= 0x0e) putEvent(event); else repeatLastCursorMove(event); } + #define REPEAT_LAST_CURSOR_MOVE() { if (EVT_KEY_MASK(event) >= 0x0e) pushEvent(event); else repeatLastCursorMove(event); } #else #define IS_ROTARY_LEFT(evt) (0) #define IS_ROTARY_RIGHT(evt) (0) diff --git a/radio/src/gui/212x64/gui.h b/radio/src/gui/212x64/gui.h index bb2e0d630..fec4f27c0 100644 --- a/radio/src/gui/212x64/gui.h +++ b/radio/src/gui/212x64/gui.h @@ -280,7 +280,7 @@ void menuChannelsView(event_t event); #define CURSOR_MOVED_RIGHT(event) (EVT_KEY_MASK(event) == KEY_RIGHT) #endif -#define REPEAT_LAST_CURSOR_MOVE() { if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) putEvent(event); else menuHorizontalPosition = 0; } +#define REPEAT_LAST_CURSOR_MOVE() { if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) pushEvent(event); else menuHorizontalPosition = 0; } #define POS_HORZ_INIT(posVert) ((COLATTR(posVert) & NAVIGATION_LINE_BY_LINE) ? -1 : 0) #define EDIT_MODE_INIT 0 // TODO enum diff --git a/radio/src/gui/colorlcd/keyboard_curve.cpp b/radio/src/gui/colorlcd/keyboard_curve.cpp index 972b8e4f0..06b30f2d5 100644 --- a/radio/src/gui/colorlcd/keyboard_curve.cpp +++ b/radio/src/gui/colorlcd/keyboard_curve.cpp @@ -32,42 +32,42 @@ CurveKeyboard::CurveKeyboard() : // up new TextButton(this, {LCD_W / 2 - 20, 5, 40, 40}, "\200", [=]() -> uint8_t { - putEvent(EVT_VIRTUAL_KEY_UP); + pushEvent(EVT_VIRTUAL_KEY_UP); return 0; }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // down new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, "\201", [=]() -> uint8_t { - putEvent(EVT_VIRTUAL_KEY_DOWN); + pushEvent(EVT_VIRTUAL_KEY_DOWN); return 0; }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // left left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, "\177", [=]() -> uint8_t { - putEvent(EVT_VIRTUAL_KEY_LEFT); + pushEvent(EVT_VIRTUAL_KEY_LEFT); return 0; }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // right right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, "\176", [=]() -> uint8_t { - putEvent(EVT_VIRTUAL_KEY_RIGHT); + pushEvent(EVT_VIRTUAL_KEY_RIGHT); return 0; }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // next new TextButton(this, {LCD_W / 2 + 80, 35, 60, 40}, "Next", [=]() -> uint8_t { - putEvent(EVT_VIRTUAL_KEY_NEXT); + pushEvent(EVT_VIRTUAL_KEY_NEXT); return 0; }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); // previous new TextButton(this, {LCD_W / 2 - 140, 35, 60, 40}, "Prev", [=]() -> uint8_t { - putEvent(EVT_VIRTUAL_KEY_PREVIOUS); + pushEvent(EVT_VIRTUAL_KEY_PREVIOUS); return 0; }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); diff --git a/radio/src/gui/colorlcd/model_select_old.cpp b/radio/src/gui/colorlcd/model_select_old.cpp index 0f268dfd8..44483bf61 100644 --- a/radio/src/gui/colorlcd/model_select_old.cpp +++ b/radio/src/gui/colorlcd/model_select_old.cpp @@ -230,7 +230,7 @@ void onDeleteModelConfirm(const char * result) int modelIndex = MODEL_INDEX(); modelslist.removeModel(currentCategory, currentModel); s_copyMode = 0; - putEvent(EVT_REFRESH); + pushEvent(EVT_REFRESH); if (modelIndex > 0) { modelIndex--; } @@ -467,7 +467,7 @@ bool menuModelSelect(event_t event) if (s_editMode == 0 || event == EVT_KEY_BREAK(KEY_EXIT)) { modelslist.save(); selectMode = MODE_SELECT_MODEL; - putEvent(EVT_REFRESH); + pushEvent(EVT_REFRESH); } } else { @@ -503,7 +503,7 @@ bool menuModelSelect(event_t event) if (selectMode == MODE_SELECT_MODEL) { if (navigate(event, index, 4, 2) != 0) { setCurrentModel(MODEL_INDEX()); - putEvent(EVT_REFRESH); + pushEvent(EVT_REFRESH); } } else if (selectMode == MODE_MOVE_MODEL) { @@ -511,7 +511,7 @@ bool menuModelSelect(event_t event) if (direction) { modelslist.moveModel(currentCategory, currentModel, direction); setCurrentModel(MODEL_INDEX()); - putEvent(EVT_REFRESH); + pushEvent(EVT_REFRESH); } } } diff --git a/radio/src/gui/navigation/common.cpp b/radio/src/gui/navigation/common.cpp index 612b34183..bb8b0991d 100644 --- a/radio/src/gui/navigation/common.cpp +++ b/radio/src/gui/navigation/common.cpp @@ -55,7 +55,7 @@ int checkIncDecSelection = 0; void repeatLastCursorMove(event_t event) { if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) { - putEvent(event); + pushEvent(event); } else { menuHorizontalPosition = 0; diff --git a/radio/src/keys.cpp b/radio/src/keys.cpp index 75025c619..395a0fea9 100644 --- a/radio/src/keys.cpp +++ b/radio/src/keys.cpp @@ -68,7 +68,7 @@ void Key::input(bool val) // key is released if (m_state != KSTATE_KILLED) { // TRACE("key %d BREAK", key()); - putEvent(EVT_KEY_BREAK(key())); + pushEvent(EVT_KEY_BREAK(key())); } m_state = KSTATE_OFF; m_cnt = 0; @@ -85,7 +85,7 @@ void Key::input(bool val) case KSTATE_START: // TRACE("key %d FIRST", key()); - putEvent(EVT_KEY_FIRST(key())); + pushEvent(EVT_KEY_FIRST(key())); inactivity.counter = 0; m_state = KSTATE_RPTDELAY; m_cnt = 0; @@ -95,7 +95,7 @@ void Key::input(bool val) if (m_cnt == KEY_LONG_DELAY) { // generate long key press // TRACE("key %d LONG", key()); - putEvent(EVT_KEY_LONG(key())); + pushEvent(EVT_KEY_LONG(key())); } if (m_cnt == KEY_REPEAT_DELAY) { m_state = 16; @@ -117,7 +117,7 @@ void Key::input(bool val) // this produces repeat events that at first repeat slowly and then increase in speed // TRACE("key %d REPEAT", key()); if (!IS_SHIFT_KEY(key())) - putEvent(EVT_KEY_REPT(key())); + pushEvent(EVT_KEY_REPT(key())); } break; @@ -197,6 +197,6 @@ bool waitKeysReleased() } memclear(keys, sizeof(keys)); - putEvent(0); + pushEvent(0); return true; } diff --git a/radio/src/keys.h b/radio/src/keys.h index 487ecadb3..919c51240 100644 --- a/radio/src/keys.h +++ b/radio/src/keys.h @@ -169,7 +169,7 @@ class Key extern Key keys[NUM_KEYS]; extern event_t s_evt; -inline void putEvent(event_t evt) +inline void pushEvent(event_t evt) { s_evt = evt; } diff --git a/radio/src/main.cpp b/radio/src/main.cpp index 7ea282eac..5e5d6a418 100644 --- a/radio/src/main.cpp +++ b/radio/src/main.cpp @@ -104,7 +104,7 @@ void handleUsbConnection() usbStop(); if (getSelectedUsbMode() == USB_MASS_STORAGE_MODE) { opentxResume(); - putEvent(EVT_ENTRY); + pushEvent(EVT_ENTRY); } setSelectedUsbMode(USB_UNSELECTED_MODE); } diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index f0027d787..a792b6391 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -180,7 +180,7 @@ void per10ms() bool new_cw = (scrollRE < 0) ? false : true; if ((g_tmr10ms - lastEvent >= 10) || (cw == new_cw)) { // 100ms - putEvent(new_cw ? EVT_ROTARY_RIGHT : EVT_ROTARY_LEFT); + pushEvent(new_cw ? EVT_ROTARY_RIGHT : EVT_ROTARY_LEFT); // rotary encoder navigation speed (acceleration) detection/calculation static uint32_t delay = 2*ROTENC_DELAY_MIDSPEED; diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp index cf63d3f2e..2b9c7152c 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp +++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp @@ -88,7 +88,7 @@ void interrupt10ms() int8_t scrollRE = reNewValue - rePreviousValue; if (scrollRE) { rePreviousValue = reNewValue; - putEvent(scrollRE < 0 ? EVT_KEY_FIRST(KEY_UP) : EVT_KEY_FIRST(KEY_DOWN)); + pushEvent(scrollRE < 0 ? EVT_KEY_FIRST(KEY_UP) : EVT_KEY_FIRST(KEY_DOWN)); } #endif } diff --git a/radio/src/telemetry/frsky_pxx2.cpp b/radio/src/telemetry/frsky_pxx2.cpp index cbfae9ab9..959d0ee43 100644 --- a/radio/src/telemetry/frsky_pxx2.cpp +++ b/radio/src/telemetry/frsky_pxx2.cpp @@ -120,7 +120,7 @@ void processRegisterFrame(uint8_t module, const uint8_t * frame) reusableBuffer.moduleSetup.pxx2.registerLoopIndex = frame[12]; reusableBuffer.moduleSetup.pxx2.registerStep = REGISTER_RX_NAME_RECEIVED; #if defined(COLORLCD) - putEvent(EVT_REFRESH); + pushEvent(EVT_REFRESH); #endif } break;