APP 4
Dependencies: mbed CRC16 mbed-rtos
Diff: Frame.cpp
- Revision:
- 20:f0932bfe09ed
- Parent:
- 12:715af3660c73
- Child:
- 26:f2b37f9dfca9
--- a/Frame.cpp Mon Feb 22 18:38:53 2016 +0000 +++ b/Frame.cpp Tue Feb 23 00:22:49 2016 +0000 @@ -1,10 +1,9 @@ #include "Frame.h" #include "CRC16.h" - #pragma once -bitset<FRAMESIZE> buildFrame(bitset<MAX_DATA> data, char size, Serial* pc) +bitset<FRAMESIZE> buildFrame(bitset<MAX_DATA> data, char size) { bitset<FRAMESIZE> bitset; @@ -51,8 +50,7 @@ } } - CRC16 crc16; - unsigned short crc = crc16.calculateCRC16(payload, size); + unsigned short crc = CRC16::calculateCRC16(payload, size); int counter = 32 + size*8; // CRC @@ -83,10 +81,10 @@ bitset.set(counter+22, 1); bitset.set(counter+23, 0); - return bitset; + return bitset.flip(); } -bitset<MAX_DATA> convertToBits(char* message, char size, Serial* pc) +bitset<MAX_DATA> convertToBits(char* message, char size) { bitset<MAX_DATA> bitset;