mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-07 07:41:06 +00:00
Hanif Koh
d8793f8353
AppConfig.hpp, DeviceManager.hpp and UserManager.hpp carried a global "using namespace nlohmann;", json_diff.hpp a global "using json = nlohmann::json;" and PrinterFileSystem.h a global "using nlohmann::json;". Every file that included one of them, directly or not, could write a bare json, and 63 did without declaring it. The last two also made the include checker treat json_diff.hpp and PrinterFileSystem.h as the headers that provide json, so they were included from files that use nothing else from them: 57 of the 59 includers of json_diff.hpp never name json_diff. The five statements are removed. Headers that use the type now spell nlohmann::json, source files declare their own "using json = nlohmann::json;", and the includes that only supplied the name are dropped or replaced by <nlohmann/json.hpp>. Eight files reached json_diff.hpp only through an include that is now gone and with it lost that header's "using namespace std;". The std names they used unqualified are qualified.
69 lines
1.8 KiB
C++
69 lines
1.8 KiB
C++
#pragma once
|
|
#include "DevFirmware.h"
|
|
|
|
#include <nlohmann/json.hpp>
|
|
#include <string>
|
|
#include <wx/string.h>
|
|
|
|
namespace Slic3r {
|
|
|
|
//Previous definitions
|
|
class MachineObject;
|
|
|
|
// Orca: firmware-type enum consumed by DeviceManager/UpgradePanel; no reference-side equivalent yet
|
|
enum PrinterFirmwareType
|
|
{
|
|
FIRMWARE_TYPE_ENGINEER = 0,
|
|
FIRMWARE_TYPE_PRODUCTION,
|
|
FIRMEARE_TYPE_UKNOWN,
|
|
};
|
|
|
|
class FirmwareInfo
|
|
{
|
|
public:
|
|
std::string module_type; // ota or ams
|
|
std::string version;
|
|
std::string url;
|
|
std::string name;
|
|
std::string description;
|
|
};
|
|
|
|
|
|
class DevFirmwareVersionInfo
|
|
{
|
|
public:
|
|
std::string name;
|
|
wxString product_name;
|
|
std::string sn;
|
|
std::string hw_ver;
|
|
std::string sw_ver;
|
|
std::string sw_new_ver;
|
|
int firmware_flag = 0;
|
|
|
|
public:
|
|
bool isValid() const { return !sn.empty(); }
|
|
|
|
/*type check*/
|
|
bool isAirPump() const { return product_name.Contains("Air Pump"); }
|
|
bool isLaszer() const { return product_name.Contains("Laser"); }
|
|
bool isCuttingModule() const { return product_name.Contains("Cutting Module"); }
|
|
bool isRotary() const { return product_name.Contains("Rotary"); }// Rotary Attachment
|
|
bool isExtinguishSystem() const { return product_name.Contains("Extinguishing System"); }// Auto Fire Extinguishing System
|
|
bool isWTM() const { return name.find("wtm") != std::string::npos; } // nozzle
|
|
bool isExhaustFan() const { return product_name.Contains("Exhaust Fan"); }
|
|
bool isHmshub() const { return product_name.find("Filament Buffer") != std::string::npos; }
|
|
bool isFilaTrackSwitch() const { return product_name.find("Filament Track") != std::string::npos; }
|
|
|
|
};
|
|
|
|
|
|
class DevFirmware
|
|
{
|
|
public:
|
|
DevFirmware(MachineObject* obj) : m_owner(obj) {}
|
|
|
|
private:
|
|
[[maybe_unused]] MachineObject* m_owner = nullptr;
|
|
};
|
|
|
|
} // namespace Slic3r
|