3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 08:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Firmware updater: Fix filename encoding on Windows

Browse source
This commit is contained in:
Vojtech Kral 2018-05-23 17:21:01 +02:00 • committed by bubnikv
parent 1602ddd56c
commit 2a07f3a0d5
2 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xs/src/slic3r/GUI/FirmwareDialog.cpp
View file

@ -163,6 +163,7 @@ void FirmwareDialog::priv::perform_upload()
flashing_status(true);
const auto filename_utf8 = filename.utf8_str();
std::vector<std::string> args {{
"-v",
"-p", "atmega2560",
@ -170,7 +171,7 @@ void FirmwareDialog::priv::perform_upload()
"-P", port,
"-b", "115200", // XXX: is this ok to hardcode?
"-D",
"-U", (boost::format("flash:w:%1%:i") % filename.ToStdString()).str()
"-U", (boost::format("flash:w:%1%:i") % filename_utf8.data()).str()
}};
BOOST_LOG_TRIVIAL(info) << "Invoking avrdude, arguments: "
@ -187,8 +188,9 @@ void FirmwareDialog::priv::perform_upload()
.args(args)
.on_message(std::move([q](const char *msg, unsigned /* size */) {
auto evt = new wxCommandEvent(EVT_AVRDUDE, q->GetId());
auto wxmsg = wxString::FromUTF8(msg);
evt->SetExtraLong(AE_MESSAGE);
evt->SetString(msg);
evt->SetString(std::move(wxmsg));
wxQueueEvent(q, evt);
}))
.on_progress(std::move([q](const char * /* task */, unsigned progress) {