maxime bouillot
/
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
Diff: main.cpp
- Revision:
- 23:1d4562f7b639
- Parent:
- 22:5b2a7d7c73fa
- Parent:
- 20:f3e8319b7899
- Child:
- 24:682b9e68dca8
--- a/main.cpp Thu May 09 10:32:58 2019 +0000
+++ b/main.cpp Fri May 10 14:06:36 2019 +0000
@@ -2,7 +2,11 @@
#include "mbed.h"
int main(){
+<<<<<<< working copy
DisplayMatrixClean(14,14,BS_H(),5,0xFF0000,0x0000FF);
+=======
+ cRR_test();
+>>>>>>> merge rev
return 1;
}
