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: mbed Herkulex_Library_2019 actions_Gr ident_crac actions_Pr
Revision 46:85208ab1fa12, committed 2019-05-31
- Comitter:
 - Artiom
 - Date:
 - Fri May 31 21:03:45 2019 +0000
 - Parent:
 - 45:3cb347342a0d
 - Commit message:
 - fork PR
 
Changed in this revision
--- a/actions_Gr.lib Thu May 30 04:05:18 2019 +0000 +++ b/actions_Gr.lib Fri May 31 21:03:45 2019 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/teams/CRAC-Team/code/actions_Gr/#bf2810b95f25 +https://os.mbed.com/teams/CRAC-Team/code/actions_Gr/#5973f13f44e2
--- a/actions_Pr.lib Thu May 30 04:05:18 2019 +0000 +++ b/actions_Pr.lib Fri May 31 21:03:45 2019 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/teams/CRAC-Team/code/actions_Pr/#ea163c506057 +https://os.mbed.com/teams/CRAC-Team/code/actions_Pr/#cf24f98ac4cd
--- a/main.cpp	Thu May 30 04:05:18 2019 +0000
+++ b/main.cpp	Fri May 31 21:03:45 2019 +0000
@@ -281,7 +281,7 @@
 
             case GOLDENIUM_ARRIERE:
                 fgoldenium_arriere=1;
-                 x=msgRxBuffer[FIFO_lecture].data[0]|((unsigned short)(msgRxBuffer[FIFO_lecture].data[1])<<8);
+                x=msgRxBuffer[FIFO_lecture].data[0]|((unsigned short)(msgRxBuffer[FIFO_lecture].data[1])<<8);
                 y=msgRxBuffer[FIFO_lecture].data[2]|((unsigned short)(msgRxBuffer[FIFO_lecture].data[3])<<8);
                 break;
 
@@ -323,7 +323,8 @@
             case VENTOUSE_AR_CENTRE_BALANCE:
                 SendAck(ACKNOWLEDGE_HERKULEX, ACK_ACTION);
                 goldenium_arriere();
-                positionControl(AR_poigne_D, 200,1,BLED_ON,3);//actionneur
+                positionControl(AR_poigne_D, 200,1,BLED_ON,3);//actionneur rentre ventouse pour pas s'eclater sur la balance
+                positionControl(AR_poigne_G, 780,1,BLED_ON,1);//actionneur rentre ventouse pour pas s'eclater sur la balance
                 verification();
                 SendAck(ACKNOWLEDGE_HERKULEX, ACK_FIN_ACTION);
                 break;