c_meyer/pxt-ev3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hard-wire escape button to exit

Browse Source
This commit is contained in:
Michal Moskal 2017-07-05 14:54:39 +01:00
parent f9073b3505
commit dfb3f9fbeb
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/core/buttons.cpp
View File

@ -96,15 +96,10 @@ class WButtons {
*/ */
//% block="button enter" weight=95 //% block="button enter" weight=95
Button buttonEnter; Button buttonEnter;
/**
* Exit button.
*/
//% block="button exit" weight=95
Button buttonExit;
WButtons() WButtons()
: buttonLeft(BUTTON_ID_LEFT), buttonRight(BUTTON_ID_RIGHT), buttonUp(BUTTON_ID_UP), : buttonLeft(BUTTON_ID_LEFT), buttonRight(BUTTON_ID_RIGHT), buttonUp(BUTTON_ID_UP),
buttonDown(BUTTON_ID_DOWN), buttonEnter(BUTTON_ID_ENTER), buttonExit(BUTTON_ID_ESCAPE) { buttonDown(BUTTON_ID_DOWN), buttonEnter(BUTTON_ID_ENTER) {
pthread_t pid; pthread_t pid;
pthread_create(&pid, NULL, buttonPoll, this); pthread_create(&pid, NULL, buttonPoll, this);
pthread_detach(pid); pthread_detach(pid);
@ -112,7 +107,7 @@ class WButtons {
}; };
SINGLETON(WButtons); SINGLETON(WButtons);
const int LastButtonID = (Button *)&((WButtons *)0)->buttonExit - ((WButtons *)0)->buttons; const int LastButtonID = (Button *)&((WButtons *)0)->buttonEnter - ((WButtons *)0)->buttons;
extern "C" uint16_t readButtons(); extern "C" uint16_t readButtons();
@ -124,6 +119,8 @@ void *buttonPoll(void *arg) {
auto state = readButtons(); auto state = readButtons();
if (state == prevState) if (state == prevState)
continue; continue;
if (state & BUTTON_ID_ESCAPE)
exit(0);
for (int i = 0; i < LastButtonID; ++i) { for (int i = 0; i < LastButtonID; ++i) {
auto btn = &wb->buttons[i]; auto btn = &wb->buttons[i];
btn->setPressed(!!(state & btn->id)); btn->setPressed(!!(state & btn->id));

6
libs/core/shims.d.ts vendored
View File

@ -31,12 +31,6 @@ declare namespace input {
*/ */
//% block="button enter" weight=95 fixedInstance shim=pxt::getButton(4) //% block="button enter" weight=95 fixedInstance shim=pxt::getButton(4)
const buttonEnter: Button; const buttonEnter: Button;
/**
* Exit button.
*/
//% block="button exit" weight=95 fixedInstance shim=pxt::getButton(5)
const buttonExit: Button;
} }
declare namespace control { declare namespace control {