Merge branch 'denia-dev' into proposed-master

68a6cf09 · unknown · c40f87f2 · 07e07988 · 68a6cf09 · 68a6cf09
Commit 68a6cf09 authored Jul 04, 2018 by unknown
35 changed files
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
--- a/doc/ug/cern-title.tex
+++ b/doc/ug/cern-title.tex
@@ -9,7 +9,7 @@

 \noindent \rule{\textwidth}{.1cm}

-\hfill January 22, 2015
+\hfill December 15, 2017

 \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}


--- a/doc/ug/fig/cern-logo.pdf
+++ b/doc/ug/fig/cern-logo.pdf
--- a/doc/ug/fig/comm.pdf
+++ b/doc/ug/fig/comm.pdf
--- a/doc/ug/fig/conv-sys-bd.pdf
+++ b/doc/ug/fig/conv-sys-bd.pdf
--- a/doc/ug/fig/cr-mpt.pdf
+++ b/doc/ug/fig/cr-mpt.pdf
--- a/doc/ug/fig/ex-invert-ttl.pdf
+++ b/doc/ug/fig/ex-invert-ttl.pdf
--- a/doc/ug/fig/ex-timing.pdf
+++ b/doc/ug/fig/ex-timing.pdf
--- a/doc/ug/fig/front-panel.pdf
+++ b/doc/ug/fig/front-panel.pdf
--- a/doc/ug/fig/gwvers.pdf
+++ b/doc/ug/fig/gwvers.pdf
--- a/doc/ug/fig/invttl-chan.pdf
+++ b/doc/ug/fig/invttl-chan.pdf
--- a/doc/ug/fig/iterm.pdf
+++ b/doc/ug/fig/iterm.pdf
--- a/doc/ug/fig/line-stat.pdf
+++ b/doc/ug/fig/line-stat.pdf
--- a/doc/ug/fig/man-trig-fsm.pdf
+++ b/doc/ug/fig/man-trig-fsm.pdf
--- a/doc/ug/fig/ohwr-logo.pdf
+++ b/doc/ug/fig/ohwr-logo.pdf
--- a/doc/ug/fig/oid.pdf
+++ b/doc/ug/fig/oid.pdf
--- a/doc/ug/fig/oterm.pdf
+++ b/doc/ug/fig/oterm.pdf
--- a/doc/ug/fig/pulse-cnt.pdf
+++ b/doc/ug/fig/pulse-cnt.pdf
--- a/doc/ug/fig/pulse-cnt.svg
+++ b/doc/ug/fig/pulse-cnt.svg
--- a/doc/ug/fig/pulse-def.pdf
+++ b/doc/ug/fig/pulse-def.pdf
--- a/doc/ug/fig/pulse-rep.pdf
+++ b/doc/ug/fig/pulse-rep.pdf
--- a/doc/ug/fig/pulse-rep.svg
+++ b/doc/ug/fig/pulse-rep.svg
--- a/doc/ug/fig/rear-panel-db9.pdf
+++ b/doc/ug/fig/rear-panel-db9.pdf
--- a/doc/ug/fig/rear-panel-db9.svg
+++ b/doc/ug/fig/rear-panel-db9.svg
--- a/doc/ug/fig/rear-panel.pdf
+++ b/doc/ug/fig/rear-panel.pdf
--- a/doc/ug/fig/rtm-det.pdf
+++ b/doc/ug/fig/rtm-det.pdf
--- a/doc/ug/fig/sr-switches.pdf
+++ b/doc/ug/fig/sr-switches.pdf
--- a/doc/ug/fig/switches.pdf
+++ b/doc/ug/fig/switches.pdf
--- a/doc/ug/fig/timetag-arch.pdf
+++ b/doc/ug/fig/timetag-arch.pdf
--- a/doc/ug/fig/timetag-buf-mech.pdf
+++ b/doc/ug/fig/timetag-buf-mech.pdf
--- a/doc/ug/fig/timetag-delay.pdf
+++ b/doc/ug/fig/timetag-delay.pdf
--- a/doc/ug/fig/ttl-chan.pdf
+++ b/doc/ug/fig/ttl-chan.pdf
--- a/doc/ug/fig/ttl-vs-ttlbar.pdf
+++ b/doc/ug/fig/ttl-vs-ttlbar.pdf
--- a/doc/ug/ug-conv-ttl-rs485.bib
+++ b/doc/ug/ug-conv-ttl-rs485.bib
@@ -43,8 +43,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 +67,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
--- a/doc/ug/ug-conv-ttl-rs485.tex
+++ b/doc/ug/ug-conv-ttl-rs485.tex