Skip to content

Commit

Permalink
Added new commands in SCPI
Browse files Browse the repository at this point in the history
  • Loading branch information
n.danilyuk committed Nov 14, 2023
1 parent 9de7612 commit 2242d93
Showing 1 changed file with 34 additions and 23 deletions.
57 changes: 34 additions & 23 deletions appsFeatures/remoteControl/SCPI_commands.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,35 +504,46 @@ Sampling rate & decimation
Parameter options:

* ``<decimation> = {1,2,4,8,16,32,64,128,256,512,1024,2048,4096,8192,16384,32768,65536}`` Default: ``1``
* ``<decimation_ext> = {1,2,4,8,16,17,18,19,......,65536}`` Default: ``1``
* ``<average> = {OFF,ON}`` Default: ``ON``

.. <decimation> = {1,2,4,8,16,17,18,19,...,65534,65535,65536}!!

.. tabularcolumns:: |p{28mm}|p{28mm}|p{28mm}|p{28mm}|

+-------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| SCPI | API | DESCRIPTION | ECOSYSTEM |
+=====================================+===================================================================+======================================================================+====================+
| | ``ACQ:DEC <decimation>`` | | C: ``rp_AcqSetDecimation(rp_acq_decimation_t decimation)`` | | Set the decimation factor. | 1.04-18 and up |
| | Example: | | | | Should be a power of 2. | |
| | ``ACQ:DEC 4`` | | Python: ``rp_AcqSetDecimation(decimation)`` | | |
| | | | | | |
+-------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| | ``ACQ:DEC?`` > ``<decimation>`` | | C: ``rp_AcqGetDecimation(rp_acq_decimation_t* decimation)`` | Get the decimation factor. | 1.04-18 and up |
| | Example: | | | | |
| | ``ACQ:DEC?`` > ``1`` | | Python: ``rp_AcqGetDecimation()`` | | |
| | | | | | |
+-------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| | ``ACQ:AVG <average>`` | | C: ``rp_AcqSetAveraging(bool enabled)`` | | Enable/disable averaging. | 1.04-18 and up |
| | | | | Each sample is the average of skipped samples if decimation > 1. | |
| | | | Python: ``rp_AcqSetAveraging(enable)`` | | |
| | | | | | |
+-------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| | ``ACQ:AVG?`` > ``<average>`` | | C: ``rp_AcqGetAveraging(bool *enabled)`` | | Get the averaging status. | 1.04-18 and up |
| | Example: | | | | Averages the skipped samples when ``DEC`` > 1 | |
| | ``ACQ:AVG?`` > ``ON`` | | Python: ``rp_AcqGetAveraging()`` | | |
| | | | | | |
+-------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
+------------------------------------------+---------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| SCPI | API | DESCRIPTION | ECOSYSTEM |
+==========================================+=====================================================================+======================================================================+====================+
| | ``ACQ:DEC <decimation>`` | | C: ``rp_AcqSetDecimation(rp_acq_decimation_t decimation)`` | | Set the decimation factor. | 1.04-18 and up |
| | Example: | | | | Should be a power of 2. | |
| | ``ACQ:DEC 4`` | | Python: ``rp_AcqSetDecimation(decimation)`` | | |
| | | | | | |
+------------------------------------------+---------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| | ``ACQ:DEC?`` > ``<decimation>`` | | C: ``rp_AcqGetDecimation(rp_acq_decimation_t* decimation)`` | Get the decimation factor. | 1.04-18 and up |
| | Example: | | | | |
| | ``ACQ:DEC?`` > ``1`` | | Python: ``rp_AcqGetDecimation()`` | | |
| | | | | | |
+------------------------------------------+---------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| | ``ACQ:DEC:F <decimation_ext>`` | | C: ``rp_AcqSetDecimationFactor(rp_acq_decimation_t decimation)`` | | Set the extended decimation factor. | in dev |
| | Example: | | | | |
| | ``ACQ:DEC:F 17`` | | Python: ``rp_AcqSetDecimationFactor(decimation)`` | | |
| | | | | | |
+------------------------------------------+---------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| | ``ACQ:DEC:F?`` > ``<decimation_ext>`` | | C: ``rp_AcqGetDecimationFactor(rp_acq_decimation_t* decimation)`` | Get the extended decimation factor. | in dev |
| | Example: | | | | |
| | ``ACQ:DEC:F?`` > ``1`` | | Python: ``rp_AcqGetDecimationFactor()`` | | |
| | | | | | |
+------------------------------------------+---------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| | ``ACQ:AVG <average>`` | | C: ``rp_AcqSetAveraging(bool enabled)`` | | Enable/disable averaging. | 1.04-18 and up |
| | | | | Each sample is the average of skipped samples if decimation > 1. | |
| | | | Python: ``rp_AcqSetAveraging(enable)`` | | |
| | | | | | |
+------------------------------------------+---------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+
| | ``ACQ:AVG?`` > ``<average>`` | | C: ``rp_AcqGetAveraging(bool *enabled)`` | | Get the averaging status. | 1.04-18 and up |
| | Example: | | | | Averages the skipped samples when ``DEC`` > 1 | |
| | ``ACQ:AVG?`` > ``ON`` | | Python: ``rp_AcqGetAveraging()`` | | |
| | | | | | |
+------------------------------------------+---------------------------------------------------------------------+----------------------------------------------------------------------+--------------------+


.. _scpi_trigger:
Expand Down

0 comments on commit 2242d93

Please sign in to comment.