Implementation of 1-Wire with added Alarm Search Functionality
Dependents: Max32630_One_Wire_Interface
Diff: Masters/DS2480B/DS2480B.h
- Revision:
- 74:23be10c32fa3
- Parent:
- 73:2cecc1372acc
- Child:
- 75:8b627804927c
diff -r 2cecc1372acc -r 23be10c32fa3 Masters/DS2480B/DS2480B.h --- a/Masters/DS2480B/DS2480B.h Thu May 12 14:38:16 2016 -0500 +++ b/Masters/DS2480B/DS2480B.h Fri May 13 07:48:35 2016 -0500 @@ -45,7 +45,6 @@ class DS2480B : public OneWireMaster { public: - enum DS2480B_BPS { BPS_9600 = 0, @@ -53,25 +52,25 @@ BPS_57600 = 4, BPS_115200 = 6 }; - + /**********************************************************//** * @brief DS2480B constructor - * + * * @details allows user to use existing Serial object * * On Entry: * @param[in] p_serial - pointer to existing serial object * * On Exit: - * @return + * @return **************************************************************/ DS2480B(mbed::Serial &p_serial); - - + + /**********************************************************//** * @brief DS2480B constructor - * - * @details Object instantiates a new serial object with no + * + * @details Object instantiates a new serial object with no * public access * * On Entry: @@ -80,47 +79,37 @@ * @param[in] baud - baudrate for uart * * On Exit: - * @return + * @return **************************************************************/ DS2480B(PinName tx, PinName rx); - - + + /**********************************************************//** - * @brief DS2480B destructor - * - * @details deletes serial object if owner + * @brief DS2480B destructor + * + * @details deletes serial object if owner * * On Entry: * * On Exit: - * @return + * @return **************************************************************/ virtual ~DS2480B(); - + + OneWireMaster::CmdResult DS2480B_ChangeBaud(DS2480B_BPS newbaud); - - - //Part of OneWireMaster that should be implemented for each master - //See OneWireMaster.h for documentation - - virtual OneWireMaster::CmdResult OWInitMaster(void); - - virtual OneWireMaster::CmdResult OWReset(void); - - virtual OneWireMaster::CmdResult OWTouchBitSetLevel(uint8_t & sendrecvbit, OWLevel after_level); + virtual OneWireMaster::CmdResult OWInitMaster(void); + virtual OneWireMaster::CmdResult OWReset(void); + virtual OneWireMaster::CmdResult OWTouchBitSetLevel(uint8_t & sendrecvbit, OWLevel after_level); virtual OneWireMaster::CmdResult OWWriteByteSetLevel(uint8_t sendbyte, OWLevel after_level); - virtual OneWireMaster::CmdResult OWReadByteSetLevel(uint8_t & recvbyte, OWLevel after_level); - virtual OneWireMaster::CmdResult OWSetSpeed(OWSpeed new_speed); + virtual OneWireMaster::CmdResult OWSetLevel(OWLevel new_level); - virtual OneWireMaster::CmdResult OWSetLevel(OWLevel new_level); - private: - void rx_callback(void); - + OneWireMaster::CmdResult DS2480B_Detect(void); OneWireMaster::CmdResult WriteCOM(uint32_t outlen, uint8_t *outbuf); OneWireMaster::CmdResult ReadCOM(uint32_t inlen, uint8_t *inbuf); @@ -128,16 +117,16 @@ void FlushCOM(void); void SetBaudCOM(uint8_t new_baud); int32_t bitacc(uint32_t op, uint32_t state, uint32_t loc, uint8_t *buf); - + mbed::Serial *_p_serial; bool _serial_owner; - + // DS2480B state OWLevel _ULevel; // 1-Wire level DS2480B_BPS _UBaud; // baud rate uint8_t _UMode; // command or data mode state uint8_t _USpeed; // 1-Wire communication speed - + static const size_t MAX_RX_BUFFER_LEN = 256; volatile struct ds2480b_circular_buff_s { @@ -151,5 +140,5 @@ } } -#endif /*DS2480B_H*/ +#endif