Diff: Masters/OneWireMaster.cpp

Revision:

82:c11090a32471

Parent:

78:0cbbac7f2016

Child:

86:2ce08ca58b9e

diff -r e2a3ad98874e -r c11090a32471 Masters/OneWireMaster.cpp
--- a/Masters/OneWireMaster.cpp	Fri Jun 03 22:15:59 2016 +0000
+++ b/Masters/OneWireMaster.cpp	Mon Jun 06 09:55:33 2016 -0500
@@ -32,8 +32,10 @@
 
 #include "OneWireMaster.h"
 #include "RomId.h"
+#include "crc.h"
 
 using OneWire::OneWireMaster;
+using namespace OneWire::crc;
 
 enum OwRomCmd
 {
@@ -396,7 +398,7 @@
                 // if the mask is 0 then go to new SerialNum byte rom_byte_number and reset mask
                 if (rom_byte_mask == 0)
                 {
-                    crc8 = RomId::calculateCrc8(crc8, searchState.romId[rom_byte_number]);  // accumulate the CRC
+                    crc8 = calculateCrc8(crc8, searchState.romId[rom_byte_number]);  // accumulate the CRC
                     rom_byte_number++;
                     rom_byte_mask = 1;
                 }