jaseg/master-thesis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ma: work on final build

Browse source
This commit is contained in:
jaseg 2020-07-05 16:18:49 +02:00
parent 01f7fd6e6d
commit 7eb5a8652e
2 changed files with 69 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ma/Makefile
View file

@ -8,6 +8,8 @@ SHELL := bash
MAKEFLAGS += --warn-undefined-variables
MAKEFLAGS += --no-builtin-rules
VERSION_STRING := $(shell git describe --tags --long --dirty)
all: safety_reset.pdf
#safety_reset.pdf: resources/grid_freq_estimation.pdf
@ -15,22 +17,51 @@ all: safety_reset.pdf
#safety_reset.pdf: resources/dsss_experiments-ber.pdf
#safety_reset.pdf: resources/freq_meas_validation_rocof_testsuite.pdf
%.pdf: %.tex %.bib version.tex
%.pdf %-extra-appendices.pdf: %.tex %.bib version.tex
pdflatex -shell-escape $<
biber $*
pdflatex -shell-escape $<
pdflatex -shell-escape -jobname $*-extra-appendices "\def\includenotebooks{1} \def\includefirmwaresources{1} \input{$<}"
biber $*-extra-appendices
pdflatex -shell-escape -jobname $*-extra-appendices "\def\includenotebooks{1} \def\includefirmwaresources{1} \input{$<}"
.PHONY: preview
preview:
pdflatex -shell-escape safety_reset.tex
version.tex: safety_reset.tex safety_reset.bib
git describe --tags --long --dirty > $@
echo "${VERSION_STRING}" > $@
resources/%.pdf: $(LAB_PATH)/%.ipynb
jupyter-nbconvert --to=pdf --output-dir=resources --output=$* --LatexExporter.template_file=resources/nbexport.tplx $^
sdcard: safety_reset.pdf
rm -rf sdcard
mkdir -p sdcard
git clone .. sdcard/git
cp safety_reset.pdf sdcard/thesis-goette-${VERSION_STRING}.pdf
cp safety_reset-extra-appendices.pdf sdcard/thesis-goette-with-sources-${VERSION_STRING}.pdf
mkdir -p sdcard/data
cp ../controller/fw/src/EasyMeter_Q3DA1002_V3.03_fw_dump_0xc000.h \
'../lab-windows/dsss_experiments_res-2020-04-11 13:54:54.json' \
'../lab-windows/dsss_experiments_res-2020-04-16 16:55:49.json' \
'../lab-windows/dsss_experiments_res-2020-04-16 16:56:46.json' \
'../lab-windows/dsss_experiments_res-2020-04-16 17:24:04.json' \
'../lab-windows/dsss_experiments_res-2020-05-06 19:35:22.json' \
'../lab-windows/dsss_experiments_res-2020-07-04 16:43:39.json' \
../lab-windows/dsss_test_signals/dsss_test_noisy_padded.bin \
../lab-windows/emulated_adc_readings_01.bin \
../lab-windows/filtered_freq.bin \
../lab-windows/grid_freq_psd_spl_108pt.json \
../lab-windows/raw_freq.bin \
../lab-windows/synth_sig_test_0123_01.flac \
../lab-windows/synth_sig_test_0123_02.flac \
../lab-windows/waveform.sqlite3 \
sdcard/data/
cp ../data/* sdcard/data/
.PHONY: clean
clean:
rm -f safety_reset.aux safety_reset.bbl safety_reset.bcf safety_reset.log safety_reset.blg
rm -f safety_reset.out safety_reset.run.xml texput.log

67
ma/safety_reset.tex
View file

@ -2724,12 +2724,6 @@ public repository listed on the second page of this document.
\newpage
\appendix
%\chapter{Transcripts of Jupyter notebooks used in this thesis}
%\includenotebook{Grid frequency estimation}{grid_freq_estimation}
%\includenotebook{Grid frequency estimation validation against ROCOF test suite}{freq_meas_validation_rocof_testsuite}
%\includenotebook{Frequency sensor clock stability analysis}{gps_clock_jitter_analysis}
%\includenotebook{DSSS modulation experiments}{dsss_experiments-ber}
\chapter{Frequency sensor schematics}
\label{sec-app-freq-sens-schematics}
@ -2743,36 +2737,47 @@ public repository listed on the second page of this document.
\includepdf[fitpaper,landscape,pagecommand={\thispagestyle{fancy}}]{resources/platform-export-pg3.pdf}
\fancyfoot[C]{\thepage}
%\chapter{Firmware source code excerpts}
%\section{DMA-backed ADC capture (adc.c)}
%\inputminted[fontsize=\footnotesize,linenos,firstline=18,lastline=115,breaklines]{C}{../gm_platform/fw/adc.c}
%
%\section{Frequency sensor packetized serial interface}
%\subsection{serial.c}
%\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../gm_platform/fw/serial.c}
%\subsection{packet\_interface.c}
%\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../gm_platform/fw/packet_interface.c}
%\subsection{cobs.c}
%\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../gm_platform/fw/cobs.c}
%\subsection{Host data logging utility (tw\_test.py)}
%\inputminted[fontsize=\footnotesize,linenos,breaklines]{python}{../gm_platform/fw/tw_test.py}
%
%\section{Frequency estimation (freq\_meas.c)}
%\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/freq_meas.c}
%\section{DSSS demodulation (dsss\_demod.c)}
%\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/dsss_demod.c}
%\section{Cryptographic protocol handling}
%\subsection{protocol.c}
%\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/protocol.c}
%\subsection{crypto.c}
%\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/crypto.c}
\chapter{Demonstrator firmware symbol size map}
\emph{Please find this appendix enclosed in the pouch on the inside of the back cover.}
\label{symbol_size_chart}
\includepdf[fitpaper]{resources/safetyreset-symbol-sizes.pdf}
\ifdefined\includenotebooks
\chapter{Transcripts of Jupyter notebooks used in this thesis}
\includenotebook{Grid frequency estimation}{grid_freq_estimation}
\includenotebook{Grid frequency estimation validation against ROCOF test suite}{freq_meas_validation_rocof_testsuite}
\includenotebook{Frequency sensor clock stability analysis}{gps_clock_jitter_analysis}
\includenotebook{DSSS modulation experiments}{dsss_experiments-ber}
\fi
\ifdefined\includefirmwaresources
\chapter{Firmware source code excerpts}
\section{DMA-backed ADC capture (adc.c)}
\inputminted[fontsize=\footnotesize,linenos,firstline=18,lastline=115,breaklines]{C}{../gm_platform/fw/adc.c}
\section{Frequency sensor packetized serial interface}
\subsection{serial.c}
\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../gm_platform/fw/serial.c}
\subsection{packet\_interface.c}
\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../gm_platform/fw/packet_interface.c}
\subsection{cobs.c}
\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../gm_platform/fw/cobs.c}
\subsection{Host data logging utility (tw\_test.py)}
\inputminted[fontsize=\footnotesize,linenos,breaklines]{python}{../gm_platform/fw/tw_test.py}
\section{Frequency estimation (freq\_meas.c)}
\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/freq_meas.c}
\section{DSSS demodulation (dsss\_demod.c)}
\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/dsss_demod.c}
\section{Cryptographic protocol handling}
\subsection{protocol.c}
\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/protocol.c}
\subsection{crypto.c}
\inputminted[fontsize=\footnotesize,linenos,breaklines]{C}{../controller/fw/src/crypto.c}
\fi
% TODO
%\chapter{Economic viability of countermeasures}
%\section{Attack cost}