GerhardHoffmann/ATBUpdateTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed handling of tariff, as this is not downloaded to dc

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-05-30 16:49:48 +02:00
parent af337874a6
commit 57b82094c8
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
update.cpp
View File

@ -43,7 +43,7 @@ Update::Update(QString update_ctrl_file,
, m_init(true) , m_init(true)
, m_delete(hw == nullptr) { , m_delete(hw == nullptr) {
qCritical() << "workingDir" << m_workingDir; // qCritical() << "workingDir" << m_workingDir;
execUpdateScript(); execUpdateScript();
@ -103,12 +103,12 @@ bool Update::execUpdateScript() {
} }
bool Update::updateBinary(char const *fileToSendToDC) { bool Update::updateBinary(char const *fileToSendToDC) {
return true; // debug // return true; // debug
return m_hw->dc_updateDC(fileToSendToDC, m_baudrate, m_serialInterface); return m_hw->dc_updateDC(fileToSendToDC, m_baudrate, m_serialInterface);
} }
bool Update::updatePrinterConf(int nrOfTemplate, char const *fileToSendToDC) { bool Update::updatePrinterConf(int nrOfTemplate, char const *fileToSendToDC) {
return true; // debug // return true; // debug
QVector<int> printTemplates{ nrOfTemplate }; QVector<int> printTemplates{ nrOfTemplate };
QVector<QString> filesToSend{ fileToSendToDC }; QVector<QString> filesToSend{ fileToSendToDC };
return m_hw->dc_updatePrinterTemplate(hwapi::FileTypeJson::PRINTER, return m_hw->dc_updatePrinterTemplate(hwapi::FileTypeJson::PRINTER,
@ -208,13 +208,6 @@ bool Update::doUpdate() {
qInfo() << "Downloaded" << name; qInfo() << "Downloaded" << name;
} }
} else } else
//if (name.contains("tariff") && name.endsWith(".json")) {
// int i = name.indexOf("tariff");
// int templateIdx = name.mid(i).midRef(6, 2).toInt();
// if ((res = updatePrinterConf(templateIdx, name.toStdString().c_str())) == true) {
// qInfo() << "Downloaded" << name;
// }
//} else
if (name.contains("opkg")) { if (name.contains("opkg")) {
int i = name.indexOf("opkg "); int i = name.indexOf("opkg ");
QString rest = name.mid(i+5).trimmed(); QString rest = name.mid(i+5).trimmed();