Diff: OneWire_Masters/GPIO/owgpio.h

Revision:

32:bce180b544ed

Parent:

28:057bb14d3cee

Child:

52:4cba20c21941

--- a/OneWire_Masters/GPIO/owgpio.h	Tue Mar 29 16:36:12 2016 -0500
+++ b/OneWire_Masters/GPIO/owgpio.h	Wed Mar 30 16:50:29 2016 -0500
@@ -80,21 +80,19 @@
     
     virtual OneWireMaster::CmdResult OWReset(void);
     
-    virtual OneWireMaster::CmdResult OWTouchBit(uint8_t & sendrecvbit, OW_LEVEL after_level);
+    virtual OneWireMaster::CmdResult OWTouchBit(uint8_t & sendrecvbit, OWLevel after_level);
 
-    virtual OneWireMaster::CmdResult OWWriteByte(uint8_t sendbyte, OW_LEVEL after_level);
+    virtual OneWireMaster::CmdResult OWWriteByte(uint8_t sendbyte, OWLevel after_level);
 
-    virtual OneWireMaster::CmdResult OWReadByte(uint8_t & recvbyte, OW_LEVEL after_level);
+    virtual OneWireMaster::CmdResult OWReadByte(uint8_t & recvbyte, OWLevel after_level);
     
     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 OneWireMaster::CmdResult OWSearch(RomId & romId);
 
-    virtual OneWireMaster::CmdResult OWSpeed(OW_SPEED new_speed);
+    virtual OneWireMaster::CmdResult OWSetSpeed(OWSpeed new_speed);
 
-    virtual OneWireMaster::CmdResult OWLevel(OW_LEVEL new_level);
+    virtual OneWireMaster::CmdResult OWSetLevel(OWLevel new_level);
     
 private:
 
@@ -102,8 +100,8 @@
     const unsigned int _ow_pin; 
 
     DigitalOut _ext_spu;
-    OW_SPEED _ow_speed;
-    OW_LEVEL _ow_level; 
+    OWSpeed _ow_speed;
+    OWLevel _ow_level; 
     
     inline void write_ow_gpio_low();
     inline void write_ow_gpio_high();