Skip to content

Commit 9dfafe6

Browse files
jankaejankae
committed
minimal working Si5332/AD9913
1 parent 1e64875 commit 9dfafe6

File tree

8 files changed

+771
-342
lines changed

8 files changed

+771
-342
lines changed

‎Hardware/Experiments/SynthEvaluationBoard.brd

+1-1
Original file line numberDiff line numberDiff line change
@@ -3217,7 +3217,7 @@ design rules under a new name.</description>
32173217
<attribute name="NAME" x="77.1909" y="76.9" size="1.27" layer="25" rot="R270" align="bottom-center"/>
32183218
<attribute name="VALUE" x="70.0091" y="76.9" size="1.27" layer="27" rot="R270" align="top-center"/>
32193219
</element>
3220-
<element name="R29" library="VNA" library_urn="urn:adsk.eagle:library:22367181" package="R0402" package3d_urn="urn:adsk.eagle:package:22367274/3" value="49R9" x="75.9" y="71.9" smashed="yes" rot="R90">
3220+
<element name="R29" library="VNA" library_urn="urn:adsk.eagle:library:22367181" package="R0402" package3d_urn="urn:adsk.eagle:package:22367274/3" value="4k64" x="75.9" y="71.9" smashed="yes" rot="R90">
32213221
<attribute name="NAME" x="75.265" y="71.265" size="1.27" layer="25" rot="R90"/>
32223222
<attribute name="VALUE" x="77.805" y="71.265" size="1.27" layer="27" rot="R90"/>
32233223
</element>

‎Hardware/Experiments/SynthEvaluationBoard.sch

+1-1
Original file line numberDiff line numberDiff line change
@@ -7906,7 +7906,7 @@ Source: www.kingbright.com</description>
79067906
<part name="FRAME3" library="VNA" library_urn="urn:adsk.eagle:library:19761286" deviceset="FRAMES_A3L-LOC" device=""/>
79077907
<part name="IC2" library="VNA" library_urn="urn:adsk.eagle:library:22367181" deviceset="AD9913" device="" package3d_urn="urn:adsk.eagle:package:22367293/2"/>
79087908
<part name="GND45" library="VNA" library_urn="urn:adsk.eagle:library:22367181" deviceset="GND" device=""/>
7909-
<part name="R29" library="VNA" library_urn="urn:adsk.eagle:library:22367181" deviceset="R-EU_" device="R0402" package3d_urn="urn:adsk.eagle:package:22367274/3" value="49R9"/>
7909+
<part name="R29" library="VNA" library_urn="urn:adsk.eagle:library:22367181" deviceset="R-EU_" device="R0402" package3d_urn="urn:adsk.eagle:package:22367274/3" value="4k64"/>
79107910
<part name="GND46" library="VNA" library_urn="urn:adsk.eagle:library:22367181" deviceset="GND" device=""/>
79117911
<part name="R30" library="VNA" library_urn="urn:adsk.eagle:library:22367181" deviceset="R-EU_" device="R0402" package3d_urn="urn:adsk.eagle:package:22367274/3" value="49R9"/>
79127912
<part name="R31" library="VNA" library_urn="urn:adsk.eagle:library:22367181" deviceset="R-EU_" device="R0402" package3d_urn="urn:adsk.eagle:package:22367274/3" value="49R9"/>

‎Software/HelperTools/SynthEvalBoard/Application/Drivers/AD9913.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ void AD9913::setReset(bool p) {
118118

119119
void AD9913::updateRegisters() {
120120
setIO_UPDATE(true);
121+
vTaskDelay(1);
121122
setIO_UPDATE(false);
122123
}
123124

‎Software/PC_Application/Device/RegisterAccess/ad9913.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ AD9913::AD9913()
101101
ui->freqRef->setUnit("Hz");
102102
ui->freqDDS->setPrefixes(" kMG");
103103
ui->freqDDS->setUnit("Hz");
104+
ui->freqOUT->setPrefixes(" kMG");
105+
ui->freqOUT->setUnit("Hz");
104106

105107
QObject::connect(ui->cbRef, &QComboBox::currentTextChanged, [=](QString input){
106108
SIUnitEdit *newInput = nullptr;
@@ -175,6 +177,7 @@ AD9913::AD9913()
175177
QObject::connect(ui->UseInternalProfile, &QCheckBox::toggled, updateOutput);
176178
QObject::connect(ui->DCoutput, &QCheckBox::toggled, updateOutput);
177179
QObject::connect(ui->InternalProfile, qOverload<int>(&QComboBox::currentIndexChanged), updateOutput);
180+
QObject::connect(ui->FreqTuneWord, qOverload<int>(&QSpinBox::valueChanged), updateOutput);
178181
QObject::connect(ui->Profile0Freq, qOverload<int>(&QSpinBox::valueChanged), updateOutput);
179182
QObject::connect(ui->Profile1Freq, qOverload<int>(&QSpinBox::valueChanged), updateOutput);
180183
QObject::connect(ui->Profile2Freq, qOverload<int>(&QSpinBox::valueChanged), updateOutput);

‎Software/PC_Application/Device/RegisterAccess/ad9913widget.ui

+9-9
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@
767767
<item row="0" column="1">
768768
<widget class="QSpinBox" name="FreqTuneWord">
769769
<property name="maximum">
770-
<number>429496729</number>
770+
<number>2147483647</number>
771771
</property>
772772
</widget>
773773
</item>
@@ -1059,7 +1059,7 @@
10591059
<item row="8" column="1">
10601060
<widget class="QSpinBox" name="Profile7Freq">
10611061
<property name="maximum">
1062-
<number>429496729</number>
1062+
<number>2147483647</number>
10631063
</property>
10641064
</widget>
10651065
</item>
@@ -1087,7 +1087,7 @@
10871087
<item row="3" column="1">
10881088
<widget class="QSpinBox" name="Profile2Freq">
10891089
<property name="maximum">
1090-
<number>429496729</number>
1090+
<number>2147483647</number>
10911091
</property>
10921092
</widget>
10931093
</item>
@@ -1143,14 +1143,14 @@
11431143
<item row="1" column="1">
11441144
<widget class="QSpinBox" name="Profile0Freq">
11451145
<property name="maximum">
1146-
<number>429496729</number>
1146+
<number>2147483647</number>
11471147
</property>
11481148
</widget>
11491149
</item>
11501150
<item row="6" column="1">
11511151
<widget class="QSpinBox" name="Profile5Freq">
11521152
<property name="maximum">
1153-
<number>429496729</number>
1153+
<number>2147483647</number>
11541154
</property>
11551155
</widget>
11561156
</item>
@@ -1171,7 +1171,7 @@
11711171
<item row="2" column="1">
11721172
<widget class="QSpinBox" name="Profile1Freq">
11731173
<property name="maximum">
1174-
<number>429496729</number>
1174+
<number>2147483647</number>
11751175
</property>
11761176
</widget>
11771177
</item>
@@ -1199,7 +1199,7 @@
11991199
<item row="4" column="1">
12001200
<widget class="QSpinBox" name="Profile3Freq">
12011201
<property name="maximum">
1202-
<number>429496729</number>
1202+
<number>2147483647</number>
12031203
</property>
12041204
</widget>
12051205
</item>
@@ -1213,7 +1213,7 @@
12131213
<item row="5" column="1">
12141214
<widget class="QSpinBox" name="Profile4Freq">
12151215
<property name="maximum">
1216-
<number>429496729</number>
1216+
<number>2147483647</number>
12171217
</property>
12181218
</widget>
12191219
</item>
@@ -1227,7 +1227,7 @@
12271227
<item row="7" column="1">
12281228
<widget class="QSpinBox" name="Profile6Freq">
12291229
<property name="maximum">
1230-
<number>429496729</number>
1230+
<number>2147483647</number>
12311231
</property>
12321232
</widget>
12331233
</item>

‎Software/PC_Application/Device/RegisterAccess/registerdevice.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ nlohmann::json RegisterDevice::registersToJSON()
9595
{
9696
nlohmann::json j;
9797
for(auto r : regs) {
98-
j[r->getAddress()] = r->getValue();
98+
j["0x"+QString::number(r->getAddress(), 16).toStdString()] = r->getValue();
9999
}
100100
return j;
101101
}
102102

103103
void RegisterDevice::registersFromJSON(nlohmann::json j)
104104
{
105105
for(auto val : j.items()) {
106-
auto address = QString::fromStdString(val.key()).toInt();
106+
auto address = QString::fromStdString(val.key()).toInt(Q_NULLPTR, 16);
107107
for(auto r : regs) {
108108
if(r->getAddress() == address) {
109109
r->setValue(val.value());

0 commit comments

Comments
 (0)