CRAC Team / Mbed 2 deprecated Carte_Pompe_V1_2020

carte esclave pompe 2020 V1

Dependencies:   mbed ident_crac

Files at this revision

API Documentation at this revision

Revision 24:3fb41d2b91af, committed 2020-07-17

Comitter:
maximilienlv
Date:
Fri Jul 17 14:34:32 2020 +0000
Parent:
23:7f62f27c028f
Commit message:
version fonctionnel strat

Changed in this revision

class_ventouse.cpp Show annotated file Show diff for this revision Revisions of this file
ident_crac.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/class_ventouse.cpp	Mon Jul 13 11:31:08 2020 +0000
+++ b/class_ventouse.cpp	Fri Jul 17 14:34:32 2020 +0000
@@ -83,8 +83,8 @@
 
 void Ventouse::relacher()
 {
+    if(flag_electrovanne) m_electrovanne->write(PWM_ELECTROVANNE);
     m_pompe->write(0.0);
-    if(flag_electrovanne) m_electrovanne->write(PWM_ELECTROVANNE);
 }
 
 bool Ventouse::getPression()

--- a/ident_crac.lib	Mon Jul 13 11:31:08 2020 +0000
+++ b/ident_crac.lib	Fri Jul 17 14:34:32 2020 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/teams/CRAC-Team/code/ident_crac/#60b92524978a
+https://os.mbed.com/teams/CRAC-Team/code/ident_crac/#ad3c5dee616c

--- a/main.cpp	Mon Jul 13 11:31:08 2020 +0000
+++ b/main.cpp	Fri Jul 17 14:34:32 2020 +0000
@@ -105,13 +105,13 @@
     can.attach(&canRx_ISR); // création de l'interrupt attachée à la réception sur le CAN
     wait_ms(100);
     
-    ventouse[AR_DROIT] = new Ventouse(PB_7, PB_6, PC_0, AR_DROIT);
-    ventouse[AR_CENTRE] = new Ventouse(PC_9, PA_8, PB_0, AR_CENTRE);
-    ventouse[AR_GAUCHE] = new Ventouse(PA_9, PA_10,  PB_1, AR_GAUCHE);
+    ventouse[AV_DROIT] = new Ventouse(PB_7, PB_6, PC_0, AR_DROIT);
+    ventouse[AV_GAUCHE] = new Ventouse(PC_9, PA_8, PB_0, AR_CENTRE);
+    ventouse[AV_CENTRE] = new Ventouse(PA_9, PA_10,  PB_1, AR_GAUCHE);
     
-    ventouse[AV_DROIT] = new Ventouse(PA_0, PA_1, PA_4, AV_DROIT); //PA_6, PA_5, PA_7,
-    ventouse[AV_CENTRE] = new Ventouse(PB_10, PB_2, PC_4, AV_CENTRE);
-    ventouse[AV_GAUCHE] = new Ventouse(PC_7,PC_8 , PC_5, AV_GAUCHE);
+    ventouse[AR_DROIT] = new Ventouse(PA_0, PA_1, PA_4, AV_DROIT);
+    ventouse[AR_CENTRE] = new Ventouse(PB_10, PB_2, PC_4, AV_CENTRE);
+    ventouse[AR_GAUCHE] = new Ventouse(PC_7,PC_8 , PC_5, AV_GAUCHE);
     
     pc.printf("Launched carte ventouse");
     //on force les ventouses à être éteintes au début