From 28277098cbdeb228c0fcb0c04394643f6fd15a20 Mon Sep 17 00:00:00 2001 From: Tristan Krause Date: Wed, 31 Jul 2019 11:26:40 +0200 Subject: [PATCH] Installationsupdate --- control/src/README.md | 3 +- control/src/drv/commit_hash.h | 2 +- docs/html/annotated.html | 2 +- docs/html/b15f_8cpp_source.html | 2 +- docs/html/b15f_8h_source.html | 2 +- docs/html/classB15F-members.html | 2 +- docs/html/classB15F.html | 2 +- docs/html/classDot-members.html | 2 +- docs/html/classDot.html | 2 +- docs/html/classDriverException-members.html | 2 +- docs/html/classDriverException.html | 2 +- docs/html/classPlottyFile-members.html | 2 +- docs/html/classPlottyFile.html | 2 +- docs/html/classTimeoutException-members.html | 2 +- docs/html/classTimeoutException.html | 2 +- docs/html/classUSART-members.html | 2 +- docs/html/classUSART.html | 2 +- docs/html/classUSARTException-members.html | 2 +- docs/html/classUSARTException.html | 2 +- docs/html/classView-members.html | 2 +- docs/html/classView.html | 2 +- docs/html/classViewInfo-members.html | 2 +- docs/html/classViewInfo.html | 2 +- docs/html/classViewMonitor-members.html | 2 +- docs/html/classViewMonitor.html | 2 +- docs/html/classViewPromt-members.html | 2 +- docs/html/classViewPromt.html | 2 +- docs/html/classViewSelection-members.html | 2 +- docs/html/classViewSelection.html | 2 +- docs/html/classes.html | 2 +- docs/html/cli_8cpp_source.html | 2 +- docs/html/commit__hash_8h_source.html | 4 +- .../dir_1788f8309b1a812dcb800a185471cf6c.html | 2 +- .../dir_587c94d866dbb2f408f78cf41f9b2f8d.html | 2 +- docs/html/dot_8cpp_source.html | 2 +- docs/html/dot_8h_source.html | 2 +- docs/html/driverexception_8h_source.html | 2 +- docs/html/files.html | 2 +- docs/html/functions.html | 2 +- docs/html/functions_func.html | 2 +- docs/html/functions_vars.html | 2 +- docs/html/hierarchy.html | 2 +- docs/html/index.html | 5 +- docs/html/plottyfile_8cpp_source.html | 2 +- docs/html/plottyfile_8h_source.html | 2 +- docs/html/requests_8h_source.html | 2 +- docs/html/timeoutexception_8h_source.html | 2 +- docs/html/ui_8cpp_source.html | 2 +- docs/html/ui_8h_source.html | 2 +- docs/html/usart_8cpp_source.html | 2 +- docs/html/usart_8h_source.html | 2 +- docs/html/usartexception_8h_source.html | 2 +- docs/html/view_8cpp_source.html | 2 +- docs/html/view_8h_source.html | 2 +- docs/html/view__info_8cpp_source.html | 2 +- docs/html/view__info_8h_source.html | 2 +- docs/html/view__monitor_8cpp_source.html | 2 +- docs/html/view__monitor_8h_source.html | 2 +- docs/html/view__promt_8cpp_source.html | 2 +- docs/html/view__promt_8h_source.html | 2 +- docs/html/view__selection_8cpp_source.html | 2 +- docs/html/view__selection_8h_source.html | 2 +- install | 171 ------------------ 63 files changed, 66 insertions(+), 235 deletions(-) delete mode 100755 install diff --git a/control/src/README.md b/control/src/README.md index 798cf92..e4c0298 100644 --- a/control/src/README.md +++ b/control/src/README.md @@ -16,10 +16,11 @@ Außerdem wird eine Bibliothek (*b15fdrv*) installiert, die eine einfache Entwic ### Installation mit Installationsscript (empfohlen) - (a) Laden Sie das [Installationsscript](https://raw.githubusercontent.com/devfix/b15f/master/install) herunter + (a) Laden Sie das [Installationsscript](https://raw.githubusercontent.com/devfix/b15f/master/install) herunter, am besten nach **/tmp/** (b) Setzen Sie die Ausführungsberechtigung (c) Schalten Sie die Stromversorgung von B15 an und schließen Sie den ISP Programmer an (d) Starten Sie das Installationsscript + (e) Treten Probleme auf? Das B15F Verzeichnis löschen und das Script nocheinmal starten ### Installation von Hand (falls Installationsscript mit Fehler abbricht) diff --git a/control/src/drv/commit_hash.h b/control/src/drv/commit_hash.h index 4cbf74e..3c3aaa4 100644 --- a/control/src/drv/commit_hash.h +++ b/control/src/drv/commit_hash.h @@ -1,4 +1,4 @@ #ifndef COMMIT_HASH_H #define COMMIT_HASH_H -const char COMMIT_HASH[] = "c36f49c6a238cf100b5d0dbbe2b40d96f19eddb4"; +const char COMMIT_HASH[] = "63bdf77ff2a041e05e0b4a5f0e02225a334eb064"; #endif // COMMIT_HASH_H diff --git a/docs/html/annotated.html b/docs/html/annotated.html index 0987c27..2763de3 100644 --- a/docs/html/annotated.html +++ b/docs/html/annotated.html @@ -85,7 +85,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/b15f_8cpp_source.html b/docs/html/b15f_8cpp_source.html index ae00335..54ebd56 100644 --- a/docs/html/b15f_8cpp_source.html +++ b/docs/html/b15f_8cpp_source.html @@ -121,7 +121,7 @@ $(function() {
DriverException
Definition: driverexception.h:10
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/b15f_8h_source.html b/docs/html/b15f_8h_source.html index c013443..eb56fdf 100644 --- a/docs/html/b15f_8h_source.html +++ b/docs/html/b15f_8h_source.html @@ -117,7 +117,7 @@ $(function() {
DriverException
Definition: driverexception.h:10
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classB15F-members.html b/docs/html/classB15F-members.html index 4e60cf8..d15ec44 100644 --- a/docs/html/classB15F-members.html +++ b/docs/html/classB15F-members.html @@ -114,7 +114,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classB15F.html b/docs/html/classB15F.html index 8bbc664..b1e6a90 100644 --- a/docs/html/classB15F.html +++ b/docs/html/classB15F.html @@ -1309,7 +1309,7 @@ constexpr static uint32_t 
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classDot-members.html b/docs/html/classDot-members.html index dad0267..d3a68a0 100644 --- a/docs/html/classDot-members.html +++ b/docs/html/classDot-members.html @@ -76,7 +76,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classDot.html b/docs/html/classDot.html index e44c933..acadb54 100644 --- a/docs/html/classDot.html +++ b/docs/html/classDot.html @@ -196,7 +196,7 @@ Public Member Functions
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classDriverException-members.html b/docs/html/classDriverException-members.html index 055bd90..6214a3c 100644 --- a/docs/html/classDriverException-members.html +++ b/docs/html/classDriverException-members.html @@ -77,7 +77,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classDriverException.html b/docs/html/classDriverException.html index b131792..2ee7696 100644 --- a/docs/html/classDriverException.html +++ b/docs/html/classDriverException.html @@ -109,7 +109,7 @@ std::string msg_<
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classPlottyFile-members.html b/docs/html/classPlottyFile-members.html index 17cadbd..666d715 100644 --- a/docs/html/classPlottyFile-members.html +++ b/docs/html/classPlottyFile-members.html @@ -100,7 +100,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classPlottyFile.html b/docs/html/classPlottyFile.html index 9ed65f6..07204cd 100644 --- a/docs/html/classPlottyFile.html +++ b/docs/html/classPlottyFile.html @@ -811,7 +811,7 @@ Public Member Functions
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classTimeoutException-members.html b/docs/html/classTimeoutException-members.html index 038161b..3032f91 100644 --- a/docs/html/classTimeoutException-members.html +++ b/docs/html/classTimeoutException-members.html @@ -77,7 +77,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classTimeoutException.html b/docs/html/classTimeoutException.html index 3337a16..28b6f56 100644 --- a/docs/html/classTimeoutException.html +++ b/docs/html/classTimeoutException.html @@ -239,7 +239,7 @@ std::string 
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classUSART-members.html b/docs/html/classUSART-members.html index dd32509..fa08ac3 100644 --- a/docs/html/classUSART-members.html +++ b/docs/html/classUSART-members.html @@ -86,7 +86,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classUSART.html b/docs/html/classUSART.html index 8e70b95..dd37bb1 100644 --- a/docs/html/classUSART.html +++ b/docs/html/classUSART.html @@ -523,7 +523,7 @@ Public Member Functions
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classUSARTException-members.html b/docs/html/classUSARTException-members.html index f23a945..e1da569 100644 --- a/docs/html/classUSARTException-members.html +++ b/docs/html/classUSARTException-members.html @@ -77,7 +77,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classUSARTException.html b/docs/html/classUSARTException.html index 9de33bb..0fd2629 100644 --- a/docs/html/classUSARTException.html +++ b/docs/html/classUSARTException.html @@ -239,7 +239,7 @@ std::string 
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classView-members.html b/docs/html/classView-members.html index 6bc0c18..8b6e770 100644 --- a/docs/html/classView-members.html +++ b/docs/html/classView-members.html @@ -89,7 +89,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classView.html b/docs/html/classView.html index c39aa63..5fe832d 100644 --- a/docs/html/classView.html +++ b/docs/html/classView.html @@ -157,7 +157,7 @@ constexpr static int KEY_E
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewInfo-members.html b/docs/html/classViewInfo-members.html index 6433997..f3404d9 100644 --- a/docs/html/classViewInfo-members.html +++ b/docs/html/classViewInfo-members.html @@ -99,7 +99,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewInfo.html b/docs/html/classViewInfo.html index 6c5d331..8c455b5 100644 --- a/docs/html/classViewInfo.html +++ b/docs/html/classViewInfo.html @@ -185,7 +185,7 @@ static std::vector< std::string > 
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewMonitor-members.html b/docs/html/classViewMonitor-members.html index 305af2c..4bc3d05 100644 --- a/docs/html/classViewMonitor-members.html +++ b/docs/html/classViewMonitor-members.html @@ -103,7 +103,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewMonitor.html b/docs/html/classViewMonitor.html index 65fc313..99954de 100644 --- a/docs/html/classViewMonitor.html +++ b/docs/html/classViewMonitor.html @@ -197,7 +197,7 @@ constexpr static int KEY_E
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewPromt-members.html b/docs/html/classViewPromt-members.html index dd33b53..3010384 100644 --- a/docs/html/classViewPromt-members.html +++ b/docs/html/classViewPromt-members.html @@ -105,7 +105,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewPromt.html b/docs/html/classViewPromt.html index b0b6617..27b6be7 100644 --- a/docs/html/classViewPromt.html +++ b/docs/html/classViewPromt.html @@ -205,7 +205,7 @@ static std::vector< std::string > 
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewSelection-members.html b/docs/html/classViewSelection-members.html index 5c331d2..c2ed09b 100644 --- a/docs/html/classViewSelection-members.html +++ b/docs/html/classViewSelection-members.html @@ -94,7 +94,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classViewSelection.html b/docs/html/classViewSelection.html index 7041af8..be88440 100644 --- a/docs/html/classViewSelection.html +++ b/docs/html/classViewSelection.html @@ -172,7 +172,7 @@ static std::vector< std::string > 
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/classes.html b/docs/html/classes.html index 63345ae..154016c 100644 --- a/docs/html/classes.html +++ b/docs/html/classes.html @@ -105,7 +105,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/cli_8cpp_source.html b/docs/html/cli_8cpp_source.html index 79d152b..71d909b 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:192
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/commit__hash_8h_source.html b/docs/html/commit__hash_8h_source.html index 71bb4f2..1bf923d 100644 --- a/docs/html/commit__hash_8h_source.html +++ b/docs/html/commit__hash_8h_source.html @@ -70,10 +70,10 @@ $(function() {
commit_hash.h
-
1 #ifndef COMMIT_HASH_H
2 #define COMMIT_HASH_H
3 const char COMMIT_HASH[] = "c36f49c6a238cf100b5d0dbbe2b40d96f19eddb4";
4 #endif // COMMIT_HASH_H
+
1 #ifndef COMMIT_HASH_H
2 #define COMMIT_HASH_H
3 const char COMMIT_HASH[] = "63bdf77ff2a041e05e0b4a5f0e02225a334eb064";
4 #endif // COMMIT_HASH_H
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/dir_1788f8309b1a812dcb800a185471cf6c.html b/docs/html/dir_1788f8309b1a812dcb800a185471cf6c.html index 2899a8d..dc0f2b0 100644 --- a/docs/html/dir_1788f8309b1a812dcb800a185471cf6c.html +++ b/docs/html/dir_1788f8309b1a812dcb800a185471cf6c.html @@ -73,7 +73,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html b/docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html index e899dc2..c25f366 100644 --- a/docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html +++ b/docs/html/dir_587c94d866dbb2f408f78cf41f9b2f8d.html @@ -73,7 +73,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/dot_8cpp_source.html b/docs/html/dot_8cpp_source.html index 4414265..0220344 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/dot_8h_source.html b/docs/html/dot_8h_source.html index 1254648..b1653ba 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/driverexception_8h_source.html b/docs/html/driverexception_8h_source.html index 0ab2031..61d7001 100644 --- a/docs/html/driverexception_8h_source.html +++ b/docs/html/driverexception_8h_source.html @@ -74,7 +74,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/files.html b/docs/html/files.html index 541d836..6c0b09b 100644 --- a/docs/html/files.html +++ b/docs/html/files.html @@ -101,7 +101,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/functions.html b/docs/html/functions.html index 4d18ad3..7ad4545 100644 --- a/docs/html/functions.html +++ b/docs/html/functions.html @@ -407,7 +407,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/functions_func.html b/docs/html/functions_func.html index fb65c73..b87cc02 100644 --- a/docs/html/functions_func.html +++ b/docs/html/functions_func.html @@ -374,7 +374,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/functions_vars.html b/docs/html/functions_vars.html index 3710ad4..c23e978 100644 --- a/docs/html/functions_vars.html +++ b/docs/html/functions_vars.html @@ -92,7 +92,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/hierarchy.html b/docs/html/hierarchy.html index a792b30..651f1ae 100644 --- a/docs/html/hierarchy.html +++ b/docs/html/hierarchy.html @@ -86,7 +86,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/index.html b/docs/html/index.html index 128d634..0ffd50e 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -82,10 +82,11 @@ Außerdem wird eine Bibliothek (b15fdrv) installiert, die eine einfache Installation

Installation mit Installationsscript (empfohlen)

-

(a) Laden Sie das Installationsscript herunter
+

(a) Laden Sie das Installationsscript herunter, am besten nach **/tmp/**
(b) Setzen Sie die Ausführungsberechtigung
(c) Schalten Sie die Stromversorgung von B15 an und schließen Sie den ISP Programmer an
(d) Starten Sie das Installationsscript
+ (e) Treten Probleme auf? Das B15F Verzeichnis löschen und das Script nocheinmal starten

Installation von Hand (falls Installationsscript mit Fehler abbricht)

@@ -174,7 +175,7 @@ Dabei gehören Punkte mit dem gleichen Index für curve (uint8_
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/plottyfile_8cpp_source.html b/docs/html/plottyfile_8cpp_source.html index 66a07dd..a53a85a 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/plottyfile_8h_source.html b/docs/html/plottyfile_8h_source.html index a70173e..b888ae7 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/requests_8h_source.html b/docs/html/requests_8h_source.html index 519a54e..8517257 100644 --- a/docs/html/requests_8h_source.html +++ b/docs/html/requests_8h_source.html @@ -73,7 +73,7 @@ $(function() {
1 #ifndef REQUESTS_H
2 #define REQUESTS_H
3 
4 constexpr static uint8_t RQ_DISCARD = 0;
5 constexpr static uint8_t RQ_TEST = 1;
6 constexpr static uint8_t RQ_INFO = 2;
7 constexpr static uint8_t RQ_INT_TEST = 3;
8 constexpr static uint8_t RQ_SELF_TEST = 4;
9 constexpr static uint8_t RQ_DIGITAL_WRITE_0 = 5;
10 constexpr static uint8_t RQ_DIGITAL_WRITE_1 = 6;
11 constexpr static uint8_t RQ_DIGITAL_READ_0 = 7;
12 constexpr static uint8_t RQ_DIGITAL_READ_1 = 8;
13 constexpr static uint8_t RQ_READ_DIP_SWITCH = 9;
14 constexpr static uint8_t RQ_ANALOG_WRITE_0 = 10;
15 constexpr static uint8_t RQ_ANALOG_WRITE_1 = 11;
16 constexpr static uint8_t RQ_ANALOG_READ = 12;
17 constexpr static uint8_t RQ_ADC_DAC_STROKE = 13;
18 constexpr static uint8_t RQ_PWM_SET_FREQ = 14;
19 constexpr static uint8_t RQ_PWM_SET_VALUE = 15;
20 constexpr static uint8_t RQ_SET_MEM_8 = 16;
21 constexpr static uint8_t RQ_GET_MEM_8 = 17;
22 constexpr static uint8_t RQ_SET_MEM_16 = 18;
23 constexpr static uint8_t RQ_GET_MEM_16 = 19;
24 constexpr static uint8_t RQ_COUNTER_OFFSET = 20;
25 constexpr static uint8_t RQ_SERVO_ENABLE = 21;
26 constexpr static uint8_t RQ_SERVO_DISABLE = 22;
27 constexpr static uint8_t RQ_SERVO_SET_POS = 23;
28 
29 uint8_t const rq_len[] =
30 {
31  1 /* RQ_DISCARD */,
32  1 /* RQ_TEST */ + 1 /* test byte */,
33  1 /* RQ_INFO */,
34  1 /* RQ_INT_TEST */ + 1 /* test int high low */ + 1 /* test int high high */,
35  1 /* RQ_SELF_TEST */,
36  1 /* RQ_DIGITAL_WRITE_0 */ + 1 /* port value */,
37  1 /* RQ_DIGITAL_WRITE_1 */ + 1 /* port value */,
38  1 /* RQ_DIGITAL_READ_0 */,
39  1 /* RQ_DIGITAL_READ_1 */,
40  1 /* RQ_READ_DIP_SWITCH */,
41  1 /* RQ_ANALOG_WRITE_0 */ + 1 /* test int high low */ + 1 /* test int high high */,
42  1 /* RQ_ANALOG_WRITE_1 */ + 1 /* test int high low */ + 1 /* test int high high */,
43  1 /* RQ_ANALOG_READ */ + 1 /* adc channel */,
44  1 /* RQ_ADC_DAC_STROKE */ + 1 /* channel a */ + 1 /* channel b */ + 1 /* start low */ + 1 /* start high */ + 1 /* delta low */ + 1 /* delta high */ + 1 /* count low */ + 1 /* count high */,
45  1 /* RQ_PWM_SET_FREQ */ + 1 /* freq low low */ + 1 /* freq low high */ + 1 /* freq high low */ + 1 /* freq high high */,
46  1 /* RQ_PWM_SET_VALUE */ + 1 /* pwm value */,
47  1 /* RQ_SET_MEM_8 */ + 1 /* memory address low */ + 1 /* memory address high */ + 1 /* memory value (8-bit) */,
48  1 /* RQ_GET_MEM_8 */ + 1 /* memory address low */ + 1 /* memory address high */,
49  1 /* RQ_SET_MEM_16 */ + 1 /* memory address low */ + 1 /* memory address high */ + 1 /* memory value low */ + 1 /* memory value high */,
50  1 /* RQ_GET_MEM_16 */ + 1 /* memory address low */ + 1 /* memory address high */,
51  1 /* RQ_COUNTER_OFFSET */,
52  1 /* RQ_SERVO_ENABLE */,
53  1 /* RQ_SERVO_DISABLE */,
54  1 /* RQ_SERVO_SET_POS */ + 1 /* pulse length low */ + 1 /* pulse length high */,
55 };
56 
57 #endif // REQUESTS_H
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/timeoutexception_8h_source.html b/docs/html/timeoutexception_8h_source.html index d20f335..b0a1acd 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/ui_8cpp_source.html b/docs/html/ui_8cpp_source.html index d39be30..ad2d40e 100644 --- a/docs/html/ui_8cpp_source.html +++ b/docs/html/ui_8cpp_source.html @@ -88,7 +88,7 @@ $(function() {
B15F::digitalWrite1
void digitalWrite1(uint8_t)
Definition: b15f.cpp:237
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/ui_8h_source.html b/docs/html/ui_8h_source.html index 3809c46..c50b9b5 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/usart_8cpp_source.html b/docs/html/usart_8cpp_source.html index 15f1edb..1d85fd9 100644 --- a/docs/html/usart_8cpp_source.html +++ b/docs/html/usart_8cpp_source.html @@ -88,7 +88,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/usart_8h_source.html b/docs/html/usart_8h_source.html index ac58a26..a3a37c3 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/usartexception_8h_source.html b/docs/html/usartexception_8h_source.html index 9f11cff..c3f3df3 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view_8cpp_source.html b/docs/html/view_8cpp_source.html index 2eed069..0b351ff 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:175
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/docs/html/view_8h_source.html b/docs/html/view_8h_source.html index 6f6c9d6..66305df 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 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 f28a140..f87581f 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 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 42c22a3..e317949 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 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 b23fe9f..49077d3 100644 --- a/docs/html/view__monitor_8cpp_source.html +++ b/docs/html/view__monitor_8cpp_source.html @@ -84,7 +84,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 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 6790546..14e52b8 100644 --- a/docs/html/view__monitor_8h_source.html +++ b/docs/html/view__monitor_8h_source.html @@ -75,7 +75,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 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 65521cf..fedd0d8 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 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 d8d3229..cbd516c 100644 --- a/docs/html/view__promt_8h_source.html +++ b/docs/html/view__promt_8h_source.html @@ -75,7 +75,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 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 c4416a2..ea43a36 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 Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 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 73390f9..b5848a7 100644 --- a/docs/html/view__selection_8h_source.html +++ b/docs/html/view__selection_8h_source.html @@ -75,7 +75,7 @@ $(function() {
-Generated on Wed Jul 31 2019 10:51:37 for B15F by   +Generated on Wed Jul 31 2019 11:26:28 for B15F by   doxygen 1.8.16
diff --git a/install b/install deleted file mode 100755 index 5c19522..0000000 --- a/install +++ /dev/null @@ -1,171 +0,0 @@ -#!/bin/bash - -# Konstanten -repo="https://github.com/devfix/b15f.git" -log="/tmp/b15f-install.log" -dependencies="git avr-libc avrdude libncurses5-dev g++ astyle" -user="$1" -path="/home/$user/b15f/" -udev_rule="# SUBSYSTEM!=\"usb_device\", ACTION!=\"add\", GOTO=\"avrisp_end\"\n\nATTR{idVendor}==\"03eb\", ATTR{idProduct}==\"2104\", MODE=\"660\", GROUP=\"dialout\"\n\n# LABEL=\"avrisp_end\"\n" -udev_path="/etc/udev/rules.d/60-olimex.rules" -mcu_cfg="/etc/b15f.mcu" -declare -a known_mcus=("atmega1284" "atmega1284p") -declare -a known_users=("famulus" "pi") - -function hr1 -{ - printf '━%.0s' $(seq $(tput cols)) - echo "" -} - -function hr2 -{ - printf '\e(0'; printf 'q%.0s' $(seq $(tput cols)); printf '\e(B\n'; -} - -function title -{ - echo "" - echo -e "\n*** $1 ***" >> "$log" - hr1 - echo " $1" - hr1 -} - -function msg -{ - echo "" - echo -e "\n* $1 *" >> "$log" - hr2 - echo " $1" - hr2 -} - -function out -{ - echo -e " $1" | tee -a "$log" -} - - -########################### -# Beginn der Installation # -########################### - -# Überprüfe, ob ausführender Nutzer root ist. -# Wenn ja überspringe diesen IF-Block. -# Sonst: fordere Anmeldung eines Nutzers mit Sudorechten an und -# rufe dieses Script automatisch nocheinmal mit den richtigen Parametern auf. -if [ "$EUID" -ne 0 ]; then - current_user="`whoami`" - - # Prüfe, ob user ungültig - if [[ ! " ${known_users[@]} " =~ " ${current_user} " ]]; then - users="${known_users[@]}" - title "Fehler: Dieses Script muss als einer der folgenden Nutzer gestartet werden: ${users}." - exit 1 - fi - - out "B15F wrid installiert für: $current_user" - out "Für die Installation werden Superrechte benötigt, Anmeldung (für sudo) folgt..." - printf " Nutzername: " - read user - printf " Melde $user an...\n " - su "$user" -c "printf \" Fordere Superrechte an...\n \" && sudo -S bash \"$0\" \"$current_user\"" - exit 0 -fi - -title "Installation B15F" - - -# Abbruch dieses Scripts, wenn ein Befehl fehlschlägt -set -e -# Abbruch dieses Scripts, wenn ein Befehl in einer Pipe fehlschlägt -set -o pipefail - - -msg "Installiere Abhängigkeiten" - -out "Aktualisiere apt..." -apt-get update > /dev/null | tee -a "$log" - -out "Installiere Packete (wenn nötig)..." -apt-get install -y $dependencies > /dev/null | tee -a "$log" - -out "Konfiguriere udev rules..." -adduser famulus dialout -echo -e "$udev_rule" > "$udev_path" - -out "Aktualisiere udev service..." -udevadm control --reload-rules| tee -a "$log" -udevadm trigger| tee -a "$log" - -msg "Lade Projekt-Daten" - -# Überprüfe, ob repo bereits existiert. -# Wenn Ja -> Aktualisierung mittels pull -if [ -d "$path" ]; then - out "Aktualisiere Repository..." - cd "$path" - su $user -c "git reset --hard" - su $user -c "git checkout --force master" - su $user -c "git pull" - su $user -c "git pull --prune" - -# Wenn Nein -> Runterladen mittels clone -else - out "Klone Repository..." - su $user -c "git clone -q \"$repo\" \"$path\"" | tee -a "$log" - cd "$path" -fi - - -# Entferne Installationsscript im b15f Verzeichnis, damit Nutzer -# getwungen ist immer das neueste per Hand herunterzuladen -rm "$path/install" - - -# Wenn die Datei $mcu_cfg nicht exístiert, frage Nutzer nach MCU von diesem -# Arbeitsplatz und erzeuge sie neu. -if [ ! -f "$mcu_cfg" ]; then - msg "Wichtiger Hinweis: atmega1284p ist nicht gleich atmega1284" - out "Bitte geben Sie die MCU für diesen Arbeitsplatz an:" - read -e -p " MCU = " -i "atmega1284p" mcu - echo "$mcu" > "$mcu_cfg" -fi - -# Lies die MCU aus der Datei $mcu_cfg aus -out "Prüfe $mcu_cfg" -mcu=`cat "$mcu_cfg"` - -# Prüfe, ob MCU unbekannt (falsch Eingabe) -if [[ ! " ${known_mcus[@]} " =~ " ${mcu} " ]]; then - mcus="${known_mcus[@]}" - title "Fehler: $mcu_cfg enhält keine der folgenden MCUs: ${mcus}. Bitte per Hand korrigieren und Installation neu starten." - exit 1 -fi - -# Eersetze die MCU im makefile durch konfigurierte MCU -sed -i "s@\\s*MCU\\s*=\\s*atmega1284.*@MCU = ${mcu} # set by ${mcu_cfg}@g" "$path/firmware/"?akefile - -msg "Kompiliere Firmware" - -cd "$path/firmware" -su $user -c "make clean" | tee -a "$log" -su $user -c "make" | tee -a "$log" - -msg "Lade Firmware auf Mikrocontroller" -make upload | tee -a "$log" || { - title "Fehler: Upload fehlgeschlagen. Hat B15 Strom?" - exit 1 -} - -msg "Kompiliere Steuersoftware" - -cd "$path/control/src" -su $user -c "make clean" | tee -a "$log" -su $user -c "make" | tee -a "$log" - -msg "Installiere Steuersoftware" -make install | tee -a "$log" - -title "Installation erfolgreich abgeschlossen"