Revision 19:a05cd42f8e91, committed 2013-04-03

Comitter:

IngesupMbed01

Date:

Wed Apr 03 08:43:22 2013 +0000

Parent:

15:793cf784dc7a

Parent:

18:0bfd3ad421e5

Child:

20:8e7db963701e

Commit message:

Module Communication modifi? et le corps de Service ajout?

Changed in this revision

--- a/Module_Communication/Module_Communication.cpp	Wed Mar 20 16:36:58 2013 +0000
+++ b/Module_Communication/Module_Communication.cpp	Wed Apr 03 08:43:22 2013 +0000
@@ -0,0 +1,47 @@
+ /* Copyright (c) 2012 - 2013 AUTHEUR
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+ /*
+ * Description : Cette classe contient les fonctionnalités du module communication.
+                 Le module communication gère la communication entre les modules présents sur le drône et le PC.
+ * Input
+ * Output
+ */
+ 
+ #include "Module_Communication.h"
+ 
+ // Pointeur sur la classe systeme d'exploitation instancié dans le main
+ extern mbos *os;
+ 
+ 
+ /* CONSRTRUCTEUR(S) */
+ C_ModuleCommunication::C_ModuleCommunication()
+ {
+    m_xbee = new xbee(p9, p10, p11);
+ }
+ 
+ /* DESTRUCTEUR */
+ C_ModuleCommunication::~C_ModuleCommunication()
+ {
+ 
+ }
+ 
+ /* Point d'entrée de la tache Module Video */
+ void C_ModuleCommunication::receptionDeTrame(void)
+ {
+    while(1){
+    // Code
+    }
+ }
+ 
+ 
\ No newline at end of file

--- a/Module_Communication/Module_Communication.h	Wed Mar 20 16:36:58 2013 +0000
+++ b/Module_Communication/Module_Communication.h	Wed Apr 03 08:43:22 2013 +0000
@@ -0,0 +1,50 @@
+ /* Copyright (c) 2012 - 2013 Yang Shi
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+ /*
+ * Description : Cette classe contient les fonctionnalités du module communication.
+                 Le module communication gère la communication entre les modules présents sur le drône et le PC.
+ * Input : 
+ * Output
+ */
+ 
+ #ifndef MODULE_COMMUNICATION_H
+ #define MODULE_COMMUNICATION_H
+ 
+ #include "mbos.h"
+ #include "xbee.h"
+ 
+ class C_ModuleCommunication
+ {
+ private :
+    /* ATTRIBUTS */
+    xbee * m_xbee;
+    
+ 
+ public :
+    /* CONSTRUCTEUR(S) */
+    C_ModuleCommunication();
+    
+    /* DESTRUCTEUR */
+    ~C_ModuleCommunication();
+    
+    /* METHODES */
+    void moduleCommunicationTask(void);
+    void envoiDeTrame(void);
+    void receptionDeTrame(void);
+ 
+    /* FONCTIONS */
+ 
+ };
+ 
+ #endif
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Service/Service.cpp	Wed Apr 03 08:43:22 2013 +0000
@@ -0,0 +1,32 @@
+ /* Copyright (c) 2012 - 2013 AUTEUR
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+ /*
+ * Description : Cette classe contient les fonctionnalités que pourraient exploiter plusieurs classes
+ * Input
+ * Output
+ */
+ 
+ #include "Service.h"
+ 
+ /* CONSRTRUCTEUR(S) */
+ C_Service::C_Service()
+ {
+ 
+ }
+ 
+ /* DESTRUCTEUR */
+ C_Service::~C_Service()
+ {
+ 
+ }
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Service/Service.h	Wed Apr 03 08:43:22 2013 +0000
@@ -0,0 +1,39 @@
+ /* Copyright (c) 2012 - 2013 AUTHEUR
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+ /*
+ * Description : Cette classe contient les fonctionnalités que pourraient exploiter plusieurs classes
+ * Input
+ * Output
+ */
+ 
+ #ifndef SERVICE_H
+ #define SERVICE_H
+ 
+ #include "mbos.h"
+ 
+ class C_Service {
+ private :
+    /* ATTRIBUTS */
+ 
+ public :
+    /* CONSTRUCTEUR(S) */
+    Service();
+    
+    /* DESTRUCTEUR */
+    ~Service();
+    
+    /* METHODES */
+ };
+ 
+ #endif
\ No newline at end of file

--- a/Service/service.cpp	Wed Mar 20 16:36:58 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
- /* Copyright (c) 2012 - 2013 AUTHEUR
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED 
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- 
- /*
- * Description
- * Input
- * Output
- */
\ No newline at end of file

--- a/xbee_lib.lib	Wed Mar 20 16:36:58 2013 +0000
+++ b/xbee_lib.lib	Wed Apr 03 08:43:22 2013 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/users/tristanjph/code/xbee_lib/#6455a079bdb3
+http://mbed.org/users/IngesupMbed01/code/xbee_lib/#945170b9c451