mclemens/ubitxv6
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some button printout debugging, and center the button grid

Browse Source
This commit is contained in:
Reed Nightingale 2020-01-01 20:27:29 -08:00
parent ad2e8341d5
commit 224fb496cd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ubitx_ui.cpp
View File

@ -32,7 +32,7 @@ static const unsigned int LAYOUT_MODE_TEXT_Y = LAYOUT_VFO_LABEL_Y + LAYOUT_VFO_L
static const unsigned int LAYOUT_MODE_TEXT_WIDTH = 320; static const unsigned int LAYOUT_MODE_TEXT_WIDTH = 320;
static const unsigned int LAYOUT_MODE_TEXT_HEIGHT = 36; static const unsigned int LAYOUT_MODE_TEXT_HEIGHT = 36;
static const unsigned int LAYOUT_BUTTON_X = 0; static const unsigned int LAYOUT_BUTTON_X = 2;
static const unsigned int LAYOUT_BUTTON_Y = LAYOUT_MODE_TEXT_Y + LAYOUT_MODE_TEXT_HEIGHT + 1; static const unsigned int LAYOUT_BUTTON_Y = LAYOUT_MODE_TEXT_Y + LAYOUT_MODE_TEXT_HEIGHT + 1;
static const unsigned int LAYOUT_BUTTON_WIDTH = 60; static const unsigned int LAYOUT_BUTTON_WIDTH = 60;
static const unsigned int LAYOUT_BUTTON_HEIGHT = 36; static const unsigned int LAYOUT_BUTTON_HEIGHT = 36;
@ -463,6 +463,8 @@ void enterFreq(){
if(button.x < ts_point.x && ts_point.x < x2 && if(button.x < ts_point.x && ts_point.x < x2 &&
button.y < ts_point.y && ts_point.y < y2){ button.y < ts_point.y && ts_point.y < y2){
Serial.print(F("Entered key: "));
Serial.println(button.text);
switch(button.id){ switch(button.id){
case KEYS_OK: case KEYS_OK:
{ {
@ -825,6 +827,13 @@ void setCwTone(){
} }
void doCommand(Button* button){ void doCommand(Button* button){
Serial.print(F("Doing command: "));
Serial.print(button->text);
Serial.print(F(", Hitbox: "));
Serial.print(button->x);Serial.print(F(","));
Serial.print(button->y);Serial.print(F(";"));
Serial.print(button->x + button->w);Serial.print(F(","));
Serial.println(button->y + button->h);
switch(button->id){ switch(button->id){
case BUTTON_RIT: case BUTTON_RIT:
{ {