Diff: Masters/DS2480B/DS2480B.h

Revision:

75:8b627804927c

Parent:

74:23be10c32fa3

Child:

76:84e6c4994e29

--- a/Masters/DS2480B/DS2480B.h	Fri May 13 07:48:35 2016 -0500
+++ b/Masters/DS2480B/DS2480B.h	Fri May 13 14:52:50 2016 -0500
@@ -45,12 +45,12 @@
         class DS2480B : public OneWireMaster
         {
         public:
-            enum DS2480B_BPS
+            enum Baud
             {
-                BPS_9600 = 0,
-                BPS_19200 = 2,
-                BPS_57600 = 4,
-                BPS_115200 = 6
+                Bps9600 = 0,
+                Bps19200 = 2,
+                Bps57600 = 4,
+                Bps115200 = 6
             };
 
             /**********************************************************//**
@@ -97,15 +97,15 @@
             virtual ~DS2480B();
 
 
-            OneWireMaster::CmdResult DS2480B_ChangeBaud(DS2480B_BPS newbaud);
+            OneWireMaster::CmdResult DS2480B_ChangeBaud(Baud newBaud);
 
-            virtual OneWireMaster::CmdResult OWInitMaster(void);
-            virtual OneWireMaster::CmdResult OWReset(void);
-            virtual OneWireMaster::CmdResult OWTouchBitSetLevel(uint8_t & sendrecvbit, OWLevel after_level);
-            virtual OneWireMaster::CmdResult OWWriteByteSetLevel(uint8_t sendbyte, OWLevel after_level);
-            virtual OneWireMaster::CmdResult OWReadByteSetLevel(uint8_t & recvbyte, OWLevel after_level);
-            virtual OneWireMaster::CmdResult OWSetSpeed(OWSpeed new_speed);
-            virtual OneWireMaster::CmdResult OWSetLevel(OWLevel new_level);
+            virtual OneWireMaster::CmdResult OWInitMaster();
+            virtual OneWireMaster::CmdResult OWReset();
+            virtual OneWireMaster::CmdResult OWTouchBitSetLevel(uint8_t & sendRecvBit, OWLevel afterLevel);
+            virtual OneWireMaster::CmdResult OWWriteByteSetLevel(uint8_t sendByte, OWLevel afterLevel);
+            virtual OneWireMaster::CmdResult OWReadByteSetLevel(uint8_t & recvByte, OWLevel afterLevel);
+            virtual OneWireMaster::CmdResult OWSetSpeed(OWSpeed newSpeed);
+            virtual OneWireMaster::CmdResult OWSetLevel(OWLevel newLevel);
 
         private:
             void rx_callback(void);
@@ -123,7 +123,7 @@
 
             // DS2480B state
             OWLevel _ULevel; // 1-Wire level
-            DS2480B_BPS _UBaud;  // baud rate
+            Baud _UBaud;  // baud rate
             uint8_t _UMode;  // command or data mode state
             uint8_t _USpeed; // 1-Wire communication speed