Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
n.danilyuk committed Jun 27, 2023
1 parent 7bdef26 commit fa5a139
Showing 1 changed file with 3 additions and 115 deletions.
118 changes: 3 additions & 115 deletions developerGuide/software/build/fpga/regset/2.00-15/stream_app.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,11 @@ ADC streaming
+----------+------------------------------------------------+------+-----+
| | DMA buffer size | 31:0 | R/W |
+----------+------------------------------------------------+------+-----+
| **0x5C** | **Number of lost samples - buffer 1 CH1** | | |
| **0x5C** | **Number of lost samples - buffer 1** | | |
+----------+------------------------------------------------+------+-----+
| | Counter of lost samples - buffer 1 | 31:0| R |
+----------+------------------------------------------------+------+-----+
| **0x60** | **Number of lost samples - buffer 2 CH1** | | |
| **0x60** | **Number of lost samples - buffer 2** | | |
+----------+------------------------------------------------+------+-----+
| | Counter of lost samples - buffer 2 | 31:0| R |
+----------+------------------------------------------------+------+-----+
Expand Down Expand Up @@ -340,118 +340,6 @@ ADC streaming
+----------+------------------------------------------------+------+-----+
| | ADC clock is present, PLL locked | 0 | R |
+----------+------------------------------------------------+------+-----+
| **0x15C**| **Number of lost samples - buffer 1 CH3** | | |
+----------+------------------------------------------------+------+-----+
| | Counter of lost samples - buffer 1 | 31:0| R |
+----------+------------------------------------------------+------+-----+
| **0x160**| **Number of lost samples - buffer 2 CH3** | | |
+----------+------------------------------------------------+------+-----+
| | Counter of lost samples - buffer 2 | 31:0| R |
+----------+------------------------------------------------+------+-----+
| **0x164**| **DMA destination address - buffer 1, CH3** | | |
+----------+------------------------------------------------+------+-----+
| | DMA destination address - buffer 1 | 31:0 | R/W |
+----------+------------------------------------------------+------+-----+
| **0x168**| **DMA destination address - buffer 2, CH3** | | |
+----------+------------------------------------------------+------+-----+
| | DMA destination address - buffer 2 | 31:0 | R/W |
+----------+------------------------------------------------+------+-----+
| **0x16C**| **DMA destination address - buffer 1, CH4** | | |
+----------+------------------------------------------------+------+-----+
| | DMA destination address - buffer 1 | 31:0 | R/W |
+----------+------------------------------------------------+------+-----+
| **0x170**| **DMA destination address - buffer 2, CH4** | | |
+----------+------------------------------------------------+------+-----+
| | DMA destination address - buffer 2 | 31:0 | R/W |
+----------+------------------------------------------------+------+-----+
| **0x174**| **Calibration offset value CH3** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:16| R |
+----------+------------------------------------------------+------+-----+
| | Calibration offset value CH3 | 15:0| R/W |
+----------+------------------------------------------------+------+-----+
| **0x178**| **Calibration gain value CH3** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:16| R |
+----------+------------------------------------------------+------+-----+
| | Calibration gain value CH3 | 15:0| R/W |
+----------+------------------------------------------------+------+-----+
| **0x17C**| **Calibration offset value CH4** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:16| R |
+----------+------------------------------------------------+------+-----+
| | Calibration offset value CH4 | 15:0| R/W |
+----------+------------------------------------------------+------+-----+
| **0x180**| **Calibration gain value CH4** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:16| R |
+----------+------------------------------------------------+------+-----+
| | Calibration gain value CH4 | 15:0| R/W |
+----------+------------------------------------------------+------+-----+
| **0x19C**| **Number of lost samples - buffer 1 CH4** | | |
+----------+------------------------------------------------+------+-----+
| | Counter of lost samples - buffer 1 | 31:0| R |
+----------+------------------------------------------------+------+-----+
| **0x1A0**| **Number of lost samples - buffer 2 CH4** | | |
+----------+------------------------------------------------+------+-----+
| | Counter of lost samples - buffer 2 | 31:0| R |
+----------+------------------------------------------------+------+-----+
| **0x1A4**| **Diagnostics - current write pointer CH3** | | |
+----------+------------------------------------------------+------+-----+
| | Write pointer | 31:0| R |
+----------+------------------------------------------------+------+-----+
| **0x1A8**| **Diagnostics - current write pointer CH4** | | |
+----------+------------------------------------------------+------+-----+
| | Write pointer | 31:0| R |
+----------+------------------------------------------------+------+-----+
| **0x1C0**| **Filter coefficient AA - CH3** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:18| R |
+----------+------------------------------------------------+------+-----+
| | AA coefficient | 17:0| W |
+----------+------------------------------------------------+------+-----+
| **0x1C4**| **Filter coefficient BB - CH3** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:24| R |
+----------+------------------------------------------------+------+-----+
| | BB coefficient | 23:0| W |
+----------+------------------------------------------------+------+-----+
| **0x1C8**| **Filter coefficient KK - CH3** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:24| R |
+----------+------------------------------------------------+------+-----+
| | KK coefficient | 23:0| W |
+----------+------------------------------------------------+------+-----+
| **0x1CC**| **Filter coefficient PP - CH3** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:0 | R |
+----------+------------------------------------------------+------+-----+
| | PP coefficient | 23:0| W |
+----------+------------------------------------------------+------+-----+
| **0x1D0**| **Filter coefficient AA - CH4** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:18| R |
+----------+------------------------------------------------+------+-----+
| | AA coefficient | 17:0| W |
+----------+------------------------------------------------+------+-----+
| **0x1D4**| **Filter coefficient BB - CH4** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:24| R |
+----------+------------------------------------------------+------+-----+
| | BB coefficient | 23:0| W |
+----------+------------------------------------------------+------+-----+
| **0x1D8**| **Filter coefficient KK - CH4** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:24| R |
+----------+------------------------------------------------+------+-----+
| | KK coefficient | 23:0| W |
+----------+------------------------------------------------+------+-----+
| **0x1DC**| **Filter coefficient PP - CH4** | | |
+----------+------------------------------------------------+------+-----+
| | Reserved | 31:0 | R |
+----------+------------------------------------------------+------+-----+
| | PP coefficient | 23:0| W |
+----------+------------------------------------------------+------+-----+

-------------
DAC streaming
Expand Down Expand Up @@ -988,4 +876,4 @@ A 32 bit chunk of data is structured like this:
| **0xC0** | **GPIO OUT - step of read pointer** | | |
+----------+------------------------------------------------+------+-----+
| | Step | 31:0 | R/W |
+----------+------------------------------------------------+------+-----+
+----------+------------------------------------------------+------+-----+

0 comments on commit fa5a139

Please sign in to comment.