Merge branch 'devel'

lnls-dig · Aug 26, 2021 · f55b2b5 · f55b2b5
2 parents 6df3337 + f38317a
commit f55b2b5
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 23 deletions.
diff --git a/README.release.md b/README.release.md
@@ -2,7 +2,7 @@
 
 1. Update API version number in HALCS headers
 
-It's is located at:
+It is located at:
 
 `include/revision.h`
 
@@ -48,6 +48,14 @@ This is located at:
 examples/include/halcs_examples_classes.h
 ```
 
-5. Merge branch with `master` branch
+5. In order to update the version nubmer in the header files there is a script to do that
+automatically called "bump_version_numbers.sh". One can call it to bump the "major",
+"minor" or "patch" version numbers as:
 
-6. Tag the `master` branch with the release version with the HALCS API version number
+```
+./bump_version_numbers.sh -t [major|minor|patch]
+```
+
+6. Merge branch with `master` branch
+
+7. Tag the `master` branch with the release version with the HALCS API version number
diff --git a/bump_version_numbers.sh b/bump_version_numbers.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 usage () {
     echo "Usage:" >&2
-    echo "  $1 -t ["major"|"minor"|"patch"" >&2
+    echo "  $1 -t ["major"|"minor"|"patch"]" >&2
     echo >&2
     echo "  Options:" >&2
     echo "    -t                  bump the specified version number" >&2

diff --git a/examples/include/halcs_examples_classes.h b/examples/include/halcs_examples_classes.h
@@ -12,7 +12,7 @@
 
 #define HALCS_EXAMPLES_VERSION_MAJOR 2
 #define HALCS_EXAMPLES_VERSION_MINOR 5
-#define HALCS_EXAMPLES_VERSION_PATCH 0
+#define HALCS_EXAMPLES_VERSION_PATCH 1
 
 #define HALCS_EXAMPLES_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/include/revision.h b/include/revision.h
@@ -15,7 +15,7 @@
 
 #define HALCS_VERSION_MAJOR 2
 #define HALCS_VERSION_MINOR 5
-#define HALCS_VERSION_PATCH 0
+#define HALCS_VERSION_PATCH 1
 
 #define HALCS_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/libs/acqclient/include/acq_client_classes.h b/libs/acqclient/include/acq_client_classes.h
@@ -23,7 +23,7 @@
 
 #define ACQ_CLIENT_VERSION_MAJOR 2
 #define ACQ_CLIENT_VERSION_MINOR 5
-#define ACQ_CLIENT_VERSION_PATCH 0
+#define ACQ_CLIENT_VERSION_PATCH 1
 
 #define ACQ_CLIENT_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/libs/bpmclient/include/bpm_client_classes.h b/libs/bpmclient/include/bpm_client_classes.h
@@ -23,7 +23,7 @@
 
 #define BPM_CLIENT_VERSION_MAJOR 3
 #define BPM_CLIENT_VERSION_MINOR 1
-#define BPM_CLIENT_VERSION_PATCH 0
+#define BPM_CLIENT_VERSION_PATCH 1
 
 #define BPM_CLIENT_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/libs/convc/include/convc_classes.h b/libs/convc/include/convc_classes.h
@@ -19,7 +19,7 @@
 
 #define CONVC_VERSION_MAJOR 2
 #define CONVC_VERSION_MINOR 5
-#define CONVC_VERSION_PATCH 0
+#define CONVC_VERSION_PATCH 1
 
 #define CONVC_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/libs/disptable/include/disptable_classes.h b/libs/disptable/include/disptable_classes.h
@@ -22,7 +22,7 @@
 
 #define DISPTABLE_VERSION_MAJOR 2
 #define DISPTABLE_VERSION_MINOR 5
-#define DISPTABLE_VERSION_PATCH 0
+#define DISPTABLE_VERSION_PATCH 1
 
 #define DISPTABLE_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/libs/errhand/include/errhand_classes.h b/libs/errhand/include/errhand_classes.h
@@ -21,7 +21,7 @@
 
 #define ERRHAND_VERSION_MAJOR 2
 #define ERRHAND_VERSION_MINOR 5
-#define ERRHAND_VERSION_PATCH 0
+#define ERRHAND_VERSION_PATCH 1
 
 #define ERRHAND_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/libs/hutils/include/hutils_classes.h b/libs/hutils/include/hutils_classes.h
@@ -19,7 +19,7 @@
 
 #define HUTILS_VERSION_MAJOR 2
 #define HUTILS_VERSION_MINOR 5
-#define HUTILS_VERSION_PATCH 0
+#define HUTILS_VERSION_PATCH 1
 
 #define HUTILS_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/libs/llio/include/ll_io_classes.h b/libs/llio/include/ll_io_classes.h
@@ -20,7 +20,7 @@
 
 #define LL_IO_VERSION_MAJOR 2
 #define LL_IO_VERSION_MINOR 5
-#define LL_IO_VERSION_PATCH 0
+#define LL_IO_VERSION_PATCH 1
 
 #define LL_IO_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/libs/sdbutils/include/sdbutils_classes.h b/libs/sdbutils/include/sdbutils_classes.h
@@ -17,7 +17,7 @@
 
 #define SDBUTILS_VERSION_MAJOR 2
 #define SDBUTILS_VERSION_MINOR 5
-#define SDBUTILS_VERSION_PATCH 0
+#define SDBUTILS_VERSION_PATCH 1
 
 #define SDBUTILS_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/src/client/include/halcs_client_classes.h b/src/client/include/halcs_client_classes.h
@@ -25,7 +25,7 @@
 
 #define HALCS_CLIENT_VERSION_MAJOR 2
 #define HALCS_CLIENT_VERSION_MINOR 5
-#define HALCS_CLIENT_VERSION_PATCH 0
+#define HALCS_CLIENT_VERSION_PATCH 1
 
 #define HALCS_CLIENT_MAKE_VERSION(major, minor, patch) \
     ((major) * 10000 + (minor) * 100 + (patch))

diff --git a/src/sm_io/modules/acq/sm_io_acq_core.c b/src/sm_io/modules/acq/sm_io_acq_core.c
@@ -144,17 +144,17 @@ smio_acq_t * smio_acq_new (smio_t *parent, uint32_t num_samples_pre,
         uint32_t first_addr = 0;
         uint32_t last_addr = 0;
         uint32_t acq_buf_id = (inst_id > __acq_buf_max_inst_id ||
-                                i > self->num_chan-1)? 
+                                i > acq_core_end_chan_id-1)?
                                     i :
-                                    (*acq_core_buf)[inst_id*acq_core_num_acq_core_smios + i].id;
+                                    (*acq_core_buf)[inst_id*acq_core_end_chan_id + i].id;
         uint32_t acq_buf_start_addr = (inst_id > __acq_buf_max_inst_id ||
-                                i > self->num_chan-1)? 
-                                    (acq_core_mem_total_size - acq_core_mem_region_size) : 
-                                    (*acq_core_buf)[inst_id*acq_core_num_acq_core_smios + i].start_addr;
+                                i > acq_core_end_chan_id-1)?
+                                    (acq_core_mem_total_size - acq_core_mem_region_size) :
+                                    (*acq_core_buf)[inst_id*acq_core_end_chan_id + i].start_addr;
         uint32_t acq_buf_end_addr =(inst_id > __acq_buf_max_inst_id ||
-                                i > self->num_chan-1)? 
-                                    (acq_core_mem_total_size - acq_core_ddr3_data_width) : 
-                                    (*acq_core_buf)[inst_id*acq_core_num_acq_core_smios + i].end_addr;
+                                i > acq_core_end_chan_id-1)?
+                                    (acq_core_mem_total_size - acq_core_ddr3_data_width) :
+                                    (*acq_core_buf)[inst_id*acq_core_end_chan_id + i].end_addr;
 
         /* Get channel properties */
         GET_PARAM_CHANNEL(parent, acq, 0x0, ACQ_CORE, CH0_DESC, INT_WIDTH,