Diff: main.cpp

Revision:

85:c46c39d879a9

Parent:

61:4046a91e1b0e

--- a/main.cpp	Wed May 29 21:27:00 2019 +0000
+++ b/main.cpp	Fri May 31 18:04:13 2019 +0000
@@ -12,15 +12,30 @@
 char strat_sd[10][SIZE+8];
 char PATH[10][SIZE+8];
 
-Serial rn42_pr(PG_14, PG_9);
+//Serial rn42_pr(PG_14, PG_9);
 //Serial rn42(PA_1,PA_2);
 Serial rn42_Tx(PA_2,NC);
 Serial rn42_Rx(NC,PA_1);
 
+Serial serialNC(NC,NC);
+Serial rn42Dessus(PG_14,PG_9);
+Serial rn42Dessous(PA_2,PA_1);
+
+
+
 Serial pc(USBTX,USBRX);
+
+
+
+#ifdef PETI_ROB
 LiaisonBluetooth liaison_Rx(&rn42_Rx,&pc);
 LiaisonBluetooth liaison_Tx(&rn42_Tx,&pc);
-LiaisonBluetooth liaison_pr(&rn42_pr,&pc);
+//LiaisonBluetooth liaison_pr(&rn42Dessus,&pc);
+LiaisonBluetooth liaisonRob(&rn42Dessus,&pc);
+#endif
+#ifdef GROS_ROB
+LiaisonBluetooth liaisonRob(&rn42Dessous,&pc);
+#endif
 
 char cheminFileStart[SIZE+8]; //Le chemin du fichier de strat, utiliser strcpy(cheminFileStart,"/local/strat.txt");
 struct S_Instruction strat_instructions[SIZE_BUFFER_FILE]; //La liste des instruction chargé en mémoire
@@ -86,7 +101,8 @@
 void bluetooth_init(void){
     rn42_Tx.baud(115200);
     rn42_Rx.baud(115200);
-    rn42_pr.baud(115200);
+    rn42Dessus.baud(115200);
+    rn42Dessous.baud(115200);
     pc.baud(115200);
     pc.printf("ok1");
     /*while(1){ // sert au paramètrage des module RN42