Armand Coetzer
class library for a TS Keyboard, then press enter and the values are stored and the keypad disappears.
Fork of
F7_TSKeypad_MultiKey
by 
Armand Coetzer
Revision 2:c5532af8da08, committed 2017-06-20
- Comitter:
- Armand
- Date:
- Tue Jun 20 12:07:24 2017 +0000
- Parent:
- 1:a236c0568cdf
- Child:
- 3:085677c90a03
- Commit message:
- F7_TSKeyboard
Changed in this revision
| F7_TSKeyboard.cpp | Show annotated file Show diff for this revision Revisions of this file |
| F7_TSKeyboard.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/F7_TSKeyboard.cpp Tue Jun 20 11:58:10 2017 +0000
+++ b/F7_TSKeyboard.cpp Tue Jun 20 12:07:24 2017 +0000
@@ -37,355 +37,355 @@
{
///////////////////////check correct touch//////////////////////////////////////////////////////////////
- if(TS_State.touchX[0]>= keypadstartX[0][0] && TS_State.touchX[0]<= keypadendX[0][0] && TS_State.touchY[0]>= keypadstartY[0][0] && TS_State.touchY[0]<= keypadendY[0][0] && keypad == 1)
+ if(TS_State.touchX[0]>= KeyboardstartX[0][0] && TS_State.touchX[0]<= KeyboardendX[0][0] && TS_State.touchY[0]>= KeyboardstartY[0][0] && TS_State.touchY[0]<= KeyboardendY[0][0] && Keyboard == 1)
{
correcttouch = 1;
button = 1;
if(button == key)
{
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][0], keypadstartY[0][0], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][0], KeyboardstartY[0][0], btnsize, btnsize);
}
}
- else if(TS_State.touchX[0]>= keypadstartX[0][1] && TS_State.touchX[0]<= keypadendX[0][1] && TS_State.touchY[0]>= keypadstartY[0][1] && TS_State.touchY[0]<= keypadendY[0][1] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][1] && TS_State.touchX[0]<= KeyboardendX[0][1] && TS_State.touchY[0]>= KeyboardstartY[0][1] && TS_State.touchY[0]<= KeyboardendY[0][1] && Keyboard == 1)
{
correcttouch = 1;
button = 2;
if(button == key)
{
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][1], keypadstartY[0][1], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][1], KeyboardstartY[0][1], btnsize, btnsize);
}
}
- else if(TS_State.touchX[0]>= keypadstartX[0][2] && TS_State.touchX[0]<= keypadendX[0][2] && TS_State.touchY[0]>= keypadstartY[0][2] && TS_State.touchY[0]<= keypadendY[0][2] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][2] && TS_State.touchX[0]<= KeyboardendX[0][2] && TS_State.touchY[0]>= KeyboardstartY[0][2] && TS_State.touchY[0]<= KeyboardendY[0][2] && Keyboard == 1)
{
correcttouch = 1;
button = 3;
if(button == key)
{
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][2], keypadstartY[0][2], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][2], KeyboardstartY[0][2], btnsize, btnsize);
}
}
- else if(TS_State.touchX[0]>= keypadstartX[0][3] && TS_State.touchX[0]<= keypadendX[0][3] && TS_State.touchY[0]>= keypadstartY[0][3] && TS_State.touchY[0]<= keypadendY[0][3] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][3] && TS_State.touchX[0]<= KeyboardendX[0][3] && TS_State.touchY[0]>= KeyboardstartY[0][3] && TS_State.touchY[0]<= KeyboardendY[0][3] && Keyboard == 1)
{
correcttouch = 1;
button = 4;
if(button == key)
{
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][3], keypadstartY[0][3], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][3], KeyboardstartY[0][3], btnsize, btnsize);
}
}
- else if(TS_State.touchX[0]>= keypadstartX[0][4] && TS_State.touchX[0]<= keypadendX[0][4] && TS_State.touchY[0]>= keypadstartY[0][4] && TS_State.touchY[0]<= keypadendY[0][4] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][4] && TS_State.touchX[0]<= KeyboardendX[0][4] && TS_State.touchY[0]>= KeyboardstartY[0][4] && TS_State.touchY[0]<= KeyboardendY[0][4] && Keyboard == 1)
{
correcttouch = 1;
button = 5;
if(button == key)
{
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][4], keypadstartY[0][4], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][4], KeyboardstartY[0][4], btnsize, btnsize);
}
}
- else if(TS_State.touchX[0]>= keypadstartX[0][5] && TS_State.touchX[0]<= keypadendX[0][5] && TS_State.touchY[0]>= keypadstartY[0][5] && TS_State.touchY[0]<= keypadendY[0][5] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][5] && TS_State.touchX[0]<= KeyboardendX[0][5] && TS_State.touchY[0]>= KeyboardstartY[0][5] && TS_State.touchY[0]<= KeyboardendY[0][5] && Keyboard == 1)
{
correcttouch = 1;
button = 6;
if(button == key)
{
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][5], keypadstartY[0][5], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][5], KeyboardstartY[0][5], btnsize, btnsize);
}
}
- else if(TS_State.touchX[0]>= keypadstartX[0][6] && TS_State.touchX[0]<= keypadendX[0][6] && TS_State.touchY[0]>= keypadstartY[0][6] && TS_State.touchY[0]<= keypadendY[0][6] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][6] && TS_State.touchX[0]<= KeyboardendX[0][6] && TS_State.touchY[0]>= KeyboardstartY[0][6] && TS_State.touchY[0]<= KeyboardendY[0][6] && Keyboard == 1)
{
correcttouch = 1;
button = 7;
if(button == key)
{
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][6], keypadstartY[0][6], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][6], KeyboardstartY[0][6], btnsize, btnsize);
}
}
- else if(TS_State.touchX[0]>= keypadstartX[0][7] && TS_State.touchX[0]<= keypadendX[0][7] && TS_State.touchY[0]>= keypadstartY[0][7] && TS_State.touchY[0]<= keypadendY[0][7] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][7] && TS_State.touchX[0]<= KeyboardendX[0][7] && TS_State.touchY[0]>= KeyboardstartY[0][7] && TS_State.touchY[0]<= KeyboardendY[0][7] && Keyboard == 1)
{
correcttouch = 1;
button = 8;
if(button == key)
{
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][7], keypadstartY[0][7], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][7], KeyboardstartY[0][7], btnsize, btnsize);
}
}
- else if(TS_State.touchX[0]>= keypadstartX[0][8] && TS_State.touchX[0]<= keypadendX[0][8] && TS_State.touchY[0]>= keypadstartY[0][8] && TS_State.touchY[0]<= keypadendY[0][8] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][8] && TS_State.touchX[0]<= KeyboardendX[0][8] && TS_State.touchY[0]>= KeyboardstartY[0][8] && TS_State.touchY[0]<= KeyboardendY[0][8] && Keyboard == 1)
{
correcttouch = 1;
button = 9;
if(button == key)
{
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][8], keypadstartY[0][8], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][8], KeyboardstartY[0][8], btnsize, btnsize);
}
}
- else if(TS_State.touchX[0]>= keypadstartX[0][9] && TS_State.touchX[0]<= keypadendX[0][9] && TS_State.touchY[0]>= keypadstartY[0][9] && TS_State.touchY[0]<= keypadendY[0][9] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][9] && TS_State.touchX[0]<= KeyboardendX[0][9] && TS_State.touchY[0]>= KeyboardstartY[0][9] && TS_State.touchY[0]<= KeyboardendY[0][9] && Keyboard == 1)
{
correcttouch = 1;
button = 10;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][9], keypadstartY[0][9], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[0][9], KeyboardstartY[0][9], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][0] && TS_State.touchX[0]<= keypadendX[1][0] && TS_State.touchY[0]>= keypadstartY[1][0] && TS_State.touchY[0]<= keypadendY[1][0] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][0] && TS_State.touchX[0]<= KeyboardendX[1][0] && TS_State.touchY[0]>= KeyboardstartY[1][0] && TS_State.touchY[0]<= KeyboardendY[1][0] && Keyboard == 1)
{
correcttouch = 1;
button = 11;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][0], keypadstartY[1][0], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][0], KeyboardstartY[1][0], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][1] && TS_State.touchX[0]<= keypadendX[1][1] && TS_State.touchY[0]>= keypadstartY[1][1] && TS_State.touchY[0]<= keypadendY[1][1] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][1] && TS_State.touchX[0]<= KeyboardendX[1][1] && TS_State.touchY[0]>= KeyboardstartY[1][1] && TS_State.touchY[0]<= KeyboardendY[1][1] && Keyboard == 1)
{
correcttouch = 1;
button = 12;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][1], keypadstartY[1][1], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][1], KeyboardstartY[1][1], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][2] && TS_State.touchX[0]<= keypadendX[1][2] && TS_State.touchY[0]>= keypadstartY[1][2] && TS_State.touchY[0]<= keypadendY[1][2] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][2] && TS_State.touchX[0]<= KeyboardendX[1][2] && TS_State.touchY[0]>= KeyboardstartY[1][2] && TS_State.touchY[0]<= KeyboardendY[1][2] && Keyboard == 1)
{
correcttouch = 1;
button = 13;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][2], keypadstartY[1][2], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][2], KeyboardstartY[1][2], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][3] && TS_State.touchX[0]<= keypadendX[1][3] && TS_State.touchY[0]>= keypadstartY[1][3] && TS_State.touchY[0]<= keypadendY[1][3] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][3] && TS_State.touchX[0]<= KeyboardendX[1][3] && TS_State.touchY[0]>= KeyboardstartY[1][3] && TS_State.touchY[0]<= KeyboardendY[1][3] && Keyboard == 1)
{
correcttouch = 1;
button = 14;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][3], keypadstartY[1][3], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][3], KeyboardstartY[1][3], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][4] && TS_State.touchX[0]<= keypadendX[1][4] && TS_State.touchY[0]>= keypadstartY[1][4] && TS_State.touchY[0]<= keypadendY[1][4] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][4] && TS_State.touchX[0]<= KeyboardendX[1][4] && TS_State.touchY[0]>= KeyboardstartY[1][4] && TS_State.touchY[0]<= KeyboardendY[1][4] && Keyboard == 1)
{
correcttouch = 1;
button = 15;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][4], keypadstartY[1][4], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][4], KeyboardstartY[1][4], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][5] && TS_State.touchX[0]<= keypadendX[1][5] && TS_State.touchY[0]>= keypadstartY[1][5] && TS_State.touchY[0]<= keypadendY[1][5] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][5] && TS_State.touchX[0]<= KeyboardendX[1][5] && TS_State.touchY[0]>= KeyboardstartY[1][5] && TS_State.touchY[0]<= KeyboardendY[1][5] && Keyboard == 1)
{
correcttouch = 1;
button = 16;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][5], keypadstartY[1][5], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][5], KeyboardstartY[1][5], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][6] && TS_State.touchX[0]<= keypadendX[1][6] && TS_State.touchY[0]>= keypadstartY[1][6] && TS_State.touchY[0]<= keypadendY[1][6] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][6] && TS_State.touchX[0]<= KeyboardendX[1][6] && TS_State.touchY[0]>= KeyboardstartY[1][6] && TS_State.touchY[0]<= KeyboardendY[1][6] && Keyboard == 1)
{
correcttouch = 1;
button = 17;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][6], keypadstartY[1][6], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][6], KeyboardstartY[1][6], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][7] && TS_State.touchX[0]<= keypadendX[1][7] && TS_State.touchY[0]>= keypadstartY[1][7] && TS_State.touchY[0]<= keypadendY[1][7] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][7] && TS_State.touchX[0]<= KeyboardendX[1][7] && TS_State.touchY[0]>= KeyboardstartY[1][7] && TS_State.touchY[0]<= KeyboardendY[1][7] && Keyboard == 1)
{
correcttouch = 1;
button = 18;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][7], keypadstartY[1][7], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][7], KeyboardstartY[1][7], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][8] && TS_State.touchX[0]<= keypadendX[1][8] && TS_State.touchY[0]>= keypadstartY[1][8] && TS_State.touchY[0]<= keypadendY[1][8] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][8] && TS_State.touchX[0]<= KeyboardendX[1][8] && TS_State.touchY[0]>= KeyboardstartY[1][8] && TS_State.touchY[0]<= KeyboardendY[1][8] && Keyboard == 1)
{
correcttouch = 1;
button = 19;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][8], keypadstartY[1][8], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][8], KeyboardstartY[1][8], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[1][9] && TS_State.touchX[0]<= keypadendX[1][9] && TS_State.touchY[0]>= keypadstartY[1][9] && TS_State.touchY[0]<= keypadendY[1][9] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[1][9] && TS_State.touchX[0]<= KeyboardendX[1][9] && TS_State.touchY[0]>= KeyboardstartY[1][9] && TS_State.touchY[0]<= KeyboardendY[1][9] && Keyboard == 1)
{
correcttouch = 1;
button = 20;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[1][9], keypadstartY[1][9], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[1][9], KeyboardstartY[1][9], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][0] && TS_State.touchX[0]<= keypadendX[2][0] && TS_State.touchY[0]>= keypadstartY[2][0] && TS_State.touchY[0]<= keypadendY[2][0] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][0] && TS_State.touchX[0]<= KeyboardendX[2][0] && TS_State.touchY[0]>= KeyboardstartY[2][0] && TS_State.touchY[0]<= KeyboardendY[2][0] && Keyboard == 1)
{
correcttouch = 1;
button = 21;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][0], keypadstartY[2][0], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][0], KeyboardstartY[2][0], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][1] && TS_State.touchX[0]<= keypadendX[2][1] && TS_State.touchY[0]>= keypadstartY[2][1] && TS_State.touchY[0]<= keypadendY[2][1] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][1] && TS_State.touchX[0]<= KeyboardendX[2][1] && TS_State.touchY[0]>= KeyboardstartY[2][1] && TS_State.touchY[0]<= KeyboardendY[2][1] && Keyboard == 1)
{
correcttouch = 1;
button = 22;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][1], keypadstartY[2][1], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][1], KeyboardstartY[2][1], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][2] && TS_State.touchX[0]<= keypadendX[2][2] && TS_State.touchY[0]>= keypadstartY[2][2] && TS_State.touchY[0]<= keypadendY[2][2] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][2] && TS_State.touchX[0]<= KeyboardendX[2][2] && TS_State.touchY[0]>= KeyboardstartY[2][2] && TS_State.touchY[0]<= KeyboardendY[2][2] && Keyboard == 1)
{
correcttouch = 1;
button = 23;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][2], keypadstartY[2][2], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][2], KeyboardstartY[2][2], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][3] && TS_State.touchX[0]<= keypadendX[2][3] && TS_State.touchY[0]>= keypadstartY[2][3] && TS_State.touchY[0]<= keypadendY[2][3] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][3] && TS_State.touchX[0]<= KeyboardendX[2][3] && TS_State.touchY[0]>= KeyboardstartY[2][3] && TS_State.touchY[0]<= KeyboardendY[2][3] && Keyboard == 1)
{
correcttouch = 1;
button = 24;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][3], keypadstartY[2][3], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][3], KeyboardstartY[2][3], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][4] && TS_State.touchX[0]<= keypadendX[2][4] && TS_State.touchY[0]>= keypadstartY[2][4] && TS_State.touchY[0]<= keypadendY[2][4] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][4] && TS_State.touchX[0]<= KeyboardendX[2][4] && TS_State.touchY[0]>= KeyboardstartY[2][4] && TS_State.touchY[0]<= KeyboardendY[2][4] && Keyboard == 1)
{
correcttouch = 1;
button = 25;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][4], keypadstartY[2][4], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][4], KeyboardstartY[2][4], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][5] && TS_State.touchX[0]<= keypadendX[2][5] && TS_State.touchY[0]>= keypadstartY[2][5] && TS_State.touchY[0]<= keypadendY[2][5] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][5] && TS_State.touchX[0]<= KeyboardendX[2][5] && TS_State.touchY[0]>= KeyboardstartY[2][5] && TS_State.touchY[0]<= KeyboardendY[2][5] && Keyboard == 1)
{
correcttouch = 1;
button = 26;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][5], keypadstartY[2][5], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][5], KeyboardstartY[2][5], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][6] && TS_State.touchX[0]<= keypadendX[2][6] && TS_State.touchY[0]>= keypadstartY[2][6] && TS_State.touchY[0]<= keypadendY[2][6] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][6] && TS_State.touchX[0]<= KeyboardendX[2][6] && TS_State.touchY[0]>= KeyboardstartY[2][6] && TS_State.touchY[0]<= KeyboardendY[2][6] && Keyboard == 1)
{
correcttouch = 1;
button = 27;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][6], keypadstartY[2][6], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][6], KeyboardstartY[2][6], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][7] && TS_State.touchX[0]<= keypadendX[2][7] && TS_State.touchY[0]>= keypadstartY[2][7] && TS_State.touchY[0]<= keypadendY[2][7] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][7] && TS_State.touchX[0]<= KeyboardendX[2][7] && TS_State.touchY[0]>= KeyboardstartY[2][7] && TS_State.touchY[0]<= KeyboardendY[2][7] && Keyboard == 1)
{
correcttouch = 1;
button = 28;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][7], keypadstartY[2][7], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][7], KeyboardstartY[2][7], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][8] && TS_State.touchX[0]<= keypadendX[2][8] && TS_State.touchY[0]>= keypadstartY[2][8] && TS_State.touchY[0]<= keypadendY[2][8] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][8] && TS_State.touchX[0]<= KeyboardendX[2][8] && TS_State.touchY[0]>= KeyboardstartY[2][8] && TS_State.touchY[0]<= KeyboardendY[2][8] && Keyboard == 1)
{
correcttouch = 1;
button = 29;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][8], keypadstartY[2][8], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][8], KeyboardstartY[2][8], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][9] && TS_State.touchX[0]<= keypadendX[2][9] && TS_State.touchY[0]>= keypadstartY[2][9] && TS_State.touchY[0]<= keypadendY[2][9] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][9] && TS_State.touchX[0]<= KeyboardendX[2][9] && TS_State.touchY[0]>= KeyboardstartY[2][9] && TS_State.touchY[0]<= KeyboardendY[2][9] && Keyboard == 1)
{
correcttouch = 1;
button = 30;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][9], keypadstartY[2][9], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[2][9], KeyboardstartY[2][9], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][0] && TS_State.touchX[0]<= keypadendX[3][0] && TS_State.touchY[0]>= keypadstartY[3][0] && TS_State.touchY[0]<= keypadendY[3][0] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][0] && TS_State.touchX[0]<= KeyboardendX[3][0] && TS_State.touchY[0]>= KeyboardstartY[3][0] && TS_State.touchY[0]<= KeyboardendY[3][0] && Keyboard == 1)
{
correcttouch = 1;
button = 31;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][0], keypadstartY[3][0], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][0], KeyboardstartY[3][0], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][1] && TS_State.touchX[0]<= keypadendX[3][1] && TS_State.touchY[0]>= keypadstartY[3][1] && TS_State.touchY[0]<= keypadendY[3][1] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][1] && TS_State.touchX[0]<= KeyboardendX[3][1] && TS_State.touchY[0]>= KeyboardstartY[3][1] && TS_State.touchY[0]<= KeyboardendY[3][1] && Keyboard == 1)
{
correcttouch = 1;
button = 32;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][1], keypadstartY[3][1], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][1], KeyboardstartY[3][1], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][2] && TS_State.touchX[0]<= keypadendX[3][2] && TS_State.touchY[0]>= keypadstartY[3][2] && TS_State.touchY[0]<= keypadendY[3][2] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][2] && TS_State.touchX[0]<= KeyboardendX[3][2] && TS_State.touchY[0]>= KeyboardstartY[3][2] && TS_State.touchY[0]<= KeyboardendY[3][2] && Keyboard == 1)
{
correcttouch = 1;
button = 33;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][2], keypadstartY[3][2], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][2], KeyboardstartY[3][2], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][3] && TS_State.touchX[0]<= keypadendX[3][3] && TS_State.touchY[0]>= keypadstartY[3][3] && TS_State.touchY[0]<= keypadendY[3][3] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][3] && TS_State.touchX[0]<= KeyboardendX[3][3] && TS_State.touchY[0]>= KeyboardstartY[3][3] && TS_State.touchY[0]<= KeyboardendY[3][3] && Keyboard == 1)
{
correcttouch = 1;
button = 34;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][3], keypadstartY[3][3], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][3], KeyboardstartY[3][3], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][4] && TS_State.touchX[0]<= keypadendX[3][4] && TS_State.touchY[0]>= keypadstartY[3][4] && TS_State.touchY[0]<= keypadendY[3][4] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][4] && TS_State.touchX[0]<= KeyboardendX[3][4] && TS_State.touchY[0]>= KeyboardstartY[3][4] && TS_State.touchY[0]<= KeyboardendY[3][4] && Keyboard == 1)
{
correcttouch = 1;
button = 35;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][4], keypadstartY[3][4], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][4], KeyboardstartY[3][4], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][5] && TS_State.touchX[0]<= keypadendX[3][5] && TS_State.touchY[0]>= keypadstartY[3][5] && TS_State.touchY[0]<= keypadendY[3][5] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][5] && TS_State.touchX[0]<= KeyboardendX[3][5] && TS_State.touchY[0]>= KeyboardstartY[3][5] && TS_State.touchY[0]<= KeyboardendY[3][5] && Keyboard == 1)
{
correcttouch = 1;
button = 36;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][5], keypadstartY[3][5], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][5], KeyboardstartY[3][5], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][6] && TS_State.touchX[0]<= keypadendX[3][6] && TS_State.touchY[0]>= keypadstartY[3][6] && TS_State.touchY[0]<= keypadendY[3][6] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][6] && TS_State.touchX[0]<= KeyboardendX[3][6] && TS_State.touchY[0]>= KeyboardstartY[3][6] && TS_State.touchY[0]<= KeyboardendY[3][6] && Keyboard == 1)
{
correcttouch = 1;
button = 37;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][6], keypadstartY[3][6], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][6], KeyboardstartY[3][6], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][7] && TS_State.touchX[0]<= keypadendX[3][7] && TS_State.touchY[0]>= keypadstartY[3][7] && TS_State.touchY[0]<= keypadendY[3][7] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][7] && TS_State.touchX[0]<= KeyboardendX[3][7] && TS_State.touchY[0]>= KeyboardstartY[3][7] && TS_State.touchY[0]<= KeyboardendY[3][7] && Keyboard == 1)
{
correcttouch = 1;
button = 38;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][7], keypadstartY[3][7], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][7], KeyboardstartY[3][7], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][8] && TS_State.touchX[0]<= keypadendX[3][8] && TS_State.touchY[0]>= keypadstartY[3][8] && TS_State.touchY[0]<= keypadendY[3][8] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][8] && TS_State.touchX[0]<= KeyboardendX[3][8] && TS_State.touchY[0]>= KeyboardstartY[3][8] && TS_State.touchY[0]<= KeyboardendY[3][8] && Keyboard == 1)
{
correcttouch = 1;
button = 39;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][8], keypadstartY[3][8], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][8], KeyboardstartY[3][8], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][9] && TS_State.touchX[0]<= keypadendX[3][9] && TS_State.touchY[0]>= keypadstartY[3][9] && TS_State.touchY[0]<= keypadendY[3][9] && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][9] && TS_State.touchX[0]<= KeyboardendX[3][9] && TS_State.touchY[0]>= KeyboardstartY[3][9] && TS_State.touchY[0]<= KeyboardendY[3][9] && Keyboard == 1)
{
correcttouch = 1;
button = 40;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][9], keypadstartY[3][9], btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][9], KeyboardstartY[3][9], btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][2] && TS_State.touchX[0]<= keypadendX[3][2] + 190 && TS_State.touchY[0]>= keypadstartY[3][2] + 38 && TS_State.touchY[0]<= keypadendY[3][2] + 38 && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][2] && TS_State.touchX[0]<= KeyboardendX[3][2] + 190 && TS_State.touchY[0]>= KeyboardstartY[3][2] + 38 && TS_State.touchY[0]<= KeyboardendY[3][2] + 38 && Keyboard == 1)
{
correcttouch = 1;
button = 41;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][2], keypadstartY[3][2] + 38, 225, btnsize);
+ lcd.FillRect(KeyboardstartX[3][2], KeyboardstartY[3][2] + 38, 225, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][0] && TS_State.touchX[0]<= keypadendX[3][0] + 38 && TS_State.touchY[0]>= keypadstartY[3][0] + 38 && TS_State.touchY[0]<= keypadendY[3][0] + 38 && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][0] && TS_State.touchX[0]<= KeyboardendX[3][0] + 38 && TS_State.touchY[0]>= KeyboardstartY[3][0] + 38 && TS_State.touchY[0]<= KeyboardendY[3][0] + 38 && Keyboard == 1)
{
correcttouch = 1;
button = 42;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][0], keypadstartY[3][0] + 38, 73, btnsize);
+ lcd.FillRect(KeyboardstartX[3][0], KeyboardstartY[3][0] + 38, 73, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][8] && TS_State.touchX[0]<= keypadendX[3][8] && TS_State.touchY[0]>= keypadstartY[3][8] + 38 && TS_State.touchY[0]<= keypadendY[3][8] + 38 && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][8] && TS_State.touchX[0]<= KeyboardendX[3][8] && TS_State.touchY[0]>= KeyboardstartY[3][8] + 38 && TS_State.touchY[0]<= KeyboardendY[3][8] + 38 && Keyboard == 1)
{
correcttouch = 1;
button = 43;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][8], keypadstartY[3][8] + 38, btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][8], KeyboardstartY[3][8] + 38, btnsize, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[3][9] && TS_State.touchX[0]<= keypadendX[3][9] + 38 && TS_State.touchY[0]>= keypadstartY[3][9] + 38 && TS_State.touchY[0]<= keypadendY[3][9] + 38 && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[3][9] && TS_State.touchX[0]<= KeyboardendX[3][9] + 38 && TS_State.touchY[0]>= KeyboardstartY[3][9] + 38 && TS_State.touchY[0]<= KeyboardendY[3][9] + 38 && Keyboard == 1)
{
correcttouch = 1;
button = 44;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[3][9], keypadstartY[3][9] + 38, 73, btnsize);
+ lcd.FillRect(KeyboardstartX[3][9], KeyboardstartY[3][9] + 38, 73, btnsize);
}
- else if(TS_State.touchX[0]>= keypadstartX[0][9] + 38 && TS_State.touchX[0]<= keypadendX[0][9] + 38 && TS_State.touchY[0]>= keypadstartY[0][9] && TS_State.touchY[0]<= keypadendY[0][9] + 38 && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[0][9] + 38 && TS_State.touchX[0]<= KeyboardendX[0][9] + 38 && TS_State.touchY[0]>= KeyboardstartY[0][9] && TS_State.touchY[0]<= KeyboardendY[0][9] + 38 && Keyboard == 1)
{
correcttouch = 1;
button = 45;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[0][9] + 38, keypadstartY[0][9], btnsize, 73);
+ lcd.FillRect(KeyboardstartX[0][9] + 38, KeyboardstartY[0][9], btnsize, 73);
}
- else if(TS_State.touchX[0]>= keypadstartX[2][9] + 38 && TS_State.touchX[0]<= keypadendX[2][9] + 38 && TS_State.touchY[0]>= keypadstartY[2][9] && TS_State.touchY[0]<= keypadendY[2][9] + 38 && keypad == 1)
+ else if(TS_State.touchX[0]>= KeyboardstartX[2][9] + 38 && TS_State.touchX[0]<= KeyboardendX[2][9] + 38 && TS_State.touchY[0]>= KeyboardstartY[2][9] && TS_State.touchY[0]<= KeyboardendY[2][9] + 38 && Keyboard == 1)
{
correcttouch = 1;
button = 46;
lcd.SetTextColor(LCD_COLOR_GRAY);
- lcd.FillRect(keypadstartX[2][9] + 38, keypadstartY[2][9], btnsize, 73);
+ lcd.FillRect(KeyboardstartX[2][9] + 38, KeyboardstartY[2][9], btnsize, 73);
}
else
{
@@ -406,7 +406,7 @@
*FontSize = *lcd.GetFont();
lcd.ClearStringLine(0);
- DrawKeypad();
+ DrawKeyboard();
lcd.SetTextColor(LCD_COLOR_WHITE);
lcd.FillRect(0, 0, 480, 20);
@@ -433,7 +433,7 @@
{
for(a = 0; a < 4; a++)
{
- if(frstprsx >= keypadstartX[a][b] && frstprsx <= keypadendX[a][b] && frstprsy >= keypadstartY[a][b] && frstprsy <= keypadendY[a][b] || frstprsx >= keypadstartX[3][2] && frstprsx <= keypadendX[3][2] + 190 && frstprsy >= keypadstartY[3][2] + 38 && frstprsy <= keypadendY[3][2] + 38 || frstprsx >= keypadstartX[3][0] && frstprsx <= keypadendX[3][0] + 38 && frstprsy >= keypadstartY[3][0] + 38 && frstprsy <= keypadendY[3][0] + 38 || frstprsx >= keypadstartX[3][8] && frstprsx <= keypadendX[3][8] && frstprsy >= keypadstartY[3][8] + 38 && frstprsy <= keypadendY[3][8] + 38 || frstprsx >= keypadstartX[3][9] && frstprsx <= keypadendX[3][9] + 38 && frstprsy >= keypadstartY[3][9] + 38 && frstprsy <= keypadendY[3][9] + 38 || frstprsx >= keypadstartX[0][9] + 38 && frstprsx <= keypadendX[0][9] + 38 && frstprsy >= keypadstartY[0][9] && frstprsy <= keypadendY[0][9] + 38 || frstprsx >= keypadstartX[2][9] + 38 && frstprsx <= keypadendX[2][9] + 38 && frstprsy >= keypadstartY[2][9] && frstprsy <= keypadendY[2][9] + 38)
+ if(frstprsx >= KeyboardstartX[a][b] && frstprsx <= KeyboardendX[a][b] && frstprsy >= KeyboardstartY[a][b] && frstprsy <= KeyboardendY[a][b] || frstprsx >= KeyboardstartX[3][2] && frstprsx <= KeyboardendX[3][2] + 190 && frstprsy >= KeyboardstartY[3][2] + 38 && frstprsy <= KeyboardendY[3][2] + 38 || frstprsx >= KeyboardstartX[3][0] && frstprsx <= KeyboardendX[3][0] + 38 && frstprsy >= KeyboardstartY[3][0] + 38 && frstprsy <= KeyboardendY[3][0] + 38 || frstprsx >= KeyboardstartX[3][8] && frstprsx <= KeyboardendX[3][8] && frstprsy >= KeyboardstartY[3][8] + 38 && frstprsy <= KeyboardendY[3][8] + 38 || frstprsx >= KeyboardstartX[3][9] && frstprsx <= KeyboardendX[3][9] + 38 && frstprsy >= KeyboardstartY[3][9] + 38 && frstprsy <= KeyboardendY[3][9] + 38 || frstprsx >= KeyboardstartX[0][9] + 38 && frstprsx <= KeyboardendX[0][9] + 38 && frstprsy >= KeyboardstartY[0][9] && frstprsy <= KeyboardendY[0][9] + 38 || frstprsx >= KeyboardstartX[2][9] + 38 && frstprsx <= KeyboardendX[2][9] + 38 && frstprsy >= KeyboardstartY[2][9] && frstprsy <= KeyboardendY[2][9] + 38)
{
state = 15;
correcttouch = 1;
@@ -455,7 +455,7 @@
{
if(TS_State.touchDetected == 0)
{
- DrawKeypad();
+ DrawKeyboard();
state = 20;
}
}
@@ -1200,7 +1200,7 @@
keypressed = ' ';
Caps = !Caps;
Func = 0;
- DrawKeypad();
+ DrawKeyboard();
a = 0;
b = 0;
correcttouch = 0;
@@ -1220,7 +1220,7 @@
keypressed = ' ';
Func = !Func;
Caps = 0;
- DrawKeypad();
+ DrawKeyboard();
a = 0;
b = 0;
correcttouch = 0;
@@ -1275,15 +1275,15 @@
}break;
case 30:
{
- if(keypad == 1)
+ if(Keyboard == 1)
{
- DrawKeypad();
- keypad = 0;
+ DrawKeyboard();
+ Keyboard = 0;
}
if(TS_State.touchDetected == 0)
{
- DrawKeypad();
+ DrawKeyboard();
a = 0;
b = 0;
correcttouch = 0;
@@ -1293,7 +1293,7 @@
}
}
- keypad = 0;
+ Keyboard = 0;
Enter = 0;
m = 0;
textx = 0;
@@ -1303,13 +1303,13 @@
lcd.ClearStringLine(0);
lcd.SetTextColor(Bckclr);
lcd.FillRect(0, 0, 480, 20);
- lcd.FillRect(keypadstartX[0][0],keypadstartY[0][0], 415, 187);
+ lcd.FillRect(KeyboardstartX[0][0],KeyboardstartY[0][0], 415, 187);
lcd.SetTextColor(Txtclr);
lcd.SetBackColor(Bckclr);
lcd.SetFont(FontSize);
}
-void F7_TSKeyboard::DrawKeypad()
+void F7_TSKeyboard::DrawKeyboard()
{
int i, o, stepx = 0, stepy = 0, Drawpointx, Drawpointy;
uint8_t text[30];
@@ -1337,7 +1337,7 @@
{'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0'}
};
- keypad = 1;
+ Keyboard = 1;
for(o= 0; o< 10; o++)
{
@@ -1346,10 +1346,10 @@
lcd.SetTextColor(LCD_COLOR_WHITE);
lcd.FillRect(Drawpointx = 33 + stepx, Drawpointy = 75 + stepy, btnsize, btnsize);
- keypadstartX[i][o] = Drawpointx;
- keypadstartY[i][o] = Drawpointy;
- keypadendX[i][o] = Drawpointx + btnsize;
- keypadendY[i][o] = Drawpointy + btnsize;
+ KeyboardstartX[i][o] = Drawpointx;
+ KeyboardstartY[i][o] = Drawpointy;
+ KeyboardendX[i][o] = Drawpointx + btnsize;
+ KeyboardendY[i][o] = Drawpointy + btnsize;
stepy += 38;
if(Caps == 0 && Func == 0)
@@ -1388,36 +1388,36 @@
}
lcd.SetTextColor(LCD_COLOR_WHITE);
- lcd.FillRect(keypadstartX[3][2], keypadstartY[3][2] + 38, 225, btnsize);
- lcd.FillRect(keypadstartX[3][0], keypadstartY[3][0] + 38, 73, btnsize);
- lcd.FillRect(keypadstartX[3][8], keypadstartY[3][8] + 38, btnsize, btnsize);
- lcd.FillRect(keypadstartX[3][9], keypadstartY[3][9] + 38, 73, btnsize);
- lcd.FillRect(keypadstartX[0][9] + 38, keypadstartY[0][9], btnsize, 73);
- lcd.FillRect(keypadstartX[2][9] + 38, keypadstartY[2][9], btnsize, 73);
+ lcd.FillRect(KeyboardstartX[3][2], KeyboardstartY[3][2] + 38, 225, btnsize);
+ lcd.FillRect(KeyboardstartX[3][0], KeyboardstartY[3][0] + 38, 73, btnsize);
+ lcd.FillRect(KeyboardstartX[3][8], KeyboardstartY[3][8] + 38, btnsize, btnsize);
+ lcd.FillRect(KeyboardstartX[3][9], KeyboardstartY[3][9] + 38, 73, btnsize);
+ lcd.FillRect(KeyboardstartX[0][9] + 38, KeyboardstartY[0][9], btnsize, 73);
+ lcd.FillRect(KeyboardstartX[2][9] + 38, KeyboardstartY[2][9], btnsize, 73);
lcd.SetBackColor(LCD_COLOR_WHITE);
lcd.SetTextColor(LCD_COLOR_BLACK);
lcd.SetFont(&Font16);
sprintf((char*)text, "<");
- lcd.DisplayStringAt(keypadstartX[0][9] + 50, keypadstartY[0][3] + 35, (uint8_t *)&text, LEFT_MODE);
+ lcd.DisplayStringAt(KeyboardstartX[0][9] + 50, KeyboardstartY[0][3] + 35, (uint8_t *)&text, LEFT_MODE);
lcd.SetFont(&Font12);
sprintf((char*)text, "E");
- lcd.DisplayStringAt(keypadstartX[2][9] + 50, keypadstartY[2][9] + 15, (uint8_t *)&text, LEFT_MODE);
+ lcd.DisplayStringAt(KeyboardstartX[2][9] + 50, KeyboardstartY[2][9] + 15, (uint8_t *)&text, LEFT_MODE);
sprintf((char*)text, "N");
- lcd.DisplayStringAt(keypadstartX[2][9] + 50, keypadstartY[2][9] + 25, (uint8_t *)&text, LEFT_MODE);
+ lcd.DisplayStringAt(KeyboardstartX[2][9] + 50, KeyboardstartY[2][9] + 25, (uint8_t *)&text, LEFT_MODE);
sprintf((char*)text, "T");
- lcd.DisplayStringAt(keypadstartX[2][9] + 50, keypadstartY[2][9] + 35, (uint8_t *)&text, LEFT_MODE);
+ lcd.DisplayStringAt(KeyboardstartX[2][9] + 50, KeyboardstartY[2][9] + 35, (uint8_t *)&text, LEFT_MODE);
sprintf((char*)text, "E");
- lcd.DisplayStringAt(keypadstartX[2][9] + 50, keypadstartY[2][9] + 45, (uint8_t *)&text, LEFT_MODE);
+ lcd.DisplayStringAt(KeyboardstartX[2][9] + 50, KeyboardstartY[2][9] + 45, (uint8_t *)&text, LEFT_MODE);
sprintf((char*)text, "R");
- lcd.DisplayStringAt(keypadstartX[2][9] + 50, keypadstartY[2][9] + 55, (uint8_t *)&text, LEFT_MODE);
+ lcd.DisplayStringAt(KeyboardstartX[2][9] + 50, KeyboardstartY[2][9] + 55, (uint8_t *)&text, LEFT_MODE);
sprintf((char*)text, "CAPS");
- lcd.DisplayStringAt(keypadstartX[3][0] + 20, keypadstartY[3][0] + 50, (uint8_t *)&text, LEFT_MODE);
+ lcd.DisplayStringAt(KeyboardstartX[3][0] + 20, KeyboardstartY[3][0] + 50, (uint8_t *)&text, LEFT_MODE);
sprintf((char*)text, ".");
- lcd.DisplayStringAt(keypadstartX[3][8] + 16, keypadstartY[3][8] + 50, (uint8_t *)&text, LEFT_MODE);
+ lcd.DisplayStringAt(KeyboardstartX[3][8] + 16, KeyboardstartY[3][8] + 50, (uint8_t *)&text, LEFT_MODE);
sprintf((char*)text, "FUNC");
- lcd.DisplayStringAt(keypadstartX[3][9] + 20, keypadstartY[3][9] + 50, (uint8_t *)&text, LEFT_MODE);
+ lcd.DisplayStringAt(KeyboardstartX[3][9] + 20, KeyboardstartY[3][9] + 50, (uint8_t *)&text, LEFT_MODE);
lcd.SetTextColor(Txtclr);
lcd.SetBackColor(Bckclr);
--- a/F7_TSKeyboard.h Tue Jun 20 11:58:10 2017 +0000
+++ b/F7_TSKeyboard.h Tue Jun 20 12:07:24 2017 +0000
@@ -1,4 +1,4 @@
-/* F7 TS Keypad Multi Key Library v1.0
+/* F7 TS Keyboard Library v1.0
* Copyright (c) 2017 Armand Coetzer
* s213293048@nmmu.ac.za
*
@@ -29,14 +29,14 @@
#include "LCD_DISCO_F746NG.h"
#include "TS_DISCO_F746NG.h"
-/** Class library for a TS Keypad and retrieving multiple keys, then press enter and the values are stored and the keypad disappears.
+/** Class library for a TS Keyboard, then press enter and the values are stored and the keyboard disappears.
*
* Example:
* @code
*#include "mbed.h"
*#include "F7_TSKeyboard.h"
- *F7_TSKeyboard keypad;
+ *F7_TSKeyboard keyboard;
*LCD_DISCO_F746NG lcd;
*
*uint8_t text1[30];
@@ -51,10 +51,10 @@
*
* while(1)
* {
- * keypad.getkeys(s, 170, 20, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P');
+ * keyboard.getkeys(s);
*
* sprintf((char*)text1, "%s", s);
- * lcd.DisplayStringAt(0, LINE(5), (uint8_t *)&text1, LEFT_MODE);
+ * lcd.DisplayStringAt(0, LINE(3), (uint8_t *)&text1, LEFT_MODE);
*
* wait(1);
* }
@@ -72,9 +72,9 @@
/** Retrieves the keys selected as a string.
* @param str[] - stores the keys selected in this array.
- * @param startx - to set x start pos of the keypad.
- * @param starty - to set y start pos of the keypad.
- * @param char1 - char16 to change the keys of the keypad.
+ * @param startx - to set x start pos of the Keyboard.
+ * @param starty - to set y start pos of the Keyboard.
+ * @param char1 - char16 to change the keys of the Keyboard.
* @retval None.
*/
void getkeys(char str[]);
@@ -82,7 +82,7 @@
private:
void Detect_isr();
- void DrawKeypad();
+ void DrawKeyboard();
Ticker ticker;
sFONT *FontSize;
@@ -97,11 +97,11 @@
uint16_t frstprsx, frstprsy;
char keypressed;
int a, b, recv;
- int keypad;
- int keypadstartX[4][10];
- int keypadstartY[4][10];
- int keypadendX[4][10];
- int keypadendY[4][10];
+ int Keyboard;
+ int KeyboardstartX[4][10];
+ int KeyboardstartY[4][10];
+ int KeyboardendX[4][10];
+ int KeyboardendY[4][10];
uint8_t status;
int m, textx, Enter;
};