Diff: Factory.cpp

Revision:

7:e24f0b29f1f7

Parent:

6:b6bafd0a7013

Child:

8:594529956266

diff -r b6bafd0a7013 -r e24f0b29f1f7 Factory.cpp
--- a/Factory.cpp	Thu May 12 14:40:14 2016 -0500
+++ b/Factory.cpp	Fri May 13 14:54:04 2016 -0500
@@ -82,7 +82,7 @@
   DS28E15_22_25::BlockProtection protectionStatus;
   bool result;
   // Select device through Skip ROM
-  result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+  result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   if (result)
     result = (sensorNode.ds28e15_22_25.readBlockProtection(blockNum, protectionStatus) == OneWireSlave::Success);
   // Check if invalid protections are set
@@ -90,13 +90,13 @@
     result = ((protectionStatus.statusByte() & ~(desiredProtection.statusByte())) == 0x00);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Load secret into scratchpad
   if (result)
     result = (sensorNode.ds28e15_22_25.writeScratchpad(validSecret ? masterSecret : invalidMasterSecret) == OneWireSlave::Success);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Load master secret from scratchpad without locking
   if (result)
     result = (sensorNode.ds28e15_22_25.loadSecret(false) == OneWireSlave::Success);
@@ -112,19 +112,19 @@
   
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Read page data
   if (result)
     result = (sensorNode.ds28e15_22_25.readPage(sensorNode.authData.pageNum, pageData, false) == OneWireSlave::Success);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Load partial secret into scratchpad
   if (result)
     result = (sensorNode.ds28e15_22_25.writeScratchpad(partialSecret) == OneWireSlave::Success);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Compute secret
   if (result)
     result = (sensorNode.ds28e15_22_25.computeSecret(sensorNode.authData.pageNum, false) == OneWireSlave::Success);
@@ -133,13 +133,13 @@
     result = (DS28E15_22_25::computeNextSecret(sensorNode.ds2465, pageData, sensorNode.authData.pageNum, partialSecret, sensorNode.ds28e15_22_25.romId, sensorNode.ds28e15_22_25.manId) == ISha256MacCoproc::Success);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Enable authentication protection if not set
   if (result && (protectionStatus != desiredProtection))
     result = (sensorNode.ds28e15_22_25.writeAuthBlockProtection(sensorNode.ds2465, desiredProtection, protectionStatus) == OneWireSlave::Success);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Write initial filter life and set all other segments to default value
   if (result)
   {
@@ -147,7 +147,7 @@
     std::memset(blankSegment, SensorNode::defaultPaddingByte, blankSegment.length);
     for (size_t i = 0; i < DS28E15_22_25::segmentsPerPage; i++)
     {
-      result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+      result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
       if (result)
         result = (sensorNode.ds28e15_22_25.writeAuthSegment(sensorNode.ds2465, sensorNode.authData.pageNum, i,
                                                             ((i == sensorNode.authData.segmentNum) ? sensorNode.authData.segment : blankSegment),
@@ -161,31 +161,31 @@
   // Reload secret with known page values
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Load master secret into scratchpad
   if (result)
     result = (sensorNode.ds28e15_22_25.writeScratchpad(masterSecret) == OneWireSlave::Success);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Load master secret
   if (result)
     result = (sensorNode.ds28e15_22_25.loadSecret(false) == OneWireSlave::Success);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Read page data
   if (result)
     result = (sensorNode.ds28e15_22_25.readPage(sensorNode.authData.pageNum, pageData, false) == OneWireSlave::Success);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Write partial secret to scratchpad
   if (result)
     result = (sensorNode.ds28e15_22_25.writeScratchpad(partialSecret) == OneWireSlave::Success);
   // Select device through Skip ROM
   if (result)
-    result = (sensorNode.ds2465.OWSkipROM() == OneWireMaster::Success);
+    result = (sensorNode.ds2465.OWSkipRom() == OneWireMaster::Success);
   // Compute secret
   if (result)
     result = (sensorNode.ds28e15_22_25.computeSecret(sensorNode.authData.pageNum, false) == OneWireSlave::Success);