From 42d46ec6522944077f1ade6f8d421c37bf5bca8b Mon Sep 17 00:00:00 2001 From: l_samenv Date: Fri, 17 Jan 2025 17:05:57 +0100 Subject: [PATCH 1/3] update gitignore --- .gitignore | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 287c0c4..57efe0d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,26 +22,11 @@ CVS /log /logger /status +/dilsc /lab* /prep* -/amor -/boa -/camea -/dmc -/eiger -/flame -/focus -/hifi -/hrpt -/hrpt2 -/morpheus -/poldi /ppms -/sans /seaman -/tasp -/zebra -/zebra2 /logger_tar cheat_chart tcl/stuff_before_2022 @@ -50,3 +35,4 @@ GraphServer tcl/calcurves calib_scripts/calib_data calib_scripts/20* +obsolete_stuff From 14e7133d855881f6bb5794cbef9b3b2dba72ba75 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Thu, 30 Jan 2025 09:43:53 +0100 Subject: [PATCH 2/3] rename obsolete dilsc.config --- tcl/{dilsc.config => dilsc_obsolete.config} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tcl/{dilsc.config => dilsc_obsolete.config} (100%) diff --git a/tcl/dilsc.config b/tcl/dilsc_obsolete.config similarity index 100% rename from tcl/dilsc.config rename to tcl/dilsc_obsolete.config From 24f15db38f2f933eb216746150b41bcaffa8e9d5 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Mon, 24 Feb 2025 11:34:11 +0100 Subject: [PATCH 3/3] ah2550: fix auto detection and disabling of serial echo --- tcl/drivers/ah2550.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcl/drivers/ah2550.tcl b/tcl/drivers/ah2550.tcl index 4cdd9d2..de3beef 100644 --- a/tcl/drivers/ah2550.tcl +++ b/tcl/drivers/ah2550.tcl @@ -46,7 +46,7 @@ proc ah2550::start {} { proc ah2550::start1 {} { set prefix [lindex [sct result] 0] - if {$prefix eq "UN"} { # this was the echo + if {[string match "*UN" $prefix]} { # this was the echo sct send "SERIAL ECHO OFF" return ah2550::start } @@ -74,7 +74,7 @@ proc ah2550::update {} { set res [string map {"=" "= "} $res] #clientput $res lassign $res prefix c _ _ _ l un _ _ v _ _ _ _ _ _ _ - if {$prefix eq "SI"} { + if {[string match "*SI" $prefix]} { sct send "\r\nSERIAL ECHO OFF\r" return stdSct::complete }