Skip to content
Snippets Groups Projects
Commit 5d29f46f authored by Reinier van der Walle's avatar Reinier van der Walle
Browse files

Merge branch 'master' into 'L2SDP-133'

Master

See merge request desp/hdl!46
parents 7f7f6d23 323d3329
No related branches found
No related tags found
3 merge requests!100Removed text for XSub that is now written in Confluence Subband correlator...,!48Resolve L2SDP-133,!46Master
Showing
with 6438 additions and 30 deletions
:0400000000002000DC
:0400040000002000D8
:0400080000002000D4
:04000C0000002000D0
:0400100000002000CC
:0400140000002000C8
:0400180000002000C4
:04001C0000002000C0
:0400200000002000BC
:0400240000002000B8
:0400280000002000B4
:04002C0000002000B0
:0400300000002000AC
:0400340000002000A8
:0400380000002000A4
:04003C0000002000A0
:04004000000020009C
:040044000000200098
:040048000000200094
:04004C000000200090
:04005000000020008C
:040054000000200088
:040058000000200084
:04005C000000200080
:04006000000020007C
:040064000000200078
:040068000000200074
:04006C000000200070
:04007000000020006C
:040074000000200068
:040078000000200064
:04007C000000200060
:04008000000020005C
:040084000000200058
:040088000000200054
:04008C000000200050
:04009000000020004C
:040094000000200048
:040098000000200044
:04009C000000200040
:0400A000000020003C
:0400A4000000200038
:0400A8000000200034
:0400AC000000200030
:0400B000000020002C
:0400B4000000200028
:0400B8000000200024
:0400BC000000200020
:0400C000000020001C
:0400C4000000200018
:0400C8000000200014
:0400CC000000200010
:0400D000000020000C
:0400D4000000200008
:0400D8000000200004
:0400DC000000200000
:0400E00000002000FC
:0400E40000002000F8
:0400E80000002000F4
:0400EC0000002000F0
:0400F00000002000EC
:0400F40000002000E8
:0400F80000002000E4
:0400FC0000002000E0
:0401000000002000DB
:0401040000002000D7
:0401080000002000D3
:04010C0000002000CF
:0401100000002000CB
:0401140000002000C7
:0401180000002000C3
:04011C0000002000BF
:0401200000002000BB
:0401240000002000B7
:0401280000002000B3
:04012C0000002000AF
:0401300000002000AB
:0401340000002000A7
:0401380000002000A3
:04013C00000020009F
:04014000000020009B
:040144000000200097
:040148000000200093
:04014C00000020008F
:04015000000020008B
:040154000000200087
:040158000000200083
:04015C00000020007F
:04016000000020007B
:040164000000200077
:040168000000200073
:04016C00000020006F
:04017000000020006B
:040174000000200067
:040178000000200063
:04017C00000020005F
:04018000000020005B
:040184000000200057
:040188000000200053
:04018C00000020004F
:04019000000020004B
:040194000000200047
:040198000000200043
:04019C00000020003F
:0401A000000020003B
:0401A4000000200037
:0401A8000000200033
:0401AC00000020002F
:0401B000000020002B
:0401B4000000200027
:0401B8000000200023
:0401BC00000020001F
:0401C000000020001B
:0401C4000000200017
:0401C8000000200013
:0401CC00000020000F
:0401D000000020000B
:0401D4000000200007
:0401D8000000200003
:0401DC0000002000FF
:0401E00000002000FB
:0401E40000002000F7
:0401E80000002000F3
:0401EC0000002000EF
:0401F00000002000EB
:0401F40000002000E7
:0401F80000002000E3
:0401FC0000002000DF
:0402000000002000DA
:0402040000002000D6
:0402080000002000D2
:04020C0000002000CE
:0402100000002000CA
:0402140000002000C6
:0402180000002000C2
:04021C0000002000BE
:0402200000002000BA
:0402240000002000B6
:0402280000002000B2
:04022C0000002000AE
:0402300000002000AA
:0402340000002000A6
:0402380000002000A2
:04023C00000020009E
:04024000000020009A
:040244000000200096
:040248000000200092
:04024C00000020008E
:04025000000020008A
:040254000000200086
:040258000000200082
:04025C00000020007E
:04026000000020007A
:040264000000200076
:040268000000200072
:04026C00000020006E
:04027000000020006A
:040274000000200066
:040278000000200062
:04027C00000020005E
:04028000000020005A
:040284000000200056
:040288000000200052
:04028C00000020004E
:04029000000020004A
:040294000000200046
:040298000000200042
:04029C00000020003E
:0402A000000020003A
:0402A4000000200036
:0402A8000000200032
:0402AC00000020002E
:0402B000000020002A
:0402B4000000200026
:0402B8000000200022
:0402BC00000020001E
:0402C000000020001A
:0402C4000000200016
:0402C8000000200012
:0402CC00000020000E
:0402D000000020000A
:0402D4000000200006
:0402D8000000200002
:0402DC0000002000FE
:0402E00000002000FA
:0402E40000002000F6
:0402E80000002000F2
:0402EC0000002000EE
:0402F00000002000EA
:0402F40000002000E6
:0402F80000002000E2
:0402FC0000002000DE
:0403000000002000D9
:0403040000002000D5
:0403080000002000D1
:04030C0000002000CD
:0403100000002000C9
:0403140000002000C5
:0403180000002000C1
:04031C0000002000BD
:0403200000002000B9
:0403240000002000B5
:0403280000002000B1
:04032C0000002000AD
:0403300000002000A9
:0403340000002000A5
:0403380000002000A1
:04033C00000020009D
:040340000000200099
:040344000000200095
:040348000000200091
:04034C00000020008D
:040350000000200089
:040354000000200085
:040358000000200081
:04035C00000020007D
:040360000000200079
:040364000000200075
:040368000000200071
:04036C00000020006D
:040370000000200069
:040374000000200065
:040378000000200061
:04037C00000020005D
:040380000000200059
:040384000000200055
:040388000000200051
:04038C00000020004D
:040390000000200049
:040394000000200045
:040398000000200041
:04039C00000020003D
:0403A0000000200039
:0403A4000000200035
:0403A8000000200031
:0403AC00000020002D
:0403B0000000200029
:0403B4000000200025
:0403B8000000200021
:0403BC00000020001D
:0403C0000000200019
:0403C4000000200015
:0403C8000000200011
:0403CC00000020000D
:0403D0000000200009
:0403D4000000200005
:0403D8000000200001
:0403DC0000002000FD
:0403E00000002000F9
:0403E40000002000F5
:0403E80000002000F1
:0403EC0000002000ED
:0403F00000002000E9
:0403F40000002000E5
:0403F80000002000E1
:0403FC0000002000DD
:0404000000002000D8
:0404040000002000D4
:0404080000002000D0
:04040C0000002000CC
:0404100000002000C8
:0404140000002000C4
:0404180000002000C0
:04041C0000002000BC
:0404200000002000B8
:0404240000002000B4
:0404280000002000B0
:04042C0000002000AC
:0404300000002000A8
:0404340000002000A4
:0404380000002000A0
:04043C00000020009C
:040440000000200098
:040444000000200094
:040448000000200090
:04044C00000020008C
:040450000000200088
:040454000000200084
:040458000000200080
:04045C00000020007C
:040460000000200078
:040464000000200074
:040468000000200070
:04046C00000020006C
:040470000000200068
:040474000000200064
:040478000000200060
:04047C00000020005C
:040480000000200058
:040484000000200054
:040488000000200050
:04048C00000020004C
:040490000000200048
:040494000000200044
:040498000000200040
:04049C00000020003C
:0404A0000000200038
:0404A4000000200034
:0404A8000000200030
:0404AC00000020002C
:0404B0000000200028
:0404B4000000200024
:0404B8000000200020
:0404BC00000020001C
:0404C0000000200018
:0404C4000000200014
:0404C8000000200010
:0404CC00000020000C
:0404D0000000200008
:0404D4000000200004
:0404D8000000200000
:0404DC0000002000FC
:0404E00000002000F8
:0404E40000002000F4
:0404E80000002000F0
:0404EC0000002000EC
:0404F00000002000E8
:0404F40000002000E4
:0404F80000002000E0
:0404FC0000002000DC
:0405000000002000D7
:0405040000002000D3
:0405080000002000CF
:04050C0000002000CB
:0405100000002000C7
:0405140000002000C3
:0405180000002000BF
:04051C0000002000BB
:0405200000002000B7
:0405240000002000B3
:0405280000002000AF
:04052C0000002000AB
:0405300000002000A7
:0405340000002000A3
:04053800000020009F
:04053C00000020009B
:040540000000200097
:040544000000200093
:04054800000020008F
:04054C00000020008B
:040550000000200087
:040554000000200083
:04055800000020007F
:04055C00000020007B
:040560000000200077
:040564000000200073
:04056800000020006F
:04056C00000020006B
:040570000000200067
:040574000000200063
:04057800000020005F
:04057C00000020005B
:040580000000200057
:040584000000200053
:04058800000020004F
:04058C00000020004B
:040590000000200047
:040594000000200043
:04059800000020003F
:04059C00000020003B
:0405A0000000200037
:0405A4000000200033
:0405A800000020002F
:0405AC00000020002B
:0405B0000000200027
:0405B4000000200023
:0405B800000020001F
:0405BC00000020001B
:0405C0000000200017
:0405C4000000200013
:0405C800000020000F
:0405CC00000020000B
:0405D0000000200007
:0405D4000000200003
:0405D80000002000FF
:0405DC0000002000FB
:0405E00000002000F7
:0405E40000002000F3
:0405E80000002000EF
:0405EC0000002000EB
:0405F00000002000E7
:0405F40000002000E3
:0405F80000002000DF
:0405FC0000002000DB
:0406000000002000D6
:0406040000002000D2
:0406080000002000CE
:04060C0000002000CA
:0406100000002000C6
:0406140000002000C2
:0406180000002000BE
:04061C0000002000BA
:0406200000002000B6
:0406240000002000B2
:0406280000002000AE
:04062C0000002000AA
:0406300000002000A6
:0406340000002000A2
:04063800000020009E
:04063C00000020009A
:040640000000200096
:040644000000200092
:04064800000020008E
:04064C00000020008A
:040650000000200086
:040654000000200082
:04065800000020007E
:04065C00000020007A
:040660000000200076
:040664000000200072
:04066800000020006E
:04066C00000020006A
:040670000000200066
:040674000000200062
:04067800000020005E
:04067C00000020005A
:040680000000200056
:040684000000200052
:04068800000020004E
:04068C00000020004A
:040690000000200046
:040694000000200042
:04069800000020003E
:04069C00000020003A
:0406A0000000200036
:0406A4000000200032
:0406A800000020002E
:0406AC00000020002A
:0406B0000000200026
:0406B4000000200022
:0406B800000020001E
:0406BC00000020001A
:0406C0000000200016
:0406C4000000200012
:0406C800000020000E
:0406CC00000020000A
:0406D0000000200006
:0406D4000000200002
:0406D80000002000FE
:0406DC0000002000FA
:0406E00000002000F6
:0406E40000002000F2
:0406E80000002000EE
:0406EC0000002000EA
:0406F00000002000E6
:0406F40000002000E2
:0406F80000002000DE
:0406FC0000002000DA
:0407000000002000D5
:0407040000002000D1
:0407080000002000CD
:04070C0000002000C9
:0407100000002000C5
:0407140000002000C1
:0407180000002000BD
:04071C0000002000B9
:0407200000002000B5
:0407240000002000B1
:0407280000002000AD
:04072C0000002000A9
:0407300000002000A5
:0407340000002000A1
:04073800000020009D
:04073C000000200099
:040740000000200095
:040744000000200091
:04074800000020008D
:04074C000000200089
:040750000000200085
:040754000000200081
:04075800000020007D
:04075C000000200079
:040760000000200075
:040764000000200071
:04076800000020006D
:04076C000000200069
:040770000000200065
:040774000000200061
:04077800000020005D
:04077C000000200059
:040780000000200055
:040784000000200051
:04078800000020004D
:04078C000000200049
:040790000000200045
:040794000000200041
:04079800000020003D
:04079C000000200039
:0407A0000000200035
:0407A4000000200031
:0407A800000020002D
:0407AC000000200029
:0407B0000000200025
:0407B4000000200021
:0407B800000020001D
:0407BC000000200019
:0407C0000000200015
:0407C4000000200011
:0407C800000020000D
:0407CC000000200009
:0407D0000000200005
:0407D4000000200001
:0407D80000002000FD
:0407DC0000002000F9
:0407E00000002000F5
:0407E40000002000F1
:0407E80000002000ED
:0407EC0000002000E9
:0407F00000002000E5
:0407F40000002000E1
:0407F80000002000DD
:0407FC0000002000D9
:0408000000002000D4
:0408040000002000D0
:0408080000002000CC
:04080C0000002000C8
:0408100000002000C4
:0408140000002000C0
:0408180000002000BC
:04081C0000002000B8
:0408200000002000B4
:0408240000002000B0
:0408280000002000AC
:04082C0000002000A8
:0408300000002000A4
:0408340000002000A0
:04083800000020009C
:04083C000000200098
:040840000000200094
:040844000000200090
:04084800000020008C
:04084C000000200088
:040850000000200084
:040854000000200080
:04085800000020007C
:04085C000000200078
:040860000000200074
:040864000000200070
:04086800000020006C
:04086C000000200068
:040870000000200064
:040874000000200060
:04087800000020005C
:04087C000000200058
:040880000000200054
:040884000000200050
:04088800000020004C
:04088C000000200048
:040890000000200044
:040894000000200040
:04089800000020003C
:04089C000000200038
:0408A0000000200034
:0408A4000000200030
:0408A800000020002C
:0408AC000000200028
:0408B0000000200024
:0408B4000000200020
:0408B800000020001C
:0408BC000000200018
:0408C0000000200014
:0408C4000000200010
:0408C800000020000C
:0408CC000000200008
:0408D0000000200004
:0408D4000000200000
:0408D80000002000FC
:0408DC0000002000F8
:0408E00000002000F4
:0408E40000002000F0
:0408E80000002000EC
:0408EC0000002000E8
:0408F00000002000E4
:0408F40000002000E0
:0408F80000002000DC
:0408FC0000002000D8
:0409000000002000D3
:0409040000002000CF
:0409080000002000CB
:04090C0000002000C7
:0409100000002000C3
:0409140000002000BF
:0409180000002000BB
:04091C0000002000B7
:0409200000002000B3
:0409240000002000AF
:0409280000002000AB
:04092C0000002000A7
:0409300000002000A3
:04093400000020009F
:04093800000020009B
:04093C000000200097
:040940000000200093
:04094400000020008F
:04094800000020008B
:04094C000000200087
:040950000000200083
:04095400000020007F
:04095800000020007B
:04095C000000200077
:040960000000200073
:04096400000020006F
:04096800000020006B
:04096C000000200067
:040970000000200063
:04097400000020005F
:04097800000020005B
:04097C000000200057
:040980000000200053
:04098400000020004F
:04098800000020004B
:04098C000000200047
:040990000000200043
:04099400000020003F
:04099800000020003B
:04099C000000200037
:0409A0000000200033
:0409A400000020002F
:0409A800000020002B
:0409AC000000200027
:0409B0000000200023
:0409B400000020001F
:0409B800000020001B
:0409BC000000200017
:0409C0000000200013
:0409C400000020000F
:0409C800000020000B
:0409CC000000200007
:0409D0000000200003
:0409D40000002000FF
:0409D80000002000FB
:0409DC0000002000F7
:0409E00000002000F3
:0409E40000002000EF
:0409E80000002000EB
:0409EC0000002000E7
:0409F00000002000E3
:0409F40000002000DF
:0409F80000002000DB
:0409FC0000002000D7
:040A000000002000D2
:040A040000002000CE
:040A080000002000CA
:040A0C0000002000C6
:040A100000002000C2
:040A140000002000BE
:040A180000002000BA
:040A1C0000002000B6
:040A200000002000B2
:040A240000002000AE
:040A280000002000AA
:040A2C0000002000A6
:040A300000002000A2
:040A3400000020009E
:040A3800000020009A
:040A3C000000200096
:040A40000000200092
:040A4400000020008E
:040A4800000020008A
:040A4C000000200086
:040A50000000200082
:040A5400000020007E
:040A5800000020007A
:040A5C000000200076
:040A60000000200072
:040A6400000020006E
:040A6800000020006A
:040A6C000000200066
:040A70000000200062
:040A7400000020005E
:040A7800000020005A
:040A7C000000200056
:040A80000000200052
:040A8400000020004E
:040A8800000020004A
:040A8C000000200046
:040A90000000200042
:040A9400000020003E
:040A9800000020003A
:040A9C000000200036
:040AA0000000200032
:040AA400000020002E
:040AA800000020002A
:040AAC000000200026
:040AB0000000200022
:040AB400000020001E
:040AB800000020001A
:040ABC000000200016
:040AC0000000200012
:040AC400000020000E
:040AC800000020000A
:040ACC000000200006
:040AD0000000200002
:040AD40000002000FE
:040AD80000002000FA
:040ADC0000002000F6
:040AE00000002000F2
:040AE40000002000EE
:040AE80000002000EA
:040AEC0000002000E6
:040AF00000002000E2
:040AF40000002000DE
:040AF80000002000DA
:040AFC0000002000D6
:040B000000002000D1
:040B040000002000CD
:040B080000002000C9
:040B0C0000002000C5
:040B100000002000C1
:040B140000002000BD
:040B180000002000B9
:040B1C0000002000B5
:040B200000002000B1
:040B240000002000AD
:040B280000002000A9
:040B2C0000002000A5
:040B300000002000A1
:040B3400000020009D
:040B38000000200099
:040B3C000000200095
:040B40000000200091
:040B4400000020008D
:040B48000000200089
:040B4C000000200085
:040B50000000200081
:040B5400000020007D
:040B58000000200079
:040B5C000000200075
:040B60000000200071
:040B6400000020006D
:040B68000000200069
:040B6C000000200065
:040B70000000200061
:040B7400000020005D
:040B78000000200059
:040B7C000000200055
:040B80000000200051
:040B8400000020004D
:040B88000000200049
:040B8C000000200045
:040B90000000200041
:040B9400000020003D
:040B98000000200039
:040B9C000000200035
:040BA0000000200031
:040BA400000020002D
:040BA8000000200029
:040BAC000000200025
:040BB0000000200021
:040BB400000020001D
:040BB8000000200019
:040BBC000000200015
:040BC0000000200011
:040BC400000020000D
:040BC8000000200009
:040BCC000000200005
:040BD0000000200001
:040BD40000002000FD
:040BD80000002000F9
:040BDC0000002000F5
:040BE00000002000F1
:040BE40000002000ED
:040BE80000002000E9
:040BEC0000002000E5
:040BF00000002000E1
:040BF40000002000DD
:040BF80000002000D9
:040BFC0000002000D5
:040C000000002000D0
:040C040000002000CC
:040C080000002000C8
:040C0C0000002000C4
:040C100000002000C0
:040C140000002000BC
:040C180000002000B8
:040C1C0000002000B4
:040C200000002000B0
:040C240000002000AC
:040C280000002000A8
:040C2C0000002000A4
:040C300000002000A0
:040C3400000020009C
:040C38000000200098
:040C3C000000200094
:040C40000000200090
:040C4400000020008C
:040C48000000200088
:040C4C000000200084
:040C50000000200080
:040C5400000020007C
:040C58000000200078
:040C5C000000200074
:040C60000000200070
:040C6400000020006C
:040C68000000200068
:040C6C000000200064
:040C70000000200060
:040C7400000020005C
:040C78000000200058
:040C7C000000200054
:040C80000000200050
:040C8400000020004C
:040C88000000200048
:040C8C000000200044
:040C90000000200040
:040C9400000020003C
:040C98000000200038
:040C9C000000200034
:040CA0000000200030
:040CA400000020002C
:040CA8000000200028
:040CAC000000200024
:040CB0000000200020
:040CB400000020001C
:040CB8000000200018
:040CBC000000200014
:040CC0000000200010
:040CC400000020000C
:040CC8000000200008
:040CCC000000200004
:040CD0000000200000
:040CD40000002000FC
:040CD80000002000F8
:040CDC0000002000F4
:040CE00000002000F0
:040CE40000002000EC
:040CE80000002000E8
:040CEC0000002000E4
:040CF00000002000E0
:040CF40000002000DC
:040CF80000002000D8
:040CFC0000002000D4
:040D000000002000CF
:040D040000002000CB
:040D080000002000C7
:040D0C0000002000C3
:040D100000002000BF
:040D140000002000BB
:040D180000002000B7
:040D1C0000002000B3
:040D200000002000AF
:040D240000002000AB
:040D280000002000A7
:040D2C0000002000A3
:040D3000000020009F
:040D3400000020009B
:040D38000000200097
:040D3C000000200093
:040D4000000020008F
:040D4400000020008B
:040D48000000200087
:040D4C000000200083
:040D5000000020007F
:040D5400000020007B
:040D58000000200077
:040D5C000000200073
:040D6000000020006F
:040D6400000020006B
:040D68000000200067
:040D6C000000200063
:040D7000000020005F
:040D7400000020005B
:040D78000000200057
:040D7C000000200053
:040D8000000020004F
:040D8400000020004B
:040D88000000200047
:040D8C000000200043
:040D9000000020003F
:040D9400000020003B
:040D98000000200037
:040D9C000000200033
:040DA000000020002F
:040DA400000020002B
:040DA8000000200027
:040DAC000000200023
:040DB000000020001F
:040DB400000020001B
:040DB8000000200017
:040DBC000000200013
:040DC000000020000F
:040DC400000020000B
:040DC8000000200007
:040DCC000000200003
:040DD00000002000FF
:040DD40000002000FB
:040DD80000002000F7
:040DDC0000002000F3
:040DE00000002000EF
:040DE40000002000EB
:040DE80000002000E7
:040DEC0000002000E3
:040DF00000002000DF
:040DF40000002000DB
:040DF80000002000D7
:040DFC0000002000D3
:040E000000002000CE
:040E040000002000CA
:040E080000002000C6
:040E0C0000002000C2
:040E100000002000BE
:040E140000002000BA
:040E180000002000B6
:040E1C0000002000B2
:040E200000002000AE
:040E240000002000AA
:040E280000002000A6
:040E2C0000002000A2
:040E3000000020009E
:040E3400000020009A
:040E38000000200096
:040E3C000000200092
:040E4000000020008E
:040E4400000020008A
:040E48000000200086
:040E4C000000200082
:040E5000000020007E
:040E5400000020007A
:040E58000000200076
:040E5C000000200072
:040E6000000020006E
:040E6400000020006A
:040E68000000200066
:040E6C000000200062
:040E7000000020005E
:040E7400000020005A
:040E78000000200056
:040E7C000000200052
:040E8000000020004E
:040E8400000020004A
:040E88000000200046
:040E8C000000200042
:040E9000000020003E
:040E9400000020003A
:040E98000000200036
:040E9C000000200032
:040EA000000020002E
:040EA400000020002A
:040EA8000000200026
:040EAC000000200022
:040EB000000020001E
:040EB400000020001A
:040EB8000000200016
:040EBC000000200012
:040EC000000020000E
:040EC400000020000A
:040EC8000000200006
:040ECC000000200002
:040ED00000002000FE
:040ED40000002000FA
:040ED80000002000F6
:040EDC0000002000F2
:040EE00000002000EE
:040EE40000002000EA
:040EE80000002000E6
:040EEC0000002000E2
:040EF00000002000DE
:040EF40000002000DA
:040EF80000002000D6
:040EFC0000002000D2
:040F000000002000CD
:040F040000002000C9
:040F080000002000C5
:040F0C0000002000C1
:040F100000002000BD
:040F140000002000B9
:040F180000002000B5
:040F1C0000002000B1
:040F200000002000AD
:040F240000002000A9
:040F280000002000A5
:040F2C0000002000A1
:040F3000000020009D
:040F34000000200099
:040F38000000200095
:040F3C000000200091
:040F4000000020008D
:040F44000000200089
:040F48000000200085
:040F4C000000200081
:040F5000000020007D
:040F54000000200079
:040F58000000200075
:040F5C000000200071
:040F6000000020006D
:040F64000000200069
:040F68000000200065
:040F6C000000200061
:040F7000000020005D
:040F74000000200059
:040F78000000200055
:040F7C000000200051
:040F8000000020004D
:040F84000000200049
:040F88000000200045
:040F8C000000200041
:040F9000000020003D
:040F94000000200039
:040F98000000200035
:040F9C000000200031
:040FA000000020002D
:040FA4000000200029
:040FA8000000200025
:040FAC000000200021
:040FB000000020001D
:040FB4000000200019
:040FB8000000200015
:040FBC000000200011
:040FC000000020000D
:040FC4000000200009
:040FC8000000200005
:040FCC000000200001
:040FD00000002000FD
:040FD40000002000F9
:040FD80000002000F5
:040FDC0000002000F1
:040FE00000002000ED
:040FE40000002000E9
:040FE80000002000E5
:040FEC0000002000E1
:040FF00000002000DD
:040FF40000002000D9
:040FF80000002000D5
:040FFC0000002000D1
:00000001FF
......@@ -6,7 +6,8 @@ hdl_lib_technology =
synth_files =
src/vhdl/sdp_pkg.vhd
src/vhdl/sdp_scope.vhd
src/vhdl/sdp_scope.vhd
src/vhdl/sdp_subband_equalizer.vhd
src/vhdl/node_sdp_filterbank.vhd
test_bench_files =
......
......@@ -52,36 +52,46 @@ ENTITY node_sdp_filterbank IS
g_scope_selected_subband : NATURAL := 0
);
PORT (
dp_clk : IN STD_LOGIC;
dp_rst : IN STD_LOGIC;
dp_clk : IN STD_LOGIC;
dp_rst : IN STD_LOGIC;
in_sosi_arr : IN t_dp_sosi_arr(c_sdp_S_pn-1 DOWNTO 0);
pfb_sosi_arr : OUT t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0);
in_sosi_arr : IN t_dp_sosi_arr(c_sdp_S_pn-1 DOWNTO 0);
pfb_sosi_arr : OUT t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0);
fsub_sosi_arr : OUT t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0);
mm_rst : IN STD_LOGIC;
mm_clk : IN STD_LOGIC;
mm_rst : IN STD_LOGIC;
mm_clk : IN STD_LOGIC;
reg_si_mosi : IN t_mem_mosi := c_mem_mosi_rst;
reg_si_miso : OUT t_mem_miso;
ram_st_sst_mosi : IN t_mem_mosi := c_mem_mosi_rst;
ram_st_sst_miso : OUT t_mem_miso;
ram_fil_coefs_mosi : IN t_mem_mosi := c_mem_mosi_rst;
ram_fil_coefs_miso : OUT t_mem_miso
ram_fil_coefs_miso : OUT t_mem_miso;
ram_gains_mosi : IN t_mem_mosi := c_mem_mosi_rst;
ram_gains_miso : OUT t_mem_miso;
reg_selector_mosi : IN t_mem_mosi := c_mem_mosi_rst;
reg_selector_miso : OUT t_mem_miso
);
END node_sdp_filterbank;
ARCHITECTURE str OF node_sdp_filterbank IS
CONSTANT c_coefs_file_prefix : STRING := "data/Coeffs16384Kaiser-quant_1wb";
CONSTANT c_gains_file_name : STRING := "data/gains_1024_complex_16b13f_unit";
CONSTANT c_subband_equalizer_latency : NATURAL := 4;
SIGNAL ram_st_sst_mosi_arr : t_mem_mosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_mem_mosi_rst);
SIGNAL ram_st_sst_miso_arr : t_mem_miso_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_mem_miso_rst);
SIGNAL si_sosi_arr : t_dp_sosi_arr(c_sdp_S_pn-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL wpfb_unit_out_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL wpfb_unit_fil_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL wpfb_unit_in_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL scope_sosi_arr : t_dp_sosi_integer_arr(c_sdp_S_pn-1 DOWNTO 0);
SIGNAL si_sosi_arr : t_dp_sosi_arr(c_sdp_S_pn-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL wpfb_unit_out_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL wpfb_unit_fil_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL wpfb_unit_in_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL subband_equalizer_out_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL dp_selector_out_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0) := (OTHERS => c_dp_sosi_rst);
SIGNAL scope_sosi_arr : t_dp_sosi_integer_arr(c_sdp_S_pn-1 DOWNTO 0);
BEGIN
---------------------------------------------------------------
......@@ -145,6 +155,52 @@ BEGIN
-- Output PFB streams
pfb_sosi_arr <= wpfb_unit_out_sosi_arr;
---------------------------------------------------------------
-- SUBBAND EQUALIZER
---------------------------------------------------------------
u_sdp_subband_equalizer : ENTITY work.sdp_subband_equalizer
GENERIC MAP (
g_gains_file_name => c_gains_file_name
)
PORT MAP(
dp_clk => dp_clk,
dp_rst => dp_rst,
in_sosi_arr => wpfb_unit_out_sosi_arr,
out_sosi_arr => subband_equalizer_out_sosi_arr,
mm_rst => mm_rst,
mm_clk => mm_clk,
ram_gains_mosi => ram_gains_mosi,
ram_gains_miso => ram_gains_miso
);
-- Output fsub streams
fsub_sosi_arr <= subband_equalizer_out_sosi_arr;
---------------------------------------------------------------
-- DP SELECTOR
---------------------------------------------------------------
u_dp_selector_arr : ENTITY dp_lib.dp_selector_arr
GENERIC MAP (
g_nof_arr => c_sdp_P_pfb,
g_pipeline => c_subband_equalizer_latency
)
PORT MAP (
mm_rst => mm_rst,
mm_clk => mm_clk,
dp_rst => dp_rst,
dp_clk => dp_clk,
reg_selector_mosi => reg_selector_mosi,
reg_selector_miso => reg_selector_miso,
pipe_sosi_arr => wpfb_unit_out_sosi_arr,
ref_sosi_arr => subband_equalizer_out_sosi_arr,
out_sosi_arr => dp_selector_out_sosi_arr
);
---------------------------------------------------------------
-- SUBBAND STATISTICS
---------------------------------------------------------------
......@@ -162,14 +218,14 @@ BEGIN
mm_clk => mm_clk,
dp_rst => dp_rst,
dp_clk => dp_clk,
in_complex => wpfb_unit_out_sosi_arr(I),
in_complex => dp_selector_out_sosi_arr(I),
ram_st_sst_mosi => ram_st_sst_mosi_arr(I),
ram_st_sst_miso => ram_st_sst_miso_arr(I)
);
END GENERATE;
---------------------------------------------------------------
-- COMBINE MEMORY MAPPED INTERFACES
-- COMBINE MEMORY MAPPED INTERFACES OF SST
---------------------------------------------------------------
-- Combine the internal array of mm interfaces for the subband
-- statistics to one array.
......@@ -196,7 +252,7 @@ BEGIN
PORT MAP (
clk => dp_clk,
rst => dp_rst,
sp_sosi_arr => wpfb_unit_out_sosi_arr,
sp_sosi_arr => subband_equalizer_out_sosi_arr,
scope_sosi_arr => scope_sosi_arr
);
......
......@@ -52,6 +52,10 @@ PACKAGE sdp_pkg is
CONSTANT c_sdp_f_adc_MHz : NATURAL := 200;
CONSTANT c_sdp_T_adc : TIME := (10**6/c_sdp_f_adc_MHz) * 1 ps;
CONSTANT c_sdp_T_sub : TIME := c_sdp_N_fft * c_sdp_T_adc;
CONSTANT c_sdp_W_sub_weight : NATURAL := 16;
CONSTANT c_sdp_W_sub_magnitude : NATURAL := 2;
CONSTANT c_sdp_W_sub_fraction : NATURAL := c_sdp_W_sub_weight - c_sdp_W_sub_magnitude -1;
-- In SDP c_nof_channels = 2**nof_chan = 1 and wb_factor = 1,
-- therefore these parameters are not explicitly used in calculation of derived constants
......
-------------------------------------------------------------------------------
--
-- Copyright 2020
-- ASTRON (Netherlands Institute for Radio Astronomy) <http://www.astron.nl/>
-- P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
-------------------------------------------------------------------------------
-------------------------------------------------------------------------------
--
-- Author: R. van der Walle
-- Purpose:
-- . Implements the functionality of the subband equalizer in the subband
-- filterbank (Fsub) of the LOFAR2 SDPFW design.
-- Description:
-- The sdp_subband_equalizer.vhd consists of mms_dp_gain_serial_arr.vhd and
-- some address counter logic to select the address of the subband weight
-- and a dp_requantize.vhd component.
-- Remark:
-- .
-------------------------------------------------------------------------------
LIBRARY IEEE, common_lib, dp_lib;
USE IEEE.STD_LOGIC_1164.ALL;
USE common_lib.common_pkg.ALL;
USE common_lib.common_mem_pkg.ALL;
USE dp_lib.dp_stream_pkg.ALL;
USE work.sdp_pkg.ALL;
ENTITY sdp_subband_equalizer IS
GENERIC (
g_gains_file_name : STRING := "UNUSED"
);
PORT (
dp_clk : IN STD_LOGIC;
dp_rst : IN STD_LOGIC;
in_sosi_arr : IN t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0);
out_sosi_arr : OUT t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0);
mm_rst : IN STD_LOGIC;
mm_clk : IN STD_LOGIC;
ram_gains_mosi : IN t_mem_mosi := c_mem_mosi_rst;
ram_gains_miso : OUT t_mem_miso
);
END sdp_subband_equalizer;
ARCHITECTURE str OF sdp_subband_equalizer IS
CONSTANT c_gain_addr_w : NATURAL := ceil_log2(c_sdp_Q_fft * c_sdp_N_sub);
CONSTANT c_gain_out_dat_w : NATURAL := c_sdp_W_sub_weight + c_sdp_W_subband -1;
SIGNAL cnt : NATURAL RANGE 0 TO c_sdp_Q_fft * c_sdp_N_sub-1;
SIGNAL gains_rd_address : STD_LOGIC_VECTOR(c_gain_addr_w-1 DOWNTO 0);
SIGNAL dp_gain_serial_out_sosi_arr : t_dp_sosi_arr(c_sdp_P_pfb-1 DOWNTO 0);
BEGIN
---------------------------------------------------------------
-- Counter
---------------------------------------------------------------
-- The subband weigths per PN are stored as
-- (cint16)subband_weights[S_pn/Q_fft]_[Q_fft][N_sub], but have
-- to be applied according the subband data order
-- fsub[S_pn/Q_fft]_[N_sub][Q_fft]. Therefore the counter in
-- sdp_subband_equalizer.vhd has to account for this difference in order.
p_cnt : PROCESS(dp_clk, dp_rst)
VARIABLE v_Q_fft, v_N_sub : NATURAL;
BEGIN
IF dp_rst = '1' THEN
cnt <= 0;
v_Q_fft := 0;
v_N_sub := 0;
ELSIF rising_edge(dp_clk) THEN
IF in_sosi_arr(0).eop = '1' THEN
v_Q_fft := 0;
v_N_sub := 0;
ELSE
IF v_Q_fft >= c_sdp_Q_fft-1 THEN
v_Q_fft := 0;
IF v_N_sub >= c_sdp_N_sub-1 THEN
v_N_sub := 0;
ELSE
v_N_sub := v_N_sub + 1;
END IF;
ELSE
v_Q_fft := v_Q_fft + 1;
END IF;
END IF;
cnt <= v_Q_fft * c_sdp_N_sub + v_N_sub;
END IF;
END PROCESS;
gains_rd_address <= TO_UVEC(cnt, c_gain_addr_w);
---------------------------------------------------------------
-- Gain
---------------------------------------------------------------
u_mms_dp_gain_serial_arr : ENTITY dp_lib.mms_dp_gain_serial_arr
GENERIC MAP (
g_nof_streams => c_sdp_P_pfb,
g_nof_gains => c_sdp_Q_fft * c_sdp_N_sub,
g_complex_data => TRUE,
g_complex_gain => TRUE,
g_gain_w => c_sdp_W_sub_weight,
g_in_dat_w => c_sdp_W_subband,
g_out_dat_w => c_gain_out_dat_w,
g_gains_file_name => g_gains_file_name
)
PORT MAP (
-- System
mm_rst => mm_rst,
mm_clk => mm_clk,
dp_rst => dp_rst,
dp_clk => dp_clk,
-- MM interface
ram_gains_mosi => ram_gains_mosi,
ram_gains_miso => ram_gains_miso,
-- ST interface
gains_rd_address => gains_rd_address,
in_sosi_arr => in_sosi_arr,
out_sosi_arr => dp_gain_serial_out_sosi_arr
);
---------------------------------------------------------------
-- Requantize
---------------------------------------------------------------
gen_dp_requantize : FOR I IN 0 TO c_sdp_P_pfb-1 GENERATE
u_dp_requantize : ENTITY dp_lib.dp_requantize
GENERIC MAP (
g_complex => TRUE,
g_representation => "SIGNED",
g_lsb_w => c_sdp_W_sub_fraction,
g_lsb_round => TRUE,
g_lsb_round_clip => FALSE,
g_msb_clip => TRUE,
g_msb_clip_symmetric => FALSE,
g_in_dat_w => c_gain_out_dat_w,
g_out_dat_w => c_sdp_W_subband
)
PORT MAP (
rst => dp_rst,
clk => dp_clk,
-- ST sink
snk_in => dp_gain_serial_out_sosi_arr(I),
-- ST source
src_out => out_sosi_arr(I)
);
END GENERATE;
END str;
......@@ -106,26 +106,40 @@ ARCHITECTURE str OF mms_dp_gain_serial_arr IS
nof_dat => g_nof_gains,
init_sl => '0');
CONSTANT c_pipeline_real_latency : NATURAL := g_pipeline_real_mult_input
+g_pipeline_real_mult_product
+g_pipeline_real_mult_output
+c_mm_ram.latency;
CONSTANT c_pipeline_complex_latency : NATURAL := g_pipeline_complex_mult_input
+g_pipeline_complex_mult_product
+g_pipeline_complex_mult_adder
+g_pipeline_complex_mult_output
+c_mm_ram.latency;
CONSTANT c_pipeline_latency : NATURAL := sel_a_b(c_real_multiply, c_pipeline_real_latency, c_pipeline_complex_latency);
TYPE t_slv_rddata_arr IS ARRAY (INTEGER RANGE <>) OF STD_LOGIC_VECTOR(c_mm_ram.dat_w-1 DOWNTO 0);
TYPE t_slv_gains_arr IS ARRAY (INTEGER RANGE <>) OF STD_LOGIC_VECTOR(g_gain_w-1 DOWNTO 0);
TYPE t_slv_in_dat_arr IS ARRAY (INTEGER RANGE <>) OF STD_LOGIC_VECTOR(g_in_dat_w-1 DOWNTO 0);
TYPE t_slv_out_dat_arr IS ARRAY (INTEGER RANGE <>) OF STD_LOGIC_VECTOR(g_out_dat_w-1 DOWNTO 0);
SIGNAL mm_gains_mosi_arr : t_mem_mosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL mm_gains_miso_arr : t_mem_miso_arr(g_nof_streams-1 DOWNTO 0) := (OTHERS => c_mem_miso_rst);
SIGNAL mm_gains_mosi_arr : t_mem_mosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL mm_gains_miso_arr : t_mem_miso_arr(g_nof_streams-1 DOWNTO 0) := (OTHERS => c_mem_miso_rst);
SIGNAL gains_rd_data_arr : t_slv_rddata_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL gains_re_arr : t_slv_gains_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL gains_im_arr : t_slv_gains_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL gains_rd_data_arr : t_slv_rddata_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL gains_re_arr : t_slv_gains_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL gains_im_arr : t_slv_gains_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL in_sosi_arr_pipe : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL in_dat_re_arr : t_slv_in_dat_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL in_dat_im_arr : t_slv_in_dat_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL in_val_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL in_sosi_arr_pipe : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL in_sosi_arr_pipe_ctrl : t_dp_sosi_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL in_dat_re_arr : t_slv_in_dat_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL in_dat_im_arr : t_slv_in_dat_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL in_val_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL out_dat_re_arr : t_slv_out_dat_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL out_dat_im_arr : t_slv_out_dat_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL out_val_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
SIGNAL out_dat_re_arr : t_slv_out_dat_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL out_dat_im_arr : t_slv_out_dat_arr(g_nof_streams-1 DOWNTO 0);
SIGNAL out_val_arr : STD_LOGIC_VECTOR(g_nof_streams-1 DOWNTO 0);
BEGIN
......@@ -142,6 +156,19 @@ BEGIN
src_out_arr => in_sosi_arr_pipe
);
-- pipeline in_sosi_arr to add sop, eop and sync back in out_sosi_arr
u_pipeline_arr_ctrl : ENTITY work.dp_pipeline_arr
GENERIC MAP (
g_nof_streams => g_nof_streams,
g_pipeline => c_pipeline_latency
)
PORT MAP (
rst => dp_rst,
clk => dp_clk,
snk_in_arr => in_sosi_arr,
src_out_arr => in_sosi_arr_pipe_ctrl
);
u_mem_mux_gains : ENTITY common_lib.common_mem_mux
GENERIC MAP (
g_nof_mosi => g_nof_streams,
......@@ -213,11 +240,14 @@ BEGIN
out_val => out_val_arr(I)
);
p_out_sosi_arr : PROCESS(out_val_arr, out_dat_re_arr)
p_out_sosi_arr : PROCESS(out_val_arr, out_dat_re_arr, in_sosi_arr_pipe_ctrl)
BEGIN
out_sosi_arr(I) <= c_dp_sosi_rst; -- to avoid (vsim-8684) No drivers exist on out port out_sosi_arr
out_sosi_arr(I).valid <= out_val_arr(I);
out_sosi_arr(I).data <= RESIZE_DP_SDATA(out_dat_re_arr(I)); -- sign extend
out_sosi_arr(I).sop <= in_sosi_arr_pipe_ctrl(I).sop;
out_sosi_arr(I).eop <= in_sosi_arr_pipe_ctrl(I).eop;
out_sosi_arr(I).sync <= in_sosi_arr_pipe_ctrl(I).sync;
END PROCESS;
END GENERATE gen_real_multiply;
......@@ -262,12 +292,15 @@ BEGIN
out_val => out_val_arr(I)
);
p_out_sosi_arr : PROCESS(out_val_arr, out_dat_re_arr, out_dat_im_arr)
p_out_sosi_arr : PROCESS(out_val_arr, out_dat_re_arr, out_dat_im_arr, in_sosi_arr_pipe_ctrl)
BEGIN
out_sosi_arr(I) <= c_dp_sosi_rst; -- to avoid (vsim-8684) No drivers exist on out port out_sosi_arr
out_sosi_arr(I).valid <= out_val_arr(I);
out_sosi_arr(I).re <= RESIZE_DP_DSP_DATA(out_dat_re_arr(I)); -- sign extend
out_sosi_arr(I).im <= RESIZE_DP_DSP_DATA(out_dat_im_arr(I)); -- sign extend
out_sosi_arr(I).sop <= in_sosi_arr_pipe_ctrl(I).sop;
out_sosi_arr(I).eop <= in_sosi_arr_pipe_ctrl(I).eop;
out_sosi_arr(I).sync <= in_sosi_arr_pipe_ctrl(I).sync;
END PROCESS;
END GENERATE gen_complex_multiply;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment