Diff: OneWire_Masters/DS248x/ds248x.h

Revision:

23:e8e403d61359

Parent:

21:00c94aeb533e

Child:

24:8942d8478d68

--- a/OneWire_Masters/DS248x/ds248x.h	Mon Mar 21 21:41:36 2016 +0000
+++ b/OneWire_Masters/DS248x/ds248x.h	Mon Mar 21 23:18:45 2016 +0000
@@ -36,7 +36,6 @@
 
 
 #include "mbed.h"
-#include "OneWireInterface.h"
 #include "OneWireMaster.h"
 
 
@@ -114,13 +113,6 @@
     
     static const int I2C_READ_OK = 0;
     
-    /**
-    * Member functions that directly support DS248x I2C to 1-wire
-    * masters are documented in this file.  Virtual function 
-    * inerited from the interface class 'OneWireInterface'
-    * are documented in 'OneWireInterface.h', trying to follow
-    * a 'DRY' methodology, Don't Repeat Yourself.
-    */ 
     
     /**********************************************************//**
     * @brief Ds248x constructor
@@ -183,7 +175,7 @@
     *            FALSE device not detected or failure to write 
     *            configuration byte
     **************************************************************/
-    OneWireInterface::CmdResult detect(void);
+    OneWireMaster::CmdResult detect(void);
     
     
     /**********************************************************//**
@@ -197,7 +189,7 @@
     *    @return TRUE if device was reset
     *            FALSE device not detected or failure to perform reset
     **************************************************************/
-    OneWireInterface::CmdResult reset(void);
+    OneWireMaster::CmdResult reset(void);
     
     
     /**********************************************************//**
@@ -215,7 +207,7 @@
     *    @return TRUE: config written and response correct
     *            FALSE: response incorrect
     **************************************************************/
-    OneWireInterface::CmdResult write_config(uint8_t config);
+    OneWireMaster::CmdResult write_config(uint8_t config);
     
     
     /**********************************************************//**
@@ -231,7 +223,7 @@
     *    @return TRUE if channel selected
     *            FALSE device not detected or failure to perform select
     **************************************************************/
-    OneWireInterface::CmdResult channel_select(uint8_t channel);
+    OneWireMaster::CmdResult channel_select(uint8_t channel);
     
     
     /**********************************************************//**
@@ -248,7 +240,7 @@
     *    @return TRUE: parameter successfully adjusted
     *            FALSE: failed to adjust parameter
     **************************************************************/
-    OneWireInterface::CmdResult adjust_timing(uint8_t param, uint8_t val);
+    OneWireMaster::CmdResult adjust_timing(uint8_t param, uint8_t val);
     
     
     /**********************************************************//**
@@ -267,37 +259,37 @@
     * On Exit:
     *    @return The Ds248x status byte result from the triplet command
     **************************************************************/
-    OneWireInterface::CmdResult search_triplet(uint8_t search_direction, uint8_t & status);
+    OneWireMaster::CmdResult search_triplet(uint8_t search_direction, uint8_t & status);
     
     
-    //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 OneWireInterface::CmdResult OWReadBlock(uint8_t *rx_buf, uint8_t rx_len);
+    virtual OneWireMaster::CmdResult OWReadBlock(uint8_t *rx_buf, uint8_t rx_len);
     
-    virtual OneWireInterface::CmdResult OWSearch(RomId & romId);
+    virtual OneWireMaster::CmdResult OWSearch(RomId & romId);
 
-    virtual OneWireInterface::CmdResult OWSpeed(OW_SPEED new_speed);
+    virtual OneWireMaster::CmdResult OWSpeed(OW_SPEED new_speed);
 
-    virtual OneWireInterface::CmdResult OWLevel(OW_LEVEL new_level);
+    virtual OneWireMaster::CmdResult OWLevel(OW_LEVEL new_level);
 
-    virtual OneWireInterface::CmdResult OWWriteBytePower(uint8_t sendbyte);
+    virtual OneWireMaster::CmdResult OWWriteBytePower(uint8_t sendbyte);
 
-    virtual OneWireInterface::CmdResult OWReadBitPower(uint8_t applyPowerResponse);
+    virtual OneWireMaster::CmdResult OWReadBitPower(uint8_t applyPowerResponse);
     
-    virtual OneWireInterface::CmdResult OWReadBytePower(uint8_t & recvbyte);
+    virtual OneWireMaster::CmdResult OWReadBytePower(uint8_t & recvbyte);
     
     private: