Merge branch 'master' into update-sofb2

lnls-sirius · Nov 15, 2023 · cbcbfde · cbcbfde
2 parents c515c1c + 369cb8a
commit cbcbfde
Show file tree

Hide file tree

Showing 82 changed files with 6,148 additions and 2,581 deletions.
diff --git a/.github/workflows/test-siriuspy.yml b/.github/workflows/test-siriuspy.yml
@@ -25,7 +25,7 @@ jobs:
         run: |
           git clone https://github.com/lnls-sirius/eth-bridge-pru-serial485.git
           cd eth-bridge-pru-serial485/client
-          python setup.py install
+          pip install .
           cd ../../
 
       - name: Install mathphys

diff --git a/siriuspy/siriuspy/VERSION b/siriuspy/siriuspy/VERSION
@@ -1 +1 @@
-2.78.0
+2.83.1
diff --git a/siriuspy/siriuspy/bsmp/constants.py b/siriuspy/siriuspy/bsmp/constants.py
@@ -38,7 +38,7 @@
 CMD_BINARY_OPERATION_IN_A_GROUP: int = 0x26
 CMD_WRITE_AND_READ_VARIABLES: int = 0x28
 
-# --- Group of Variables Manipulation Commnads ---
+# --- Group of Variables Manipulation Commands ---
 CMD_CREATE_GROUP_OF_VARIABLES: int = 0x30
 CMD_REMOVE_ALL_GROUPS_OF_VARIABLES: int = 0x32
 

diff --git a/siriuspy/siriuspy/clientconfigdb/configdb_client.py b/siriuspy/siriuspy/clientconfigdb/configdb_client.py
@@ -17,7 +17,7 @@
 class ConfigDBClient:
     """Perform operation on configuration database."""
 
-    _TIMEOUT_DEFAULT = 2.0
+    _TIMEOUT_DEFAULT = 30.0
     _INVALID_CHARACTERS = '\\/:;,?!$'
 
     def __init__(self, url=None, config_type=None):

diff --git a/siriuspy/siriuspy/clientconfigdb/types/as_corrloop_params.py b/siriuspy/siriuspy/clientconfigdb/types/as_corrloop_params.py
@@ -287,7 +287,10 @@ def get_dict():
     ['AS-Glob:AP-InjCtrl:BiasFBLinModOffCoeff-SP', -52.0, 0.0],
     ['AS-Glob:AP-InjCtrl:BiasFBGPModNoiseStd-SP', 0.05, 0.0],
     ['AS-Glob:AP-InjCtrl:BiasFBGPModKernStd-SP', 0.4, 0.0],
-    ['AS-Glob:AP-InjCtrl:BiasFBGPModKernLenScl-SP', 5, 0.0],
+    ['AS-Glob:AP-InjCtrl:BiasFBGPModKernLenScl-SP', 4, 0.0],
+    ['AS-Glob:AP-InjCtrl:BiasFBGPModNoiseStdFit-Sel', 0, 0.0],
+    ['AS-Glob:AP-InjCtrl:BiasFBGPModKernStdFit-Sel', 0, 0.0],
+    ['AS-Glob:AP-InjCtrl:BiasFBGPModKernLenSclFit-Sel', 0, 0.0],
 ]