Diff: OneWire_Masters/DS2465/DS2465.hpp

Revision:

26:a361e3f42ba5

Parent:

24:8942d8478d68

Child:

27:d5aaefa252f1

diff -r bdb1c5a53b58 -r a361e3f42ba5 OneWire_Masters/DS2465/DS2465.hpp
--- a/OneWire_Masters/DS2465/DS2465.hpp	Tue Mar 22 15:18:00 2016 -0500
+++ b/OneWire_Masters/DS2465/DS2465.hpp	Wed Mar 23 15:25:40 2016 -0500
@@ -58,25 +58,20 @@
   // 1-Wire Master Commands
   virtual OneWireMaster::CmdResult OWInitMaster(void);
   virtual OneWireMaster::CmdResult OWReset(void);                                   // Issues a 1-Wire Reset Pulse
-  virtual OneWireMaster::CmdResult OWSearch(RomId & romId);
-  virtual OneWireMaster::CmdResult OWReadByte(uint8_t & recvbyte);
-  virtual OneWireMaster::CmdResult OWWriteByte(uint8_t sendbyte);
-  virtual OneWireMaster::CmdResult OWTouchBit(uint8_t & sendrecvbit);
-  virtual OneWireMaster::CmdResult OWSpeed(OW_SPEED new_speed);
-  virtual OneWireMaster::CmdResult OWLevel(OW_LEVEL new_level);
+  virtual OneWireMaster::CmdResult OWTouchBit(uint8_t & sendrecvbit, OW_LEVEL after_level);
+  virtual OneWireMaster::CmdResult OWReadByte(uint8_t & recvbyte, OW_LEVEL after_level);
+  virtual OneWireMaster::CmdResult OWWriteByte(uint8_t sendbyte, OW_LEVEL after_level);
   virtual OneWireMaster::CmdResult OWReadBlock(uint8_t *rx_buf, uint8_t rx_len);
   virtual OneWireMaster::CmdResult OWWriteBlock(const uint8_t *tran_buf, uint8_t tran_len);
   OneWireMaster::CmdResult OWWriteBlock(bool tx_mac, const uint8_t *tran_buf, uint8_t tran_len);
-  OneWireMaster::CmdResult OWPowerDown(void);
-  OneWireMaster::CmdResult OWPowerUp(void);
-  OneWireMaster::CmdResult ConfigureAPU(bool apu_enable);
-  OneWireMaster::CmdResult Triplet(Direction search_direction, uint8_t & status);
+  virtual OneWireMaster::CmdResult OWSpeed(OW_SPEED new_speed);
+  virtual OneWireMaster::CmdResult OWLevel(OW_LEVEL new_level);
+  virtual OneWireMaster::CmdResult OWSearch(RomId & romId);
   
-  virtual OneWireMaster::CmdResult OWWriteBytePower(uint8_t sendbyte);
-  virtual OneWireMaster::CmdResult OWReadBytePower(uint8_t & recvbyte);
-  virtual OneWireMaster::CmdResult OWReadBitPower(uint8_t applyPowerResponse);
-  
-  virtual OneWireMaster::CmdResult OWBlock(uint8_t *tran_buf, uint8_t tran_len);
+  OneWireMaster::CmdResult ConfigurePowerDown(bool pdn_enable);
+  OneWireMaster::CmdResult ConfigureAPU(bool apu_enable);
+  OneWireMaster::CmdResult ConfigureSPU(bool spu_enable);
+  OneWireMaster::CmdResult Triplet(Direction search_direction, uint8_t & status);
   
   //DS2465 Coprocessor Commands
   OneWireMaster::CmdResult Compute_NextMasterSecret(bool swap, unsigned int pageNum, PageRegion region);