d-a-v/OneWireArduinoSlaveATTINY85
1
0
Fork 0
forked from IanF/OneWireArduinoSlaveATTINY85
Code Issues Pull Requests Releases Wiki Activity

implement resume command (0xA5)

Browse Source
This commit is contained in:
ntruchsess 2016-02-26 10:06:59 +01:00
parent 5621c45c02
commit a31256f60d
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OneWireSlave.cpp
View File

@ -46,6 +46,7 @@ byte OneWireSlave::receivingByte_;
byte OneWireSlave::searchRomBytePos_; byte OneWireSlave::searchRomBytePos_;
byte OneWireSlave::searchRomBitPos_; byte OneWireSlave::searchRomBitPos_;
bool OneWireSlave::searchRomInverse_; bool OneWireSlave::searchRomInverse_;
bool OneWireSlave::resumeCommandFlag_;
const byte* OneWireSlave::sendBuffer_; const byte* OneWireSlave::sendBuffer_;
byte* OneWireSlave::recvBuffer_; byte* OneWireSlave::recvBuffer_;
@ -77,6 +78,8 @@ void OneWireSlave::begin(const byte* rom, byte pinNumber)
memcpy(rom_, rom, 7); memcpy(rom_, rom, 7);
rom_[7] = crc8(rom_, 7); rom_[7] = crc8(rom_, 7);
resumeCommandFlag_ = false;
clientReceiveBitCallback_ = 0; clientReceiveBitCallback_ = 0;
// log("Enabling 1-wire library") // log("Enabling 1-wire library")
@ -416,9 +419,18 @@ void OneWireSlave::onBitReceived_(bool bit, bool error)
beginReceiveBytes_(scratchpad_, 8, &OneWireSlave::matchRomBytesReceived_); beginReceiveBytes_(scratchpad_, 8, &OneWireSlave::matchRomBytesReceived_);
return; return;
case 0xCC: // SKIP ROM case 0xCC: // SKIP ROM
// emulate a match rom operation resumeCommandFlag_ = false;
memcpy(scratchpad_, rom_, 8); beginReceiveBytes_(scratchpad_, 1, &OneWireSlave::notifyClientByteReceived_);
matchRomBytesReceived_(false); return;
case 0xA5: // RESUME
if (resumeCommandFlag_)
{
beginReceiveBytes_(scratchpad_, 1, &OneWireSlave::notifyClientByteReceived_);
}
else
{
beginWaitReset_();
}
return; return;
default: default:
ERROR("Unknown command"); ERROR("Unknown command");
@ -582,6 +594,7 @@ void OneWireSlave::matchRomBytesReceived_(bool error)
{ {
if (error) if (error)
{ {
resumeCommandFlag_ = false;
ERROR("error receiving match rom bytes"); ERROR("error receiving match rom bytes");
return; return;
} }
@ -589,13 +602,13 @@ void OneWireSlave::matchRomBytesReceived_(bool error)
if (memcmp(rom_, scratchpad_, 8) == 0) if (memcmp(rom_, scratchpad_, 8) == 0)
{ {
// log("ROM matched"); // log("ROM matched");
resumeCommandFlag_ = true;
beginReceiveBytes_(scratchpad_, 1, &OneWireSlave::notifyClientByteReceived_); beginReceiveBytes_(scratchpad_, 1, &OneWireSlave::notifyClientByteReceived_);
} }
else else
{ {
// log("ROM not matched"); // log("ROM not matched");
resumeCommandFlag_ = false;
beginWaitReset_(); beginWaitReset_();
} }
} }

1
OneWireSlave.h
View File

@ -102,6 +102,7 @@ private:
static byte searchRomBytePos_; static byte searchRomBytePos_;
static byte searchRomBitPos_; static byte searchRomBitPos_;
static bool searchRomInverse_; static bool searchRomInverse_;
static bool resumeCommandFlag_;
static const byte* sendBuffer_; static const byte* sendBuffer_;
static byte* recvBuffer_; static byte* recvBuffer_;