From dcf195ba95f6ad6212419591dc9699cdddba1ab6 Mon Sep 17 00:00:00 2001
From: Jan Michel <j.michel@gsi.de>
Date: Wed, 26 Jul 2017 18:17:44 +0200
Subject: [PATCH] Update Frankfurt_test scripts

---
 users/frankfurt_test/dirich_cycle.pl       | 6 +++---
 users/frankfurt_test/powercycle.sh         | 2 ++
 users/frankfurt_test/register_configgbe.db | 4 ++--
 users/frankfurt_test/startup.sh            | 9 +++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100755 users/frankfurt_test/powercycle.sh

diff --git a/users/frankfurt_test/dirich_cycle.pl b/users/frankfurt_test/dirich_cycle.pl
index ed26f6d..504d214 100755
--- a/users/frankfurt_test/dirich_cycle.pl
+++ b/users/frankfurt_test/dirich_cycle.pl
@@ -2,7 +2,7 @@
 
 use warnings;
 use HADES::TrbNet;
-use Dmon;
+#use Dmon;
 use Time::HiRes qq|usleep|;
 use Data::Dumper;
 
@@ -18,11 +18,11 @@ count();
   
 my $act_ports = trb_register_read(0xfe52,0x84); #active ports
 my $to_ports  = trb_register_read(0xfe52,0x8b); #ports with timeouts
-
+my $er_ports  = trb_register_read(0xfe52,0xa4); #ports with sctrl error
 
 foreach my $combs (keys %$act_ports) {
   #not active or timeout
-  my $mask = (((~$act_ports->{$combs}) & 0x1ffe) or ($to_ports->{$combs} & 0x1ffe));
+  my $mask = (((~$act_ports->{$combs}) & 0x1ffe) | ($to_ports->{$combs} & 0x1ffe) | ($er_ports->{$combs} & 0x1ffe));
   #shift for LDO switch
   $mask <<= 15;
   printf("%04x\t%08x\t%08x\t%08x\n",$combs,$act_ports->{$combs},$to_ports->{$combs},$mask);
diff --git a/users/frankfurt_test/powercycle.sh b/users/frankfurt_test/powercycle.sh
new file mode 100755
index 0000000..49c3d7f
--- /dev/null
+++ b/users/frankfurt_test/powercycle.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+(echo -n -e "\n"; sleep .1; echo -n -e "*IDN?\nOUTPUT:GENERAL OFF\nMEAS:CURR?\n"; sleep 1.7; echo -n -e "OUTPUT:GENERAL ON\nMEAS:CURR?\n";) | socat  - /dev/HAMEG_HO732_VCP023842636
diff --git a/users/frankfurt_test/register_configgbe.db b/users/frankfurt_test/register_configgbe.db
index e21b9da..1010382 100755
--- a/users/frankfurt_test/register_configgbe.db
+++ b/users/frankfurt_test/register_configgbe.db
@@ -16,8 +16,8 @@
   0x8100      0       0x8100        1            0        0xffffff         1
   0x8200      0       0x8200        1            0        0xffffff         1
   0x8820      0       0x8200        1            0        0xffffff         1
-  0xf3ce      0       0x82ce        1            0        0xffffff         1
-  0xc000      0       0x8000        1            0        0xffffff         1
+  0xf3ce      0       0x82ce        1            1        0xffffff         1
+  0xc000      0       0x8000        1            1        0xffffff         1
   0xc002      0       0xc002        1            0        0xffffff         1
   0xc148      0       0xc148        1            0        0xffffff         1
 
diff --git a/users/frankfurt_test/startup.sh b/users/frankfurt_test/startup.sh
index a6a00e3..29b287b 100755
--- a/users/frankfurt_test/startup.sh
+++ b/users/frankfurt_test/startup.sh
@@ -37,6 +37,13 @@ trbcmd s  0x4e0000070ef49128  0x00 0x0480
 trbcmd s  0x790000070ef49028  0x02 0x0482
 trbcmd s  0x270000070ef42328  0x03 0x0483
 
+#2
+trbcmd s 0x08000002e2e22b28  0x05  0xc002
+trbcmd s 0xa6000002e2e2df28  0x00 0x8200
+trbcmd s 0x51000002e2e22828  0x01 0x0201
+trbcmd s 0x72000002e2eb4628  0x02 0x0202
+trbcmd s 0xb0000002e311b928  0x03 0x0203
+
 #Dirich
 trbcmd s  0x58000007125dbc28  0x01 0xf3d2
 
@@ -55,7 +62,9 @@ trbcmd w 0xfc00 0xc5 0x50ff
 
 
 echo "cts"
+trbcmd w 0xc002 0xa156  100000
 trbcmd w 0xc000 0xa156  1000000
+trbcmd w 0xc000 0xa157  10000
 trbcmd w 0xc148 0xa150  1000000
 
 
-- 
2.43.0