projet_Laos / programme_final

programme final projet s4

Dependencies:   BSP_DISCO_F746NG SDFileSystem TS_DISCO_F746NG affichage_des_ecrans mbed rtc_lib

main_glb.cpp@3:53f3194a919e, 2016-10-14 (annotated)

Committer:
Asoumy
Date:
Fri Oct 14 11:59:38 2016 +0000
Revision:
3:53f3194a919e
Parent:
2:a6c2f346bca5
Child:
4:c6e9b4449a5f
nouvel affichage

Who changed what in which revision?

UserRevisionLine numberNew contents of line
Asoumy 2:a6c2f346bca5 1 #include "mbed.h"
Asoumy 2:a6c2f346bca5 2 #include "TS_DISCO_F746NG.h"
Asoumy 2:a6c2f346bca5 3 #include "LCD_DISCO_F746NG.h"
Asoumy 2:a6c2f346bca5 4 #include "ds1338.h"
Asoumy 3:53f3194a919e 5 #include "horloge.h"
Asoumy 3:53f3194a919e 6 #include "Ecran.h"
Asoumy 2:a6c2f346bca5 7 //définition de la zone tactile dans l'ecran principal
Asoumy 2:a6c2f346bca5 8 #define TOUCHADMINISTRATEUR ((TS_State.touchDetected) && ( TS_State.touchX[0]>0) &&( TS_State.touchX[0]< 240)&& ( TS_State.touchY[0]>0) && (TS_State.touchY[0] < 272))
Asoumy 2:a6c2f346bca5 9 #define TOUCHUTILISATEUR ((TS_State.touchDetected) && ( TS_State.touchX[0]> 240) &&( TS_State.touchX[0]< 480)&& ( TS_State.touchY[0]> 0) && (TS_State.touchY[0] < 272))
Asoumy 2:a6c2f346bca5 10
Asoumy 2:a6c2f346bca5 11 // définitions des touches tactiles qui interviennent dans l'écran 1
Asoumy 2:a6c2f346bca5 12 #define TOUCHTIMEDATE ((TS_State.touchDetected) && ( TS_State.touchX[0]>10) && (TS_State.touchX[0]< 165)&& (TS_State.touchY[0]>50) && (TS_State.touchY[0] < 180))
Asoumy 2:a6c2f346bca5 13 #define TOUCHFREQ ((TS_State.touchDetected) && ( TS_State.touchX[0]>170) && (TS_State.touchX[0]< 328)&& (TS_State.touchY[0]>60) && (TS_State.touchY[0] < 180))
Asoumy 2:a6c2f346bca5 14 #define TOUCHAFFICHAGE ((TS_State.touchDetected) && ( TS_State.touchX[0]>333) &&( TS_State.touchX[0]< 475)&& ( TS_State.touchY[0]> 60) && (TS_State.touchY[0] < 180))
Asoumy 2:a6c2f346bca5 15
Asoumy 2:a6c2f346bca5 16 //définitions des touches tactiles qui intervient dans les écrans paramettrable
Asoumy 2:a6c2f346bca5 17 #define TOUCHRETOUR ((TS_State.touchDetected) && ( TS_State.touchX[0]>30) &&( TS_State.touchX[0]< 110)&& ( TS_State.touchY[0]> 210) && (TS_State.touchY[0] < 240))
Asoumy 2:a6c2f346bca5 18 #define TOUCHMoins ((TS_State.touchDetected) && ( TS_State.touchX[0]>145) &&( TS_State.touchX[0]< 225)&& ( TS_State.touchY[0]> 210) && (TS_State.touchY[0] < 240))
Asoumy 2:a6c2f346bca5 19 #define TOUCHPlus ((TS_State.touchDetected) && ( TS_State.touchX[0]> 245) &&( TS_State.touchX[0]< 325)&& ( TS_State.touchY[0]> 210) && (TS_State.touchY[0] < 240))
Asoumy 2:a6c2f346bca5 20 #define TOUCHOK ((TS_State.touchDetected) && ( TS_State.touchX[0]> 360) &&( TS_State.touchX[0]< 440)&& ( TS_State.touchY[0]> 210) && (TS_State.touchY[0] < 240))
Asoumy 2:a6c2f346bca5 21
Asoumy 2:a6c2f346bca5 22 //définitions des touches tactiles pour régler l'heure et la date
Asoumy 2:a6c2f346bca5 23 #define TOUCHDAY ((TS_State.touchDetected) && ( TS_State.touchX[0]> 30) &&( TS_State.touchX[0]< 85)&& ( TS_State.touchY[0]> 82) && (TS_State.touchY[0] < 110))
Asoumy 2:a6c2f346bca5 24 #define TOUCHMonth ((TS_State.touchDetected) && ( TS_State.touchX[0]> 100) &&( TS_State.touchX[0]< 160)&& ( TS_State.touchY[0]> 82) && (TS_State.touchY[0] < 110))
Asoumy 2:a6c2f346bca5 25 #define TOUCHYear ((TS_State.touchDetected) && ( TS_State.touchX[0]> 170) &&( TS_State.touchX[0]< 240)&& ( TS_State.touchY[0]> 82) && (TS_State.touchY[0] < 110))
Asoumy 2:a6c2f346bca5 26 #define TOUCHHour ((TS_State.touchDetected) && ( TS_State.touchX[0]> 30) &&( TS_State.touchX[0]< 60)&& ( TS_State.touchY[0]> 164) && (TS_State.touchY[0] < 204))
Asoumy 2:a6c2f346bca5 27 #define TOUCHMinute ((TS_State.touchDetected) && ( TS_State.touchX[0]> 100) &&( TS_State.touchX[0]< 159)&& ( TS_State.touchY[0]> 164) && (TS_State.touchY[0] < 204))
Asoumy 2:a6c2f346bca5 28 #define TOUCHSeconde ((TS_State.touchDetected) && ( TS_State.touchX[0]> 172) &&( TS_State.touchX[0]< 240)&& ( TS_State.touchY[0]> 164) && (TS_State.touchY[0] < 204))
Asoumy 2:a6c2f346bca5 29
Asoumy 2:a6c2f346bca5 30 //définition des touches tactiles pour le réglage de la fréquence d'envoi des données sur la carte SD
Asoumy 2:a6c2f346bca5 31 #define TOUCHPerHour ((TS_State.touchDetected) && ( TS_State.touchX[0]> 25) &&( TS_State.touchX[0]< 175)&& ( TS_State.touchY[0]> 115) && (TS_State.touchY[0] < 145))
Asoumy 2:a6c2f346bca5 32 #define TOUCHPerDay ((TS_State.touchDetected) && ( TS_State.touchX[0]> 245) &&( TS_State.touchX[0]< 405)&& ( TS_State.touchY[0]> 115) && (TS_State.touchY[0] < 145))
Asoumy 2:a6c2f346bca5 33 #define TOUCHPerWeek ((TS_State.touchDetected) && ( TS_State.touchX[0]> 25) &&( TS_State.touchX[0]< 175)&& ( TS_State.touchY[0]> 155) && (TS_State.touchY[0] < 185))
Asoumy 2:a6c2f346bca5 34 #define TOUCHPermonth ((TS_State.touchDetected) && ( TS_State.touchX[0]> 245) &&( TS_State.touchX[0]< 405)&& ( TS_State.touchY[0]> 155) && (TS_State.touchY[0] < 185))
Asoumy 2:a6c2f346bca5 35
Asoumy 2:a6c2f346bca5 36 //définition de l'attente avant l'affichage d'un nouvel écran
Asoumy 2:a6c2f346bca5 37 #define ATTENTE wait(0.2);
Asoumy 2:a6c2f346bca5 38
Asoumy 2:a6c2f346bca5 39 int affiche=0;
Asoumy 3:53f3194a919e 40 /*void horloge();
Asoumy 2:a6c2f346bca5 41 char jour[6];
Asoumy 2:a6c2f346bca5 42 char mois[6];
Asoumy 2:a6c2f346bca5 43 char annee[6];
Asoumy 2:a6c2f346bca5 44 char heure[6];
Asoumy 2:a6c2f346bca5 45 char minute[6];
Asoumy 3:53f3194a919e 46 char seconde[6]; */
Asoumy 3:53f3194a919e 47
Asoumy 2:a6c2f346bca5 48
Asoumy 3:53f3194a919e 49
Asoumy 3:53f3194a919e 50
Asoumy 2:a6c2f346bca5 51 TS_DISCO_F746NG ts;
Asoumy 2:a6c2f346bca5 52
Asoumy 2:a6c2f346bca5 53 DigitalOut led1(LED1);
Asoumy 2:a6c2f346bca5 54
Asoumy 3:53f3194a919e 55
Asoumy 2:a6c2f346bca5 56 int main()
Asoumy 2:a6c2f346bca5 57 {
Asoumy 3:53f3194a919e 58 DS1338 ds1338(D14,D15);
Asoumy 3:53f3194a919e 59 wait(0.5);
Asoumy 3:53f3194a919e 60 void principal();
Asoumy 3:53f3194a919e 61 struct tm time;
Asoumy 2:a6c2f346bca5 62 wait(1);
Asoumy 2:a6c2f346bca5 63 affiche=1;
Asoumy 2:a6c2f346bca5 64
Asoumy 2:a6c2f346bca5 65 TS_StateTypeDef TS_State;
Asoumy 2:a6c2f346bca5 66 ts.Init(480, 272);
Asoumy 3:53f3194a919e 67 ds1338.writeTime(&time);
Asoumy 2:a6c2f346bca5 68 while(1)
Asoumy 2:a6c2f346bca5 69 {
Asoumy 2:a6c2f346bca5 70 ts.GetState(&TS_State);
Asoumy 3:53f3194a919e 71
Asoumy 3:53f3194a919e 72 ds1338.readTime(&time);
Asoumy 2:a6c2f346bca5 73
Asoumy 2:a6c2f346bca5 74
Asoumy 2:a6c2f346bca5 75 typedef enum {etat0, etat1, etat1_1,etat_reg_minute, etat3, etat4 ,etat2, etat_reg_day, etat_reg_month,etat_reg_year, etat_reg_hour} type_etat;
Asoumy 2:a6c2f346bca5 76 static type_etat etat= etat0;
Asoumy 2:a6c2f346bca5 77
Asoumy 2:a6c2f346bca5 78 switch (etat)
Asoumy 2:a6c2f346bca5 79 {
Asoumy 2:a6c2f346bca5 80 case etat0:
Asoumy 2:a6c2f346bca5 81 if (affiche==1)
Asoumy 2:a6c2f346bca5 82 {
Asoumy 2:a6c2f346bca5 83 Ecranprincipal ();
Asoumy 2:a6c2f346bca5 84 affiche=0;
Asoumy 2:a6c2f346bca5 85 }
Asoumy 2:a6c2f346bca5 86
Asoumy 2:a6c2f346bca5 87 if (TOUCHUTILISATEUR)
Asoumy 2:a6c2f346bca5 88 {
Asoumy 2:a6c2f346bca5 89 etat= etat1_1;
Asoumy 2:a6c2f346bca5 90 affiche=1;
Asoumy 2:a6c2f346bca5 91 ATTENTE
Asoumy 2:a6c2f346bca5 92 }
Asoumy 2:a6c2f346bca5 93
Asoumy 2:a6c2f346bca5 94 if (TOUCHADMINISTRATEUR)
Asoumy 2:a6c2f346bca5 95 {
Asoumy 2:a6c2f346bca5 96 etat= etat1;
Asoumy 2:a6c2f346bca5 97 affiche=1;
Asoumy 2:a6c2f346bca5 98 ATTENTE
Asoumy 2:a6c2f346bca5 99 }
Asoumy 2:a6c2f346bca5 100 break;
Asoumy 2:a6c2f346bca5 101
Asoumy 2:a6c2f346bca5 102 case etat1_1:
Asoumy 2:a6c2f346bca5 103 if(affiche==1)
Asoumy 2:a6c2f346bca5 104 {
Asoumy 2:a6c2f346bca5 105 ATTENTE
Asoumy 2:a6c2f346bca5 106 EcranUtilis ();
Asoumy 2:a6c2f346bca5 107 affiche=0;
Asoumy 2:a6c2f346bca5 108 }
Asoumy 2:a6c2f346bca5 109 /*if (TOUCHAFF)
Asoumy 2:a6c2f346bca5 110 {
Asoumy 2:a6c2f346bca5 111 etat=etat4;
Asoumy 2:a6c2f346bca5 112 affiche=1;
Asoumy 2:a6c2f346bca5 113 }*/
Asoumy 2:a6c2f346bca5 114 if (TOUCHRETOUR)
Asoumy 2:a6c2f346bca5 115 {
Asoumy 2:a6c2f346bca5 116 etat= etat0;
Asoumy 2:a6c2f346bca5 117 affiche=1;
Asoumy 2:a6c2f346bca5 118 ATTENTE
Asoumy 2:a6c2f346bca5 119 }
Asoumy 2:a6c2f346bca5 120 break;
Asoumy 2:a6c2f346bca5 121
Asoumy 2:a6c2f346bca5 122 case etat1:
Asoumy 2:a6c2f346bca5 123 if (affiche==1)
Asoumy 2:a6c2f346bca5 124 {
Asoumy 2:a6c2f346bca5 125 ATTENTE
Asoumy 2:a6c2f346bca5 126 EcranAdminis ();
Asoumy 2:a6c2f346bca5 127 ;
Asoumy 2:a6c2f346bca5 128 affiche=0;
Asoumy 2:a6c2f346bca5 129 }
Asoumy 2:a6c2f346bca5 130
Asoumy 2:a6c2f346bca5 131 if (TOUCHTIMEDATE)
Asoumy 2:a6c2f346bca5 132 {
Asoumy 2:a6c2f346bca5 133 etat = etat2;
Asoumy 2:a6c2f346bca5 134 affiche=1;
Asoumy 2:a6c2f346bca5 135 }
Asoumy 2:a6c2f346bca5 136 if (TOUCHFREQ)
Asoumy 2:a6c2f346bca5 137 {
Asoumy 2:a6c2f346bca5 138 etat= etat3;
Asoumy 2:a6c2f346bca5 139 affiche=1;
Asoumy 2:a6c2f346bca5 140 }
Asoumy 2:a6c2f346bca5 141 if (TOUCHAFFICHAGE)
Asoumy 2:a6c2f346bca5 142 {
Asoumy 2:a6c2f346bca5 143 etat=etat4;
Asoumy 2:a6c2f346bca5 144 affiche=1;
Asoumy 2:a6c2f346bca5 145 }
Asoumy 2:a6c2f346bca5 146 if (TOUCHRETOUR)
Asoumy 2:a6c2f346bca5 147 {
Asoumy 2:a6c2f346bca5 148 etat= etat0;
Asoumy 2:a6c2f346bca5 149 affiche=1;
Asoumy 2:a6c2f346bca5 150 ATTENTE;
Asoumy 2:a6c2f346bca5 151 }
Asoumy 2:a6c2f346bca5 152 break;
Asoumy 2:a6c2f346bca5 153
Asoumy 2:a6c2f346bca5 154 case etat2:
Asoumy 2:a6c2f346bca5 155 if (affiche==1)
Asoumy 2:a6c2f346bca5 156 {
Asoumy 2:a6c2f346bca5 157 Ecran2();
Asoumy 2:a6c2f346bca5 158 affiche=0;
Asoumy 2:a6c2f346bca5 159 }
Asoumy 2:a6c2f346bca5 160 if (TOUCHRETOUR)
Asoumy 2:a6c2f346bca5 161 {
Asoumy 2:a6c2f346bca5 162 etat= etat1;
Asoumy 2:a6c2f346bca5 163 affiche=1;
Asoumy 2:a6c2f346bca5 164 ATTENTE
Asoumy 2:a6c2f346bca5 165 }
Asoumy 2:a6c2f346bca5 166 if (TOUCHDAY)
Asoumy 2:a6c2f346bca5 167 {
Asoumy 2:a6c2f346bca5 168 etat= etat_reg_day;
Asoumy 2:a6c2f346bca5 169 affiche=1;
Asoumy 2:a6c2f346bca5 170 }
Asoumy 2:a6c2f346bca5 171 if (TOUCHMonth)
Asoumy 2:a6c2f346bca5 172 {
Asoumy 2:a6c2f346bca5 173 etat=etat_reg_month;
Asoumy 2:a6c2f346bca5 174 affiche=1;
Asoumy 2:a6c2f346bca5 175 }
Asoumy 2:a6c2f346bca5 176 if (TOUCHYear)
Asoumy 2:a6c2f346bca5 177 {
Asoumy 2:a6c2f346bca5 178 etat=etat_reg_year;
Asoumy 2:a6c2f346bca5 179 affiche=1;
Asoumy 2:a6c2f346bca5 180 }
Asoumy 2:a6c2f346bca5 181 if (TOUCHHour)
Asoumy 2:a6c2f346bca5 182 {
Asoumy 2:a6c2f346bca5 183 etat=etat_reg_hour;
Asoumy 2:a6c2f346bca5 184 affiche=1;
Asoumy 2:a6c2f346bca5 185 }
Asoumy 2:a6c2f346bca5 186 if (TOUCHMinute)
Asoumy 2:a6c2f346bca5 187 {
Asoumy 2:a6c2f346bca5 188 etat=etat_reg_minute;
Asoumy 2:a6c2f346bca5 189 affiche=1;
Asoumy 2:a6c2f346bca5 190 }
Asoumy 2:a6c2f346bca5 191 if (TOUCHRETOUR)
Asoumy 2:a6c2f346bca5 192 {
Asoumy 2:a6c2f346bca5 193 etat= etat1;
Asoumy 2:a6c2f346bca5 194 affiche=1;
Asoumy 2:a6c2f346bca5 195 ATTENTE
Asoumy 2:a6c2f346bca5 196 }
Asoumy 2:a6c2f346bca5 197 if (TOUCHSeconde)
Asoumy 2:a6c2f346bca5 198 {
Asoumy 2:a6c2f346bca5 199 time.tm_sec=0;
Asoumy 2:a6c2f346bca5 200 affiche=1;
Asoumy 2:a6c2f346bca5 201 }
Asoumy 2:a6c2f346bca5 202 break;
Asoumy 2:a6c2f346bca5 203
Asoumy 2:a6c2f346bca5 204
Asoumy 2:a6c2f346bca5 205
Asoumy 2:a6c2f346bca5 206
Asoumy 2:a6c2f346bca5 207 case etat_reg_day:
Asoumy 2:a6c2f346bca5 208 if (affiche==1)
Asoumy 2:a6c2f346bca5 209 {
Asoumy 2:a6c2f346bca5 210 Ecran2_Day();
Asoumy 2:a6c2f346bca5 211 affiche=0;
Asoumy 2:a6c2f346bca5 212 }
Asoumy 2:a6c2f346bca5 213
Asoumy 2:a6c2f346bca5 214 if(TOUCHPlus){
Asoumy 2:a6c2f346bca5 215 time.tm_mday=time.tm_mday+1;
Asoumy 2:a6c2f346bca5 216 ATTENTE
Asoumy 2:a6c2f346bca5 217 Ecran2_Day();
Asoumy 2:a6c2f346bca5 218 //if(day>30) day=0;
Asoumy 2:a6c2f346bca5 219 }
Asoumy 2:a6c2f346bca5 220 if(TOUCHMoins)
Asoumy 2:a6c2f346bca5 221 {
Asoumy 2:a6c2f346bca5 222 time.tm_mday=time.tm_mday-1;
Asoumy 2:a6c2f346bca5 223 wait (0.3);
Asoumy 2:a6c2f346bca5 224 Ecran2_Day();
Asoumy 2:a6c2f346bca5 225 //if(day<2) day=32;
Asoumy 2:a6c2f346bca5 226 }
Asoumy 2:a6c2f346bca5 227 if ( (TOUCHOK)||(TOUCHRETOUR) )
Asoumy 2:a6c2f346bca5 228 {
Asoumy 2:a6c2f346bca5 229 etat= etat2;
Asoumy 2:a6c2f346bca5 230 affiche=1;
Asoumy 2:a6c2f346bca5 231 ATTENTE
Asoumy 2:a6c2f346bca5 232 }
Asoumy 2:a6c2f346bca5 233 break;
Asoumy 2:a6c2f346bca5 234
Asoumy 2:a6c2f346bca5 235 case etat_reg_month:
Asoumy 2:a6c2f346bca5 236 if (affiche==1){
Asoumy 2:a6c2f346bca5 237 Ecran2_Month();
Asoumy 2:a6c2f346bca5 238 affiche=0;
Asoumy 2:a6c2f346bca5 239 }
Asoumy 2:a6c2f346bca5 240 if(TOUCHPlus)
Asoumy 2:a6c2f346bca5 241 {
Asoumy 2:a6c2f346bca5 242 time.tm_mon=time.tm_mon+1;
Asoumy 2:a6c2f346bca5 243 ATTENTE
Asoumy 2:a6c2f346bca5 244 Ecran2_Month();
Asoumy 2:a6c2f346bca5 245 //if(month>11) month=0;
Asoumy 2:a6c2f346bca5 246 }
Asoumy 2:a6c2f346bca5 247 if(TOUCHMoins)
Asoumy 2:a6c2f346bca5 248 {
Asoumy 2:a6c2f346bca5 249 time.tm_mon=time.tm_mon-1;
Asoumy 2:a6c2f346bca5 250 ATTENTE
Asoumy 2:a6c2f346bca5 251 Ecran2_Month();
Asoumy 2:a6c2f346bca5 252 //if(month<2) month=13;
Asoumy 2:a6c2f346bca5 253
Asoumy 2:a6c2f346bca5 254 }
Asoumy 2:a6c2f346bca5 255 if ( (TOUCHOK)|| (TOUCHRETOUR))
Asoumy 2:a6c2f346bca5 256 {
Asoumy 2:a6c2f346bca5 257 etat= etat2;
Asoumy 2:a6c2f346bca5 258 affiche=1;
Asoumy 2:a6c2f346bca5 259 ATTENTE
Asoumy 2:a6c2f346bca5 260 }
Asoumy 2:a6c2f346bca5 261
Asoumy 2:a6c2f346bca5 262 break;
Asoumy 2:a6c2f346bca5 263 case etat_reg_year:
Asoumy 2:a6c2f346bca5 264 if (affiche==1){
Asoumy 2:a6c2f346bca5 265 Ecran2_Year ();
Asoumy 2:a6c2f346bca5 266 affiche=0;
Asoumy 2:a6c2f346bca5 267 }
Asoumy 2:a6c2f346bca5 268
Asoumy 2:a6c2f346bca5 269 if(TOUCHPlus)
Asoumy 2:a6c2f346bca5 270 {
Asoumy 2:a6c2f346bca5 271 time.tm_year=time.tm_year+1;
Asoumy 2:a6c2f346bca5 272 ATTENTE
Asoumy 2:a6c2f346bca5 273 Ecran2_Year();
Asoumy 2:a6c2f346bca5 274 //if(year>3000) year=2000;
Asoumy 2:a6c2f346bca5 275 }
Asoumy 2:a6c2f346bca5 276 if(TOUCHMoins)
Asoumy 2:a6c2f346bca5 277 {
Asoumy 2:a6c2f346bca5 278 time.tm_year=time.tm_year-1;
Asoumy 2:a6c2f346bca5 279 ATTENTE
Asoumy 2:a6c2f346bca5 280 Ecran2_Year();
Asoumy 2:a6c2f346bca5 281 //if(year<2000) year=3000;
Asoumy 2:a6c2f346bca5 282 }
Asoumy 2:a6c2f346bca5 283 if ((TOUCHOK) ||(TOUCHRETOUR))
Asoumy 2:a6c2f346bca5 284 {
Asoumy 2:a6c2f346bca5 285 etat= etat2;
Asoumy 2:a6c2f346bca5 286 affiche=1;
Asoumy 2:a6c2f346bca5 287 ATTENTE
Asoumy 2:a6c2f346bca5 288 }
Asoumy 2:a6c2f346bca5 289
Asoumy 2:a6c2f346bca5 290 break;
Asoumy 2:a6c2f346bca5 291
Asoumy 2:a6c2f346bca5 292 case etat_reg_hour:
Asoumy 2:a6c2f346bca5 293 if (affiche==1){
Asoumy 2:a6c2f346bca5 294 affiche=0;
Asoumy 2:a6c2f346bca5 295 Ecran2_Hour();
Asoumy 2:a6c2f346bca5 296 }
Asoumy 2:a6c2f346bca5 297
Asoumy 2:a6c2f346bca5 298 if(TOUCHPlus){
Asoumy 2:a6c2f346bca5 299 time.tm_hour=time.tm_hour+1;
Asoumy 2:a6c2f346bca5 300 ATTENTE
Asoumy 2:a6c2f346bca5 301 Ecran2_Hour();
Asoumy 2:a6c2f346bca5 302 //if(hour>22) hour=0;
Asoumy 2:a6c2f346bca5 303 }
Asoumy 2:a6c2f346bca5 304 if(TOUCHMoins){
Asoumy 2:a6c2f346bca5 305 time.tm_hour=time.tm_hour-1;
Asoumy 2:a6c2f346bca5 306 ATTENTE
Asoumy 2:a6c2f346bca5 307 Ecran2_Hour();
Asoumy 2:a6c2f346bca5 308 //if(hour<1) hour=24;
Asoumy 2:a6c2f346bca5 309 }
Asoumy 2:a6c2f346bca5 310
Asoumy 2:a6c2f346bca5 311 if ((TOUCHOK)||(TOUCHRETOUR)){
Asoumy 2:a6c2f346bca5 312 etat= etat2;
Asoumy 2:a6c2f346bca5 313 affiche=1;
Asoumy 2:a6c2f346bca5 314 ATTENTE
Asoumy 2:a6c2f346bca5 315 }
Asoumy 2:a6c2f346bca5 316 break;
Asoumy 2:a6c2f346bca5 317
Asoumy 2:a6c2f346bca5 318
Asoumy 2:a6c2f346bca5 319 case etat_reg_minute:
Asoumy 2:a6c2f346bca5 320 if (affiche==1)
Asoumy 2:a6c2f346bca5 321 { Ecran2_Minutes();
Asoumy 2:a6c2f346bca5 322 affiche=0;
Asoumy 2:a6c2f346bca5 323 }
Asoumy 2:a6c2f346bca5 324
Asoumy 2:a6c2f346bca5 325 if(TOUCHPlus)
Asoumy 2:a6c2f346bca5 326 {
Asoumy 2:a6c2f346bca5 327 time.tm_min=time.tm_min+1;
Asoumy 2:a6c2f346bca5 328 ATTENTE
Asoumy 2:a6c2f346bca5 329 Ecran2_Minutes();
Asoumy 2:a6c2f346bca5 330 //if(min>58) min=0;
Asoumy 2:a6c2f346bca5 331 }
Asoumy 2:a6c2f346bca5 332 if(TOUCHMoins)
Asoumy 2:a6c2f346bca5 333 {
Asoumy 2:a6c2f346bca5 334 time.tm_min=time.tm_min-1;
Asoumy 2:a6c2f346bca5 335 wait (0.3);
Asoumy 2:a6c2f346bca5 336 Ecran2_Minutes();
Asoumy 2:a6c2f346bca5 337 //if(min>2) min=59;
Asoumy 2:a6c2f346bca5 338 }
Asoumy 2:a6c2f346bca5 339 if ((TOUCHOK) || (TOUCHRETOUR)){
Asoumy 2:a6c2f346bca5 340 etat= etat2;
Asoumy 2:a6c2f346bca5 341 affiche=1;
Asoumy 2:a6c2f346bca5 342 ATTENTE
Asoumy 2:a6c2f346bca5 343 }
Asoumy 2:a6c2f346bca5 344 break;
Asoumy 2:a6c2f346bca5 345
Asoumy 2:a6c2f346bca5 346 case etat3:
Asoumy 2:a6c2f346bca5 347 if (affiche==1)
Asoumy 2:a6c2f346bca5 348 {
Asoumy 2:a6c2f346bca5 349 Ecran3();
Asoumy 2:a6c2f346bca5 350 affiche=0;
Asoumy 2:a6c2f346bca5 351 }
Asoumy 2:a6c2f346bca5 352 if (TOUCHRETOUR)
Asoumy 2:a6c2f346bca5 353 {
Asoumy 2:a6c2f346bca5 354 etat= etat1;
Asoumy 2:a6c2f346bca5 355 affiche=1;
Asoumy 2:a6c2f346bca5 356 ATTENTE
Asoumy 2:a6c2f346bca5 357 }
Asoumy 2:a6c2f346bca5 358 break;
Asoumy 2:a6c2f346bca5 359
Asoumy 2:a6c2f346bca5 360 case etat4:
Asoumy 2:a6c2f346bca5 361 if (affiche==1)
Asoumy 2:a6c2f346bca5 362 {
Asoumy 2:a6c2f346bca5 363 Ecran4();
Asoumy 2:a6c2f346bca5 364 affiche=0;
Asoumy 2:a6c2f346bca5 365 }
Asoumy 2:a6c2f346bca5 366 if (TOUCHRETOUR)
Asoumy 2:a6c2f346bca5 367 {
Asoumy 2:a6c2f346bca5 368 etat= etat1;
Asoumy 2:a6c2f346bca5 369 affiche=1;
Asoumy 2:a6c2f346bca5 370 ATTENTE
Asoumy 2:a6c2f346bca5 371 }
Asoumy 2:a6c2f346bca5 372 break;
Asoumy 2:a6c2f346bca5 373 }
Asoumy 2:a6c2f346bca5 374 }
Asoumy 2:a6c2f346bca5 375 }
Asoumy 2:a6c2f346bca5 376
Asoumy 2:a6c2f346bca5 377