Diff: Slaves/Switches/DS2413/DS2413.cpp

Revision:

94:d2dea35b25ea

Parent:

86:2ce08ca58b9e

Child:

104:3f48daed532b

--- a/Slaves/Switches/DS2413/DS2413.cpp	Fri Jun 24 21:06:46 2016 +0000
+++ b/Slaves/Switches/DS2413/DS2413.cpp	Fri Jun 24 21:12:26 2016 +0000
@@ -52,36 +52,36 @@
 {
 }
 
-DS2413::CmdResult DS2413::pio_access_read_chA(uint8_t & val)
+DS2413::CmdResult DS2413::pioAccessReadChA(uint8_t & val)
 {
     DS2413::CmdResult result = OpFailure;
 
-    result = pio_access_read(val);
+    result = pioAccessRead(val);
 
     val = (val & 0x01);
 
     return result;
 }
 
-DS2413::CmdResult DS2413::pio_access_read_chB(uint8_t & val)
+DS2413::CmdResult DS2413::pioAccessReadChB(uint8_t & val)
 {
     DS2413::CmdResult result = OpFailure;
 
-    result = pio_access_read(val);
+    result = pioAccessRead(val);
 
     val = ((val >> 2) & 0x01);
 
     return result;
 }
 
-DS2413::CmdResult DS2413::pio_access_write_chA(uint8_t val)
+DS2413::CmdResult DS2413::pioAccessWriteChA(uint8_t val)
 {
     DS2413::CmdResult result = OpFailure;
 
     uint8_t local_val = 0;
 
     //read current state of PIO
-    result = pio_access_read(local_val);
+    result = pioAccessRead(local_val);
 
     if (result == DS2413::Success)
     {
@@ -92,20 +92,20 @@
         val = (0xFC | (((local_val >> 1) & 0x02) | (0x01 & val)));
 
         //write, bit[1:0] new state of pio
-        result = pio_access_write(val);
+        result = pioAccessWrite(val);
     }
 
     return result;
 }
 
-DS2413::CmdResult DS2413::pio_access_write_chB(uint8_t val)
+DS2413::CmdResult DS2413::pioAccessWriteChB(uint8_t val)
 {
     DS2413::CmdResult result = OpFailure;
 
     uint8_t local_val = 0;
 
     //read current state of PIO
-    result = pio_access_read(local_val);
+    result = pioAccessRead(local_val);
 
     if (result == DS2413::Success)
     {
@@ -116,18 +116,18 @@
         val = (0xFC | ((local_val & 0x01) | (0x02 & (val << 1))));
 
         //write, bit[1:0] new state of pio
-        result = pio_access_write(val);
+        result = pioAccessWrite(val);
     }
 
     return result;
 }
 
-DS2413::CmdResult DS2413::pio_access_write_chAB(uint8_t val)
+DS2413::CmdResult DS2413::pioAccessWriteChAB(uint8_t val)
 {
-    return pio_access_write((0x03 & val) | 0xFC);
+    return pioAccessWrite((0x03 & val) | 0xFC);
 }
 
-DS2413::CmdResult DS2413::pio_access_read(uint8_t & val)
+DS2413::CmdResult DS2413::pioAccessRead(uint8_t & val)
 {
     DS2413::CmdResult result = DS2413::OpFailure;
 
@@ -159,7 +159,7 @@
     return result;
 }
 
-DS2413::CmdResult DS2413::pio_access_write(uint8_t val)
+DS2413::CmdResult DS2413::pioAccessWrite(uint8_t val)
 {
     DS2413::CmdResult result = DS2413::OpFailure;