Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions codeloader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,11 @@ bool CodeLoader::lispUpload(QString codeStr, QString editorPath, bool reduceLisp
return lispUpload(vb);
}

bool CodeLoader::lispUploadString(QString codeStr, QString editorPath, bool reduceLisp)
{
return lispUpload(codeStr, editorPath, reduceLisp);
}

bool CodeLoader::lispUploadFromPath(QString path, bool reduceLisp)
{
QFile f(path);
Expand Down Expand Up @@ -674,6 +679,16 @@ QString CodeLoader::lispRead(QWidget *parent, QString &lispPath)
return "";
}

QVariantMap CodeLoader::lispReadWithPath()
{
QVariantMap res;
QString path = "From VESC";
QString code = lispRead(nullptr, path);
res.insert("path", path);
res.insert("code", code);
return res;
}

bool CodeLoader::qmlErase(int size)
{
if (!mVesc) {
Expand Down
2 changes: 2 additions & 0 deletions codeloader.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@ class CodeLoader : public QObject
QPair<QString, QList<QPair<QString, QByteArray> > > lispUnpackImports(QByteArray data);
bool lispUpload(VByteArray vb);
bool lispUpload(QString codeStr, QString editorPath = QDir::currentPath(), bool reduceLisp = false);
Q_INVOKABLE bool lispUploadString(QString codeStr, QString editorPath = QDir::currentPath(), bool reduceLisp = false);
Q_INVOKABLE bool lispUploadFromPath(QString path, bool reduceLisp);
bool lispStream(VByteArray vb, qint8 mode);
Q_INVOKABLE bool lispStreamString(QString str, qint8 mode) {
return lispStream(str.toUtf8(), mode);
}
QString lispRead(QWidget *parent, QString &lispPath);
Q_INVOKABLE QVariantMap lispReadWithPath();

Q_INVOKABLE bool qmlErase(int size);
QByteArray qmlCompress(QString script);
Expand Down
17 changes: 17 additions & 0 deletions commands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1027,11 +1027,28 @@ void Commands::processPacket(QByteArray data)
stats.mem_use = vb.vbPopFrontDouble16(1e2);
stats.stack_use = vb.vbPopFrontDouble16(1e2);
stats.done_ctx_r = vb.vbPopFrontString();

QVariantList globals;
while (vb.size() > 0) {
auto name = vb.vbPopFrontString();
auto num = vb.vbPopFrontDouble32Auto();
stats.number_bindings.append(qMakePair(name, num));

QVariantMap g;
g.insert("name", name);
g.insert("value", num);
globals.append(g);
}

QVariantMap statsMap;
statsMap.insert("cpu_use", stats.cpu_use);
statsMap.insert("heap_use", stats.heap_use);
statsMap.insert("mem_use", stats.mem_use);
statsMap.insert("stack_use", stats.stack_use);
statsMap.insert("done_ctx_r", stats.done_ctx_r);
statsMap.insert("globals", globals);

emit lispStatsRxMap(statsMap);
emit lispStatsRx(stats);
} break;

Expand Down
1 change: 1 addition & 0 deletions commands.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ class Commands : public QObject
void lispWriteCodeRx(bool ok, quint32 offset);
void lispPrintReceived(QString str);
void lispStatsRx(LISP_STATS stats);
void lispStatsRxMap(QVariantMap stats);
void lispRunningResRx(bool ok);
void lispStreamCodeRx(quint32 offset, qint16 res);

Expand Down
Loading