Diff: OneWire_Masters/DS2480B/ds2480b.h

Revision:

23:e8e403d61359

Parent:

17:b646b1e3970b

Child:

24:8942d8478d68

diff -r 686273e55cdc -r e8e403d61359 OneWire_Masters/DS2480B/ds2480b.h
--- a/OneWire_Masters/DS2480B/ds2480b.h	Mon Mar 21 21:41:36 2016 +0000
+++ b/OneWire_Masters/DS2480B/ds2480b.h	Mon Mar 21 23:18:45 2016 +0000
@@ -36,7 +36,6 @@
 
 
 #include "mbed.h"
-#include "OneWireInterface.h"
 #include "OneWireMaster.h"
 
 
@@ -88,32 +87,34 @@
     virtual ~Ds2480b();
     
     
-    //Part of OneWireInterface that should be implemented for each master
-    //See OneWireInterface.h for documentation
+    //Part of OneWireMaster that should be implemented for each master
+    //See OneWireMaster.h for documentation
     
-    virtual OneWireInterface::CmdResult OWInitMaster(void);
+    virtual OneWireMaster::CmdResult OWInitMaster(void);
     
-    virtual OneWireInterface::CmdResult OWReset(void);
+    virtual OneWireMaster::CmdResult OWReset(void);
     
-    virtual OneWireInterface::CmdResult OWTouchBit(uint8_t & sendrecvbit);
+    virtual OneWireMaster::CmdResult OWTouchBit(uint8_t & sendrecvbit);
 
-    virtual OneWireInterface::CmdResult OWWriteByte(uint8_t sendbyte);
+    virtual OneWireMaster::CmdResult OWWriteByte(uint8_t sendbyte);
 
-    virtual OneWireInterface::CmdResult OWReadByte(uint8_t & recvbyte);
+    virtual OneWireMaster::CmdResult OWReadByte(uint8_t & recvbyte);
     
-    virtual OneWireInterface::CmdResult OWWriteBlock(const uint8_t *tran_buf, uint8_t tran_len);
+    virtual OneWireMaster::CmdResult OWWriteBlock(const uint8_t *tran_buf, uint8_t tran_len);
+    
+    virtual OneWireMaster::CmdResult OWReadBlock(uint8_t *rx_buf, uint8_t rx_len);
     
-    virtual OneWireInterface::CmdResult OWReadBlock(uint8_t *rx_buf, uint8_t rx_len);
-    
-    virtual OneWireInterface::CmdResult OWSearch(RomId & romId);
+    virtual OneWireMaster::CmdResult OWSearch(RomId & romId);
+
+    virtual OneWireMaster::CmdResult OWSpeed(OW_SPEED new_speed);
 
-    virtual OneWireInterface::CmdResult OWSpeed(OW_SPEED new_speed);
+    virtual OneWireMaster::CmdResult OWLevel(OW_LEVEL new_level);
 
-    virtual OneWireInterface::CmdResult OWLevel(OW_LEVEL new_level);
+    virtual OneWireMaster::CmdResult OWWriteBytePower(uint8_t sendbyte);
 
-    virtual OneWireInterface::CmdResult OWWriteBytePower(uint8_t sendbyte);
-
-    virtual OneWireInterface::CmdResult OWReadBitPower(uint8_t applyPowerResponse);
+    virtual OneWireMaster::CmdResult OWReadBitPower(uint8_t applyPowerResponse);
+    
+    virtual OneWireMaster::CmdResult OWReadBytePower(uint8_t & recvbyte);
     
     private: