ajout module_mouvement
Dependencies: mbed xbee_lib ADXL345_I2C IMUfilter ITG3200 Motor RangeFinder Servo mbos PID
Fork of Labo_TRSE_Drone by
Revision 26:814d9b08aa68, committed 2013-04-03
- Comitter:
- IngesupMbed01
- Date:
- Wed Apr 03 12:41:38 2013 +0000
- Parent:
- 24:3462a304f9a0
- Child:
- 27:67c37f97fc66
- Commit message:
- Ajout de compteur de message dans les buffers de trame.
Changed in this revision
Service/Buffer_Trame.cpp | Show annotated file Show diff for this revision Revisions of this file |
Service/Buffer_Trame.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/Service/Buffer_Trame.cpp Wed Apr 03 12:16:14 2013 +0000 +++ b/Service/Buffer_Trame.cpp Wed Apr 03 12:41:38 2013 +0000 @@ -26,6 +26,7 @@ m_maxSize = default_size; m_currentReadIndex = 0; m_currentWriteIndex = 0; + m_numberMessage = 0; } C_FrameBuffer::C_FrameBuffer(unsigned int size) @@ -34,6 +35,7 @@ m_frameBuffer = new frame[m_maxSize]; m_currentReadIndex = 0; m_currentWriteIndex = 0; + m_numberMessage = 0; } /* DESTRUCTEUR */ @@ -43,6 +45,7 @@ m_maxSize = 0; m_currentReadIndex = 0; m_currentWriteIndex = 0; + m_numberMessage = 0; } /* Propriétés */ @@ -50,6 +53,7 @@ { m_frameBuffer[m_currentWriteIndex] = newFrame; m_currentWriteIndex++; + m_numberMessage++; if(m_currentWriteIndex >= m_maxSize) m_currentWriteIndex = 0; } @@ -58,6 +62,7 @@ { frame newFrame = m_frameBuffer[m_currentReadIndex]; m_currentReadIndex++; + m_numberMessage--; if(m_currentReadIndex >= m_maxSize) m_currentReadIndex = 0; @@ -81,21 +86,12 @@ return m_currentReadIndex; } - void C_FrameBuffer::currentReadIndex(unsigned int newIndex) - { - if(newIndex >= m_maxSize) newIndex = m_maxSize; - - m_currentReadIndex = newIndex; - } - unsigned int C_FrameBuffer::currentWriteIndex(void) { return m_currentWriteIndex; } - void C_FrameBuffer::currentWriteIndex(unsigned int newIndex) + unsigned int C_FrameBuffer::numberMessage(void) { - if(newIndex >= m_maxSize) newIndex = m_maxSize; - - m_currentWriteIndex = newIndex; + return m_numberMessage; } \ No newline at end of file
--- a/Service/Buffer_Trame.h Wed Apr 03 12:16:14 2013 +0000 +++ b/Service/Buffer_Trame.h Wed Apr 03 12:41:38 2013 +0000 @@ -37,6 +37,7 @@ frame * m_frameBuffer; unsigned int m_currentReadIndex; unsigned int m_currentWriteIndex; + unsigned int m_numberMessage; unsigned int m_maxSize; public : @@ -53,9 +54,8 @@ frame frameBuffer(unsigned int index); unsigned int maxSize(void); unsigned int currentReadIndex(void); - void currentReadIndex(unsigned int newIndex); unsigned int currentWriteIndex(void); - void currentWriteIndex(unsigned int newIndex); + unsigned int numberMessage(void); }; #endif \ No newline at end of file