created separate function for hex to char
Dependencies: SDFileSystem ds3231 eeprom_Nikita mbed testUniGraphic_150217
Fork of SS_SensePOC2P0_11Dec2017_USERPID by
Diff: touch_modules.cpp
- Revision:
- 31:0f67acfc6236
- Parent:
- 29:7edc76b15e3d
- Child:
- 35:43133f017ed4
--- a/touch_modules.cpp Sat Jul 08 12:06:16 2017 +0000 +++ b/touch_modules.cpp Sat Jul 15 05:39:45 2017 +0000 @@ -87,7 +87,7 @@ } else if ( ((xt >=FILE_MAIN_X_MIN) && (xt<=FILE_MAIN_X_MAX)) && ( (yt>=FILE_MAIN_Y_MIN) && (yt<=FILE_MAIN_Y_MAX) ) ) // file { - // state=5; + state=11; } else if ( ((xt >=HOME_MAIN_X_MIN) && (xt<=HOME_MAIN_X_MAX)) && ( (yt>=HOME_MAIN_Y_MIN) && (yt<=HOME_MAIN_Y_MAX) ) ) // home @@ -151,7 +151,7 @@ state=8; } - else if ( ((xt >=RET_MAIN_X_MIN) && (xt<=RET_MAIN_X_MAX)) && ( (yt>=RET_MAIN_Y_MIN) && (yt<=RET_MAIN_Y_MAX) ) ) // RETURN + else if ( ((xt >=MAIN_X_MIN) && (xt<=MAIN_X_MAX)) && ( (yt>=MAIN_Y_MIN) && (yt<=MAIN_Y_MAX) ) ) // RETURN { state=3; } @@ -201,7 +201,7 @@ state=9; } - else if ( ((xt >=RET_MAIN_X_MIN) && (xt<=RET_MAIN_X_MAX)) && ( (yt>=RET_MAIN_Y_MIN) && (yt<=RET_MAIN_Y_MAX) ) ) // RETURN + else if ( ((xt >=MAIN_X_MIN) && (xt<=MAIN_X_MAX)) && ( (yt>=MAIN_Y_MIN) && (yt<=MAIN_Y_MAX) ) ) // RETURN { state=3; } @@ -324,7 +324,20 @@ return state; } - + unsigned char BT_return() // //determining the touch for bp main screen + +{ + unsigned char state; + + if ( ((xt >=MAIN_X_MIN) && (xt<=MAIN_X_MAX)) && ( (yt>=MAIN_Y_MIN) && (yt<=MAIN_Y_MAX) ) ) // RETURN + { + state=1; + } + else + state=10; + + return state; + } //TOUCH Functionalities for old display//