Disabled EEPROM editor for firmwares different from Repetier
This commit is contained in:
parent
2c09580633
commit
4b29cc979d
@ -7,8 +7,13 @@ EEPROMWindow::EEPROMWindow(QStringList eepromLines, QWidget *parent) :
|
|||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
QSettings settings;
|
||||||
|
firmware = settings.value("printer/firmware").toInt();
|
||||||
|
|
||||||
QLayout *layout = new QVBoxLayout();
|
QLayout *layout = new QVBoxLayout();
|
||||||
|
|
||||||
|
if(firmware == Repetier)
|
||||||
|
{
|
||||||
int j = 0;
|
int j = 0;
|
||||||
foreach (QString str, eepromLines)
|
foreach (QString str, eepromLines)
|
||||||
{
|
{
|
||||||
@ -70,9 +75,15 @@ EEPROMWindow::EEPROMWindow(QStringList eepromLines, QWidget *parent) :
|
|||||||
|
|
||||||
j++; // increase counter
|
j++; // increase counter
|
||||||
}
|
}
|
||||||
|
|
||||||
for(int i = 0; i < lines.size(); i++) changed.append(false);
|
for(int i = 0; i < lines.size(); i++) changed.append(false);
|
||||||
ui->eepromWidgets->setLayout(layout);
|
ui->eepromWidgets->setLayout(layout);
|
||||||
}
|
}
|
||||||
|
else if(firmware == Marlin)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
EEPROMWindow::~EEPROMWindow()
|
EEPROMWindow::~EEPROMWindow()
|
||||||
{
|
{
|
||||||
@ -80,16 +91,26 @@ EEPROMWindow::~EEPROMWindow()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void EEPROMWindow::lineChanged(QString s)
|
void EEPROMWindow::lineChanged(QString s)
|
||||||
|
{
|
||||||
|
if(firmware == Repetier)
|
||||||
{
|
{
|
||||||
int num = sender()->objectName().remove(0, 1).toInt();
|
int num = sender()->objectName().remove(0, 1).toInt();
|
||||||
|
|
||||||
lines[num].S = s;
|
lines[num].S = s;
|
||||||
changed[num] = true;
|
changed[num] = true;
|
||||||
}
|
}
|
||||||
|
else if(firmware == Marlin)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void EEPROMWindow::on_buttonBox_accepted()
|
void EEPROMWindow::on_buttonBox_accepted()
|
||||||
{
|
{
|
||||||
QStringList gcode;
|
QStringList gcode;
|
||||||
|
|
||||||
|
if(firmware == Repetier)
|
||||||
|
{
|
||||||
for(int i=0; i < changed.size(); i++)
|
for(int i=0; i < changed.size(); i++)
|
||||||
{
|
{
|
||||||
if(changed.at(i))
|
if(changed.at(i))
|
||||||
@ -108,6 +129,11 @@ void EEPROMWindow::on_buttonBox_accepted()
|
|||||||
gcode.append(command);
|
gcode.append(command);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else if(firmware == Marlin)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
emit changesComplete(gcode);
|
emit changesComplete(gcode);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,6 +24,7 @@ private:
|
|||||||
Ui::EEPROMWindow *ui;
|
Ui::EEPROMWindow *ui;
|
||||||
QVector <repetierEEPROMline> lines;
|
QVector <repetierEEPROMline> lines;
|
||||||
QVector <bool> changed;
|
QVector <bool> changed;
|
||||||
|
int firmware;
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void changesComplete(QStringList changed);
|
void changesComplete(QStringList changed);
|
||||||
|
|||||||
@ -267,7 +267,7 @@ void MainWindow::serialconnect()
|
|||||||
ui->consoleGroup->setDisabled(false);
|
ui->consoleGroup->setDisabled(false);
|
||||||
ui->actionPrint_from_SD->setEnabled(true);
|
ui->actionPrint_from_SD->setEnabled(true);
|
||||||
ui->actionSet_SD_printing_mode->setEnabled(true);
|
ui->actionSet_SD_printing_mode->setEnabled(true);
|
||||||
if(firmware != OtherFirmware) ui->actionEEPROM_editor->setDisabled(false);
|
if(firmware == Repetier) ui->actionEEPROM_editor->setDisabled(false);
|
||||||
//if(checkingTemperature) injectCommand("M105");
|
//if(checkingTemperature) injectCommand("M105");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -708,9 +708,6 @@ void MainWindow::on_actionAbout_triggered()
|
|||||||
|
|
||||||
void MainWindow::injectCommand(QString command)
|
void MainWindow::injectCommand(QString command)
|
||||||
{
|
{
|
||||||
//if(checkingTemperature && command == "M105" && userCommands.contains("M105")) return;
|
|
||||||
//if(chekingSDStatus && command == "M27" && userCommands.contains("M27")) return;
|
|
||||||
|
|
||||||
if(!userCommands.contains(command)) userCommands.enqueue(command);
|
if(!userCommands.contains(command)) userCommands.enqueue(command);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -872,7 +869,7 @@ void MainWindow::requestEEPROMSettings()
|
|||||||
switch(firmware)
|
switch(firmware)
|
||||||
{
|
{
|
||||||
case Marlin:
|
case Marlin:
|
||||||
injectCommand("M501");
|
injectCommand("M503");
|
||||||
break;
|
break;
|
||||||
case Repetier:
|
case Repetier:
|
||||||
injectCommand("M205");
|
injectCommand("M205");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user