RELEASE - fw 0.2.4 + sw 0.1.5

parezj · Oct 20, 2021 · 46d66de · 46d66de
1 parent 3761ead
commit 46d66de
Show file tree

Hide file tree

Showing 61 changed files with 184 additions and 15,932 deletions.
diff --git a/doc/EMBO.chm b/doc/EMBO.chm
diff --git a/doc/EMBO.pdf b/doc/EMBO.pdf
diff --git a/doc/EMBO_cz.docx b/doc/EMBO_cz.docx
diff --git a/doc/EMBO_cz.pdf b/doc/EMBO_cz.pdf
diff --git a/...ctujakubparez.embo/data/qrc_resources.cpp → doc/tables/QtInstallerFramework-win-x86.exe b/...ctujakubparez.embo/data/qrc_resources.cpp → doc/tables/QtInstallerFramework-win-x86.exe
diff --git a/doc/tables/limits_cz.pdf b/doc/tables/limits_cz.pdf
diff --git a/doc/tables/limits_cz.png b/doc/tables/limits_cz.png
diff --git a/doc/tables/limits_cz.tex b/doc/tables/limits_cz.tex
@@ -0,0 +1,43 @@
+\documentclass{article}
+\usepackage{czech}
+\usepackage[utf8]{inputenc}
+\usepackage{mhchem}
+\usepackage{multirow}
+\usepackage{hhline}
+\usepackage{makebox}
+\usepackage{graphicx}
+\usepackage{amsmath,amssymb}
+\usepackage[czech]{babel}
+\usepackage{fancyhdr}
+\usepackage[titles]{tocloft}
+
+\makeatletter
+\newcommand{\thickhline}{%
+    \noalign {\ifnum 0=`}\fi \hrule height 1pt
+    \futurelet \reserved@a \@xhline
+}
+
+\begin{document}
+
+
+\begin{table}[!htbp]
+\catcode`\-=12
+\bgroup
+\def\arraystretch{1.5}%
+\begin{tabular}  { |l|l||c|c|c|c|c|c| }
+ \hline
+ \multicolumn{8}{|c|}{ Limity přístrojů osciloskopu EMBO } \\
+ \hline
+ STM32 & produkt & DAQ & SCOPE & LA & CNTR & PWM & SGEN \\
+ \hhline{|=|=||=|=|=|=|=|=|}
+F103C8 & BluePill & 10 kB & 0.800 MSps & \,\,\,5.142 MSps & 33 MHz & 14.4 MHz & $\times$  \\
+F103RE & LQFP64 & 44 kB & 0.800 MSps & \,\,\,5.142 MSps & 33 MHz & 14.4 MHz & 4.5 Msps  \\
+F303RE & Nucleo64 & 44 kB & 4.965 MSps & 14.400 MSps & 57 MHz & 20.6 MHz & 4.5 Msps  \\
+L412KB & Nucleo32 & 25 kB & 5.000 MSps & 13.333 MSps & 37 MHz & 16.0 MHz & $\times$ \\
+ \hline
+\end{tabular}
+\egroup
+\end{table}
+
+
+\end{document}
diff --git a/doc/tables/limits_en.pdf b/doc/tables/limits_en.pdf
diff --git a/doc/tables/limits_en.png b/doc/tables/limits_en.png
diff --git a/doc/tables/limits_en.tex b/doc/tables/limits_en.tex
@@ -0,0 +1,42 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage{mhchem}
+\usepackage{multirow}
+\usepackage{hhline}
+\usepackage{makebox}
+\usepackage{graphicx}
+\usepackage{amsmath,amssymb}
+\usepackage[czech]{babel}
+\usepackage{fancyhdr}
+\usepackage[titles]{tocloft}
+
+\makeatletter
+\newcommand{\thickhline}{%
+    \noalign {\ifnum 0=`}\fi \hrule height 1pt
+    \futurelet \reserved@a \@xhline
+}
+
+\begin{document}
+
+
+\begin{table}[!htbp]
+\catcode`\-=12
+\bgroup
+\def\arraystretch{1.5}%
+\begin{tabular}  { |l|l||c|c|c|c|c|c| }
+ \hline
+ \multicolumn{8}{|c|}{ Limits of EMBO oscilloscope instruments } \\
+ \hline
+ STM32 & product & DAQ & SCOPE & LA & CNTR & PWM & SGEN \\
+ \hhline{|=|=||=|=|=|=|=|=|}
+F103C8 & BluePill & 10 kB & 0.800 MSps & \,\,\,5.142 MSps & 33 MHz & 14.4 MHz & $\times$  \\
+F103RE & LQFP64 & 44 kB & 0.800 MSps & \,\,\,5.142 MSps & 33 MHz & 14.4 MHz & 4.5 Msps  \\
+F303RE & Nucleo64 & 44 kB & 4.965 MSps & 14.400 MSps & 57 MHz & 20.6 MHz & 4.5 Msps  \\
+L412KB & Nucleo32 & 25 kB & 5.000 MSps & 13.333 MSps & 37 MHz & 16.0 MHz & $\times$ \\
+ \hline
+\end{tabular}
+\egroup
+\end{table}
+
+
+\end{document}
diff --git a/doc/tables/params_cz.pdf b/doc/tables/params_cz.pdf
diff --git a/doc/tables/params_cz.png b/doc/tables/params_cz.png
diff --git a/doc/tables/params_cz.tex b/doc/tables/params_cz.tex
@@ -0,0 +1,44 @@
+\documentclass{article}
+\usepackage{czech}
+\usepackage[utf8]{inputenc}
+\usepackage{mhchem}
+\usepackage{multirow}
+\usepackage{hhline}
+\usepackage{makebox}
+\usepackage{graphicx}
+\usepackage{amsmath,amssymb}
+\usepackage[czech]{babel}
+\usepackage{fancyhdr}
+\usepackage[titles]{tocloft}
+
+\makeatletter
+\newcommand{\thickhline}{%
+    \noalign {\ifnum 0=`}\fi \hrule height 1pt
+    \futurelet \reserved@a \@xhline
+}
+
+
+\begin{document}
+
+
+\begin{table}[!htbp]
+\catcode`\-=12
+\bgroup
+\def\arraystretch{1.5}%
+\begin{tabular}  { |l|l||c|c|c|c|c|c|c| }
+ \hline
+ \multicolumn{9}{|c|}{ Základní parametry pøístrojù osciloskopu EMBO } \\
+ \hline
+ STM32 & produkt & USB & SCOPE & LA & VM & CNTR & PWM & SGEN \\
+ \hhline{|=|=||=|=|=|=|=|=|=|}
+F103C8 & BluePill & $\checkmark$ & 4 ch / 1 ADC  & 4 ch  & 4 ch & 1 ch & 2 ch & $\times$  \\
+F103RE & LQFP64 & $\checkmark$ & 4 ch / 2 ADC  & 4 ch  & 4 ch & 1 ch & 2 ch & 1 ch  \\
+F303RE & Nucleo64 & STLINK & 4 ch / 4 ADC  & 4 ch  & 4 ch & 1 ch & 2 ch & 1 ch  \\
+L412KB & Nucleo32 & $\checkmark$ & 4 ch / 2 ADC  & 4 ch  & 4 ch & 1 ch & 1 ch & $\times$ \\
+ \hline
+\end{tabular}
+\egroup
+\end{table}
+
+
+\end{document}
diff --git a/doc/tables/params_en.pdf b/doc/tables/params_en.pdf
diff --git a/doc/tables/params_en.png b/doc/tables/params_en.png
diff --git a/doc/tables/params_en.tex b/doc/tables/params_en.tex
@@ -0,0 +1,43 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage{mhchem}
+\usepackage{multirow}
+\usepackage{hhline}
+\usepackage{makebox}
+\usepackage{graphicx}
+\usepackage{amsmath,amssymb}
+\usepackage[czech]{babel}
+\usepackage{fancyhdr}
+\usepackage[titles]{tocloft}
+
+\makeatletter
+\newcommand{\thickhline}{%
+    \noalign {\ifnum 0=`}\fi \hrule height 1pt
+    \futurelet \reserved@a \@xhline
+}
+
+
+\begin{document}
+
+
+\begin{table}[!htbp]
+\catcode`\-=12
+\bgroup
+\def\arraystretch{1.5}%
+\begin{tabular}  { |l|l||c|c|c|c|c|c|c| }
+ \hline
+ \multicolumn{9}{|c|}{ Basic parameters of EMBO oscilloscope instruments } \\
+ \hline
+ STM32 & product & USB & SCOPE & LA & VM & CNTR & PWM & SGEN \\
+ \hhline{|=|=||=|=|=|=|=|=|=|}
+F103C8 & BluePill & $\checkmark$ & 4 ch / 1 ADC  & 4 ch  & 4 ch & 1 ch & 2 ch & $\times$  \\
+F103RE & LQFP64 & $\checkmark$ & 4 ch / 2 ADC  & 4 ch  & 4 ch & 1 ch & 2 ch & 1 ch  \\
+F303RE & Nucleo64 & STLINK & 4 ch / 4 ADC  & 4 ch  & 4 ch & 1 ch & 2 ch & 1 ch  \\
+L412KB & Nucleo32 & $\checkmark$ & 4 ch / 2 ADC  & 4 ch  & 4 ch & 1 ch & 1 ch & $\times$ \\
+ \hline
+\end{tabular}
+\egroup
+\end{table}
+
+
+\end{document}
diff --git a/img/params1.png b/img/params1.png
diff --git a/img/params2.png b/img/params2.png
diff --git a/src/firmware/src/cfg/cfg_f103re.h b/src/firmware/src/cfg/cfg_f103re.h
@@ -163,7 +163,7 @@
 #define EM_TIM_SGEN2_MAX       65535
 
 // max values ------------------------------------------------------
-#define EM_DAQ_MAX_MEM         42000     // DAQ max total memory in release mode
+#define EM_DAQ_MAX_MEM         44000     // DAQ max total memory in release mode
 #define EM_LA_MAX_FS           5142857   // Logic Analyzer max FS
 #define EM_DAQ_MAX_B12_FS      800000    // DAQ ADC max fs per 1 channel - 12 bit
 #define EM_DAQ_MAX_B8_FS       0         // DAQ ADC max fs per 1 channel - 8 bit

diff --git a/src/software/EMBO/EMBO.pro b/src/software/EMBO/EMBO.pro
@@ -63,6 +63,10 @@ win32 {
         inst.path += $${DESTDIR}
         INSTALLS += inst
     }
+    help.files += "$${PWD}/doc/EMBO.chm" \
+                  "$${PWD}/doc/EMBO.pdf"
+    help.path += $${DESTDIR}/doc
+    INSTALLS += help
 }
 
 linux {
@@ -95,11 +99,6 @@ macx {
 #LIBS += -lOpenGL32
 #DEFINES += QCUSTOMPLOT_USE_OPENGL
 
-help.files += "$${PWD}/doc/EMBO.chm" \
-              "$${PWD}/doc/EMBO.pdf"
-help.path += $${DESTDIR}/doc
-INSTALLS += help
-
 QMAKE_TARGET_COMPANY = CTU Jakub Parez
 QMAKE_TARGET_PRODUCT = EMBO
 QMAKE_TARGET_DESCRIPTION = EMBedded Oscilloscope