3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-22 00:01:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Firmware updater GUI

Browse source
This commit is contained in:
Vojtech Kral 2018-05-04 16:04:43 +02:00
parent 3d09f2a980
commit af360d7097
9 changed files with 291 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

21
xs/src/avrdude/avrdude-slic3r.cpp
View file

@ -5,30 +5,39 @@ extern "C" {
#include "avrdude.h"
}
namespace Slic3r {
namespace AvrDude {
static void avrdude_message_handler_ostream(const char *msg, unsigned size, void *user_p)
// Used by our custom code in avrdude to receive messages that avrdude normally outputs on stdout (see avrdude_message())
static void avrdude_message_handler_closure(const char *msg, unsigned size, void *user_p)
{
(void)size;
std::ostream &os = *reinterpret_cast<std::ostream*>(user_p);
os << msg;
auto *message_fn = reinterpret_cast<MessageFn*>(user_p);
(*message_fn)(msg, size);
}
int main(std::vector<std::string> args, std::string sys_config, std::ostream &os)
int main(std::vector<std::string> args, std::string sys_config, MessageFn message_fn)
{
std::vector<char *> c_args {{ const_cast<char*>(PACKAGE_NAME) }};
for (const auto &arg : args) {
c_args.push_back(const_cast<char*>(arg.data()));
}
::avrdude_message_handler_set(avrdude_message_handler_ostream, reinterpret_cast<void*>(&os));
::avrdude_message_handler_set(avrdude_message_handler_closure, reinterpret_cast<void*>(&message_fn));
const auto res = ::avrdude_main(static_cast<int>(c_args.size()), c_args.data(), sys_config.c_str());
::avrdude_message_handler_set(nullptr, nullptr);
return res;
}
int main(std::vector<std::string> args, std::string sys_config, std::ostream &os)
{
return main(std::move(args), std::move(sys_config), std::move([&os](const char *msg, unsigned /* size */) {
os << msg;
}));
}
}

4
xs/src/avrdude/avrdude-slic3r.hpp
View file

@ -4,10 +4,14 @@
#include <vector>
#include <string>
#include <ostream>
#include <functional>
namespace Slic3r {
namespace AvrDude {
typedef std::function<void(const char * /* msg */, unsigned /* size */)> MessageFn;
int main(std::vector<std::string> args, std::string sys_config, MessageFn message_fn);
int main(std::vector<std::string> args, std::string sys_config, std::ostream &os);
}