Skip to content
Snippets Groups Projects

Wip/focus 2024 spring

Merged Martin Christoph Hierholzer requested to merge wip/focus-2024-spring into master
133 files
+ 73888
7086
Compare changes
  • Side-by-side
  • Inline
Files
133
@@ -11,7 +11,7 @@
The module layout is as follows:
- Configuration,
- Configuration
- BoardInit
- SamplingScheme
- Controller
@@ -37,6 +37,8 @@
<!--
-->
<module name="ToControlSystem">
<module name="Configuration">
<variable name="bitScaling">
@@ -537,7 +539,7 @@
<targetRegister>OUTPUT.WORD_AMP_LIMIT</targetRegister>
<plugin name="math">
<parameter name="formula">x*bitScaling</parameter>
<parameter name="bitScaling">/Configuration/bitScaling</parameter>
<parameter name="bitScaling">/ToControlSystem/Configuration/bitScaling</parameter>
<parameter name="enable_push_parameters"/>
</plugin>
</redirectedRegister>
@@ -754,14 +756,14 @@
<!-- Summarised status bits -->
<redirectedRegister name="saturation">
<targetDevice>this</targetDevice>
<targetRegister>/Controller/Status/feedForwardSaturationI</targetRegister>
<targetRegister>/ToControlSystem/Controller/Status/feedForwardSaturationI</targetRegister>
<plugin name="math">
<parameter name="formula">x | FFQ | OCI | OCQ | GCI | GCQ </parameter>
<parameter name="FFQ">/Controller/Status/feedForwardSaturationQ</parameter>
<parameter name="OCI">/Controller/Status/offsetCompensationSaturationI</parameter>
<parameter name="OCQ">/Controller/Status/offsetCompensationSaturationQ</parameter>
<parameter name="GCI">/Controller/Status/gainSaturationI</parameter>
<parameter name="GCQ">/Controller/Status/gainSaturationQ</parameter>
<parameter name="FFQ">/ToControlSystem/Controller/Status/feedForwardSaturationQ</parameter>
<parameter name="OCI">/ToControlSystem/Controller/Status/offsetCompensationSaturationI</parameter>
<parameter name="OCQ">/ToControlSystem/Controller/Status/offsetCompensationSaturationQ</parameter>
<parameter name="GCI">/ToControlSystem/Controller/Status/gainSaturationI</parameter>
<parameter name="GCQ">/ToControlSystem/Controller/Status/gainSaturationQ</parameter>
</plugin>
<plugin name="typeHintModifier"><parameter name="type">Boolean</parameter></plugin>
</redirectedRegister>
@@ -881,9 +883,9 @@
<targetRegister>APP.WORD_PROT_T0</targetRegister>
<plugin name="math">
<parameter name="formula">(x + delay + filling) * fs</parameter>
<parameter name="delay">/Controller/PulseShape/delay</parameter>
<parameter name="filling">/Controller/PulseShape/fillingDuration</parameter>
<parameter name="fs">/Configuration/samplingFrequency</parameter>
<parameter name="delay">/ToControlSystem/Controller/PulseShape/delay</parameter>
<parameter name="filling">/ToControlSystem/Controller/PulseShape/fillingDuration</parameter>
<parameter name="fs">/ToControlSystem/Configuration/samplingFrequency</parameter>
</plugin>
</redirectedRegister>
@@ -892,10 +894,10 @@
<targetRegister>APP.WORD_PROT_T1</targetRegister>
<plugin name="math">
<parameter name="formula">(x + delay + filling + flattop) * fs</parameter>
<parameter name="delay">/Controller/PulseShape/delay</parameter>
<parameter name="filling">/Controller/PulseShape/fillingDuration</parameter>
<parameter name="flattop">/Controller/PulseShape/flattopDuration</parameter>
<parameter name="fs">/Configuration/samplingFrequency</parameter>
<parameter name="delay">/ToControlSystem/Controller/PulseShape/delay</parameter>
<parameter name="filling">/ToControlSystem/Controller/PulseShape/fillingDuration</parameter>
<parameter name="flattop">/ToControlSystem/Controller/PulseShape/flattopDuration</parameter>
<parameter name="fs">/ToControlSystem/Configuration/samplingFrequency</parameter>
</plugin>
</redirectedRegister>
@@ -994,4 +996,6 @@
<!--
-->
</module> <!-- ToControlSystem -->
</logicalNameMap>
Loading