juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 02:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: support AMS switching for A series; clean class AMSSetting

Browse Source 
jira: [STUDIO-14068] [STUDIO-14330]
Change-Id: I6281fbf56f3bf406ef28103998790a2a98c3f5c0
(cherry picked from commit 8ee02ec73076691c482ea6d089a49ea1c99ad10c)
This commit is contained in:
xin.zhang
2025-10-28 15:29:55 +08:00
committed by Noisyfox
parent 8534cf5fce
commit 491100a9d2
20 changed files with 748 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h
+68 -2
View File
@@ -1,4 +1,6 @@
#pragma once
#include <nlohmann/json.hpp>
#include "DevCtrl.h"
namespace Slic3r
{
@@ -11,7 +13,7 @@ public:
public:
// getters
bool IsDetectOnInsertEnabled() const { return m_enable_detect_on_insert; };
std::optional<bool> IsDetectOnInsertEnabled() const { return m_enable_detect_on_insert; };
bool IsDetectOnPowerupEnabled() const { return m_enable_detect_on_powerup; }
bool IsDetectRemainEnabled() const { return m_enable_detect_remain; }
bool IsAutoRefillEnabled() const { return m_enable_auto_refill; }
@@ -26,10 +28,74 @@ public:
private:
DevFilaSystem* m_owner = nullptr;
bool m_enable_detect_on_insert = false;
std::optional<bool> m_enable_detect_on_insert = false;
bool m_enable_detect_on_powerup = false;
bool m_enable_detect_remain = false;
bool m_enable_auto_refill = false;
};
class DevAmsSystemFirmwareSwitch
{
public:
enum DevAmsSystemIdx : int
{
IDX_DC = -1,
IDX_LITE = 0,
IDX_AMS_AMS2_AMSHT = 1,
};
struct DevAmsSystemFirmware
{
DevAmsSystemIdx m_firmare_idx = IDX_DC;
std::string m_name;
std::string m_version;
public:
bool operator==(const DevAmsSystemFirmware& o) const
{
return (m_firmare_idx == o.m_firmare_idx) &&
(m_name == o.m_name) &&
(m_version == o.m_version);
};
};
public:
static std::shared_ptr<DevAmsSystemFirmwareSwitch> Create(DevFilaSystem* owner)
{
return std::shared_ptr<DevAmsSystemFirmwareSwitch>(new DevAmsSystemFirmwareSwitch(owner));
};
protected:
DevAmsSystemFirmwareSwitch(DevFilaSystem* owner) : m_owner(owner) {};
public:
DevFilaSystem* GetFilaSystem() const { return m_owner; };
bool SupportSwitchFirmware() const { return !m_firmwares.empty();};
DevAmsSystemIdx GetCurrentFirmwareIdxSel() const { return m_current_firmware_sel.m_firmare_idx; };
DevAmsSystemIdx GetCurrentFirmwareIdxRun() const { return m_current_firmware_run.m_firmare_idx; };
std::unordered_map<int, DevAmsSystemFirmware> GetSuppotedFirmwares() const { return m_firmwares;};
bool IsSwitching() const { return m_status == "SWITCHING";};
bool IsIdle() const { return m_status == "IDLE";};
// commands
int CrtlSwitchFirmware(int firmware_idx);
// setters
void Reset();
void ParseFirmwareSwitch(const nlohmann::json& j);
private:
DevFilaSystem* m_owner = nullptr;
std::string m_status;
DevAmsSystemFirmware m_current_firmware_run;
DevAmsSystemFirmware m_current_firmware_sel;
std::unordered_map<int, DevAmsSystemFirmware> m_firmwares;
DevCtrlInfo m_ctrl_switching;
};
}// namespace Slic3r