Merge branch 'master' into develop

This commit is contained in:
Matthias Ringwald 2016-03-09 12:15:34 +01:00
commit c1bdcc2493
3 changed files with 5 additions and 8 deletions

View File

@ -22,5 +22,7 @@ all:
clean: clean:
rm -rf docs_final tmp btstack *.pdf latex/btstack_generated.* latex/btstack_final.tex rm -rf docs_final tmp btstack *.pdf latex/btstack_generated.* latex/btstack_final.tex
rm -rf docs/appendix/apis.md docs/appendix/index.md docs/examples/examples.md rm -rf docs/appendix/apis.md docs/appendix/index.md docs/examples/examples.md
rm -rf docs_tmp latex btstack help

View File

@ -67,12 +67,7 @@ morekeywords={*, btstack_timer_source_t, btstack_data_source_t, uint32_t, uint16
le_characteristic_event_t} le_characteristic_event_t}
} }
% Bluetopia & TI MSP430 + Stellaris \newcommand{\versionNr}{0.9}
% http://processors.wiki.ti.com/index.php/CC256x_Bluetopia_Stack#Demos
% Setup MSP430+PAN1315
%
\newcommand{\versionNr}{1.3}
\newcommand{\authorMila}{Dr. sc. Milanka Ringwald} \newcommand{\authorMila}{Dr. sc. Milanka Ringwald}
\newcommand{\authorMatthias}{Dr. sc. Matthias Ringwald} \newcommand{\authorMatthias}{Dr. sc. Matthias Ringwald}
\newcommand{\bkContact}{\href{contact@bluekitchen-gmbh.com}{contact@bluekitchen-gmbh.com}} \newcommand{\bkContact}{\href{contact@bluekitchen-gmbh.com}{contact@bluekitchen-gmbh.com}}
@ -90,7 +85,7 @@ morekeywords={*, btstack_timer_source_t, btstack_data_source_t, uint32_t, uint16
\end{minipage} \end{minipage}
\hfill\begin{minipage}[b]{.8\textwidth}\begin{flushright} \hfill\begin{minipage}[b]{.8\textwidth}\begin{flushright}
{\color{bkblue} {\color{bkblue}
% VERSION \versionNr{} \\ VERSION \versionNr{} \\
\today \\} \today \\}
\vspace*{7.5cm} \vspace*{7.5cm}
\hfill\includegraphics[width=0.85\textwidth]{picts/bklogo.pdf} \hfill\includegraphics[width=0.85\textwidth]{picts/bklogo.pdf}

View File

@ -1,4 +1,4 @@
site_name: BTstack Manual site_name: BTstack Manual v0.9
site_dir: btstack site_dir: btstack
docs_dir: docs_final docs_dir: docs_final
pages: pages: