diff --git a/app/app-prime-modbus/app/app-prime-modbus/rs485_serial.c b/app/app-prime-modbus/app/app-prime-modbus/rs485_serial.c index 61b1dc4..80855b8 100644 --- a/app/app-prime-modbus/app/app-prime-modbus/rs485_serial.c +++ b/app/app-prime-modbus/app/app-prime-modbus/rs485_serial.c @@ -443,7 +443,7 @@ static void on_rcv_control( void){ printf( "manual_onoff22 = 0x%04x\n", bit_onoff22); // GUI로 전송 - gui_send_data_to_gui( ( char *)&oven, sizeof( gui_oven_state_t)); + gui_send_data_to_gui( ( char *)&oven, sizeof( gui_oven_control_t)); // 다음 단계 실행 run_next_step_work(); diff --git a/app/gui/oven_control/ignitionicon.cpp b/app/gui/oven_control/ignitionicon.cpp index 2faf8f3..c89804d 100644 --- a/app/gui/oven_control/ignitionicon.cpp +++ b/app/gui/oven_control/ignitionicon.cpp @@ -6,13 +6,10 @@ QPixmap *IgnitionIcon::icon = Q_NULLPTR; IgnitionIcon::IgnitionIcon(QWidget *parent) : QLabel(parent) { - if (icon == Q_NULLPTR) - icon = new QPixmap(":/images/symbol/inigited.png"); - connect(&timer, SIGNAL(timeout()), SLOT(check())); timer.start(1000); - setPixmap(*icon); + setPixmap(QPixmap(":/images/symbol/ignited.png")); check(); } diff --git a/app/gui/oven_control/udphandler.h b/app/gui/oven_control/udphandler.h index 16c410b..23494ea 100644 --- a/app/gui/oven_control/udphandler.h +++ b/app/gui/oven_control/udphandler.h @@ -69,11 +69,11 @@ public: switch (num) { case 1: - return state.burner1_state != 0; + return (state.burner1_state & 0x08) != 0; case 2: - return state.burner2_state != 0; + return (state.burner2_state & 0x08) != 0; case 3: - return state.burner3_state != 0; + return (state.burner3_state & 0x08) != 0; default: return false; }