maxime bouillot / Mbed 2 deprecated testLucadeTHmaxBOUI

le test

Dependencies:   LCD_DISCO_F429ZI mbed BSP_DISCO_F429ZI

Lettres/Display_Elements.h@10:f2cb60383040, 2019-03-28 (annotated)

Committer:
ascheriit
Date:
Thu Mar 28 18:07:20 2019 +0000
Revision:
10:f2cb60383040
Parent:
9:19f7cac66f50
Child:
17:c9b66df08920
J'ai mis en commentaire les lettres d'avant car ca empechait de compiler.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
ascheriit 10:f2cb60383040 1 /*<<<<<<< working copy
Luca1996 6:4ef1fabb6c47 2 void Display_H_1(void);
Luca1996 6:4ef1fabb6c47 3 void Display_He_2(void);
Luca1996 6:4ef1fabb6c47 4 void Display_Li_3(void);
Luca1996 6:4ef1fabb6c47 5 void Display_Be_4(void);
Luca1996 6:4ef1fabb6c47 6 void Display_O_8(void);
Luca1996 6:4ef1fabb6c47 7 void Display_C_6(void);
Luca1996 6:4ef1fabb6c47 8 void Display_N_7(void);
Luca1996 6:4ef1fabb6c47 9 void Display_F_9(void);
Luca1996 6:4ef1fabb6c47 10 void Cadrage(void);
Luca1996 6:4ef1fabb6c47 11
ascheriit 9:19f7cac66f50 12 =======
ascheriit 7:db52e78db1bd 13 #include "mbed.h"
ascheriit 7:db52e78db1bd 14 #include "LCD_DISCO_F429ZI.h"
ascheriit 7:db52e78db1bd 15
ascheriit 7:db52e78db1bd 16 void Display_H_1();
ascheriit 7:db52e78db1bd 17 void Display_He_2();
ascheriit 7:db52e78db1bd 18 void Display_Li_3();
ascheriit 7:db52e78db1bd 19 void Display_Be_4();
ascheriit 7:db52e78db1bd 20 void Display_O_8();
ascheriit 7:db52e78db1bd 21 void Display_C_6();
ascheriit 7:db52e78db1bd 22 void Display_N_7();
ascheriit 10:f2cb60383040 23 void Display_F_9();>>>>>>> merge rev*/