odie/ubitxv6
1
0
Fork 0
mirror of https://codeberg.org/mclemens/ubitxv6.git synced 2024-06-03 03:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually activate buttons!

Browse Source
This commit is contained in:
Reed Nightingale 2020-02-11 22:17:30 -08:00
parent c176604320
commit 3b932d54b4
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu_main.cpp
View File

@ -123,12 +123,7 @@ MenuReturn_e runMainMenu(const ButtonPress_e tuner_button,
memcpy_P(&bp,&(mainMenuButtons[menu_index]),sizeof(bp));
memcpy_P(&button,bp,sizeof(button));
endSelector(&button);
//TODO: activate button
Serial.print(F("Select button "));
Serial.print(menu_index);
Serial.print(F(":"));
Serial.println(button.text);
button.on_select();
}
else{
initSelector(&mainMenuSelectedItemRaw,
@ -164,13 +159,10 @@ MenuReturn_e runMainMenu(const ButtonPress_e tuner_button,
//We treat long and short presses the same, so no need to have a switch
Button button;
if(findPressedButton(mainMenuButtons,MAIN_MENU_NUM_BUTTONS,&button,touch_point)){
//TODO: activate button
Serial.print(F("Touch button "));
Serial.println(button.text);
button.on_select();
}
else{
//Touch detected, but not on our buttons, so ignore
Serial.println(F("Touch not on button"));
}
}//touch_button