Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /Misc Projects/PcMarlinInterface/MainWindow.h @ 350

  → /Misc Projects/PcMarlinInterface/MainWindow.h @ 351

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 350 → Rev 351

/Misc Projects/PcMarlinInterface/MainWindow.h
14,21 → 14,14
~MainWindow();
public slots:
void Serial_UpdateParameters(QStringList ports, QStringList speeds, QStringList dataBits,
QStringList stopBits, QStringList parity, QStringList flowControl);
void Serial_PrepareTransmit(QString string = "");
void Serial_ReceivedString(QString string);
void Serial_Connected(void);
void Serial_Disconnected(void);
void Serial_ConnectToggleBtn(void);
void Serial_PrepareTransmit(QString string = "");
void Serial_ClearBtn(void);
void UpdateStatus(QString string);
void UpdateSerialStatus(QString string);
signals:
void Serial_QueryParameters(void);
void Serial_Connect(QString port, QString speed, QString dataBits,
QString stopBits, QString parity, QString flowControl);
void Serial_Disconnect(void);
void Serial_TransmitString(QString string);
protected:
38,24 → 31,10
// Serial controller + UI
SerialController *serialController;
QThread *serialThread;
QGroupBox *groupSerialInit;
QPushButton *btnSerialConnect;
QPushButton *btnSerialRefresh;
QLabel *labelSerialPort;
QLabel *labelSerialSpeed;
QLabel *labelSerialDataBits;
QLabel *labelSerialStopBits;
QLabel *labelSerialParity;
QLabel *labelSerialFlowControl;
QComboBox *cboxSerialPort;
QComboBox *cboxSerialSpeed;
QComboBox *cboxSerialDataBits;
QComboBox *cboxSerialStopBits;
QComboBox *cboxSerialParity;
QComboBox *cboxSerialFlowControl;
// Serial data
QGroupBox *groupSerialData;
QTextEdit *textSerialData;
QLineEdit *textSerialTransmit;
69,6 → 48,8
QGroupBox *groupMacro;
QPushButton *btnMacro;
QLabel *statusSerial;
};
#endif // MAINWINDOW_H