diff options
| author | Stefan Pöschel <basicmaster@users.noreply.github.com> | 2016-11-16 22:26:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 22:26:07 +0100 |
| commit | fe130e3292ad26346c0ca5475e4314ba288af63b (patch) | |
| tree | e5c96faac0445d75538da6f8fe4dc5923311513f /src/odr-padenc.cpp | |
| parent | 261054bf3873b48d16f03a5f7de19428f12c26ec (diff) | |
| parent | 4d52b7e19d50ea3533ec7e07681115b9db08115e (diff) | |
| download | ODR-PadEnc-fe130e3292ad26346c0ca5475e4314ba288af63b.tar.gz ODR-PadEnc-fe130e3292ad26346c0ca5475e4314ba288af63b.tar.bz2 ODR-PadEnc-fe130e3292ad26346c0ca5475e4314ba288af63b.zip | |
Merge pull request #1 from paneda/fix-crc-conflict
converted the crc impl into c++ with namespace.
Diffstat (limited to 'src/odr-padenc.cpp')
| -rw-r--r-- | src/odr-padenc.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/odr-padenc.cpp b/src/odr-padenc.cpp index 06076af..a42d62d 100644 --- a/src/odr-padenc.cpp +++ b/src/odr-padenc.cpp @@ -57,9 +57,7 @@ #define SLEEPDELAY_DEFAULT 10 //seconds -extern "C" { #include "crc.h" -} #define MIN(a,b) (((a)<(b))?(a):(b)) #define MAX(a,b) (((a)>(b))?(a):(b)) @@ -254,7 +252,7 @@ struct DATA_GROUP { void AppendCRC() { uint16_t crc = 0xFFFF; - crc = crc16(crc, &data[0], data.size()); + crc = odr::crc16(crc, &data[0], data.size()); crc = ~crc; #if DEBUG fprintf(stderr, "crc=%04x ~crc=%04x\n", crc, ~crc); |