mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i2c decoder no longer tries to read invalid buffer region

This commit is contained in:
Chris Esposito 2018-11-04 10:36:11 +11:00
parent d65b647ab4
commit 0f00af0c08
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Desktop_Interface/i2cdecoder.cpp
View File

@ -7,7 +7,8 @@ static const uint32_t kClockMultiplier = 10;
i2cDecoder::i2cDecoder(isoBuffer* sda_in, isoBuffer* scl_in, uint32_t clockRate) : i2cDecoder::i2cDecoder(isoBuffer* sda_in, isoBuffer* scl_in, uint32_t clockRate) :
QObject(nullptr), QObject(nullptr),
sda(sda_in), sda(sda_in),
scl(scl_in) scl(scl_in),
serialPtr_bit(sda->back * 8)
{ {
setStepSize(clockRate, kClockMultiplier); setStepSize(clockRate, kClockMultiplier);
} }
@ -15,12 +16,15 @@ i2cDecoder::i2cDecoder(isoBuffer* sda_in, isoBuffer* scl_in, uint32_t clockRate)
void i2cDecoder::run() void i2cDecoder::run()
{ {
qDebug() << "i2cDecoder::run()"; qDebug() << "i2cDecoder::run()";
while (serialDistance(sda) > SERIAL_DELAY * sda->sampleRate_bit) while (serialDistance(sda) > SERIAL_DELAY * sda->sampleRate_bit)
{ {
updateBitValues(); updateBitValues();
runStateMachine(); runStateMachine();
serialPtr_bit += stepSize; serialPtr_bit += stepSize;
qDebug() << serialPtr_bit; if (serialPtr_bit > (sda->bufferEnd * 8)){
serialPtr_bit -= (sda->bufferEnd * 8);
}
// qDebug () << serialPtr_bit;
currentStepIndex = (currentStepIndex + 1) % stepsPerBit; currentStepIndex = (currentStepIndex + 1) % stepsPerBit;
} }
} }
@ -36,14 +40,15 @@ int i2cDecoder::serialDistance(isoBuffer* buffer)
} }
void i2cDecoder::updateBitValues(){ void i2cDecoder::updateBitValues(){
previousSdaValue = currentSdaValue;
previousSclValue = currentSclValue;
int coord_byte = serialPtr_bit/8; int coord_byte = serialPtr_bit/8;
int coord_bit = serialPtr_bit - (8*coord_byte); int coord_bit = serialPtr_bit - (8*coord_byte);
unsigned char dataByteSda = sda->buffer[coord_byte]; unsigned char dataByteSda = sda->buffer[coord_byte];
unsigned char dataByteScl = scl->buffer[coord_byte]; unsigned char dataByteScl = scl->buffer[coord_byte];
unsigned char mask = (1 << coord_bit); unsigned char mask = (1 << coord_bit);
previousSdaValue = currentSdaValue; currentSdaValue = dataByteSda & mask;
previousSclValue = currentSclValue;
currentSdaValue = dataByteSda & mask;
currentSclValue = dataByteScl & mask; currentSclValue = dataByteScl & mask;
} }
@ -51,7 +56,7 @@ void i2cDecoder::updateBitValues(){
void i2cDecoder::setStepSize(uint32_t clockRate, uint32_t multiplier) void i2cDecoder::setStepSize(uint32_t clockRate, uint32_t multiplier)
{ {
stepSize = (double)((sda->sampleRate_bit)/clockRate)/(double)multiplier; stepSize = (double)((sda->sampleRate_bit)/clockRate)/(double)multiplier;
stepsPerBit = multiplier; stepsPerBit = multiplier;
} }
void i2cDecoder::runStateMachine() void i2cDecoder::runStateMachine()
@ -64,12 +69,16 @@ void i2cDecoder::runStateMachine()
// if (sclEdge == edge::rising || sclEdge == edge::falling) // if (sclEdge == edge::rising || sclEdge == edge::falling)
// qDebug() << "sclEdge"; // qDebug() << "sclEdge";
qDebug() << "sdaEdge" << (uint8_t)sdaEdge << "sclEdge" << (uint8_t)sclEdge; // qDebug() << "sdaEdge" << (uint8_t)sdaEdge << "sclEdge" << (uint8_t)sclEdge;
if ((sdaEdge == edge::rising) && (sclEdge == edge::falling)) // INVALID STATE TRANSITION if ((sdaEdge == edge::rising) && (sclEdge == edge::falling)) // INVALID STATE TRANSITION
{ {
state = transmissionState::unknown; state = transmissionState::unknown;
return; qDebug() << "Dumping I2C state and aborting...";
for (uint8_t i=0; i < 32; i++)
qDebug("%x\t%x", sda->buffer[serialPtr_bit/8 - i] & 0xFF, scl->buffer[serialPtr_bit/8 - i] & 0xFF);
throw std::runtime_error("unknown i2c transmission state");
return;
} }
if ((sdaEdge == edge::rising) && (sclEdge == edge::held_high)) // START if ((sdaEdge == edge::rising) && (sclEdge == edge::held_high)) // START
@ -114,7 +123,7 @@ edge i2cDecoder::edgeDetection(uint8_t current, uint8_t prev)
void i2cDecoder::decodeAddress(edge sdaEdge, edge sclEdge) void i2cDecoder::decodeAddress(edge sdaEdge, edge sclEdge)
{ {
// Sample in the middle of the bits! // Sample in the middle of the bits!
if (currentStepIndex != (stepsPerBit/2)) if (currentStepIndex != (stepsPerBit/2))
return; return;
// Read in the next bit. // Read in the next bit.
@ -154,7 +163,7 @@ void i2cDecoder::startCondition()
{ {
currentBitIndex = 0; currentBitIndex = 0;
currentStepIndex = 0; currentStepIndex = 0;
address = 0x0000; address = 0x0000;
state = transmissionState::address; state = transmissionState::address;
qDebug() << "I2C START"; qDebug() << "I2C START";
} }
@ -167,10 +176,12 @@ void i2cDecoder::stopCondition()
currentBitIndex = 0; currentBitIndex = 0;
currentStepIndex = 0; currentStepIndex = 0;
state = transmissionState::data; state = transmissionState::data;
currentDataByte = 0; currentDataByte = 0;
qDebug() << "Address =" << address;
break; break;
case transmissionState::data: case transmissionState::data:
state = transmissionState::idle; state = transmissionState::idle;
qDebug() << "Data =" << currentDataByte;
break; break;
} }
qDebug() << "I2C STOP"; qDebug() << "I2C STOP";

2
Desktop_Interface/i2cdecoder.h
View File

@ -38,7 +38,7 @@ public:
uint8_t previousSdaValue = 0; uint8_t previousSdaValue = 0;
uint8_t currentSclValue = 0; uint8_t currentSclValue = 0;
uint8_t previousSclValue = 0; uint8_t previousSclValue = 0;
uint64_t serialPtr_bit = 0; uint64_t serialPtr_bit;
transmissionState state = transmissionState::unknown; transmissionState state = transmissionState::unknown;
// Data Transmission // Data Transmission