Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: TS_DISCO_F746NG mbed LCD_DISCO_F746NG BSP_DISCO_F746NG
Revision 2:be9870d89885, committed 2021-06-22
- Comitter:
- theoduval
- Date:
- Tue Jun 22 18:42:23 2021 +0000
- Parent:
- 1:0cdea7a7e38f
- Commit message:
- CNY70
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Tue Jun 22 12:20:04 2021 +0000
+++ b/main.cpp Tue Jun 22 18:42:23 2021 +0000
@@ -127,7 +127,10 @@
case 0: //lancement de compte a rebour
AfficheDiffPartie(modeChoisie);
lcd.DisplayStringAt(0,160,(uint8_t *)"3",CENTER_MODE);
- if(CNY70.read()<0.1)*numSwitchPartie=1; //verification si poignee est la
+ if(CNY70.read()<0.1){
+ *numSwitchPartie=1; //verification si poignee est la
+ timePartie.reset();
+ }
break;
case 1: //compte a rebour
AfficheDiffPartie(modeChoisie);
@@ -212,10 +215,10 @@
lcd.DisplayStringAt(0,145,(uint8_t *)" A Z E R T Y U I O P",LEFT_MODE);
lcd.DisplayStringAt(0,188,(uint8_t *)" Q S D F G H J K L M",LEFT_MODE);
lcd.DisplayStringAt(0,237,(uint8_t *)" W X C V B N SUP ENTER",LEFT_MODE);
- for(int i=0;i<10;i++){
+ for(int i=0;i<10;i++){ //affichage des carres
for(int j=0;j<3;j++){
if(i>5 && j==0){
- if(i==6 || i==8)lcd.DrawRect((i*tailleCarres),(valMaxy-tailleCarres)-(j*tailleCarres),tailleCarres*2,tailleCarres);
+ if(i==6 || i==8)lcd.DrawRect((i*tailleCarres),(valMaxy-tailleCarres)-(j*tailleCarres),tailleCarres*2,tailleCarres); //rectangle enter et supp
}
else lcd.DrawRect((i*tailleCarres),(valMaxy-tailleCarres)-(j*tailleCarres),tailleCarres,tailleCarres);
}