t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional functionality for scripting interface.

Browse Source 
In progress but raw CAN works now.
This commit is contained in:
Collin Kidder
2017-08-22 20:03:58 -04:00
parent 7c3fef54f9
commit 6ef5757a4d
6 changed files with 161 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/udsscanwindow.cpp
+2 -14
View File
@@ -165,20 +165,8 @@ void UDSScanWindow::dumpNode(QTreeWidgetItem* item, QFile *file, int indent)
void UDSScanWindow::sendOnBuses(UDS_MESSAGE test, int buses)
{
//int busList = buses;
//if (busList < ui->cbBuses->count() - 1)
//{
test.bus = buses;
sendingFrames.append(test);
//}
/*else
{
for (int c = 0; c < ui->cbBuses->count() - 1; c++)
{
test.bus = c;
sendingFrames.append(test);
}
}*/
test.bus = buses;
sendingFrames.append(test);
}
void UDSScanWindow::scanUDS()
scriptcontainer.cpp
+89 -70
View File
@@ -4,9 +4,12 @@
#include "scriptcontainer.h"
#include "connections/canconmanager.h"
ScriptContainer::ScriptContainer(QString& pConName):
mConName(pConName)
ScriptContainer::ScriptContainer()
{
canHelper = new CANScriptHelper(&scriptEngine);
isoHelper = new ISOTPScriptHelper;
udsHelper = new UDSScriptHelper;
elapsedTime.start();
connect(&timer, SIGNAL(timeout()), this, SLOT(tick()));
}
@@ -14,25 +17,39 @@ void ScriptContainer::compileScript()
{
QJSValue result = scriptEngine.evaluate(scriptText, fileName);
errorWidget->clear();
if (result.isError() && errorWidget)
if (logWidget)
{
errorWidget->addItem("SCRIPT EXCEPTION!");
errorWidget->addItem("Line: " + result.property("lineNumber").toString());
errorWidget->addItem(result.property("message").toString());
errorWidget->addItem("Stack:");
errorWidget->addItem(result.property("stack").toString());
logWidget->addItem("");
logWidget->addItem("Compiling script " + fileName);
}
if (result.isError() && logWidget)
{
logWidget->addItem("SCRIPT EXCEPTION!");
logWidget->addItem("Line: " + result.property("lineNumber").toString());
logWidget->addItem(result.property("message").toString());
logWidget->addItem("Stack:");
logWidget->addItem(result.property("stack").toString());
}
else
{
compiledScript = result;
//Add a bunch of helper objects into javascript that the scripts
//can use to interact with the CAN buses
QJSValue hostObj = scriptEngine.newQObject(this);
scriptEngine.globalObject().setProperty("host", hostObj);
QJSValue canObj = scriptEngine.newQObject(canHelper);
scriptEngine.globalObject().setProperty("can", canObj);
QJSValue isoObj = scriptEngine.newQObject(isoHelper);
scriptEngine.globalObject().setProperty("isotp", isoObj);
QJSValue udsObj = scriptEngine.newQObject(udsHelper);
scriptEngine.globalObject().setProperty("uds", udsObj);
//Find out which callbacks the script has created.
setupFunction = scriptEngine.globalObject().property("setup");
gotFrameFunction = scriptEngine.globalObject().property("gotFrame");
canHelper->setRxCallback(scriptEngine.globalObject().property("gotCANFrame"));
tickFunction = scriptEngine.globalObject().property("tick");
if (setupFunction.isCallable())
@@ -41,47 +58,23 @@ void ScriptContainer::compileScript()
QJSValue res = setupFunction.call();
if (res.isError())
{
errorWidget->addItem("Error in setup function on line " + res.property("lineNumber").toString());
errorWidget->addItem(res.property("message").toString());
logWidget->addItem("Error in setup function on line " + res.property("lineNumber").toString());
logWidget->addItem(res.property("message").toString());
}
}
if (gotFrameFunction.isCallable()) qDebug() << "gotFrame exists";
if (tickFunction.isCallable()) qDebug() << "tick exists";
}
}
void ScriptContainer::setErrorWidget(QListWidget *list)
void ScriptContainer::setLogWidget(QListWidget *list)
{
errorWidget = list;
logWidget = list;
}
void ScriptContainer::setFilter(QJSValue id, QJSValue mask, QJSValue bus)
void ScriptContainer::log(QJSValue logString)
{
uint32_t idVal = id.toUInt();
uint32_t maskVal = mask.toUInt();
int busVal = bus.toInt();
qDebug() << "Called set filter";
qDebug() << idVal << "*" << maskVal << "*" << busVal;
CANFilter filter;
filter.setFilter(idVal, maskVal, busVal);
filters.append(filter);
qDebug() << "FIXME setFilter";
CANConnection* conn_p = CANConManager::getInstance()->getByName(mConName);
if(conn_p)
{
//CANFlt canFlt;
for(int i=0 ; i<conn_p->getNumBuses() ; i++)
{
foreach(const CANFilter& flt, filters)
{
if(flt.bus==i) {
conn_p->addTargettedFrame(busVal, idVal, maskVal, this);
}
}
}
}
QString val = logString.toString();
logWidget->addItem(QString::number(elapsedTime.elapsed()) + ": " + val);
}
void ScriptContainer::setTickInterval(QJSValue interval)
@@ -96,20 +89,59 @@ void ScriptContainer::setTickInterval(QJSValue interval)
else timer.stop();
}
void ScriptContainer::clearFilters()
void ScriptContainer::tick()
{
qDebug() << "Called clear filters";
filters.clear();
qDebug() << "FIXME clearFilters";
CANConnection* conn_p = CANConManager::getInstance()->getByName(mConName);
if(conn_p)
if (tickFunction.isCallable())
{
conn_p->removeAllTargettedFrames(this);
//qDebug() << "Calling tick function";
QJSValue res = tickFunction.call();
if (res.isError())
{
logWidget->addItem("Error in tick function on line " + res.property("lineNumber").toString());
logWidget->addItem(res.property("message").toString());
}
}
}
void ScriptContainer::sendFrame(QJSValue bus, QJSValue id, QJSValue length, QJSValue data)
/* CANScriptHandler Methods */
CANScriptHelper::CANScriptHelper(QJSEngine *engine)
{
scriptEngine = engine;
}
void CANScriptHelper::setRxCallback(QJSValue cb)
{
gotFrameFunction = cb;
}
void CANScriptHelper::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() << idVal << "*" << maskVal << "*" << busVal;
CANFilter filter;
filter.setFilter(idVal, maskVal, busVal);
filters.append(filter);
CANConManager::getInstance()->addTargettedFrame(busVal, idVal, maskVal, this);
}
void CANScriptHelper::clearFilters()
{
qDebug() << "Called clear filters";
foreach (CANFilter filter, filters)
{
CANConManager::getInstance()->removeTargettedFrame(filter.bus, filter.ID, filter.mask, this);
}
filters.clear();
}
void CANScriptHelper::sendFrame(QJSValue bus, QJSValue id, QJSValue length, QJSValue data)
{
CANFrame frame;
frame.extended = false;
@@ -125,17 +157,15 @@ void ScriptContainer::sendFrame(QJSValue bus, QJSValue id, QJSValue length, QJSV
}
frame.bus = (uint32_t)bus.toInt();
if (frame.bus > 1) frame.bus = 1;
//if (frame.bus > 1) frame.bus = 1;
if (frame.ID > 0x7FF) frame.extended = true;
qDebug() << "sending frame from script";
CANConnection* conn_p = CANConManager::getInstance()->getByName(mConName);
if(conn_p)
conn_p->sendFrame(frame);
CANConManager::getInstance()->sendFrame(frame);
}
void ScriptContainer::gotFrame(const CANFrame &frame)
void CANScriptHelper::gotTargettedFrame(const CANFrame &frame)
{
if (!gotFrameFunction.isCallable()) return; //nothing to do if we can't even call the function
//qDebug() << "Got frame in script interface";
@@ -145,7 +175,8 @@ void ScriptContainer::gotFrame(const CANFrame &frame)
{
QJSValueList args;
args << frame.bus << frame.ID << frame.len;
QJSValue dataBytes = scriptEngine.newArray(frame.len);
QJSValue dataBytes = scriptEngine->newArray(frame.len);
for (unsigned int j = 0; j < frame.len; j++) dataBytes.setProperty(j, QJSValue(frame.data[j]));
args.append(dataBytes);
gotFrameFunction.call(args);
@@ -154,16 +185,4 @@ void ScriptContainer::gotFrame(const CANFrame &frame)
}
}
void ScriptContainer::tick()
{
if (tickFunction.isCallable())
{
//qDebug() << "Calling tick function";
QJSValue res = tickFunction.call();
if (res.isError())
{
errorWidget->addItem("Error in tick function on line " + res.property("lineNumber").toString());
errorWidget->addItem(res.property("message").toString());
}
}
}
scriptcontainer.h
+46 -10
View File
@@ -4,30 +4,64 @@
#include "can_structs.h"
#include "canfilter.h"
#include <QElapsedTimer>
#include <QJSEngine>
#include <QTimer>
#include <qlistwidget.h>
class CANScriptHelper: public QObject
{
Q_OBJECT
public:
CANScriptHelper(QJSEngine *engine);
public slots:
void setFilter(QJSValue id, QJSValue mask, QJSValue bus);
void clearFilters();
void sendFrame(QJSValue bus, QJSValue id, QJSValue length, QJSValue data);
void setRxCallback(QJSValue cb);
private slots:
void gotTargettedFrame(const CANFrame &frame);
private:
QList<CANFilter> filters;
QJSValue gotFrameFunction;
QJSEngine *scriptEngine;
};
class ISOTPScriptHelper: public QObject
{
Q_OBJECT
private:
QJSValue gotFrameFunction;
QJSEngine *scriptEngine;
};
class UDSScriptHelper: public QObject
{
Q_OBJECT
private:
QJSValue gotFrameFunction;
QJSEngine *scriptEngine;
};
class ScriptContainer : public QObject
{
Q_OBJECT
public:
ScriptContainer(QString&);
void gotFrame(const CANFrame &frame);
ScriptContainer();
void setLogWidget(QListWidget *list);
QString fileName;
QString filePath;
QString scriptText;
QString mConName;
public slots:
void compileScript();
void setErrorWidget(QListWidget *list);
void setFilter(QJSValue id, QJSValue mask, QJSValue bus);
void setTickInterval(QJSValue interval);
void clearFilters();
void sendFrame(QJSValue bus, QJSValue id, QJSValue length, QJSValue data);
void log(QJSValue logString);
private slots:
void tick();
@@ -36,11 +70,13 @@ private:
QJSEngine scriptEngine;
QJSValue compiledScript;
QJSValue setupFunction;
QJSValue gotFrameFunction;
QJSValue tickFunction;
QTimer timer;
QListWidget *errorWidget;
QList<CANFilter> filters;
QListWidget *logWidget;
CANScriptHelper *canHelper;
ISOTPScriptHelper *isoHelper;
UDSScriptHelper *udsHelper;
QElapsedTimer elapsedTime;
};
#endif // SCRIPTCONTAINER_H
scriptingwindow.cpp
+13 -17
View File
@@ -17,6 +17,7 @@ ScriptingWindow::ScriptingWindow(const QVector<CANFrame> *frames, QWidget *paren
editor->setFrameShape(JSEdit::NoFrame);
editor->setWordWrapMode(QTextOption::NoWrap);
editor->setTabStopWidth(4);
editor->setEnabled(false);
editor->show();
ui->verticalLayout->insertWidget(2,editor, 10);
@@ -30,6 +31,7 @@ ScriptingWindow::ScriptingWindow(const QVector<CANFrame> *frames, QWidget *paren
connect(ui->btnRemoveScript, &QAbstractButton::pressed, this, &ScriptingWindow::deleteCurrentScript);
connect(ui->btnRevertScript, &QAbstractButton::pressed, this, &ScriptingWindow::revertScript);
connect(ui->btnSaveScript, &QAbstractButton::pressed, this, &ScriptingWindow::saveScript);
connect(ui->btnClearLog, &QAbstractButton::pressed, this, &ScriptingWindow::clickedLogClear);
connect(CANConManager::getInstance(), &CANConManager::framesReceived, this, &ScriptingWindow::newFrames);
@@ -51,7 +53,7 @@ void ScriptingWindow::newFrames(const CANConnection* pConn, const QVector<CANFra
{
foreach(const CANFrame& frame, pFrames)
{
scripts[j]->gotFrame(frame);
//scripts[j]->gotFrame(frame);
}
}
}
@@ -117,23 +119,17 @@ void ScriptingWindow::loadNewScript()
QStringList fileList = filename.split('/');
QString justFileName = fileList[fileList.length() - 1];
ui->listLoadedScripts->addItem(justFileName);
/* get the first connection in the list for now */
qDebug() << "FIXME: connection is always the first in list";
QString portName;
QList<CANConnection*> list = CANConManager::getInstance()->getConnections();
if(!list.isEmpty())
portName = list.first()->getPort();
container = new ScriptContainer(portName);
container = new ScriptContainer;
container->fileName = justFileName;
container->filePath = filename;
container->scriptText = contents;
container->setErrorWidget(ui->listErrors);
container->setLogWidget(ui->listLog);
container->compileScript();
scripts.append(container);
currentScript = container;
editor->setPlainText(container->scriptText);
setEnabled(true);
editor->setEnabled(true);
}
}
}
@@ -143,17 +139,12 @@ void ScriptingWindow::createNewScript()
{
ScriptContainer *container;
QString portName;
QList<CANConnection*> list = CANConManager::getInstance()->getConnections();
if(!list.isEmpty())
portName = list.first()->getPort();
container = new ScriptContainer(portName);
container = new ScriptContainer;
container->fileName = "UNNAMED_" + QString::number((qrand() % 10000)) + ".js";
container->filePath = QString();
container->scriptText = QString();
container->setErrorWidget(ui->listErrors);
container->setLogWidget(ui->listLog);
scripts.append(container);
ui->listLoadedScripts->addItem(container->fileName);
currentScript = container;
@@ -214,3 +205,8 @@ void ScriptingWindow::recompileScript()
currentScript->scriptText = editor->toPlainText();
currentScript->compileScript();
}
void ScriptingWindow::clickedLogClear()
{
ui->listLog->clear();
}
scriptingwindow.h
+1
View File
@@ -31,6 +31,7 @@ private slots:
void revertScript();
void recompileScript();
void newFrames(const CANConnection*, const QVector<CANFrame>&);
void clickedLogClear();
private:
void closeEvent(QCloseEvent *event);
ui/scriptingwindow.ui
+10 -3
View File
@@ -53,7 +53,7 @@
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,4">
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,4,0">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
@@ -92,7 +92,7 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Current Scripting Errors</string>
<string>Log Window:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -100,7 +100,14 @@
</widget>
</item>
<item>
<widget class="QListWidget" name="listErrors"/>
<widget class="QListWidget" name="listLog"/>
</item>
<item>
<widget class="QPushButton" name="btnClearLog">
<property name="text">
<string>Clear Log Window</string>
</property>
</widget>
</item>
</layout>
</item>