Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 20:35:17 +03:00
Code Issues Wiki Activity

pushEvent insteado of putEvent

Browse source
This commit is contained in:
Bertrand Songis 2021-03-12 11:07:31 +01:00
parent 59cef7ebc7
commit 889f645c1a
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
11 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/128x64/gui.h
View file

@ -248,7 +248,7 @@ void menuChannelsViewCommon(event_t event);
#define IS_ROTARY_LONG(evt) (evt == EVT_ROTARY_LONG) #define IS_ROTARY_LONG(evt) (evt == EVT_ROTARY_LONG)
#define IS_ROTARY_EVENT(evt) (EVT_KEY_MASK(evt) >= 0x0e) #define IS_ROTARY_EVENT(evt) (EVT_KEY_MASK(evt) >= 0x0e)
void repeatLastCursorMove(event_t event); 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 #else
#define IS_ROTARY_LEFT(evt) (0) #define IS_ROTARY_LEFT(evt) (0)
#define IS_ROTARY_RIGHT(evt) (0) #define IS_ROTARY_RIGHT(evt) (0)

2
radio/src/gui/212x64/gui.h
View file

@ -280,7 +280,7 @@ void menuChannelsView(event_t event);
#define CURSOR_MOVED_RIGHT(event) (EVT_KEY_MASK(event) == KEY_RIGHT) #define CURSOR_MOVED_RIGHT(event) (EVT_KEY_MASK(event) == KEY_RIGHT)
#endif #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 POS_HORZ_INIT(posVert) ((COLATTR(posVert) & NAVIGATION_LINE_BY_LINE) ? -1 : 0)
#define EDIT_MODE_INIT 0 // TODO enum #define EDIT_MODE_INIT 0 // TODO enum

12
radio/src/gui/colorlcd/keyboard_curve.cpp
View file

@ -32,42 +32,42 @@ CurveKeyboard::CurveKeyboard() :
// up // up
new TextButton(this, {LCD_W / 2 - 20, 5, 40, 40}, "\200", new TextButton(this, {LCD_W / 2 - 20, 5, 40, 40}, "\200",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_UP); pushEvent(EVT_VIRTUAL_KEY_UP);
return 0; return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// down // down
new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, "\201", new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, "\201",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_DOWN); pushEvent(EVT_VIRTUAL_KEY_DOWN);
return 0; return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// left // left
left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, "\177", left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, "\177",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_LEFT); pushEvent(EVT_VIRTUAL_KEY_LEFT);
return 0; return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// right // right
right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, "\176", right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, "\176",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_RIGHT); pushEvent(EVT_VIRTUAL_KEY_RIGHT);
return 0; return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// next // next
new TextButton(this, {LCD_W / 2 + 80, 35, 60, 40}, "Next", new TextButton(this, {LCD_W / 2 + 80, 35, 60, 40}, "Next",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_NEXT); pushEvent(EVT_VIRTUAL_KEY_NEXT);
return 0; return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// previous // previous
new TextButton(this, {LCD_W / 2 - 140, 35, 60, 40}, "Prev", new TextButton(this, {LCD_W / 2 - 140, 35, 60, 40}, "Prev",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_PREVIOUS); pushEvent(EVT_VIRTUAL_KEY_PREVIOUS);
return 0; return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS); }, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);

8
radio/src/gui/colorlcd/model_select_old.cpp
View file

@ -230,7 +230,7 @@ void onDeleteModelConfirm(const char * result)
int modelIndex = MODEL_INDEX(); int modelIndex = MODEL_INDEX();
modelslist.removeModel(currentCategory, currentModel); modelslist.removeModel(currentCategory, currentModel);
s_copyMode = 0; s_copyMode = 0;
putEvent(EVT_REFRESH); pushEvent(EVT_REFRESH);
if (modelIndex > 0) { if (modelIndex > 0) {
modelIndex--; modelIndex--;
} }
@ -467,7 +467,7 @@ bool menuModelSelect(event_t event)
if (s_editMode == 0 || event == EVT_KEY_BREAK(KEY_EXIT)) { if (s_editMode == 0 || event == EVT_KEY_BREAK(KEY_EXIT)) {
modelslist.save(); modelslist.save();
selectMode = MODE_SELECT_MODEL; selectMode = MODE_SELECT_MODEL;
putEvent(EVT_REFRESH); pushEvent(EVT_REFRESH);
} }
} }
else { else {
@ -503,7 +503,7 @@ bool menuModelSelect(event_t event)
if (selectMode == MODE_SELECT_MODEL) { if (selectMode == MODE_SELECT_MODEL) {
if (navigate(event, index, 4, 2) != 0) { if (navigate(event, index, 4, 2) != 0) {
setCurrentModel(MODEL_INDEX()); setCurrentModel(MODEL_INDEX());
putEvent(EVT_REFRESH); pushEvent(EVT_REFRESH);
} }
} }
else if (selectMode == MODE_MOVE_MODEL) { else if (selectMode == MODE_MOVE_MODEL) {
@ -511,7 +511,7 @@ bool menuModelSelect(event_t event)
if (direction) { if (direction) {
modelslist.moveModel(currentCategory, currentModel, direction); modelslist.moveModel(currentCategory, currentModel, direction);
setCurrentModel(MODEL_INDEX()); setCurrentModel(MODEL_INDEX());
putEvent(EVT_REFRESH); pushEvent(EVT_REFRESH);
} }
} }
} }

2
radio/src/gui/navigation/common.cpp
View file

@ -55,7 +55,7 @@ int checkIncDecSelection = 0;
void repeatLastCursorMove(event_t event) void repeatLastCursorMove(event_t event)
{ {
if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) { if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) {
putEvent(event); pushEvent(event);
} }
else { else {
menuHorizontalPosition = 0; menuHorizontalPosition = 0;

10
radio/src/keys.cpp
View file

@ -68,7 +68,7 @@ void Key::input(bool val)
// key is released // key is released
if (m_state != KSTATE_KILLED) { if (m_state != KSTATE_KILLED) {
// TRACE("key %d BREAK", key()); // TRACE("key %d BREAK", key());
putEvent(EVT_KEY_BREAK(key())); pushEvent(EVT_KEY_BREAK(key()));
} }
m_state = KSTATE_OFF; m_state = KSTATE_OFF;
m_cnt = 0; m_cnt = 0;
@ -85,7 +85,7 @@ void Key::input(bool val)
case KSTATE_START: case KSTATE_START:
// TRACE("key %d FIRST", key()); // TRACE("key %d FIRST", key());
putEvent(EVT_KEY_FIRST(key())); pushEvent(EVT_KEY_FIRST(key()));
inactivity.counter = 0; inactivity.counter = 0;
m_state = KSTATE_RPTDELAY; m_state = KSTATE_RPTDELAY;
m_cnt = 0; m_cnt = 0;
@ -95,7 +95,7 @@ void Key::input(bool val)
if (m_cnt == KEY_LONG_DELAY) { if (m_cnt == KEY_LONG_DELAY) {
// generate long key press // generate long key press
// TRACE("key %d LONG", key()); // TRACE("key %d LONG", key());
putEvent(EVT_KEY_LONG(key())); pushEvent(EVT_KEY_LONG(key()));
} }
if (m_cnt == KEY_REPEAT_DELAY) { if (m_cnt == KEY_REPEAT_DELAY) {
m_state = 16; 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 // this produces repeat events that at first repeat slowly and then increase in speed
// TRACE("key %d REPEAT", key()); // TRACE("key %d REPEAT", key());
if (!IS_SHIFT_KEY(key())) if (!IS_SHIFT_KEY(key()))
putEvent(EVT_KEY_REPT(key())); pushEvent(EVT_KEY_REPT(key()));
} }
break; break;
@ -197,6 +197,6 @@ bool waitKeysReleased()
} }
memclear(keys, sizeof(keys)); memclear(keys, sizeof(keys));
putEvent(0); pushEvent(0);
return true; return true;
} }

2
radio/src/keys.h
View file

@ -169,7 +169,7 @@ class Key
extern Key keys[NUM_KEYS]; extern Key keys[NUM_KEYS];
extern event_t s_evt; extern event_t s_evt;
inline void putEvent(event_t evt) inline void pushEvent(event_t evt)
{ {
s_evt = evt; s_evt = evt;
} }

2
radio/src/main.cpp
View file

@ -104,7 +104,7 @@ void handleUsbConnection()
usbStop(); usbStop();
if (getSelectedUsbMode() == USB_MASS_STORAGE_MODE) { if (getSelectedUsbMode() == USB_MASS_STORAGE_MODE) {
opentxResume(); opentxResume();
putEvent(EVT_ENTRY); pushEvent(EVT_ENTRY);
} }
setSelectedUsbMode(USB_UNSELECTED_MODE); setSelectedUsbMode(USB_UNSELECTED_MODE);
} }

2
radio/src/opentx.cpp
View file

@ -180,7 +180,7 @@ void per10ms()
bool new_cw = (scrollRE < 0) ? false : true; bool new_cw = (scrollRE < 0) ? false : true;
if ((g_tmr10ms - lastEvent >= 10) || (cw == new_cw)) { // 100ms 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 // rotary encoder navigation speed (acceleration) detection/calculation
static uint32_t delay = 2*ROTENC_DELAY_MIDSPEED; static uint32_t delay = 2*ROTENC_DELAY_MIDSPEED;

2
radio/src/targets/common/arm/stm32/bootloader/boot.cpp
View file

@ -88,7 +88,7 @@ void interrupt10ms()
int8_t scrollRE = reNewValue - rePreviousValue; int8_t scrollRE = reNewValue - rePreviousValue;
if (scrollRE) { if (scrollRE) {
rePreviousValue = reNewValue; 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 #endif
} }

2
radio/src/telemetry/frsky_pxx2.cpp
View file

@ -120,7 +120,7 @@ void processRegisterFrame(uint8_t module, const uint8_t * frame)
reusableBuffer.moduleSetup.pxx2.registerLoopIndex = frame[12]; reusableBuffer.moduleSetup.pxx2.registerLoopIndex = frame[12];
reusableBuffer.moduleSetup.pxx2.registerStep = REGISTER_RX_NAME_RECEIVED; reusableBuffer.moduleSetup.pxx2.registerStep = REGISTER_RX_NAME_RECEIVED;
#if defined(COLORLCD) #if defined(COLORLCD)
putEvent(EVT_REFRESH); pushEvent(EVT_REFRESH);
#endif #endif
} }
break; break;