Commit 3c4cc4ba authored by Denia Bouhired-Ferrag's avatar Denia Bouhired-Ferrag

Merge branch 'proposed-master'

parents c40f87f2 c1d3b6a1
*.~*
doc/ug/fig/*.pdf
......@@ -6,4 +6,4 @@
url = git@ohwr.org:level-conversion/conv-ttl-rs485/conv-ttl-rs485-tst.git
[submodule "conv-ttl-rs485-gw"]
path = conv-ttl-rs485-gw
url = git://ohwr.org/level-conversion/conv-ttl-rs485/conv-ttl-rs485-gw.git
url = git@ohwr.org:level-conversion/conv-ttl-rs485/conv-ttl-rs485-gw.git
conv-ttl-rs485-gw @ d81130fe
Subproject commit 5f388feae52b22e6214842e2e29682a52c879dc8
Subproject commit d81130fe94bcd6b340a6495dbebdb67a7fb4e187
conv-ttl-rs485-hw @ 12438280
Subproject commit f2a158f7236a4d40de093f1f26068889e7f88bbf
Subproject commit 124382804cd2d9c6d0000c868ec908d86cb4ea79
conv-ttl-rs485-tst @ 2cf50e56
Subproject commit 987fa158711bf2978200bb14e1d3d61fb8d744c7
Subproject commit 2cf50e5632d77374afaf99004e80636c18894a1b
......@@ -9,7 +9,7 @@
\noindent \rule{\textwidth}{.1cm}
\hfill January 22, 2015
\hfill August 29, 2018
\vspace*{3cm}
......@@ -24,7 +24,7 @@
%---------------------------------------------------------------
% name
%---------------------------------------------------------------
\noindent {\Large \textbf{Theodor-Adrian Stana (CERN/BE-CO-HT)}}
\noindent {\Large \textbf{CERN/BE-CO-HT}}
\noindent \rule{\textwidth}{.05cm}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -13,7 +13,7 @@
height="294.34448"
id="svg2"
version="1.1"
inkscape:version="0.48.3.1 r9886"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="ttl-chan.svg">
<defs
id="defs4">
......@@ -71,10 +71,10 @@
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:window-width="1855"
inkscape:window-height="1176"
inkscape:window-x="65"
inkscape:window-y="24"
inkscape:window-width="1920"
inkscape:window-height="1138"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
......@@ -88,10 +88,10 @@
enabled="true"
snapvisiblegridlinesonly="true"
units="mm"
spacingx="1mm"
spacingy="1mm"
originx="-37.929446mm"
originy="-181.92944mm" />
spacingx="3.5433071"
spacingy="3.5433071"
originx="-134.39567"
originy="-644.63187" />
</sodipodi:namedview>
<metadata
id="metadata7">
......@@ -101,7 +101,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
......@@ -117,12 +117,12 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<rect
style="fill:#e5e5e5;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
style="fill:#e5e5e5;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect5531"
width="131.10236"
height="56.692909"
x="134.64568"
y="350.78738" />
y="350.78735" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 279.92126,216.14171 -131.10236,0 0,127.55906 152.3622,0"
......@@ -147,13 +147,12 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" />
<text
sodipodi:linespacing="125%"
id="text3974"
y="340.15747"
x="180.70866"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
xml:space="preserve"><tspan
style="font-size:12px"
style="font-size:12px;line-height:1.25;font-family:sans-serif"
y="340.15747"
x="180.70866"
id="tspan3976"
......@@ -172,19 +171,18 @@
sodipodi:cy="350.78738"
sodipodi:rx="3.5433071"
sodipodi:ry="3.5433071"
d="m 446.4567,350.78738 c 0,1.95692 -1.58639,3.54331 -3.54331,3.54331 -1.95691,0 -3.54331,-1.58639 -3.54331,-3.54331 0,-1.95691 1.5864,-3.5433 3.54331,-3.5433 1.95692,0 3.54331,1.58639 3.54331,3.5433 z" />
d="m 446.4567,350.78738 a 3.5433071,3.5433071 0 0 1 -3.54331,3.54331 3.5433071,3.5433071 0 0 1 -3.54331,-3.54331 3.5433071,3.5433071 0 0 1 3.54331,-3.5433 3.5433071,3.5433071 0 0 1 3.54331,3.5433 z" />
<text
xml:space="preserve"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
x="201.96851"
y="382.67715"
id="text7092"
sodipodi:linespacing="125%"><tspan
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
x="215.89709"
y="370.17715"
id="text7092"><tspan
sodipodi:role="line"
x="201.96851"
y="382.67715"
x="215.89709"
y="370.17715"
id="tspan3277"
style="font-size:14px;font-weight:bold;text-align:center;text-anchor:middle">RS-485 side</tspan></text>
style="font-weight:bold;font-size:14px;line-height:1.25;font-family:sans-serif;text-align:center;text-anchor:middle">RTM side</tspan></text>
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 442.91339,279.92122 -3.54331,7.08661 7.08661,0 -3.5433,-7.08661"
......@@ -41345,20 +41343,19 @@
transform="translate(134.39568,113.3858)" />
<text
xml:space="preserve"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
x="396.8504"
y="308.26767"
id="text52692"
sodipodi:linespacing="125%"><tspan
id="text52692"><tspan
sodipodi:role="line"
id="tspan52694"
x="396.8504"
y="308.26767"
style="font-size:12px;text-align:center;text-anchor:middle">pulse</tspan><tspan
style="font-size:12px;line-height:1.25;font-family:sans-serif;text-align:center;text-anchor:middle">pulse</tspan><tspan
sodipodi:role="line"
x="396.8504"
y="323.26767"
style="font-size:12px;text-align:center;text-anchor:middle"
style="font-size:12px;line-height:1.25;font-family:sans-serif;text-align:center;text-anchor:middle"
id="tspan52696">generator</tspan></text>
<rect
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
......@@ -41381,7 +41378,7 @@
sodipodi:cy="-16.716501"
sodipodi:rx="1.7716535"
sodipodi:ry="1.7716535"
d="m 111.75489,-16.716501 a 1.7716535,1.7716535 0 1 1 -3.54331,0 1.7716535,1.7716535 0 1 1 3.54331,0 z"
d="m 111.75489,-16.716501 a 1.7716535,1.7716535 0 0 1 -1.77165,1.771653 1.7716535,1.7716535 0 0 1 -1.77166,-1.771653 1.7716535,1.7716535 0 0 1 1.77166,-1.771654 1.7716535,1.7716535 0 0 1 1.77165,1.771654 z"
transform="matrix(2,0,0,2,-42.801111,249.57469)" />
<path
inkscape:connector-curvature="0"
......@@ -41391,15 +41388,14 @@
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
x="187.79529"
y="248.03145"
id="text12957"
sodipodi:linespacing="125%"><tspan
id="text12957"><tspan
sodipodi:role="line"
id="tspan12959"
x="187.79529"
y="248.03145"
style="font-size:12px">50R</tspan></text>
style="font-size:12px;line-height:1.25;font-family:sans-serif">50R</tspan></text>
</g>
</svg>
......@@ -8,6 +8,21 @@
howpublished = {\url{http://www.ohwr.org/projects/conv-ttl-rs485}}
}
@misc{conv-ttl-rtm-rs485-db9-ohwr,
title = {{CONV-TTL-RTM-RS485-DB9 Wiki Page on OHWR}},
howpublished = {\url{https://www.ohwr.org/projects/conv-ttl-rs485-hw/wiki/DB9-RTM}}
}
@misc{conv-rs485-rtm-opt-ohwr,
title = {{CONV-RS485-OPT-RTM Project Page on OHWR}},
howpublished = {\url{https://www.ohwr.org/projects/conv-rs485-opt-rtm/wiki/wiki}}
}
@misc{conv-ttl-rs485-ohwr,
title = {{CONV-TTL-RS485 Project Page on OHWR}},
howpublished = {\url{http://www.ohwr.org/projects/conv-ttl-rs485}}
}
@misc{conv-ttl-rs485-gw-releases,
title = {{CONV-TTL-RS485 Gateware Releases Page on OHWR}},
howpublished = {\url{http://www.ohwr.org/projects/conv-ttl-rs485-gw/wiki/Releases}}
......@@ -18,6 +33,11 @@
howpublished = {\url{http://www.ohwr.org/documents/389}}
}
@misc{conv-rs485-opt-rtm-hwg,
title = {{CONV-RS485-OPT-RTM Hardware Guide on OHWR}},
howpublished = {\url{https://www.ohwr.org/documents/757}}
}
@misc{conv-ttl-rs485-sch,
title = {{CONV-TTL-RS485 on CERN EDMS}},
howpublished = {\url{https://edms.cern.ch/nav/EDA-02541}}
......@@ -43,8 +63,8 @@
}
@misc{m25p32,
title = {{M25P32 32Mb 3V NOR Serial Flash Embedded Memory}},
howpublished = {\url{http://cern.ch/go/vSq8}}
title = {{MX25L3233F 32Mb 3V NOR Serial Flash Embedded Memory}},
howpublished = {\url{http://cern.ch/go/7BfN}}
}
@misc{ug380,
......@@ -67,3 +87,9 @@
year = 2011,
note = {\url{http://opencores.org/websvn,filedetails?repname=sockit_owm&path=%2Fsockit_owm%2Ftrunk%2Fdoc%2Fsockit_owr.pdf}}
}
@misc{ds18b20,
author = {{Maxim Integrated}},
title = {{DS18B20 -- Programmable Resolution 1-Wire Digital Thermometer}},
note = {\url{http://datasheets.maximintegrated.com/en/ds/DS18B20.pdf}}
}
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment