mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-13 10:51:12 +00:00
HanifKoh
84657ff11e
* Ignore Clipper, libpng, mcut and Boost.Polygon Internals in clang-tidy Each only works through a wrapper or umbrella header: libslic3r/clipper.hpp or clipper_z.hpp configure Clipper before including it, png.h pulls in libpng's config headers, and Boost.Polygon's headers only compile through polygon.hpp or voronoi.hpp. * Ignore minilzo's Config Headers in clang-tidy lzoconf.h and lzodefs.h are internal to minilzo.h, which is what the code includes. * Add Missing Includes Across the Remaining Sources and Tests Covers src/slic3r/Utils, src/slic3r/plugin, src/slic3r/Config, src/libvgcode, src/dev-utils, src/OrcaSlicer.cpp and tests/, the directories left after src/slic3r/GUI and src/libslic3r. Generated with clang-tidy misc-include-cleaner. libvgcode's own headers are included by relative path as in the rest of that library, and Catch2 and pybind11 with angle brackets as elsewhere in the repo. * Make the GUI and Test Headers Compile on Their Own Each now includes, or forward-declares, what it uses instead of relying on what its includers happened to include first. Headers that only compile on one platform, or that nothing built includes, are left alone. * Keep Windows and nanosvg Setup Ahead of the Added Includes OrcaSlicer.cpp and several tests set _WIN32_WINNT, WIN32_LEAN_AND_MEAN or NOMINMAX before including Windows.h, and the profile validator defines NANOSVG_IMPLEMENTATION before any libslic3r header. The added includes had landed above those blocks, which broke the Windows build. * Add the GUI Includes the First Pass Missed Covers headers that only became editable once they compiled on their own, and wx symbols whose suggested header changed as the clang-tidy ignore list grew after the src/slic3r/GUI pass. * Keep the Added Test Includes Below the NOMINMAX Guard test_marchingsquares.cpp and test_texture_displacement.cpp had includes inside #ifndef NOMINMAX, which the tests inherit as defined on Windows from libslic3r, so those were skipped there. .clang-tidy also ignores the MSVC STL and UCRT internals, Boost.Multiprecision's fwd.hpp and CPython's Windows include directory, as in #16068.
115 lines
2.4 KiB
C++
115 lines
2.4 KiB
C++
#include "HexFile.hpp"
|
|
|
|
#include <cstddef>
|
|
#include <boost/filesystem/path.hpp>
|
|
#include <ostream>
|
|
#include <exception>
|
|
#include <sstream>
|
|
#include <boost/filesystem/fstream.hpp>
|
|
#include <boost/property_tree/ptree.hpp>
|
|
#include <boost/property_tree/ini_parser.hpp>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
namespace fs = boost::filesystem;
|
|
namespace pt = boost::property_tree;
|
|
|
|
|
|
namespace Slic3r {
|
|
namespace Utils {
|
|
|
|
|
|
static HexFile::DeviceKind parse_device_kind(const std::string &str)
|
|
{
|
|
if (str == "mk2") { return HexFile::DEV_MK2; }
|
|
else if (str == "mk3") { return HexFile::DEV_MK3; }
|
|
else if (str == "mm-control") { return HexFile::DEV_MM_CONTROL; }
|
|
else if (str == "cw1") { return HexFile::DEV_CW1; }
|
|
else if (str == "cw1s") { return HexFile::DEV_CW1S; }
|
|
else { return HexFile::DEV_GENERIC; }
|
|
}
|
|
|
|
static size_t hex_num_sections(fs::ifstream &file)
|
|
{
|
|
file.seekg(0);
|
|
if (! file.good()) {
|
|
return 0;
|
|
}
|
|
|
|
static const char *hex_terminator = ":00000001FF\r";
|
|
size_t res = 0;
|
|
std::string line;
|
|
while (getline(file, line, '\n').good()) {
|
|
// Account for LF vs CRLF
|
|
if (!line.empty() && line.back() != '\r') {
|
|
line.push_back('\r');
|
|
}
|
|
|
|
if (line == hex_terminator) {
|
|
res++;
|
|
}
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
HexFile::HexFile(fs::path path) :
|
|
path(std::move(path))
|
|
{
|
|
fs::ifstream file(this->path);
|
|
if (! file.good()) {
|
|
return;
|
|
}
|
|
|
|
std::string line;
|
|
std::stringstream header_ini;
|
|
while (std::getline(file, line, '\n').good()) {
|
|
if (line.empty()) {
|
|
continue;
|
|
}
|
|
|
|
// Account for LF vs CRLF
|
|
if (!line.empty() && line.back() == '\r') {
|
|
line.pop_back();
|
|
}
|
|
|
|
if (line.front() == ';') {
|
|
line.front() = ' ';
|
|
header_ini << line << std::endl;
|
|
} else if (line.front() == ':') {
|
|
break;
|
|
}
|
|
}
|
|
|
|
pt::ptree ptree;
|
|
try {
|
|
pt::read_ini(header_ini, ptree);
|
|
} catch (std::exception & /* e */) {
|
|
return;
|
|
}
|
|
|
|
bool has_device_meta = false;
|
|
const auto device = ptree.find("device");
|
|
if (device != ptree.not_found()) {
|
|
this->device = parse_device_kind(device->second.data());
|
|
has_device_meta = true;
|
|
}
|
|
|
|
const auto model_id = ptree.find("model_id");
|
|
if (model_id != ptree.not_found()) {
|
|
this->model_id = model_id->second.data();
|
|
}
|
|
|
|
if (! has_device_meta) {
|
|
// No device metadata, look at the number of 'sections'
|
|
if (hex_num_sections(file) == 2) {
|
|
// Looks like a pre-metadata l10n firmware for the MK3, assume that's the case
|
|
this->device = DEV_MK3;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|