Skip to content

Commit 81780e7

Browse files
committed
add more position sensor
1 parent 669ecad commit 81780e7

File tree

1 file changed

+112
-29
lines changed

1 file changed

+112
-29
lines changed

frontier.qsys

Lines changed: 112 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@
442442
}
443443
datum baseAddress
444444
{
445-
value = "268436320";
446-
type = "long";
445+
value = "268437984";
446+
type = "String";
447447
}
448448
}
449449
element fan_motor_driver_1.ctrl
@@ -572,8 +572,8 @@
572572
}
573573
datum baseAddress
574574
{
575-
value = "268436288";
576-
type = "long";
575+
value = "268437952";
576+
type = "String";
577577
}
578578
}
579579
element position_encoder_1.ctrl
@@ -585,8 +585,8 @@
585585
}
586586
datum baseAddress
587587
{
588-
value = "268436256";
589-
type = "long";
588+
value = "16779680";
589+
type = "String";
590590
}
591591
}
592592
element steering_driver_8.ctrl
@@ -746,7 +746,7 @@
746746
{
747747
datum _lockedAddress
748748
{
749-
value = "0";
749+
value = "1";
750750
type = "boolean";
751751
}
752752
datum baseAddress
@@ -972,8 +972,8 @@
972972
}
973973
datum baseAddress
974974
{
975-
value = "268436224";
976-
type = "long";
975+
value = "268437888";
976+
type = "String";
977977
}
978978
}
979979
element AM2301_2.ctrl
@@ -1230,23 +1230,63 @@
12301230
{
12311231
datum _sortIndex
12321232
{
1233-
value = "63";
1233+
value = "65";
12341234
type = "int";
12351235
}
12361236
}
12371237
element position_encoder_2
12381238
{
12391239
datum _sortIndex
12401240
{
1241-
value = "62";
1241+
value = "66";
12421242
type = "int";
12431243
}
12441244
}
12451245
element position_encoder_3
12461246
{
12471247
datum _sortIndex
12481248
{
1249-
value = "61";
1249+
value = "67";
1250+
type = "int";
1251+
}
1252+
}
1253+
element position_encoder_4
1254+
{
1255+
datum _sortIndex
1256+
{
1257+
value = "68";
1258+
type = "int";
1259+
}
1260+
}
1261+
element position_encoder_5
1262+
{
1263+
datum _sortIndex
1264+
{
1265+
value = "69";
1266+
type = "int";
1267+
}
1268+
}
1269+
element position_encoder_6
1270+
{
1271+
datum _sortIndex
1272+
{
1273+
value = "70";
1274+
type = "int";
1275+
}
1276+
}
1277+
element position_encoder_7
1278+
{
1279+
datum _sortIndex
1280+
{
1281+
value = "71";
1282+
type = "int";
1283+
}
1284+
}
1285+
element position_encoder_8
1286+
{
1287+
datum _sortIndex
1288+
{
1289+
value = "72";
12501290
type = "int";
12511291
}
12521292
}
@@ -1461,39 +1501,39 @@
14611501
{
14621502
datum _sortIndex
14631503
{
1464-
value = "65";
1504+
value = "60";
14651505
type = "int";
14661506
}
14671507
}
14681508
element step_motor_driver_6
14691509
{
14701510
datum _sortIndex
14711511
{
1472-
value = "66";
1512+
value = "61";
14731513
type = "int";
14741514
}
14751515
}
14761516
element step_motor_driver_7
14771517
{
14781518
datum _sortIndex
14791519
{
1480-
value = "67";
1520+
value = "62";
14811521
type = "int";
14821522
}
14831523
}
14841524
element step_motor_driver_8
14851525
{
14861526
datum _sortIndex
14871527
{
1488-
value = "68";
1528+
value = "63";
14891529
type = "int";
14901530
}
14911531
}
14921532
element subdivision_step_motor_driver_0
14931533
{
14941534
datum _sortIndex
14951535
{
1496-
value = "60";
1536+
value = "73";
14971537
type = "int";
14981538
}
14991539
}
@@ -1564,7 +1604,9 @@
15641604
dir="end" />
15651605
<interface
15661606
name="position_encoder_0"
1567-
internal="position_encoder_0.position_encoder" />
1607+
internal="position_encoder_0.position_encoder"
1608+
type="conduit"
1609+
dir="end" />
15681610
<interface
15691611
name="step_motor_driver_1"
15701612
internal="step_motor_driver_1.step_motor"
@@ -1602,13 +1644,19 @@
16021644
dir="end" />
16031645
<interface
16041646
name="position_encoder_1"
1605-
internal="position_encoder_1.position_encoder" />
1647+
internal="position_encoder_1.position_encoder"
1648+
type="conduit"
1649+
dir="end" />
16061650
<interface
16071651
name="position_encoder_2"
1608-
internal="position_encoder_2.position_encoder" />
1652+
internal="position_encoder_2.position_encoder"
1653+
type="conduit"
1654+
dir="end" />
16091655
<interface
16101656
name="position_encoder_3"
1611-
internal="position_encoder_3.position_encoder" />
1657+
internal="position_encoder_3.position_encoder"
1658+
type="conduit"
1659+
dir="end" />
16121660
<interface
16131661
name="brush_motor_driver_0"
16141662
internal="brush_motor_driver_0.brush_motor"
@@ -1814,7 +1862,7 @@
18141862
<module
18151863
kind="position_encoder"
18161864
version="1.0"
1817-
enabled="0"
1865+
enabled="1"
18181866
name="position_encoder_0">
18191867
<parameter name="AUTO_MCLK_CLOCK_RATE" value="133333333" />
18201868
</module>
@@ -1885,21 +1933,21 @@
18851933
<module
18861934
kind="position_encoder"
18871935
version="1.0"
1888-
enabled="0"
1936+
enabled="1"
18891937
name="position_encoder_1">
18901938
<parameter name="AUTO_MCLK_CLOCK_RATE" value="133333333" />
18911939
</module>
18921940
<module
18931941
kind="position_encoder"
18941942
version="1.0"
1895-
enabled="0"
1943+
enabled="1"
18961944
name="position_encoder_2">
18971945
<parameter name="AUTO_MCLK_CLOCK_RATE" value="133333333" />
18981946
</module>
18991947
<module
19001948
kind="position_encoder"
19011949
version="1.0"
1902-
enabled="0"
1950+
enabled="1"
19031951
name="position_encoder_3">
19041952
<parameter name="AUTO_MCLK_CLOCK_RATE" value="133333333" />
19051953
</module>
@@ -2848,6 +2896,41 @@
28482896
<parameter name="AUTO_MCLK_CLOCK_RATE" value="133333333" />
28492897
<parameter name="AUTO_PWMCLK_CLOCK_RATE" value="200000000" />
28502898
</module>
2899+
<module
2900+
kind="position_encoder"
2901+
version="1.0"
2902+
enabled="0"
2903+
name="position_encoder_4">
2904+
<parameter name="AUTO_MCLK_CLOCK_RATE" value="-1" />
2905+
</module>
2906+
<module
2907+
kind="position_encoder"
2908+
version="1.0"
2909+
enabled="0"
2910+
name="position_encoder_5">
2911+
<parameter name="AUTO_MCLK_CLOCK_RATE" value="-1" />
2912+
</module>
2913+
<module
2914+
kind="position_encoder"
2915+
version="1.0"
2916+
enabled="0"
2917+
name="position_encoder_6">
2918+
<parameter name="AUTO_MCLK_CLOCK_RATE" value="-1" />
2919+
</module>
2920+
<module
2921+
kind="position_encoder"
2922+
version="1.0"
2923+
enabled="0"
2924+
name="position_encoder_7">
2925+
<parameter name="AUTO_MCLK_CLOCK_RATE" value="-1" />
2926+
</module>
2927+
<module
2928+
kind="position_encoder"
2929+
version="1.0"
2930+
enabled="0"
2931+
name="position_encoder_8">
2932+
<parameter name="AUTO_MCLK_CLOCK_RATE" value="-1" />
2933+
</module>
28512934
<connection
28522935
kind="reset"
28532936
version="12.1"
@@ -3110,7 +3193,7 @@
31103193
start="HPS_tabby.M1"
31113194
end="position_encoder_0.ctrl">
31123195
<parameter name="arbitrationPriority" value="1" />
3113-
<parameter name="baseAddress" value="0x10000300" />
3196+
<parameter name="baseAddress" value="0x10000980" />
31143197
</connection>
31153198
<connection
31163199
kind="avalon"
@@ -3375,7 +3458,7 @@
33753458
start="HPS_tabby.M1"
33763459
end="position_encoder_1.ctrl">
33773460
<parameter name="arbitrationPriority" value="1" />
3378-
<parameter name="baseAddress" value="0x10000320" />
3461+
<parameter name="baseAddress" value="0x010009a0" />
33793462
</connection>
33803463
<connection
33813464
kind="reset"
@@ -3393,7 +3476,7 @@
33933476
start="HPS_tabby.M1"
33943477
end="position_encoder_2.ctrl">
33953478
<parameter name="arbitrationPriority" value="1" />
3396-
<parameter name="baseAddress" value="0x10000340" />
3479+
<parameter name="baseAddress" value="0x100009c0" />
33973480
</connection>
33983481
<connection
33993482
kind="reset"
@@ -3411,7 +3494,7 @@
34113494
start="HPS_tabby.M1"
34123495
end="position_encoder_3.ctrl">
34133496
<parameter name="arbitrationPriority" value="1" />
3414-
<parameter name="baseAddress" value="0x10000360" />
3497+
<parameter name="baseAddress" value="0x100009e0" />
34153498
</connection>
34163499
<connection
34173500
kind="clock"

0 commit comments

Comments
 (0)