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

more reliable search rom (but also with more active waiting)

Browse Source
This commit is contained in:
Youen Toupin 2015-04-25 00:06:00 +02:00
parent f53e2adae8
commit c0250f685b
1 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
OneWireIO.ino
View File

@ -216,7 +216,9 @@ void onewireInterruptImpl(void)
byte currentByte = owROM[searchROMCurrentByte]; byte currentByte = owROM[searchROMCurrentByte];
searchRomNextBit = bitRead(currentByte, searchROMCurrentBit); searchRomNextBit = bitRead(currentByte, searchROMCurrentBit);
searchRomNextBitToSend = searchROMSendingInverse ? !searchRomNextBit : searchRomNextBit; searchRomNextBitToSend = searchROMSendingInverse ? !searchRomNextBit : searchRomNextBit;
attachInterrupt(InterruptNumber, onewireInterruptSearchROM, FALLING); //attachInterrupt(InterruptNumber, onewireInterruptSearchROM, FALLING);
setTimerEvent(10, owSearchSendBit);
detachInterrupt(InterruptNumber);
return; return;
} }
} }
@ -225,6 +227,57 @@ void onewireInterruptImpl(void)
} }
bool ignoreNextFallingEdge = false; bool ignoreNextFallingEdge = false;
void owSearchSendBit()
{
// wait for a falling edge (active wait is more reliable than interrupts to send the bit fast enough)
while (!owPin.read());
while (owPin.read());
//sendBit(searchRomNextBitToSend);
if (searchRomNextBitToSend)
{
//delayMicroseconds(SendBitDuration);
ignoreNextFallingEdge = false;
}
else
{
owPullLow();
//delayMicroseconds(SendBitDuration);
//owRelease();
ignoreNextFallingEdge = true;
}
unsigned long sendBitStart = micros();
if (searchROMSendingInverse)
{
searchROMSendingInverse = false;
searchROMReadingMasterResponseBit = true;
}
else
{
searchROMSendingInverse = true;
}
byte currentByte = owROM[searchROMCurrentByte];
searchRomNextBit = bitRead(currentByte, searchROMCurrentBit);
searchRomNextBitToSend = searchROMSendingInverse ? !searchRomNextBit : searchRomNextBit;
if (searchROMReadingMasterResponseBit)
{
ignoreNextFallingEdge = true;
attachInterrupt(InterruptNumber, onewireInterruptSearchROM, FALLING);
}
else
{
setTimerEvent(10, owSearchSendBit);
}
delayMicroseconds(SendBitDuration - (micros() - sendBitStart));
owRelease();
}
void onewireInterruptSearchROM() void onewireInterruptSearchROM()
{ {
if (ignoreNextFallingEdge) if (ignoreNextFallingEdge)
@ -262,6 +315,14 @@ void onewireInterruptSearchROM()
attachInterrupt(InterruptNumber, onewireInterrupt, FALLING); attachInterrupt(InterruptNumber, onewireInterrupt, FALLING);
return; return;
} }
byte currentByte = owROM[searchROMCurrentByte];
searchRomNextBit = bitRead(currentByte, searchROMCurrentBit);
searchRomNextBitToSend = searchROMSendingInverse ? !searchRomNextBit : searchRomNextBit;
setTimerEvent(10, owSearchSendBit);
detachInterrupt(InterruptNumber);
return;
} }
else else
{ {
@ -290,7 +351,10 @@ void onewireInterruptSearchROM()
bool readBit() bool readBit()
{ {
delayMicroseconds(ReadBitSamplingTime); delayMicroseconds(ReadBitSamplingTime);
return owPin.read(); bool bit = owPin.read();
//owOutTestPin.write(!owOutTestPin.read());
//owOutTestPin.write(!owOutTestPin.read());
return bit;
} }
void sendBit(bool bit) void sendBit(bool bit)
@ -298,6 +362,7 @@ void sendBit(bool bit)
if (bit) if (bit)
{ {
delayMicroseconds(SendBitDuration); delayMicroseconds(SendBitDuration);
ignoreNextFallingEdge = false;
} }
else else
{ {