Diff: touch_modules.h

Revision:

35:43133f017ed4

Parent:

33:a80eed071fdc

Child:

37:92fcbf22bf91

--- a/touch_modules.h	Sun Jul 23 16:50:59 2017 +0000
+++ b/touch_modules.h	Sat Jul 29 10:38:05 2017 +0000
@@ -6,100 +6,100 @@
 #define X_MAX 240
 #define Y_MAX 320
 // touch co-ordinates//
-#define SYSCFG_MAIN_X_MIN 110
-#define SYSCFG_MAIN_X_MAX 170
-#define SYSCFG_MAIN_Y_MIN 80
-#define SYSCFG_MAIN_Y_MAX 240
+#define SYSCFG_HOME_X_MIN 106            //SYSCFG_MAIN CHANGED TO SYSCFG_HOME 21/07/17
+#define SYSCFG_HOME_X_MAX 150
+#define SYSCFG_HOME_Y_MIN 90
+#define SYSCFG_HOME_Y_MAX 225
 
-#define TEST_MAIN_X_MIN 40
-#define TEST_MAIN_X_MAX 90
-#define TEST_MAIN_Y_MIN 160
-#define TEST_MAIN_Y_MAX 230
+#define TEST_HOME_X_MIN 53              //TEST_MAIN CHANGED TO TEST_HOME 21/07/17
+#define TEST_HOME_X_MAX 81
+#define TEST_HOME_Y_MIN 90
+#define TEST_HOME_Y_MAX 225
 
-#define BLE_MAIN_X_MIN 110
-#define BLE_MAIN_X_MAX 150
-#define BLE_MAIN_Y_MIN 70
-#define BLE_MAIN_Y_MAX 125
+#define BT_MAIN_X_MIN 110               //BLE_MAIN CHANGED TO BT_MAIN 21/07/17
+#define BT_MAIN_X_MAX 145
+#define BT_MAIN_Y_MIN 50
+#define BT_MAIN_Y_MAX 130
 
-#define ERASE_MAIN_X_MIN 110
-#define ERASE_MAIN_X_MAX 150
-#define ERASE_MAIN_Y_MIN 180
-#define ERASE_MAIN_Y_MAX 260
+#define DELETE_MAIN_X_MIN 110           //ERASE_MAIN CHANGED TO DELETE_MAIN 21/07/17
+#define DELETE_MAIN_X_MAX 145
+#define DELETE_MAIN_Y_MIN 180
+#define DELETE_MAIN_Y_MAX 260
 
-#define FILE_MAIN_X_MIN 60
-#define FILE_MAIN_X_MAX 90
-#define FILE_MAIN_Y_MIN 50
-#define FILE_MAIN_Y_MAX 100
+#define PATIENT_INFO_MAIN_X_MIN 60     //FILE CHANGED TO PATIENT_INFO 21/07/17
+#define PATIENT_INFO_MAIN_X_MAX 90
+#define PATIENT_INFO_MAIN_Y_MIN 50
+#define PATIENT_INFO_MAIN_Y_MAX 130
 
 #define HOME_MAIN_X_MIN 60
-#define HOME_MAIN_X_MAX 100
-#define HOME_MAIN_Y_MIN 190
-#define HOME_MAIN_Y_MAX 300
+#define HOME_MAIN_X_MAX 90
+#define HOME_MAIN_Y_MIN 180
+#define HOME_MAIN_Y_MAX 260
 
 #define BG_MAIN_X_MIN 110
-#define BG_MAIN_X_MAX 150
-#define BG_MAIN_Y_MIN 70
-#define BG_MAIN_Y_MAX 125
+#define BG_MAIN_X_MAX 140
+#define BG_MAIN_Y_MIN 50
+#define BG_MAIN_Y_MAX 130
 
 #define ECG_MAIN_X_MIN 110
-#define ECG_MAIN_X_MAX 150
+#define ECG_MAIN_X_MAX 145
 #define ECG_MAIN_Y_MIN 180
 #define ECG_MAIN_Y_MAX 260
 
 #define BP_MAIN_X_MIN 60
 #define BP_MAIN_X_MAX 90
 #define BP_MAIN_Y_MIN 50
-#define BP_MAIN_Y_MAX 100
+#define BP_MAIN_Y_MAX 130
 
-#define START_MAIN_X_MIN 110
+#define START_MAIN_X_MIN 106
 #define START_MAIN_X_MAX 150
-#define START_MAIN_Y_MIN 100
-#define START_MAIN_Y_MAX 220
+#define START_MAIN_Y_MIN 90
+#define START_MAIN_Y_MAX 225
 
-#define MAIN_X_MIN 40
-#define MAIN_X_MAX 90
-#define MAIN_Y_MIN 160
-#define MAIN_Y_MAX 230
+#define MAIN_X_MIN 53
+#define MAIN_X_MAX 81
+#define MAIN_Y_MIN 90
+#define MAIN_Y_MAX 225
 
-#define RET_MAIN_X_MIN 60
-#define RET_MAIN_X_MAX 90
-#define RET_MAIN_Y_MIN 50
-#define RET_MAIN_Y_MAX 100
+#define BG_RET_MAIN_X_MIN 60                //RET_MAIN CHANGED TO BG_RET_MAIN 21/7/17   // MAIN IN BG SCREEN
+#define BG_RET_MAIN_X_MAX 90
+#define BG_RET_MAIN_Y_MIN 180
+#define BG_RET_MAIN_Y_MAX 260
 
-#define RETEST_MAIN_X_MIN 60
-#define RETEST_MAIN_X_MAX 100
-#define RETEST_MAIN_Y_MIN 190
-#define RETEST_MAIN_Y_MAX 300
+#define RETEST_HOME_X_MIN 60                //RETEST ICON IN THE RESULT SCREEN
+#define RETEST_HOME_X_MAX 90
+#define RETEST_HOME_Y_MIN 180
+#define RETEST_HOME_Y_MAX 260
 
 #define FPS_MAIN_X_MIN 110
-#define FPS_MAIN_X_MAX 150
-#define FPS_MAIN_Y_MIN 70
-#define FPS_MAIN_Y_MAX 125
+#define FPS_MAIN_X_MAX 140
+#define FPS_MAIN_Y_MIN 50
+#define FPS_MAIN_Y_MAX 130
 
 #define PP_MAIN_X_MIN 110
-#define PP_MAIN_X_MAX 150
+#define PP_MAIN_X_MAX 145
 #define PP_MAIN_Y_MIN 180
 #define PP_MAIN_Y_MAX 260
 
 #define RANDOM_MAIN_X_MIN 60
 #define RANDOM_MAIN_X_MAX 90
 #define RANDOM_MAIN_Y_MIN 50
-#define RANDOM_MAIN_Y_MAX 100
+#define RANDOM_MAIN_Y_MAX 130
 
-#define RET_TEST_X_MIN 60
+#define RET_TEST_X_MIN 60                       //MAIN ICON IN RESULT SCREEN
 #define RET_TEST_X_MAX 90
 #define RET_TEST_Y_MIN 50
-#define RET_TEST_Y_MAX 100
+#define RET_TEST_Y_MAX 130
 
 #define YES_MAIN_X_MIN 60
 #define YES_MAIN_X_MAX 90
 #define YES_MAIN_Y_MIN 50
-#define YES_MAIN_Y_MAX 100
+#define YES_MAIN_Y_MAX 130
 
 #define NO_MAIN_X_MIN 60
-#define NO_MAIN_X_MAX 100
-#define NO_MAIN_Y_MIN 190
-#define NO_MAIN_Y_MAX 300
+#define NO_MAIN_X_MAX 90
+#define NO_MAIN_Y_MIN 180
+#define NO_MAIN_Y_MAX 260
 
 unsigned char touch_main();
 unsigned char touch_main_1();