Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
Conv TTL Blocking - Testing
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Conv TTL Blocking - Testing
Commits
7f95c22b
Commit
7f95c22b
authored
Jul 12, 2018
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'rw-origin/denia-tempo' into HEAD
parents
285344ce
cfcfcb49
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
31 additions
and
158 deletions
+31
-158
pts_regs.vhd
fm/hdl/modules/pts_regs.vhd
+1
-1
pts.vhd
fm/hdl/top/pts.vhd
+7
-6
copy-to-usb.desktop
fm/pts/config/ExpertTools/copy-to-usb.desktop
+1
-1
men-off.desktop
fm/pts/config/ExpertTools/men-off.desktop
+1
-1
men-on.desktop
fm/pts/config/ExpertTools/men-on.desktop
+1
-1
run-one-pts.desktop
fm/pts/config/ExpertTools/run-one-pts.desktop
+2
-2
tar-log.desktop
fm/pts/config/ExpertTools/tar-log.desktop
+1
-1
hw-gwver.py
fm/pts/python/hw-gwver.py
+0
-142
ttl_pulse_switch.py
fm/pts/python/ttl_pulse_switch.py
+14
-0
flash
fm/pts/shell/flash
+1
-1
program
fm/pts/shell/program
+1
-1
tar-log
fm/pts/shell/tar-log
+1
-1
No files found.
fm/hdl/modules/pts_regs.vhd
View file @
7f95c22b
...
...
@@ -3,7 +3,7 @@
---------------------------------------------------------------------------------------
-- File : .\pts_regs.vhd
-- Author : auto-generated by wbgen2 from .\pts_regs.wb
-- Created :
06/19/17 17:23:25
-- Created :
10/27/17 10:49:32
-- Standard : VHDL'87
---------------------------------------------------------------------------------------
-- THIS FILE WAS GENERATED BY wbgen2 FROM SOURCE FILE .\pts_regs.wb
...
...
fm/hdl/top/pts.vhd
View file @
7f95c22b
...
...
@@ -155,7 +155,6 @@ entity pts is
sw_gp_n_i
:
in
std_logic_vector
(
7
downto
0
);
sw_multicast_n_i
:
in
std_logic_vector
(
3
downto
0
);
-- PCB version recognition
pcbrev_i
:
in
std_logic_vector
(
5
downto
0
);
...
...
@@ -1901,8 +1900,10 @@ end generate gen_rear_test_logic;
end
if
;
end
process
p_led_seq
;
max_led_seq
<=
to_unsigned
(
30
,
5
)
when
pulse_led_en
=
'1'
else
to_unsigned
(
24
,
5
);
-- cycle 24 times for status leds
-- cycle 24 times for status leds
-- 30 times for pulse leds
max_led_seq
<=
to_unsigned
(
30
,
5
)
when
pulse_led_en
=
'1'
else
to_unsigned
(
24
,
5
);
-- Sequence the front-panel LEDs based on the sequence counter
front_led_seq
<=
"0000000001"
when
(
pulse_led_en
=
'1'
)
and
(
led_seq
=
1
)
else
"0000000010"
when
(
pulse_led_en
=
'1'
)
and
(
led_seq
=
2
)
else
...
...
fm/pts/config/ExpertTools/copy-to-usb.desktop
View file @
7f95c22b
...
...
@@ -3,7 +3,7 @@
Version=1.0
Name=Copy Log to USB
Comment=Copy log and info files to USB key
Exec=gnome-terminal --title "Copy to USB Key" -e "bash -c 'cp /home/pts
/ubuntu/ttlbl/log/ttlbl* /media/pts
/log'"
Exec=gnome-terminal --title "Copy to USB Key" -e "bash -c 'cp /home/pts
-administrator/ubuntu/ttlbl/log/ttlbl* /media/pts-administrator
/log'"
Icon=/usr/share/icons/Humanity/apps/48/gnome-session-switch.svg
Terminal=false
Type=Application
...
...
fm/pts/config/ExpertTools/men-off.desktop
View file @
7f95c22b
...
...
@@ -3,7 +3,7 @@
Version=1.0
Name=VME OFF
Comment=Switch off crate
Exec=/home/pts/ubuntu/ttlbl/shell/men-off
Exec=/home/pts
-administrator
/ubuntu/ttlbl/shell/men-off
Icon=/usr/share/icons/LoginIcons/apps/48/system-shutdown.svg
Terminal=true
Type=Application
...
...
fm/pts/config/ExpertTools/men-on.desktop
View file @
7f95c22b
...
...
@@ -3,7 +3,7 @@
Version=1.0
Name=VME ON
Comment=Switch on crate
Exec=/home/pts/ubuntu/ttlbl/shell/men-on
Exec=/home/pts
-administrator
/ubuntu/ttlbl/shell/men-on
Icon=/usr/share/icons/LoginIcons/apps/48/view-refresh.svg
Terminal=true
Type=Application
...
...
fm/pts/config/ExpertTools/run-one-pts.desktop
View file @
7f95c22b
...
...
@@ -3,8 +3,8 @@
Version=1.0
Name=Run One PTS CONV-TTL-BLO Test
Comment=Automated testing for the CONV-TTL-BLO board
Exec=gnome-terminal --geometry 81x32+0+0 --title "PTS Run One Window" -e "bash -c 'cd /home/pts/ubuntu/ttlbl/;./one'"
Icon=/home/pts/ubuntu/ttlbl/config/pts-ico-2.png
Exec=gnome-terminal --geometry 81x32+0+0 --title "PTS Run One Window" -e "bash -c 'cd /home/pts
-administrator
/ubuntu/ttlbl/;./one'"
Icon=/home/pts
-administrator
/ubuntu/ttlbl/config/pts-ico-2.png
Terminal=false
Type=Application
Categories=Utility;Application;
...
...
fm/pts/config/ExpertTools/tar-log.desktop
View file @
7f95c22b
...
...
@@ -3,7 +3,7 @@
Version=1.0
Name=Make log.tar.gz USB zip
Comment=Make tarball from log data on USB key
Exec=/home/pts/ubuntu/ttlbl/shell/tar-log
Exec=/home/pts
-administrator
/ubuntu/ttlbl/shell/tar-log
Icon=/usr/share/icons/Humanity/devices/48/gnome-dev-zipdisk.svg
Terminal=true
Type=Application
...
...
fm/pts/python/hw-gwver.py
deleted
100644 → 0
View file @
285344ce
##_______________________________________________________________________________________________
##
## CONV-TTL-BLO PTS
##
## CERN,BE/CO-HT
##_______________________________________________________________________________________________
##
##-----------------------------------------------------------------------------------------------
##
## CONV-TTL-BLO pcb version
##
##-----------------------------------------------------------------------------------------------
##
## Description Test whether the version of PCB is the expected one
##
##
## Authors Maciej Lipinski (maciej.lipinski@cern.ch)
## Website http://www.ohwr.org/projects/pts
## Date 17/08/2017
##-----------------------------------------------------------------------------------------------
##
##------------------------------------------------------------------------------------------------
## GNU LESSER GENERAL PUBLIC LICENSE
## ------------------------------------
## This source file is free software; you can redistribute it and/or modify it under the terms of
## the GNU Lesser General Public License as published by the Free Software Foundation; either
## version 2.1 of the License, or (at your option) any later version.
## This source is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
## without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
## See the GNU Lesser General Public License for more details.
## You should have received a copy of the GNU Lesser General Public License along with this
## source; if not, download it from http://www.gnu.org/licenses/lgpl-2.1.html
##-------------------------------------------------------------------------------------------------
##-------------------------------------------------------------------------------------------------
## Import
##-------------------------------------------------------------------------------------------------
# Import system modules
import
sys
sys
.
path
.
append
(
"log/"
)
import
time
import
os
,
errno
,
re
,
sys
,
struct
import
os.path
import
traceback
import
glob
import
binascii
# Import common modules
from
ctypes
import
*
from
ptsexcept
import
*
from
vv_pts
import
*
from
ptsdefine
import
*
##-------------------------------------------------------------------------------------------------
## main --
##-------------------------------------------------------------------------------------------------
def
main
(
bus
,
tname
,
inf
,
log
):
"""
tests : Hardware version
uses : pts.bit and hwvertest.py
"""
HWVERS
=
0.0
GWVERS
=
4.1
# Control and Status Register
CSR
=
0x004
CSR_GWVERS_OFS
=
0
CSR_HWVERS_OFS
=
22
pel
=
PTS_ERROR_LOGGER
(
inf
,
log
)
try
:
# Read PCB version: a 6 bits representing HW/PCB version number
# 4 MSB represent HW version number (major)
# 2 LSB represent number of execution (minor)
# Eg: value 010010 represents PCB version 4.2
hwvers
=
(
bus
.
vv_read
(
CSR
)
&
0xFC00000
)
>>
CSR_HWVERS_OFS
maj
=
int
(
hwvers
>>
2
)
min
=
float
(
hwvers
&
0x03
)
min
/=
10
hwvers
=
maj
+
min
# and now check if appropriate
if
(
hwvers
==
HWVERS
):
if
(
HWVERS
==
0.0
)
msg
=
"HW/PCB version is version 3 or earlier
\n
"
inf
.
write
(
msg
)
else
:
msg
=
"HW/PCB version is version
%2.1
f
\n
"
%
(
HWVERS
)
inf
.
write
(
msg
)
else
:
msg
=
"ERROR: HW/PCBe version (
%2.1
f) incorrect - expected
%2.1
f"
%
(
hwvers
,
HWVERS
)
pel
.
set
(
msg
)
print
"-->
%
s"
%
msg
return
pel
.
get
()
except
BusException
,
e
:
raise
PtsError
(
"SKT Exception:
%
s"
%
(
e
))
except
BusWarning
,
e
:
raise
PtsError
(
"SKT Warning:
%
s"
%
(
e
))
try
:
# Read GW release version: a 8 bits representing HW/PCB version number
# 4 MSB represent HW version number (major)
# 4 LSB represent number of execution (minor)
# Eg: value 01000010 represents PCB version 4.2
hwvers
=
(
bus
.
vv_read
(
CSR
)
&
0xFF
)
>>
CSR_GWVERS_OFS
maj
=
int
(
gwvers
>>
4
)
min
=
float
(
hwvers
&
0x0F
)
min
/=
10
gwvers
=
maj
+
min
# and now check if appropriate
if
(
gwvers
==
GWVERS
):
msg
=
"GW version is version
%2.1
f or earlier
\n
"
%
(
GWVERS
)
inf
.
write
(
msg
)
else
:
msg
=
"ERROR: GW version (
%2.1
f) incorrect - expected
%2.1
f
\n
"
%
(
gwvers
,
GWVERS
)
pel
.
set
(
msg
)
print
"-->
%
s"
%
msg
return
pel
.
get
()
except
BusException
,
e
:
raise
PtsError
(
"SKT Exception:
%
s"
%
(
e
))
except
BusWarning
,
e
:
raise
PtsError
(
"SKT Warning:
%
s"
%
(
e
))
fm/pts/python/ttl_pulse_switch.py
View file @
7f95c22b
...
...
@@ -153,6 +153,20 @@ def main(bus, tname, inf, log):
chans
=
[
'1'
,
'2'
,
'3'
,
'4'
,
'5'
,
'6'
,
'A'
,
'B'
,
'C'
,
'D'
]
try
:
# Ask the user to make the daisy-chain
print
(
"Please plug in the patch board for front panel daisy-chaining:
\n
"
)
reply
=
raw_input
(
"Is the patch board plugged-in? (yes/no) "
)
while
True
:
if
"yes"
in
reply
.
lower
():
break
if
"no"
in
reply
.
lower
():
msg
=
"ERROR: No daisy-chain on front panel"
pel
.
set
(
msg
)
return
pel
.
get
()
else
:
reply
=
raw_input
(
'Please type "yes" or "no" to continue: '
)
# Initialize a pulse counter object
pc
=
CPulseCounter
(
bus
,
PULSE_CNT_BASE
)
...
...
fm/pts/shell/flash
View file @
7f95c22b
#!/bin/bash
xc3sprog
-c
xpc flash_load.bit
xc3sprog
-c
xpc
-I
golden-v0.
2_release-v4.0
.bin:w:0:bin
xc3sprog
-c
xpc
-I
golden-v0.
3_release-v4.1
.bin:w:0:bin
fm/pts/shell/program
View file @
7f95c22b
#!/bin/bash
xc3sprog
-c
xpc pts
-v4
.bit
xc3sprog
-c
xpc pts.bit
fm/pts/shell/tar-log
View file @
7f95c22b
#!/bin/bash
cd
cd
/media/pts
cd
/media/pts
-administrator
rm
-f
log.tar.gz
tar
cvzf log.tar.gz log
cd
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment