Superseded by MaximInterface.

Diff: Masters/DS2480B/DS2480B.cpp

Revision:

75:8b627804927c

Parent:

74:23be10c32fa3

Child:

76:84e6c4994e29

diff -r 23be10c32fa3 -r 8b627804927c Masters/DS2480B/DS2480B.cpp
--- a/Masters/DS2480B/DS2480B.cpp	Fri May 13 07:48:35 2016 -0500
+++ b/Masters/DS2480B/DS2480B.cpp	Fri May 13 14:52:50 2016 -0500
@@ -227,7 +227,7 @@
 
 
 //*********************************************************************
-OneWireMaster::CmdResult DS2480B::OWInitMaster(void)
+OneWireMaster::CmdResult DS2480B::OWInitMaster()
 {
     _p_serial->attach(this, &DS2480B::rx_callback, mbed::Serial::RxIrq);
 
@@ -236,17 +236,17 @@
     rx_buffer.rx_bytes_available = 0;
     rx_buffer.wrap_error = false;
 
-    _ULevel = OneWireMaster::LEVEL_NORMAL;
-    _UBaud = BPS_9600;
+    _ULevel = OneWireMaster::NormalLevel;
+    _UBaud = Bps9600;
     _UMode = MODSEL_COMMAND;
-    _USpeed = OneWireMaster::SPEED_STANDARD;
+    _USpeed = OneWireMaster::StandardSpeed;
 
     return DS2480B_Detect();
 }
 
 
 //*********************************************************************
-OneWireMaster::CmdResult DS2480B::OWReset(void)
+OneWireMaster::CmdResult DS2480B::OWReset()
 {
     OneWireMaster::CmdResult result;
 
@@ -254,7 +254,7 @@
     uint8_t sendlen = 0;
 
     // make sure normal level
-    result = OWSetLevel(OneWireMaster::LEVEL_NORMAL);
+    result = OWSetLevel(OneWireMaster::NormalLevel);
     if (result == OneWireMaster::Success)
     {
         // check for correct mode
@@ -301,7 +301,7 @@
 
 
 //*********************************************************************
-OneWireMaster::CmdResult DS2480B::OWTouchBitSetLevel(uint8_t & sendrecvbit, OWLevel after_level)
+OneWireMaster::CmdResult DS2480B::OWTouchBitSetLevel(uint8_t & sendRecvBit, OWLevel afterLevel)
 {
     OneWireMaster::CmdResult result = OneWireMaster::OperationFailure;
 
@@ -309,7 +309,7 @@
     uint8_t sendlen = 0;
 
     // make sure normal level
-    OWSetLevel(OneWireMaster::LEVEL_NORMAL);
+    OWSetLevel(OneWireMaster::NormalLevel);
 
     // check for correct mode
     if (_UMode != MODSEL_COMMAND)
@@ -319,7 +319,7 @@
     }
 
     // construct the command
-    sendpacket[sendlen] = (sendrecvbit != 0) ? BITPOL_ONE : BITPOL_ZERO;
+    sendpacket[sendlen] = (sendRecvBit != 0) ? BITPOL_ONE : BITPOL_ZERO;
     sendpacket[sendlen++] |= CMD_COMM | FUNCTSEL_BIT | _USpeed;
 
     // flush the buffers
@@ -336,12 +336,12 @@
             // interpret the response
             if (((readbuffer[0] & 0xE0) == 0x80) && ((readbuffer[0] & RB_BIT_MASK) == RB_BIT_ONE))
             {
-                sendrecvbit = 1;
+                sendRecvBit = 1;
                 result = OneWireMaster::Success;
             }
             else
             {
-                sendrecvbit = 0;
+                sendRecvBit = 0;
                 result = OneWireMaster::Success;
             }
         }
@@ -362,7 +362,7 @@
     }
     else
     {
-        result = OWSetLevel(after_level);
+        result = OWSetLevel(afterLevel);
     }
 
     return result;
@@ -370,7 +370,7 @@
 
 
 //*********************************************************************
-OneWireMaster::CmdResult DS2480B::OWWriteByteSetLevel(uint8_t sendbyte, OWLevel after_level)
+OneWireMaster::CmdResult DS2480B::OWWriteByteSetLevel(uint8_t sendByte, OWLevel afterLevel)
 {
     OneWireMaster::CmdResult result = OneWireMaster::OperationFailure;
 
@@ -378,7 +378,7 @@
     uint8_t sendlen = 0;
 
     // make sure normal level
-    OWSetLevel(OneWireMaster::LEVEL_NORMAL);
+    OWSetLevel(OneWireMaster::NormalLevel);
 
     // check for correct mode
     if (_UMode != MODSEL_DATA)
@@ -388,12 +388,12 @@
     }
 
     // add the byte to send
-    sendpacket[sendlen++] = sendbyte;
+    sendpacket[sendlen++] = sendByte;
 
     // check for duplication of data that looks like COMMAND mode
-    if (sendbyte == MODE_COMMAND)
+    if (sendByte == MODE_COMMAND)
     {
-        sendpacket[sendlen++] = sendbyte;
+        sendpacket[sendlen++] = sendByte;
     }
 
     // flush the buffers
@@ -405,7 +405,7 @@
     {
         // read back the 1 byte response
         result = ReadCOM(1, readbuffer);
-        if ((result == OneWireMaster::Success) && (readbuffer[0] == sendbyte))
+        if ((result == OneWireMaster::Success) && (readbuffer[0] == sendByte))
         {
             result = OneWireMaster::Success;
         }
@@ -426,7 +426,7 @@
     }
     else
     {
-        result = OWSetLevel(after_level);
+        result = OWSetLevel(afterLevel);
     }
 
     return result;
@@ -434,7 +434,7 @@
 
 
 //*********************************************************************
-OneWireMaster::CmdResult DS2480B::OWReadByteSetLevel(uint8_t & recvbyte, OWLevel after_level)
+OneWireMaster::CmdResult DS2480B::OWReadByteSetLevel(uint8_t & recvByte, OWLevel afterLevel)
 {
     OneWireMaster::CmdResult result = OneWireMaster::OperationFailure;
 
@@ -442,7 +442,7 @@
     uint8_t sendlen = 0;
 
     // make sure normal level
-    OWSetLevel(OneWireMaster::LEVEL_NORMAL);
+    OWSetLevel(OneWireMaster::NormalLevel);
 
     // check for correct mode
     if (_UMode != MODSEL_DATA)
@@ -465,7 +465,7 @@
         result = ReadCOM(1, readbuffer);
         if (result == OneWireMaster::Success)
         {
-            recvbyte = readbuffer[0];
+            recvByte = readbuffer[0];
             result = OneWireMaster::Success;
         }
         else
@@ -485,7 +485,7 @@
     }
     else
     {
-        result = OWSetLevel(after_level);
+        result = OWSetLevel(afterLevel);
     }
 
     return result;
@@ -493,7 +493,7 @@
 
 
 //*********************************************************************
-OneWireMaster::CmdResult DS2480B::OWSetSpeed(OWSpeed new_speed)
+OneWireMaster::CmdResult DS2480B::OWSetSpeed(OWSpeed newSpeed)
 {
     OneWireMaster::CmdResult result = OneWireMaster::OperationFailure;
 
@@ -504,7 +504,7 @@
 
 
 //*********************************************************************
-OneWireMaster::CmdResult DS2480B::OWSetLevel(OWLevel new_level)
+OneWireMaster::CmdResult DS2480B::OWSetLevel(OWLevel newLevel)
 {
     OneWireMaster::CmdResult result = OneWireMaster::Success;
 
@@ -512,7 +512,7 @@
     uint8_t sendlen = 0;
 
     // check if need to change level
-    if (new_level != _ULevel)
+    if (newLevel != _ULevel)
     {
         // check for correct mode
         if (_UMode != MODSEL_COMMAND)
@@ -522,7 +522,7 @@
         }
 
         // check if just putting back to normal
-        if (new_level == OneWireMaster::LEVEL_NORMAL)
+        if (newLevel == OneWireMaster::NormalLevel)
         {
             // stop pulse command
             sendpacket[sendlen++] = MODE_STOP_PULSE;
@@ -546,7 +546,7 @@
                     // check response byte
                     if (((readbuffer[0] & 0xE0) == 0xE0) && ((readbuffer[1] & 0xE0) == 0xE0))
                     {
-                        _ULevel = OneWireMaster::LEVEL_NORMAL;
+                        _ULevel = OneWireMaster::NormalLevel;
                     }
                     else
                     {
@@ -576,7 +576,7 @@
                     // check response byte
                     if ((readbuffer[0] & 0x81) == 0)
                     {
-                        _ULevel = new_level;
+                        _ULevel = newLevel;
                     }
                     else
                     {
@@ -608,7 +608,7 @@
 
     // reset modes
     _UMode = MODSEL_COMMAND;
-    _UBaud = BPS_9600;
+    _UBaud = Bps9600;
     _USpeed = SPEEDSEL_FLEX;
 
     // set the baud rate to 9600
@@ -673,7 +673,7 @@
 
 
 //*********************************************************************
-OneWireMaster::CmdResult DS2480B::DS2480B_ChangeBaud(DS2480B_BPS newbaud)
+OneWireMaster::CmdResult DS2480B::DS2480B_ChangeBaud(Baud newBaud)
 {
     OneWireMaster::CmdResult result = OneWireMaster::Success;
 
@@ -681,7 +681,7 @@
     uint8_t sendlen = 0, sendlen2 = 0;
 
     //see if diffenent then current baud rate
-    if (_UBaud != newbaud)
+    if (_UBaud != newBaud)
     {
         // build the command packet
         // check for correct mode
@@ -691,7 +691,7 @@
             sendpacket[sendlen++] = MODE_COMMAND;
         }
         // build the command
-        sendpacket[sendlen++] = CMD_CONFIG | PARMSEL_BAUDRATE | newbaud;
+        sendpacket[sendlen++] = CMD_CONFIG | PARMSEL_BAUDRATE | newBaud;
 
         // flush the buffers
         FlushCOM();
@@ -704,8 +704,8 @@
             wait_ms(5);
 
             // change our baud rate
-            SetBaudCOM(newbaud);
-            _UBaud = newbaud;
+            SetBaudCOM(newBaud);
+            _UBaud = newBaud;
 
             // wait for things to settle
             wait_ms(5);
@@ -774,19 +774,19 @@
     //double for 115200 due to timer object inaccuracies
     switch (_UBaud)
     {
-    case BPS_115200:
+    case Bps115200:
         timeout = ((1000000 / 115200) * 20);
         break;
 
-    case BPS_57600:
+    case Bps57600:
         timeout = ((1000000 / 57600) * 10);
         break;
 
-    case BPS_19200:
+    case Bps19200:
         timeout = ((1000000 / 19200) * 10);
         break;
 
-    case BPS_9600:
+    case Bps9600:
     default:
         timeout = ((1000000 / 9600) * 10);
         break;
@@ -829,19 +829,19 @@
     //double for 115200 due to timer object inaccuracies
     switch (_UBaud)
     {
-    case BPS_115200:
+    case Bps115200:
         timeout = ((1000000 / 115200) * 200) * inlen;
         break;
 
-    case BPS_57600:
+    case Bps57600:
         timeout = ((1000000 / 57600) * 100) * inlen;
         break;
 
-    case BPS_19200:
+    case Bps19200:
         timeout = ((1000000 / 19200) * 100) * inlen;
         break;
 
-    case BPS_9600:
+    case Bps9600:
     default:
         timeout = ((1000000 / 9600) * 100) * inlen;
         break;
@@ -938,19 +938,19 @@
 {
     switch (new_baud)
     {
-    case BPS_115200:
+    case Bps115200:
         _p_serial->baud(115200);
         break;
 
-    case BPS_57600:
+    case Bps57600:
         _p_serial->baud(57600);
         break;
 
-    case BPS_19200:
+    case Bps19200:
         _p_serial->baud(19200);
         break;
 
-    case BPS_9600:
+    case Bps9600:
     default:
         _p_serial->baud(9600);
         break;