maxime bouillot / Mbed 2 deprecated testLucadeTHmaxBOUI

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:   LCD_DISCO_F429ZI mbed BSP_DISCO_F429ZI

main.cpp@23:1d4562f7b639, 2019-05-10 (annotated)

Committer:
ascheriit
Date:
Fri May 10 14:06:36 2019 +0000
Revision:
23:1d4562f7b639
Parent:
22:5b2a7d7c73fa
Parent:
20:f3e8319b7899
Child:
24:682b9e68dca8
tentative de fusion

Who changed what in which revision?

UserRevisionLine numberNew contents of line
ascheriit 5:b2963bf379bb 1 #include "main.h"
Luca1996 22:5b2a7d7c73fa 2 #include "mbed.h"
ascheriit 0:f088dc72fbd4 3
ascheriit 7:db52e78db1bd 4 int main(){
ascheriit 23:1d4562f7b639 5 <<<<<<< working copy
Luca1996 22:5b2a7d7c73fa 6 DisplayMatrixClean(14,14,BS_H(),5,0xFF0000,0x0000FF);
ascheriit 23:1d4562f7b639 7 =======
ascheriit 20:f3e8319b7899 8 cRR_test();
ascheriit 23:1d4562f7b639 9 >>>>>>> merge rev
ascheriit 7:db52e78db1bd 10 return 1;
ascheriit 0:f088dc72fbd4 11 }
ascheriit 0:f088dc72fbd4 12