Fix scripting and 2d graphics segfaults

vintagepc · Oct 27, 2021 · ae084e7 · ae084e7
1 parent 8dfdd60
commit ae084e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/hw/arm/prusa/opengl/GLDashboardMgr.cpp b/hw/arm/prusa/opengl/GLDashboardMgr.cpp
@@ -155,8 +155,9 @@ void GLDashboardMgr::UpdateMotorStall(int motor, int pos) {
 
 void GLDashboardMgr::UpdateIndicator(int iInd, int level) {
 	bool bIsFan = iInd == DB_IND_EFAN || iInd == DB_IND_PFAN;
+	bool bIsDigital = iInd == DB_IND_FSENS || iInd == DB_IND_ZPROBE;
 	if (iInd>=0 && iInd<DB_IND_COUNT) {
-		m_indicators.at(iInd)->SetValue(gsl::narrow<uint8_t>(level));
+		m_indicators.at(iInd)->SetValue(gsl::narrow<uint8_t>(bIsDigital ? level*255U : level));
 
 		if (m_p3DVis) {
 			m_p3DVis->OnBoolChanged(iInd, bIsFan ? level : level>0);

diff --git a/hw/arm/prusa/utility/IScriptable.h b/hw/arm/prusa/utility/IScriptable.h
@@ -54,7 +54,8 @@ class IScriptable
 	friend ScriptHost;
 	//friend TelemetryHost;
     public:
-		explicit IScriptable(std::string strName, bool bCanDelete = true, P404ScriptIF *obj = nullptr):m_strName(std::move(strName)),m_obj(obj),m_bCanDelete(bCanDelete){}
+        explicit IScriptable(std::string strName, P404ScriptIF *obj = nullptr):m_strName(std::move(strName)),m_obj(obj),m_bCanDelete(true){}
+		explicit IScriptable(std::string strName, bool bCanDelete = true):m_strName(std::move(strName)),m_obj(nullptr),m_bCanDelete(bCanDelete){}
         virtual ~IScriptable() = default;
 
 	enum class LineStatus