Revision 94:d2dea35b25ea, committed 2016-06-24

Comitter:

j3

Date:

Fri Jun 24 21:12:26 2016 +0000

Parent:

93:e496a45ce796

Child:

95:5ebdf5d955f4

Commit message:

updated DS2413 mbr fx names

Changed in this revision

--- 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;
 

--- a/Slaves/Switches/DS2413/DS2413.h	Fri Jun 24 21:06:46 2016 +0000
+++ b/Slaves/Switches/DS2413/DS2413.h	Fri Jun 24 21:12:26 2016 +0000
@@ -79,7 +79,7 @@
         DS2413(RandomAccessRomIterator &selector);
 
         /**********************************************************//**
-        * @brief pio_access_read_chA()
+        * @brief pioAccessReadChA()
         *
         * @details reads state of pio
         *
@@ -91,10 +91,10 @@
         *
         * @return CmdResult - result of operation
         **************************************************************/
-        CmdResult pio_access_read_chA(uint8_t & val);
+        CmdResult pioAccessReadChA(uint8_t & val);
 
         /**********************************************************//**
-        * @brief pio_access_read_chB()
+        * @brief pioAccessReadChB()
         *
         * @details reads state of pio
         *
@@ -106,10 +106,10 @@
         *
         * @return CmdResult - result of operation
         **************************************************************/
-        CmdResult pio_access_read_chB(uint8_t & val);
+        CmdResult pioAccessReadChB(uint8_t & val);
 
         /**********************************************************//**
-        * @brief pio_acess_write_chA()
+        * @brief pioAccessWriteChA()
         *
         * @details writes to pio
         *
@@ -121,10 +121,10 @@
         *
         * @return CmdResult - result of operation
         **************************************************************/
-        CmdResult pio_access_write_chA(uint8_t val);
+        CmdResult pioAccessWriteChA(uint8_t val);
 
         /**********************************************************//**
-        * @brief pio_acess_write_chB()
+        * @brief pioAccessWriteChB()
         *
         * @details writes to pio
         *
@@ -136,10 +136,10 @@
         *
         * @return CmdResult - result of operation
         **************************************************************/
-        CmdResult pio_access_write_chB(uint8_t val);
+        CmdResult pioAccessWriteChB(uint8_t val);
 
         /**********************************************************//**
-        * @brief pio_acess_write_chAB()
+        * @brief pioAccessWriteChAB()
         *
         * @details writes to pio
         *
@@ -151,13 +151,13 @@
         *
         * @return CmdResult - result of operation
         **************************************************************/
-        CmdResult pio_access_write_chAB(uint8_t val);
+        CmdResult pioAccessWriteChAB(uint8_t val);
 
     private:
 
-        CmdResult pio_access_read(uint8_t & val);
+        CmdResult pioAccessRead(uint8_t & val);
 
-        CmdResult pio_access_write(uint8_t val);
+        CmdResult pioAccessWrite(uint8_t val);
     };
 }