juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-31 00:52:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

FirmwareUpdater: MMU 2.0 / Caterina flashing

Browse Source
This commit is contained in:
Vojtech Kral
2018-07-24 17:42:12 +02:00
committed by bubnikv
parent a7eaf38853
commit a32bd17b75
8 changed files with 496 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xs/src/avrdude/avrdude-slic3r.cpp
View File

@@ -36,6 +36,7 @@ struct AvrDude::priv
std::string sys_config;
std::deque<std::vector<std::string>> args;
size_t current_args_set = 0;
bool cancelled = false;
RunFn run_fn;
MessageFn message_fn;
ProgressFn progress_fn;
@@ -141,11 +142,16 @@ AvrDude::Ptr AvrDude::run()
if (self->p) {
auto avrdude_thread = std::thread([self]() {
bool cancel = false;
int res = -1;
if (self->p->run_fn) {
self->p->run_fn();
self->p->run_fn(*self);
}
auto res = self->p->run();
if (! self->p->cancelled) {
res = self->p->run();
}
if (self->p->complete_fn) {
self->p->complete_fn(res, self->p->current_args_set);
@@ -160,7 +166,10 @@ AvrDude::Ptr AvrDude::run()
void AvrDude::cancel()
{
::avrdude_cancel();
if (p) {
p->cancelled = true;
::avrdude_cancel();
}
}
void AvrDude::join()