Skip to content

Commit 5d0b242

Browse files
committed
[v1.0.2] 解决已知Bug,优化界面
1 parent 10ce2ba commit 5d0b242

File tree

5 files changed

+1684
-1789
lines changed

5 files changed

+1684
-1789
lines changed

project/RTduino.pro.user

Lines changed: 0 additions & 266 deletions
This file was deleted.

project/pininfoui.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@ void PininfoUI::on_addbtn_clicked()
100100
list << ui->rttpinedit->text();
101101
list << ui->devnameedit->text();
102102
list << ui->channeledit->text();
103-
list << ui->pinfucbox->currentText();
103+
if(ui->funcbox->currentText() == "ADC")
104+
list << ui->pinfucbox->currentText().mid(0,6);
105+
else
106+
list << ui->pinfucbox->currentText();
104107
list << curpinstate;
105108

106109
emit send_pininfo_data(list);
@@ -114,7 +117,7 @@ void PininfoUI::on_cancebtn_clicked()
114117

115118
void PininfoUI::on_funcbox_currentIndexChanged(const QString &arg1)
116119
{
117-
120+
ui->pinfuclabel->setText("引脚功能");
118121
if(arg1 == "GPIO")
119122
{
120123
show_name_or_channel(false,false);
@@ -140,7 +143,7 @@ void PininfoUI::on_funcbox_currentIndexChanged(const QString &arg1)
140143
show_name_or_channel(true,true);
141144
show_pin_function(true);
142145
ui->pinfuclabel->setText("通道功能");
143-
pinfunclist << "EXTVOL" << "INTVOL" << "INTTEP";
146+
pinfunclist << "EXTVOL(外部电压)" << "INTVOL(内部电压)" << "INTTEP(内部温度)";
144147
ui->pinfucbox->addItems(pinfunclist);
145148
ui->devnameedit->setPlaceholderText("adc1");
146149
ui->channeledit->setPlaceholderText("3");

0 commit comments

Comments
 (0)