Skip to content

Commit e3a9a26

Browse files
liYonyliYony
committed
super version
1 parent 52cecf5 commit e3a9a26

File tree

13 files changed

+757
-200
lines changed

13 files changed

+757
-200
lines changed

‎project/RTduino.pro.user‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 5.0.2, 2022-10-14T15:01:22. -->
3+
<!-- Written by QtCreator 6.0.2, 2022-12-04T10:52:07. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>
7-
<value type="QByteArray">{d3cfe9e2-3d75-4cb7-8ea1-58a0aafaa176}</value>
7+
<value type="QByteArray">{295ef3e1-714e-4a61-88ff-efcd7ecccccd}</value>
88
</data>
99
<data>
1010
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -70,9 +70,7 @@
7070
<valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
7171
<value type="int" key="AutoTest.RunAfterBuild">0</value>
7272
<value type="bool" key="AutoTest.UseGlobal">true</value>
73-
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey">
74-
<value type="QString">-fno-delayed-template-parsing</value>
75-
</valuelist>
73+
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
7674
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
7775
<value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.BuildSystem</value>
7876
<valuemap type="QVariantMap" key="ClangTools">
@@ -91,16 +89,16 @@
9189
<variable>ProjectExplorer.Project.Target.0</variable>
9290
<valuemap type="QVariantMap">
9391
<value type="QString" key="DeviceType">Desktop</value>
94-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.12 MinGW 64-bit</value>
95-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.12 MinGW 64-bit</value>
96-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.51212.win64_mingw73_kit</value>
92+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">桌面</value>
93+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">桌面</value>
94+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{d8acf931-8eee-43f0-8fcd-4995eb5a38e0}</value>
9795
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
9896
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
9997
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
10098
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
10199
<value type="int" key="EnableQmlDebugging">0</value>
102-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\94184\Desktop\QT\build-RTduino-Desktop_Qt_5_12_12_MinGW_64_bit-Debug</value>
103-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/94184/Desktop/QT/build-RTduino-Desktop_Qt_5_12_12_MinGW_64_bit-Debug</value>
100+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/liyony/Desktop/QTcode/build-RTduino-unknown-Debug</value>
101+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/liyony/Desktop/QTcode/build-RTduino-unknown-Debug</value>
104102
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
105103
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
106104
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -131,14 +129,15 @@
131129
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
132130
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
133131
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
132+
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
134133
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
135134
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
136135
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
137136
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
138137
</valuemap>
139138
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
140-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\94184\Desktop\QT\build-RTduino-Desktop_Qt_5_12_12_MinGW_64_bit-Release</value>
141-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/94184/Desktop/QT/build-RTduino-Desktop_Qt_5_12_12_MinGW_64_bit-Release</value>
139+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/liyony/Desktop/QTcode/build-RTduino-unknown-Release</value>
140+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/liyony/Desktop/QTcode/build-RTduino-unknown-Release</value>
142141
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
143142
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
144143
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -169,6 +168,7 @@
169168
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
170169
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
171170
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
171+
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
172172
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
173173
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
174174
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
@@ -177,8 +177,8 @@
177177
</valuemap>
178178
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
179179
<value type="int" key="EnableQmlDebugging">0</value>
180-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\94184\Desktop\QT\build-RTduino-Desktop_Qt_5_12_12_MinGW_64_bit-Profile</value>
181-
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/94184/Desktop/QT/build-RTduino-Desktop_Qt_5_12_12_MinGW_64_bit-Profile</value>
180+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/liyony/Desktop/QTcode/build-RTduino-unknown-Profile</value>
181+
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/home/liyony/Desktop/QTcode/build-RTduino-unknown-Profile</value>
182182
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
183183
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
184184
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -209,6 +209,7 @@
209209
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
210210
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
211211
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
212+
<value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
212213
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
213214
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
214215
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
@@ -237,14 +238,14 @@
237238
<valuelist type="QVariantList" key="CustomOutputParsers"/>
238239
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
239240
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
240-
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/94184/Desktop/QT/RTduino/RTduino.pro</value>
241-
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/94184/Desktop/QT/RTduino/RTduino.pro</value>
241+
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/liyony/Desktop/QTcode/pinout-generator-qt/RTduino.pro</value>
242+
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/liyony/Desktop/QTcode/pinout-generator-qt/RTduino.pro</value>
242243
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
243244
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
244245
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
245246
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
246247
<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-Debug</value>
248+
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/liyony/Desktop/QTcode/build-RTduino-unknown-Debug</value>
248249
</valuemap>
249250
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
250251
</valuemap>

‎project/filein.cpp‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ void Widget::prase_pin_item_from_string(QString &pinline)
1414
QRegularExpression rttpinreg("([ADC]{1,3}\\d+),[ ]?.*?(GET_PIN.*?\\)|\\d+)?[,} ]");
1515
QRegularExpression namereg("\"(.*)\"");
1616
QRegularExpression channelreg("[ ,](-?\\d+)[ }]");
17+
QRegularExpression pinfuncreg("-(.*? )");
1718

1819
pmap->arduino_pin = arduinoreg.match(pinline).captured(1);
1920
pmap->io_channel = channelreg.match(pinline).captured(1);
@@ -22,7 +23,17 @@ void Widget::prase_pin_item_from_string(QString &pinline)
2223
pmap->rtthread_pin = "RT_NULL";
2324
else
2425
pmap->rtthread_pin = rttpinreg.match(pinline).captured(2);
25-
26+
// qDebug() << pinfuncreg.match(pinline).captured(1).mid(0,pinfuncreg.match(pinline).captured(1).size()-1);
27+
if(pinfuncreg.match(pinline).captured(1).mid(0,pinfuncreg.match(pinline).captured(1).size()-1) != "SS")
28+
pmap->pin_func = pinfuncreg.match(pinline).captured(1).mid(0,pinfuncreg.match(pinline).captured(1).size()-1);
29+
if(pinline.contains("ADC",Qt::CaseSensitive))
30+
{
31+
pmap->pin_func = "EXTVOL";
32+
if(pinline.contains("voltage",Qt::CaseSensitive))
33+
pmap->pin_func = "INTVOL";
34+
if(pinline.contains("temperature",Qt::CaseSensitive))
35+
pmap->pin_func = "INTTEP";
36+
}
2637
pin_set_io_function(pmap);
2738
pinmaplist.fill_pinmap_notes(pmap);
2839
pinmaplist.Allpinlist.push_back(pmap);

‎project/fileinfo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"src = Glob('*.c') + Glob('*.cpp')\n"\
2020
"inc = [cwd]\n"\
2121
"\n"\
22-
"group = DefineGroup('Arduino', src, depend = ['PKG_USING_RTDUINO'], CPPPATH = inc)\n"\
22+
"group = DefineGroup('RTduino', src, depend = ['PKG_USING_RTDUINO'], CPPPATH = inc)\n"\
2323
"\n"\
2424
"Return('group')\n"
2525
#endif // FILEINFO_H

0 commit comments

Comments
 (0)