Skip to content

Commit f43fdf3

Browse files
committed
[bug]修复bug
1 parent 10da09d commit f43fdf3

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

exe/pinout-generator.exe

0 Bytes
Binary file not shown.

project/RTduino.pro.user

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 5.0.2, 2022-09-23T18:21:44. -->
3+
<!-- Written by QtCreator 5.0.2, 2022-10-14T15:01:22. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>
@@ -94,7 +94,7 @@
9494
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.12 MinGW 64-bit</value>
9595
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.12 MinGW 64-bit</value>
9696
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.51212.win64_mingw73_kit</value>
97-
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
97+
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
9898
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
9999
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
100100
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -244,7 +244,7 @@
244244
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
245245
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
246246
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
247-
<value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/94184/Desktop/QT/build-RTduino-Desktop_Qt_5_12_12_MinGW_64_bit-Release</value>
247+
<value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/94184/Desktop/QT/build-RTduino-Desktop_Qt_5_12_12_MinGW_64_bit-Debug</value>
248248
</valuemap>
249249
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
250250
</valuemap>

project/fileout.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,16 +258,19 @@ void Widget::write_data_to_kconfig()
258258
break;
259259
}
260260
};
261-
foreach(auto i,varlist)
261+
if(!varlist.isEmpty())
262262
{
263-
out << i;
263+
foreach(auto i,varlist)
264+
{
265+
out << i;
266+
}
267+
if(varlist.at(pwmindex) == " select BSP_USING_PWM\n")
268+
out << " imply RTDUINO_USING_SERVO\n";
269+
if(ui->i2cdevbox->currentText() != "NULL")
270+
out << " imply RTDUINO_USING_WIRE\n";
271+
if(ui->spidevbox->currentText() != "NULL")
272+
out << " imply RTDUINO_USING_SPI\n";
264273
}
265-
if(varlist.at(pwmindex) == " select BSP_USING_PWM\n")
266-
out << " imply RTDUINO_USING_SERVO\n";
267-
if(ui->i2cdevbox->currentText() != "NULL")
268-
out << " imply RTDUINO_USING_WIRE\n";
269-
if(ui->spidevbox->currentText() != "NULL")
270-
out << " imply RTDUINO_USING_SPI\n";
271274
out << " default n";
272275
}
273276

0 commit comments

Comments
 (0)