Merge branch '8-do-the-6-0-3-release' into 'master'

Resolve "Do the 6.0.3 release" Closes #8 See merge request be-cem-edl/fec/hardware-modules/fmc-adc-100m14b4cha!1

Merge branch '8-do-the-6-0-3-release' into 'master'
Resolve "Do the 6.0.3 release" Closes #8 See merge request be-cem-edl/fec/hardware-modules/fmc-adc-100m14b4cha!1
b077d94f · Federico Vaga · 3b816e09 · dc450d61 · b077d94f · b077d94f
Commit b077d94f authored Jul 25, 2022 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

CHANGELOG.rst CHANGELOG.rst +6 -0

fau-acq-time.c software/tools/fau-acq-time.c +1 -1

fau-trg-config.c software/tools/fau-trg-config.c +1 -1

No files found.
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,12 @@
 Changelog
 =========
+6.0.3 - 2022-07-25
+==================
+Fixed
+-----
+- hdl: fix threshold logic that unders certain conditions was forcing a channel to 0
 6.0.2 - 2022-04-05
 ==================
 Changed

--- a/software/tools/fau-acq-time.c
+++ b/software/tools/fau-acq-time.c
@@ -85,7 +85,7 @@ int fau_read_time(long time[3], enum fau_attribute first_attr)
 	return err;
 }
-void fau_print_time(long time1[3], long time2[3])
+void fau_print_time(const long time1[3], const long time2[3])
 {
 	long result[3];

--- a/software/tools/fau-trg-config.c
+++ b/software/tools/fau-trg-config.c
@@ -124,7 +124,7 @@ static long strtol_or_die(const char *arg)
 int main(int argc, char *argv[])
 {
 	/* default attribute */
-	static int attrdef[FAU_TRIG_NUM_ATTR] = {1, 0, 0, 0, 0, 0, 0, 0, 0 ,0};
+	const static int attrdef[FAU_TRIG_NUM_ATTR] = {1, 0, 0, 0, 0, 0, 0, 0, 0 ,0};
 	/* getop attribute */
 	static int attrval[FAU_TRIG_NUM_ATTR] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
 	static int force = 0;