Added the ability to track which direction frames are coming from

(from us or to us), import that detail from file formats that support
it, save it to file formats that support it. Also some bug fixes.
This commit is contained in:
Collin Kidder
2015-12-01 20:25:52 -05:00
parent 0ff076de3a
commit f6b5db9617
8 changed files with 111 additions and 39 deletions
+20 -1
View File
@@ -58,8 +58,14 @@ void ScriptContainer::setErrorWidget(QListWidget *list)
void ScriptContainer::setFilter(QJSValue id, QJSValue mask, QJSValue bus)
{
uint32_t idVal = id.toUInt();
uint32_t maskVal = mask.toUInt();
int busVal = bus.toInt();
qDebug() << "Called set filter";
qDebug() << id.toInt() << "*" << mask.toInt() << "*" << bus.toInt();
qDebug() << idVal << "*" << maskVal << "*" << busVal;
CANFilter filter;
filter.setFilter(idVal, maskVal, busVal);
filters.append(filter);
}
void ScriptContainer::setTickInterval(QJSValue interval)
@@ -77,6 +83,7 @@ void ScriptContainer::setTickInterval(QJSValue interval)
void ScriptContainer::clearFilters()
{
qDebug() << "Called clear filters";
filters.clear();
}
void ScriptContainer::sendFrame(QJSValue id, QJSValue length, QJSValue data)
@@ -84,6 +91,18 @@ void ScriptContainer::sendFrame(QJSValue id, QJSValue length, QJSValue data)
qDebug() << "called send frame";
}
void ScriptContainer::gotFrame(const CANFrame &frame)
{
for (int i = 0; i < filters.length(); i++)
{
if (filters[i].checkFilter(frame.ID, frame.bus))
{
return; //as soon as one filter matches we jump out
}
}
}
void ScriptContainer::tick()
{
if (tickFunction.isCallable())