diff --git a/control/examples/transistor/main.cpp b/control/examples/transistor/main.cpp index cdfc5c2..7073c9d 100644 --- a/control/examples/transistor/main.cpp +++ b/control/examples/transistor/main.cpp @@ -4,6 +4,15 @@ #include #include +/* + * Erfasse die Kennlinien des ersten und zweiten Quadrants eines FETs. + * Anschlüsse: + * ADC0: U_out (über 100Ohm an Drain) + * ADC1: U_drain (Drain) + * DAC0: U_out (über 100Ohm an Drain) + * DAC1: U_GS (über 1K an Gate) + */ + const char PLOT_FILE[] = "plot.bin"; void printProgress(double p) diff --git a/control/src/Makefile b/control/src/Makefile index 4a22456..62cfdac 100644 --- a/control/src/Makefile +++ b/control/src/Makefile @@ -40,7 +40,7 @@ OBJECTS_CLI = cli.o ui/view.o ui/view_selection.o ui/view_promt.o ui/view_info .PHONY: $(OUT_TMP_DRV) clean help -all: drv cli style +all: drv cli drv: $(OBJECTS_DRV) $(OUT_TMP_DRV) @@ -51,14 +51,14 @@ cli: drv $(OBJECTS_CLI) $(PATH_COMPILER) $(CFLAGS) $(OBJECTS_CLI) -L $(PATH_TMP_LIB) -o $(OUT_TMP_CLI) $(LDFLAGS_CLI) @bash -c 'if [ ! -f "$(OUT_DRV)" ]; then echo -e "\n*** Warning ***: driver not installed\nType \"sudo make install\" to install or update b15fdrv."; fi' -doc: +doc: style @echo "Creating documentation with doxygen..." $(PATH_DOXYGEN) doxygen-cfg @echo problems found: `($(PATH_DOXYGEN) doxygen-cfg 3>&2 2>&1 1>&3) 2>/dev/null | wc -l` style: @echo "Formatting source code with astyle..." - astyle --recursive --style=allman *.cpp,*.h,*.c,*.hpp + -astyle --recursive --style=allman *.cpp,*.h,*.c,*.hpp install: @echo "Installing driver..." @@ -83,9 +83,9 @@ help: clean: @echo "Cleaning..." - rm -f $(OBJECTS_DRV) $(OBJECTS_CLI) $(OUT_TMP_CLI) $(OUT_TMP_DRV) - rm -rf $(OUT_DOC) - find . -type f -name '*.orig' -delete + -rm -f $(OBJECTS_DRV) $(OBJECTS_CLI) $(OUT_TMP_CLI) $(OUT_TMP_DRV) + -rm -rf $(OUT_DOC) + -find . -type f -name '*.orig' -delete .cpp.o: $(PATH_COMPILER) $(CFLAGS) -c $< -o $@ diff --git a/control/src/README.md b/control/src/README.md index 38b9001..12597aa 100644 --- a/control/src/README.md +++ b/control/src/README.md @@ -16,7 +16,7 @@ Außerdem wird eine Bibliothek (*b15fdrv*) installiert, die eine einfache Entwic ### 1. Abhängigkeiten installieren (a) **sudo apt-get update** - (b) **sudo apt-get install git avr-libc avrdude libncurses5-dev g++** + (b) **sudo apt-get install git avr-libc avrdude libncurses5-dev g++ astyle** ### 2. Das Repository klonen (a) **cd /home/famulus/** @@ -89,7 +89,7 @@ PlottyFile pf; pf.setUnitX("V"); pf.setUnitY("V"); pf.setUnitPara("V"); -pf.setDescX("U_{OUT}"); +pf.setDescX("U_{OUT}"); // Markdown wird unterstuetzt pf.setDescY("U_{IN}"); pf.setDescPara(""); pf.setRefX(5); diff --git a/docs/html/annotated.html b/docs/html/annotated.html index 020411e..ef61f9a 100644 --- a/docs/html/annotated.html +++ b/docs/html/annotated.html @@ -85,7 +85,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/b15f_8cpp_source.html b/docs/html/b15f_8cpp_source.html index ecbe9fd..acc8ea5 100644 --- a/docs/html/b15f_8cpp_source.html +++ b/docs/html/b15f_8cpp_source.html @@ -112,7 +112,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/b15f_8h_source.html b/docs/html/b15f_8h_source.html index 035e0db..ddfc4a8 100644 --- a/docs/html/b15f_8h_source.html +++ b/docs/html/b15f_8h_source.html @@ -107,7 +107,7 @@ $(function() {
B15F::testIntConv
bool testIntConv(void)
Definition: b15f.cpp:114
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classB15F-members.html b/docs/html/classB15F-members.html index 22fa87a..707c073 100644 --- a/docs/html/classB15F-members.html +++ b/docs/html/classB15F-members.html @@ -105,7 +105,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classB15F.html b/docs/html/classB15F.html index d8b7952..c87b9b8 100644 --- a/docs/html/classB15F.html +++ b/docs/html/classB15F.html @@ -1030,7 +1030,7 @@ constexpr static uint32_t 
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classDot-members.html b/docs/html/classDot-members.html index 39c6a3f..e3f377e 100644 --- a/docs/html/classDot-members.html +++ b/docs/html/classDot-members.html @@ -76,7 +76,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classDot.html b/docs/html/classDot.html index 5c851dd..665c410 100644 --- a/docs/html/classDot.html +++ b/docs/html/classDot.html @@ -196,7 +196,7 @@ Public Member Functions
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classDriverException-members.html b/docs/html/classDriverException-members.html index 849571a..e48c75b 100644 --- a/docs/html/classDriverException-members.html +++ b/docs/html/classDriverException-members.html @@ -77,7 +77,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classDriverException.html b/docs/html/classDriverException.html index 2e142b4..faa3298 100644 --- a/docs/html/classDriverException.html +++ b/docs/html/classDriverException.html @@ -109,7 +109,7 @@ std::string msg_<
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classPlottyFile-members.html b/docs/html/classPlottyFile-members.html index 99b2bb9..b50d376 100644 --- a/docs/html/classPlottyFile-members.html +++ b/docs/html/classPlottyFile-members.html @@ -100,7 +100,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classPlottyFile.html b/docs/html/classPlottyFile.html index a9f751d..d5a9bed 100644 --- a/docs/html/classPlottyFile.html +++ b/docs/html/classPlottyFile.html @@ -811,7 +811,7 @@ Public Member Functions
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classTimeoutException-members.html b/docs/html/classTimeoutException-members.html index c54ce38..486fba4 100644 --- a/docs/html/classTimeoutException-members.html +++ b/docs/html/classTimeoutException-members.html @@ -77,7 +77,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classTimeoutException.html b/docs/html/classTimeoutException.html index af3ee1a..da64976 100644 --- a/docs/html/classTimeoutException.html +++ b/docs/html/classTimeoutException.html @@ -239,7 +239,7 @@ std::string 
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classUSART-members.html b/docs/html/classUSART-members.html index 824e9d9..2fdb7ec 100644 --- a/docs/html/classUSART-members.html +++ b/docs/html/classUSART-members.html @@ -86,7 +86,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classUSART.html b/docs/html/classUSART.html index 7a6bb75..ec343a6 100644 --- a/docs/html/classUSART.html +++ b/docs/html/classUSART.html @@ -523,7 +523,7 @@ Public Member Functions
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classUSARTException-members.html b/docs/html/classUSARTException-members.html index da4fb11..83aab23 100644 --- a/docs/html/classUSARTException-members.html +++ b/docs/html/classUSARTException-members.html @@ -77,7 +77,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classUSARTException.html b/docs/html/classUSARTException.html index 3fd0f7f..67ce065 100644 --- a/docs/html/classUSARTException.html +++ b/docs/html/classUSARTException.html @@ -239,7 +239,7 @@ std::string 
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classView-members.html b/docs/html/classView-members.html index 6b825f3..89b86d8 100644 --- a/docs/html/classView-members.html +++ b/docs/html/classView-members.html @@ -89,7 +89,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classView.html b/docs/html/classView.html index 77297a6..0bd3043 100644 --- a/docs/html/classView.html +++ b/docs/html/classView.html @@ -157,7 +157,7 @@ constexpr static int KEY_E
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewInfo-members.html b/docs/html/classViewInfo-members.html index 38493ec..3958c69 100644 --- a/docs/html/classViewInfo-members.html +++ b/docs/html/classViewInfo-members.html @@ -99,7 +99,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewInfo.html b/docs/html/classViewInfo.html index 3b5e91c..31aa7a9 100644 --- a/docs/html/classViewInfo.html +++ b/docs/html/classViewInfo.html @@ -185,7 +185,7 @@ static std::vector< std::string > 
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewMonitor-members.html b/docs/html/classViewMonitor-members.html index eccb4b6..79d515d 100644 --- a/docs/html/classViewMonitor-members.html +++ b/docs/html/classViewMonitor-members.html @@ -103,7 +103,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewMonitor.html b/docs/html/classViewMonitor.html index 9ba923d..42d0600 100644 --- a/docs/html/classViewMonitor.html +++ b/docs/html/classViewMonitor.html @@ -197,7 +197,7 @@ constexpr static int KEY_E
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewPromt-members.html b/docs/html/classViewPromt-members.html index 72441ce..9482bc7 100644 --- a/docs/html/classViewPromt-members.html +++ b/docs/html/classViewPromt-members.html @@ -105,7 +105,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewPromt.html b/docs/html/classViewPromt.html index 62eda32..b86d3ac 100644 --- a/docs/html/classViewPromt.html +++ b/docs/html/classViewPromt.html @@ -205,7 +205,7 @@ static std::vector< std::string > 
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewSelection-members.html b/docs/html/classViewSelection-members.html index 3e68a7d..8a49b6c 100644 --- a/docs/html/classViewSelection-members.html +++ b/docs/html/classViewSelection-members.html @@ -94,7 +94,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewSelection.html b/docs/html/classViewSelection.html index 42b3f1e..87f91ff 100644 --- a/docs/html/classViewSelection.html +++ b/docs/html/classViewSelection.html @@ -172,7 +172,7 @@ static std::vector< std::string > 
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classes.html b/docs/html/classes.html index ec5dd9f..4c09ed9 100644 --- a/docs/html/classes.html +++ b/docs/html/classes.html @@ -105,7 +105,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/cli_8cpp_source.html b/docs/html/cli_8cpp_source.html index 6ea3c5a..7de037d 100644 --- a/docs/html/cli_8cpp_source.html +++ b/docs/html/cli_8cpp_source.html @@ -72,7 +72,7 @@ $(function() {
B15F::setAbortHandler
static void setAbortHandler(errorhandler_t func)
Definition: b15f.cpp:485
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/dir_1788f8309b1a812dcb800a185471cf6c.html b/docs/html/dir_1788f8309b1a812dcb800a185471cf6c.html index e6b1e92..c4bdf28 100644 --- a/docs/html/dir_1788f8309b1a812dcb800a185471cf6c.html +++ b/docs/html/dir_1788f8309b1a812dcb800a185471cf6c.html @@ -73,7 +73,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html b/docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html index 23d7240..35b8999 100644 --- a/docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html +++ b/docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html @@ -73,7 +73,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/dot_8cpp_source.html b/docs/html/dot_8cpp_source.html index 86a8aee..5d60273 100644 --- a/docs/html/dot_8cpp_source.html +++ b/docs/html/dot_8cpp_source.html @@ -77,7 +77,7 @@ $(function() {
Dot::Dot
Dot(uint16_t x, uint16_t y, uint8_t curve)
Definition: dot.cpp:3
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/dot_8h_source.html b/docs/html/dot_8h_source.html index d2bcb23..467ed10 100644 --- a/docs/html/dot_8h_source.html +++ b/docs/html/dot_8h_source.html @@ -78,7 +78,7 @@ $(function() {
Dot::Dot
Dot(uint16_t x, uint16_t y, uint8_t curve)
Definition: dot.cpp:3
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/driverexception_8h_source.html b/docs/html/driverexception_8h_source.html index a48126e..4041155 100644 --- a/docs/html/driverexception_8h_source.html +++ b/docs/html/driverexception_8h_source.html @@ -74,7 +74,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/files.html b/docs/html/files.html index e2789a2..8fd54c0 100644 --- a/docs/html/files.html +++ b/docs/html/files.html @@ -99,7 +99,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/functions.html b/docs/html/functions.html index 7e340ce..b00da03 100644 --- a/docs/html/functions.html +++ b/docs/html/functions.html @@ -380,7 +380,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/functions_func.html b/docs/html/functions_func.html index 71e9038..d6dfce2 100644 --- a/docs/html/functions_func.html +++ b/docs/html/functions_func.html @@ -347,7 +347,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/functions_vars.html b/docs/html/functions_vars.html index 6108e18..cce82b5 100644 --- a/docs/html/functions_vars.html +++ b/docs/html/functions_vars.html @@ -92,7 +92,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/hierarchy.html b/docs/html/hierarchy.html index b5d42de..3c4318f 100644 --- a/docs/html/hierarchy.html +++ b/docs/html/hierarchy.html @@ -86,7 +86,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/index.html b/docs/html/index.html index 85e371c..445fe91 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -83,7 +83,7 @@ Installation

1. Abhängigkeiten installieren

(a) sudo apt-get update
- (b) sudo apt-get install git avr-libc avrdude libncurses5-dev g++
+ (b) sudo apt-get install git avr-libc avrdude libncurses5-dev g++ astyle

2. Das Repository klonen

@@ -150,14 +150,14 @@ Falls noch keine existiert, wird automatisch eine erzeugt und Verbindung zum Boa Kennlinien mit plottyfile generieren

Die Beschreibung zu Plottyfile befindet sich hier.
Nach dem Include von plottyfile kann ein neues Objekt erzeugt und konfiguriert werden:
-

{C++}
PlottyFile pf;
pf.setUnitX("V");
pf.setUnitY("V");
pf.setUnitPara("V");
pf.setDescX("U_{OUT}");
pf.setDescY("U_{IN}");
pf.setDescPara("");
pf.setRefX(5);
pf.setRefY(5);
pf.setParaFirstCurve(0);
pf.setParaStepWidth(0);

Messpunkte können anschließend hinzugefügt werden.
+

{C++}
PlottyFile pf;
pf.setUnitX("V");
pf.setUnitY("V");
pf.setUnitPara("V");
pf.setDescX("U_{OUT}"); // Markdown wird unterstuetzt
pf.setDescY("U_{IN}");
pf.setDescPara("");
pf.setRefX(5);
pf.setRefY(5);
pf.setParaFirstCurve(0);
pf.setParaStepWidth(0);

Messpunkte können anschließend hinzugefügt werden.
Dabei gehören Punkte mit dem gleichen Index für curve (uint8_t) zur selben Kurve und erhalten durch Plotty automatisch die gleiche Farbe.

{C++}
pf.addDot(Dot(x, y, curve));

Wichtig: Die Werte für x und y sind uint16_t, also keine Gleitkommazahlen. Stattdessen sind sie auf RefX und RefY bezogen.

-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/plottyfile_8cpp_source.html b/docs/html/plottyfile_8cpp_source.html index 8d872d8..3d3dd70 100644 --- a/docs/html/plottyfile_8cpp_source.html +++ b/docs/html/plottyfile_8cpp_source.html @@ -101,7 +101,7 @@ $(function() {
PlottyFile::getUnitX
std::string getUnitX(void) const
Definition: plottyfile.cpp:105
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/plottyfile_8h_source.html b/docs/html/plottyfile_8h_source.html index ac0daed..8503ca3 100644 --- a/docs/html/plottyfile_8h_source.html +++ b/docs/html/plottyfile_8h_source.html @@ -102,7 +102,7 @@ $(function() {
PlottyFile::getUnitX
std::string getUnitX(void) const
Definition: plottyfile.cpp:105
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/timeoutexception_8h_source.html b/docs/html/timeoutexception_8h_source.html index 8369649..9330309 100644 --- a/docs/html/timeoutexception_8h_source.html +++ b/docs/html/timeoutexception_8h_source.html @@ -79,7 +79,7 @@ $(function() {
TimeoutException::TimeoutException
TimeoutException(const std::string &message)
Definition: timeoutexception.h:24
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/ui_8cpp_source.html b/docs/html/ui_8cpp_source.html index d362d43..d547bda 100644 --- a/docs/html/ui_8cpp_source.html +++ b/docs/html/ui_8cpp_source.html @@ -88,7 +88,7 @@ $(function() {
B15F::analogWrite0
bool analogWrite0(uint16_t port)
Definition: b15f.cpp:249
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/ui_8h_source.html b/docs/html/ui_8h_source.html index 081277b..5524084 100644 --- a/docs/html/ui_8h_source.html +++ b/docs/html/ui_8h_source.html @@ -73,7 +73,7 @@ $(function() {
1 #ifndef UI_H
2 #define UI_H
3 
4 #include <vector>
5 #include "view_selection.h"
6 #include "view_info.h"
7 #include "view_monitor.h"
8 #include "view_promt.h"
9 
10 void show_main(int);
11 void input(int);
12 void view_back(int);
13 void finish(int);
14 void cleanup();
15 
16 void show_info(int);
17 void show_monitor(int);
18 void show_invalid_port_input(int);
19 void show_invalid_dac_input(int);
20 void write_digital_output0(int);
21 void write_digital_output1(int);
22 void write_analog_output0(int);
23 void write_analog_output1(int);
24 void show_digital_output0(int);
25 void show_digital_output1(int);
26 void show_analog_output0(int);
27 void show_analog_output1(int);
28 
29 // selftest group
30 void show_selftest_info(int);
31 void start_selftest(int);
32 void stop_selftest(int);
33 
34 
35 extern std::vector<View*> win_stack;
36 extern std::thread t_refresh;
37 
38 #endif // UI_H
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/usart_8cpp_source.html b/docs/html/usart_8cpp_source.html index e639289..36fea6d 100644 --- a/docs/html/usart_8cpp_source.html +++ b/docs/html/usart_8cpp_source.html @@ -88,7 +88,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/usart_8h_source.html b/docs/html/usart_8h_source.html index a320b1b..0d1e5dd 100644 --- a/docs/html/usart_8h_source.html +++ b/docs/html/usart_8h_source.html @@ -88,7 +88,7 @@ $(function() {
USART::flushOutputBuffer
void flushOutputBuffer(void)
Definition: usart.cpp:68
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/usartexception_8h_source.html b/docs/html/usartexception_8h_source.html index 6e3aa16..d3bd920 100644 --- a/docs/html/usartexception_8h_source.html +++ b/docs/html/usartexception_8h_source.html @@ -79,7 +79,7 @@ $(function() {
USARTException::~USARTException
virtual ~USARTException()=default
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view_8cpp_source.html b/docs/html/view_8cpp_source.html index 2c0c8a0..a07b9bb 100644 --- a/docs/html/view_8cpp_source.html +++ b/docs/html/view_8cpp_source.html @@ -74,7 +74,7 @@ $(function() {
B15F::abort
static void abort(std::string msg)
Definition: b15f.cpp:467
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view_8h_source.html b/docs/html/view_8h_source.html index 0448ef3..64a3147 100644 --- a/docs/html/view_8h_source.html +++ b/docs/html/view_8h_source.html @@ -74,7 +74,7 @@ $(function() {
View
Definition: view.h:19
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view__info_8cpp_source.html b/docs/html/view__info_8cpp_source.html index e911b4a..5711211 100644 --- a/docs/html/view__info_8cpp_source.html +++ b/docs/html/view__info_8cpp_source.html @@ -73,7 +73,7 @@ $(function() {
1 #include "view_info.h"
2 
3 ViewInfo::ViewInfo()
4 {
5  calls.push_back(nullptr);
6 }
7 
8 void ViewInfo::setText(std::string text)
9 {
10  this->text = text;
11 }
12 
13 void ViewInfo::setLabelClose(std::string label)
14 {
15  this->label_close = label;
16 }
17 
18 void ViewInfo::setCall(call_t call)
19 {
20  calls[0] = call;
21 }
22 
23 void ViewInfo::draw()
24 {
25  int li = 0;
26  for(std::string line : str_split(text, "\n"))
27  mvwprintw(win, text_offset_y + li++, text_offset_x, "%s", line.c_str());
28 
29  close_offset_x = (width - label_close.length()) / 2;
30  close_offset_y = height - 2;
31 
32  wattron(win, A_REVERSE);
33  mvwprintw(win, close_offset_y, close_offset_x, "%s", label_close.c_str());
34  wattroff(win, A_REVERSE);
35 }
36 
37 call_t ViewInfo::keypress(int& key)
38 {
39  switch(key)
40  {
41 
42  case KEY_MOUSE:
43  {
44  // http://pronix.linuxdelta.de/C/Linuxprogrammierung/Linuxsystemprogrammieren_C_Kurs_Kapitel10b.shtml
45  MEVENT event;
46  if(getmouse(&event) == OK && event.bstate & (BUTTON1_CLICKED | BUTTON1_DOUBLE_CLICKED))
47  {
48  size_t column = start_x + close_offset_x;
49  size_t row = start_y + close_offset_y;
50  size_t mouse_x = event.x, mouse_y = event.y;
51  if(mouse_y == row && mouse_x >= column && mouse_x < column + label_close.length())
52  key = -1; // do return from view
53  }
54  break;
55  }
56  case KEY_ENT:
57  key = -1; // do return from view
58  break;
59  default:
60  break;
61  }
62  return calls[0];
63 }
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view__info_8h_source.html b/docs/html/view__info_8h_source.html index 29d9f33..cbfb6bd 100644 --- a/docs/html/view__info_8h_source.html +++ b/docs/html/view__info_8h_source.html @@ -75,7 +75,7 @@ $(function() {
View
Definition: view.h:19
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view__monitor_8cpp_source.html b/docs/html/view__monitor_8cpp_source.html index f0285f7..5aa49a5 100644 --- a/docs/html/view__monitor_8cpp_source.html +++ b/docs/html/view__monitor_8cpp_source.html @@ -84,7 +84,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view__monitor_8h_source.html b/docs/html/view__monitor_8h_source.html index a303615..843b24e 100644 --- a/docs/html/view__monitor_8h_source.html +++ b/docs/html/view__monitor_8h_source.html @@ -75,7 +75,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view__promt_8cpp_source.html b/docs/html/view__promt_8cpp_source.html index 4e704c9..09580c1 100644 --- a/docs/html/view__promt_8cpp_source.html +++ b/docs/html/view__promt_8cpp_source.html @@ -73,7 +73,7 @@ $(function() {
1 #include "view_promt.h"
2 
3 void ViewPromt::draw()
4 {
5  curs_set(1); // show cursor
6 
7  int li = text_offset_y;
8  int ci = 0;
9  for(std::string line : str_split(message + input, "\n"))
10  {
11  mvwprintw(win, ++li, text_offset_x, "%s", line.c_str());
12  ci = line.length() + text_offset_x;
13  }
14 
15  button_offset_x = (width - label_cancel.length() - sep.length() - label_confirm.length()) / 2;
16  button_offset_y = height - text_offset_y;
17 
18  if(selection == 0)
19  {
20  wattron(win, A_REVERSE);
21  mvwprintw(win, button_offset_y, button_offset_x, "%s", label_cancel.c_str());
22  wattroff(win, A_REVERSE);
23  mvwprintw(win, button_offset_y, button_offset_x + label_cancel.length(), "%s", sep.c_str());
24  mvwprintw(win, button_offset_y, button_offset_x + label_cancel.length() + sep.length(), "%s", label_confirm.c_str());
25  }
26  else
27  {
28  mvwprintw(win, button_offset_y, button_offset_x, "%s", label_cancel.c_str());
29  mvwprintw(win, button_offset_y, button_offset_x + label_cancel.length(), "%s", sep.c_str());
30  wattron(win, A_REVERSE);
31  mvwprintw(win, button_offset_y, button_offset_x + label_cancel.length() + sep.length(), "%s", label_confirm.c_str());
32  wattroff(win, A_REVERSE);
33  }
34  wmove(win, li, ci);
35 }
36 
37 void ViewPromt::setMessage(std::string message)
38 {
39  this->message = message;
40 }
41 
42 void ViewPromt::setConfirm(std::string name, std::function<void(int)> call)
43 {
44  label_confirm = name;
45  call_confirm = call;
46 }
47 
48 void ViewPromt::setCancel(std::string name, bool cancelable)
49 {
50  label_cancel = name;
51  this->cancelable = cancelable;
52 }
53 
54 std::string ViewPromt::getInput()
55 {
56  return input;
57 }
58 
59 std::function<void(int)> ViewPromt::keypress(int& key)
60 {
61  std::function<void(int)> ret = nullptr;
62  switch(key)
63  {
64  case KEY_BACKSPACE:
65  if(input.length())
66  input.pop_back();
67  break;
68  case '\t':
69  case KEY_LEFT:
70  case KEY_RIGHT:
71  selection = (selection + 1 ) % 2;
72  break;
73  case KEY_MOUSE:
74  {
75  // http://pronix.linuxdelta.de/C/Linuxprogrammierung/Linuxsystemprogrammieren_C_Kurs_Kapitel10b.shtml
76  MEVENT event;
77  bool hit = false;
78  if(getmouse(&event) == OK && event.bstate & (BUTTON1_CLICKED | BUTTON1_DOUBLE_CLICKED))
79  {
80  size_t column_start = start_x + button_offset_x;
81  size_t row_start = start_y + button_offset_y;
82  size_t mouse_x = event.x, mouse_y = event.y;
83  if(mouse_y == row_start)
84  {
85  if(cancelable && mouse_x >= column_start && mouse_x < column_start + label_cancel.length())
86  {
87  if(selection == 0 || event.bstate & BUTTON1_DOUBLE_CLICKED)
88  hit = true;
89  selection = 0;
90  }
91  if(mouse_x >= column_start + label_cancel.length() + sep.length() && mouse_x < column_start + label_cancel.length() + sep.length() + label_confirm.length())
92  {
93  if(selection == 1 || event.bstate & BUTTON1_DOUBLE_CLICKED)
94  hit = true;
95  selection = 1;
96  }
97  }
98  }
99  if(!hit)
100  break;
101 
102  // fall through to next case
103  [[fallthrough]];
104  }
105  case KEY_ENT:
106  if(selection == 0) // exit
107  key = -1; // do return from view
108  else
109  ret = call_confirm;
110  break;
111  default:
112  break;
113  }
114 
115  if(key >= ' ' && key <= '~')
116  input += (char) key;
117 
118  if(key != KEY_ENT)
119  repaint();
120  return ret;
121 }
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view__promt_8h_source.html b/docs/html/view__promt_8h_source.html index 85deada..bb95b07 100644 --- a/docs/html/view__promt_8h_source.html +++ b/docs/html/view__promt_8h_source.html @@ -75,7 +75,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view__selection_8cpp_source.html b/docs/html/view__selection_8cpp_source.html index e3bb217..a3b32a2 100644 --- a/docs/html/view__selection_8cpp_source.html +++ b/docs/html/view__selection_8cpp_source.html @@ -73,7 +73,7 @@ $(function() {
1 #include "view_selection.h"
2 
3 void ViewSelection::draw()
4 {
5  //curs_set(0); // hide cursor
6  for(size_t i = 0; i < choices.size(); i++)
7  {
8  if(selection == i)
9  wattron(win, A_REVERSE);
10  mvwprintw(win, i + choice_offset_y, choice_offset_x, "%s", choices[i].c_str());
11  if(selection == i)
12  wattroff(win, A_REVERSE);
13  }
14 }
15 
16 void ViewSelection::addChoice(std::string name, call_t call)
17 {
18  choices.push_back(name);
19  calls.push_back(call);
20 }
21 
22 call_t ViewSelection::keypress(int& key)
23 {
24  call_t ret = nullptr;
25  switch(key)
26  {
27  case KEY_UP:
28  do
29  selection = (selection - 1 + choices.size()) % choices.size();
30  while(!choices[selection].length() && choices.size());
31  break;
32 
33  case '\t':
34  case KEY_DOWN:
35  do
36  selection = (selection + 1) % choices.size();
37  while(!choices[selection].length() && choices.size());
38  break;
39 
40  case KEY_MOUSE:
41  {
42  // http://pronix.linuxdelta.de/C/Linuxprogrammierung/Linuxsystemprogrammieren_C_Kurs_Kapitel10b.shtml
43  MEVENT event;
44  bool hit = false;
45  if(getmouse(&event) == OK && event.bstate & (BUTTON1_CLICKED | BUTTON1_DOUBLE_CLICKED))
46  {
47  size_t column_start = start_x + choice_offset_x;
48  size_t row_start = start_y + choice_offset_y;
49  size_t mouse_x = event.x, mouse_y = event.y;
50  for(size_t i = 0; i < choices.size(); i++)
51  if(choices[i].length() && mouse_y == row_start + i && mouse_x >= column_start && mouse_x < column_start + choices[i].length())
52  {
53  if(selection == i || event.bstate & BUTTON1_DOUBLE_CLICKED)
54  hit = true;
55  selection = i;
56  }
57  }
58  if(!hit)
59  break;
60 
61  // fall through to next case
62  [[fallthrough]];
63  }
64 
65  case KEY_ENT:
66  if(selection == choices.size() - 1) // exit
67  key = -1; // do return from view
68  else
69  ret = calls[selection];
70  break;
71  default:
72  break;
73  }
74  repaint();
75  return ret;
76 }
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view__selection_8h_source.html b/docs/html/view__selection_8h_source.html index f576e9b..d15317b 100644 --- a/docs/html/view__selection_8h_source.html +++ b/docs/html/view__selection_8h_source.html @@ -75,7 +75,7 @@ $(function() {
-Generated on Tue Jun 11 2019 14:56:58 for B15F by   +Generated on Tue Jun 11 2019 15:00:56 for B15F by   doxygen 1.8.16