Implementation of 1-Wire with added Alarm Search Functionality
Dependents: Max32630_One_Wire_Interface
Diff: OneWire_Masters/DS2465/DS2465.hpp
- Revision:
- 24:8942d8478d68
- Parent:
- 21:00c94aeb533e
- Child:
- 26:a361e3f42ba5
diff -r e8e403d61359 -r 8942d8478d68 OneWire_Masters/DS2465/DS2465.hpp --- a/OneWire_Masters/DS2465/DS2465.hpp Mon Mar 21 23:18:45 2016 +0000 +++ b/OneWire_Masters/DS2465/DS2465.hpp Tue Mar 22 14:24:53 2016 -0500 @@ -21,17 +21,6 @@ REGION_SECOND_HALF = 0x02 }; - enum OWConfigAddr - { - ADDR_TRSTL_REG = 0x68, - ADDR_TMSP_REG = 0x69, - ADDR_TW0L_REG = 0x6A, - ADDR_TREC0_REG = 0x6B, - ADDR_RWPU_REG = 0x6C, - ADDR_TW1L_REG = 0x6D - }; - - // DS2465 addresses enum MemoryAddr { ADDR_SPAD = 0x00, @@ -41,6 +30,12 @@ ADDR_MAC_READ = 0x63, ADDR_SHA_SELECT_REG = 0x66, ADDR_WCFG_REG = 0x67, + ADDR_TRSTL_REG = 0x68, + ADDR_TMSP_REG = 0x69, + ADDR_TW0L_REG = 0x6A, + ADDR_TREC0_REG = 0x6B, + ADDR_RWPU_REG = 0x6C, + ADDR_TW1L_REG = 0x6D, ADDR_USER_MEM_PAGE_0 = 0x80, ADDR_USER_MEM_PAGE_1 = 0xA0 }; @@ -56,50 +51,32 @@ // DS2465 Memory Commands OneWireMaster::CmdResult ReadMemory(std::uint8_t addr, std::uint8_t * buf, size_t bufLen, bool skip_set_pointer = false) const; - OneWireMaster::CmdResult WriteScratchpad(std::uint8_t addr, const std::uint8_t * buf, size_t bufLen) const; + OneWireMaster::CmdResult WriteMemory(std::uint8_t addr, const std::uint8_t * buf, std::size_t bufLen) { return CWriteMemory(addr, buf, bufLen); } + OneWireMaster::CmdResult WriteScratchpad(const std::uint8_t * buf, std::size_t bufLen) const { return CWriteMemory(ADDR_SPAD, buf, bufLen); } OneWireMaster::CmdResult CopyScratchpad(bool dest_secret, unsigned int pageNum, bool notFull, unsigned int segmentNum); - - // DS2465 Configuration Commands - OneWireMaster::CmdResult ReadOneWireConfig(OWConfigAddr addr, std::uint8_t & config) const; - OneWireMaster::CmdResult WriteOneWireConfig(OWConfigAddr addr, unsigned int ovr, unsigned int std); // 1-Wire Master Commands virtual OneWireMaster::CmdResult OWInitMaster(void); virtual OneWireMaster::CmdResult OWReset(void); // Issues a 1-Wire Reset Pulse - virtual OneWireMaster::CmdResult OWWriteByte(uint8_t sendbyte); + virtual OneWireMaster::CmdResult OWSearch(RomId & romId); virtual OneWireMaster::CmdResult OWReadByte(uint8_t & recvbyte); - virtual OneWireMaster::CmdResult OWTouchByte(uint8_t & sendrecvbyte); + virtual OneWireMaster::CmdResult OWWriteByte(uint8_t sendbyte); virtual OneWireMaster::CmdResult OWTouchBit(uint8_t & sendrecvbit); - virtual OneWireMaster::CmdResult OWWriteBit(uint8_t sendbit); - virtual OneWireMaster::CmdResult OWReadBit(uint8_t & recvbit); - virtual OneWireMaster::CmdResult OWBlock(uint8_t *tran_buf, uint8_t tran_len); - virtual OneWireMaster::CmdResult OWFirst(RomId & romId); - virtual OneWireMaster::CmdResult OWNext(RomId & romId); - virtual OneWireMaster::CmdResult OWVerify(const RomId & romId); - virtual void OWTargetSetup(RomId & romId); - virtual void OWFamilySkipSetup(void); - virtual OneWireMaster::CmdResult OWSearch(RomId & romId); - virtual OneWireMaster::CmdResult OWReadROM(RomId & romId); - virtual OneWireMaster::CmdResult OWSkipROM(void); - virtual OneWireMaster::CmdResult OWMatchROM(const RomId & romId); - virtual OneWireMaster::CmdResult OWOverdriveSkipROM(void); - virtual OneWireMaster::CmdResult OWResume(void); - virtual OneWireMaster::CmdResult OWOverdriveMatchROM(const RomId & romId); - - // Extended 1-Wire functions virtual OneWireMaster::CmdResult OWSpeed(OW_SPEED new_speed); virtual OneWireMaster::CmdResult OWLevel(OW_LEVEL new_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 OWWriteBytePower(uint8_t sendbyte); virtual OneWireMaster::CmdResult OWReadBytePower(uint8_t & recvbyte); virtual OneWireMaster::CmdResult OWReadBitPower(uint8_t applyPowerResponse); - 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); - virtual OneWireMaster::CmdResult OWReadBlock(uint8_t *rx_buf, uint8_t rx_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 OWBlock(uint8_t *tran_buf, uint8_t tran_len); //DS2465 Coprocessor Commands OneWireMaster::CmdResult Compute_NextMasterSecret(bool swap, unsigned int pageNum, PageRegion region); @@ -115,22 +92,24 @@ const std::uint8_t (&deviceScratchpad)[deviceScratchpad_len], const std::uint8_t (&SSecret_data)[SSecret_data_len]); private: - static const int POLL_LIMIT = 200; + struct Config + { + bool c1WS, cSPU, cPDN, cAPU; + + std::uint8_t readByte() const; + std::uint8_t writeByte() const; + + void reset(); + Config() { reset(); } + }; I2C & m_I2C_interface; std::uint8_t m_I2C_address; - - std::uint8_t c1WS, cSPU, cPDN, cAPU; - bool short_detected; + Config m_curConfig; - // Search state - std::uint8_t m_lastDiscrepancy; - std::uint8_t m_lastFamilyDiscrepancy; - std::uint8_t m_lastDeviceFlag; - - //DS2465 Configuration Commands - OneWireMaster::CmdResult Write_Config(uint8_t config); - OneWireMaster::CmdResult Write_Command_Reg(uint8_t cmd, uint8_t par, bool poll) const; + OneWireMaster::CmdResult CWriteMemory(std::uint8_t addr, const std::uint8_t * buf, std::size_t bufLen) const; + OneWireMaster::CmdResult WriteConfig(const Config & config); + OneWireMaster::CmdResult PollBusy(uint8_t * pStatus = NULL); }; #endif