Rework dashboard to native QEMU (#101)

* Rework dashboard to native QEMU. Needs cleanup.

* Suppress default LPT/TTY ports.

* Fix some memory leaks (Closes #81)

* strip out deprecated GL dashboard code

Author: vintagepc

hw/arm/prusa/meson.build

@@ -29,6 +29,7 @@ arm_ss.add(when: 'CONFIG_BUDDYBOARD', if_true: files(
         'parts/encoder_input.c',
         'parts/fan.c',
         'parts/gl_dashboard.c',
+        'parts/2d-dashboard.c',
         'parts/heater.c',
         'parts/irsensor.c',
         'parts/p404_key_input.c',
@@ -45,6 +46,8 @@ arm_ss.add(when: 'CONFIG_BUDDYBOARD', if_true: files(
         'utility/p404_script_console.c',
         'utility/p404scriptable.c',
         'utility/p404_keyclient.c',
+        'utility/p404_motor_if.c',
+        'utility/text_helper.c',
     ))
 
 # Use CONFIG_PRUSA_STM32_HACKS when building our target to enable our specific workarounds

hw/arm/prusa/opengl/GLDashboardMgr.cpp

@@ -58,42 +58,12 @@ extern "C" {
 		}
 	}
 
-	extern void gl_dashboard_update_motor_stall(void* pDashboard, int motor, int level) {
-		GLDashboardMgr* p = static_cast<GLDashboardMgr*>(pDashboard);
-		if (p) {
-			p->UpdateMotorStall(motor,level);
-		}
-	}
-
-	extern void gl_dashboard_update_motor_enable(void* pDashboard, int motor, int level) {
-		GLDashboardMgr* p = static_cast<GLDashboardMgr*>(pDashboard);
-		if (p) {
-			p->UpdateMotorEnable(motor,level);
-		}
-	}
 	extern void gl_dashboard_update_indicator(void* pDashboard, int indicator, int level) {
 		GLDashboardMgr* p = static_cast<GLDashboardMgr*>(pDashboard);
 		if (p) {
 			p->UpdateIndicator(indicator,level);
 		}
 	}
-
-	void GLAPIENTRY
-	GLErrorCB( GLenum, //source,
-				GLenum type,
-				GLuint id,
-				GLenum severity,
-				GLsizei, // length
-				const GLchar* message,
-				const void*) // userparam )
-	{
-		std::cerr <<  "GL:";
-		if (type == GL_DEBUG_TYPE_ERROR)
-		{
-			std::cerr << "** GL ERROR **";
-		}
-		std::cerr << "ID:" << id << " type = " << type << " sev = " << severity << " message = " << message << '\n';
-	}
 };
 
 GLDashboardMgr* GLDashboardMgr::g_pGLDashboardMgr = nullptr;
@@ -107,11 +77,7 @@ GLDashboardMgr::GLDashboardMgr(int iType):m_iType(iType) {
 	g_pGLDashboardMgr = this;
 }
 
-
-	
 GLDashboardMgr::~GLDashboardMgr() {
-	m_bQuit = true;
-	glutLeaveMainLoop();
 }   
 
 void GLDashboardMgr::Start() {
@@ -127,38 +93,18 @@ void GLDashboardMgr::Start() {
 
 void GLDashboardMgr::UpdateMotor(int motor, int pos) {
 	if (motor>=0 && motor<DB_MOTOR_COUNT) {
-		m_motors.at(motor)->SetCurrentPos(pos);
 		if (m_p3DVis) {
 			m_p3DVis->OnMotorStep(motor,pos);
-			m_p3DVis->OnPosChanged(motor, m_motors.at(motor)->GetCurrentPos());
 		}
 	} else {
 		std::cerr << "Error: Invalid motor index: "<< std::to_string(motor) <<"!\n";
 	}
 }
 
-void GLDashboardMgr::UpdateMotorEnable(int motor, int pos) {
-	if (motor>=0 && motor<DB_MOTOR_COUNT) {
-		m_motors.at(motor)->SetEnable(pos>0);
-	} else {
-		std::cerr << "Error: Invalid motor index: "<< std::to_string(motor) <<"!\n";
-	}
-}
-
-void GLDashboardMgr::UpdateMotorStall(int motor, int pos) {
-	if (motor>=0 && motor<DB_MOTOR_COUNT) {
-		m_motors.at(motor)->SetStall(pos>0);
-	} else {
-		std::cerr << "Error: Invalid motor index: "<< std::to_string(motor) <<"!\n";
-	}
-}
-
 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;
+	// 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>(bIsDigital ? level*255U : level));
-
 		if (m_p3DVis) {
 			m_p3DVis->OnBoolChanged(iInd, bIsFan ? level : level>0);
 		}
@@ -167,66 +113,11 @@ void GLDashboardMgr::UpdateIndicator(int iInd, int level) {
 	}
 }
 
-void GLDashboardMgr::Draw() {	
-	if (m_bQuit) {
-		return;
-	}
-	glClear((GL_COLOR_BUFFER_BIT) | (GL_DEPTH_BUFFER_BIT));
-	glLoadIdentity();
-	glScalef(500.f/350, -4, 1);
-	for (auto motor : m_motors) {
-		motor->Draw();
-		glTranslatef(0,10,0);
-	}
-	for (auto ind : m_indicators) {
-		ind->Draw();
-		glTranslatef(20,0,0);
-	}
-	glutSwapBuffers();
-	m_iFrCount++;
-	m_iTic=glutGet(GLUT_ELAPSED_TIME);
-	auto iDiff = m_iTic - m_iLast;
-	if (iDiff > 1000) {
-		int iFPS = m_iFrCount*1000.f/(iDiff);
-		m_iLast = m_iTic;
-		m_iFrCount = 0;
-		std::string strFPS = "Mini404 GL Dashboard (" +std::to_string(iFPS) + " FPS)";
-		glutSetWindowTitle(strFPS.c_str());
-	}
-}
-
-void GLDashboardMgr::TimerCB(int i) {
-	if (m_bQuit) {
-		return;
-	}
-	glutSetWindow(m_iWindow);
-	glutTimerFunc(32, m_fcnTimer, i);
-	glutPostRedisplay();
-	if(m_p3DVis) {
-		m_p3DVis->FlagForRedraw();
-	}
-}
-
 void GLDashboardMgr::SetupHardware() {
-	m_EFan.SetColor(0xFF0000);
-	m_PFan.SetColor(0xFF0000);
-	m_ZProbe.SetColor(0xFFFF0000);
-	m_FSens.SetColor(0xFF00);
-	m_Htr.SetColor(0xFF000000);
-	m_Bed.SetColor(0xFF000000);
 	switch (m_iType) {
 		case DB_MINI_LITE:
 		case DB_MINI_FULL:
-		case DB_MINI_DB:
 		{
-			m_X.SetStepsPerMM(100*16);
-			m_X.SetMaxPos(100*16*182);
-			m_Y.SetStepsPerMM(100*16);
-			m_Y.SetMaxPos(100*16*183);
-			m_Z.SetStepsPerMM(400*16);
-			m_Z.SetMaxPos(400*16*185);
-			m_E.SetStepsPerMM(320*16);
-
 		}
 		break;
 		default: 
@@ -235,50 +126,7 @@ void GLDashboardMgr::SetupHardware() {
 }
 
 void* GLDashboardMgr::RunThread(void *p) {
-	int argc = 0;
-	char **argv = nullptr;
-
 	SetupHardware();
-
-	glutInit(&argc, argv);		/* initialize GLUT system */
-	glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS);
-	glutInitContextVersion(3,0);
-	glutSetOption(GLUT_MULTISAMPLE,2);
-	glutInitDisplayMode((GLUT_RGB) | (GLUT_DOUBLE) | (GLUT_MULTISAMPLE));
-	glutInitWindowSize(m_iWinW, m_iWinH);		/* width=400pixels height=500pixels */
-	m_iWindow = glutCreateWindow("Mini404 GL Dashboard");	/* create window */
-
-	glewInit();
-	std::cout << "GL_VERSION   : " << glGetString(GL_VERSION) << '\n';
-	std::cout << "GL_VENDOR    : " << glGetString(GL_VENDOR) << '\n';
-	std::cout << "GL_RENDERER  : " << glGetString(GL_RENDERER) << '\n';
-	std::cout << "GLEW_VERSION : " << glewGetString(GLEW_VERSION) << '\n';
-#if !defined(__APPLE__)
-		glDebugMessageCallback( GLErrorCB, nullptr );
-		if (true)
-		{
-			glDebugMessageControl(GL_DONT_CARE,
-						GL_DONT_CARE,
-						GL_DEBUG_SEVERITY_NOTIFICATION,
-						0, nullptr, GL_FALSE);
-		}
-		glEnable(GL_DEBUG_OUTPUT);
-#endif
-			// Set up projection matrix
-	auto fcnDraw = []() { g_pGLDashboardMgr->Draw();};
-	glutDisplayFunc(fcnDraw);
-	auto fcnClose = []() { g_pGLDashboardMgr->OnGlutClose();};
-	glutCloseFunc(fcnClose);
-	m_fcnTimer = [](int i) { g_pGLDashboardMgr->TimerCB(i);};
-	glutTimerFunc(1000, m_fcnTimer, 0);
-	auto fcnResize = [](int w, int h) { g_pGLDashboardMgr->ResizeCB(w,h);};
-	glutReshapeFunc(fcnResize);
-	glEnable(GL_MULTISAMPLE);
-	glShadeModel(GL_SMOOTH);
-	glClearColor(0.0f, 0.f, 0.f, 1.0f);
-	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	glEnable(GL_BLEND);
 	// Also set up the 3D visuals. 
 	switch (m_iType) {
 		case DB_MINI_FULL:
@@ -296,22 +144,3 @@ void* GLDashboardMgr::RunThread(void *p) {
 	glutMainLoop();
 	return p;
 }
-
-void GLDashboardMgr::OnGlutClose() {
-	m_bQuit = true;
-}
-
-
-void GLDashboardMgr::ResizeCB(int w, int h) {
-	if (m_bQuit) {
-		return;
-	}
-	glViewport(0, 0, w, h);
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glOrtho(0, w, 0, h, -1, 10);
-	glTranslatef(0, h, 0);
-	//glScalef(fScale,-fScale,1);
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-}

hw/arm/prusa/opengl/GLDashboardMgr.h

@@ -25,9 +25,6 @@
 
 #include <cstdint>          // for uint32_t
 #include "../parts/dashboard_types.h"
-#include "GLMotor.h"
-#include "IPCIndicator.h"
-#include <array>
 #include <memory>
 #include <pthread.h>
 class MK3SGL;
@@ -45,52 +42,20 @@ class GLDashboardMgr
 
         void UpdateIndicator(int iInd, int level);    
 
-        void UpdateMotorStall(int motor, int level);
-
-        void UpdateMotorEnable(int motor, int level);
-
     private:
 
         void SetupHardware();
 
-        // Draws the visuals within the current GL transformation context.
-        void Draw();
-
-        void SetWindow(int iWin) { m_iWindow = iWin;};
-
-		void ResizeCB(int w, int h);
-
-        void TimerCB(int i);
-
-        void OnGlutClose();
-
         void* RunThread(void *p);
 
-        int m_iWindow = 0;
         pthread_t m_glThread;
         pthread_cond_t m_glReady;
         pthread_mutex_t m_glMtx;
 
-        void (*m_fcnTimer)(int i) = nullptr;
-
-        int m_iWinW = 500, m_iWinH = 200;
-
         int m_iType = DB_NONE;
 
-        int m_iTic = 0, m_iLast = 0, m_iFrCount = 0;
-
         static GLDashboardMgr* g_pGLDashboardMgr;
 
-        GLMotor m_X{'X'}, m_Y{'Y'}, m_Z{'Z'}, m_E{'E',true};
-
-        std::array<GLMotor*,4> m_motors = {&m_X, &m_Y, &m_Z, &m_E};
-
-        IPCIndicator m_EFan {'E'}, m_PFan{'P'}, m_FSens {'F'}, m_ZProbe{'Z'}, m_Bed{'B'}, m_Htr{'H'};
-
-        std::array<IPCIndicator*, 6> m_indicators = {&m_PFan, &m_EFan, &m_FSens, &m_ZProbe, &m_Bed, &m_Htr};
-
-        bool m_bQuit = false;
-
         std::unique_ptr<MK3SGL> m_p3DVis {nullptr};
 
 };
@@ -105,8 +70,6 @@ extern void gl_dashboard_reset(void* pDashboard);
 extern void gl_dashboard_run(void* pDashboard);
 
 extern void gl_dashboard_update_motor(void* pDashboard, int motor, int pos);
-extern void gl_dashboard_update_motor_enable(void* pDashboard, int motor, int pos);
-extern void gl_dashboard_update_motor_stall(void* pDashboard, int motor, int pos);
 
 extern void gl_dashboard_update_indicator(void *pDashboard, int indicator, int level);